Skip to content

fix(snapshot): scope restore and diff to the session directory #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryangamerdev wants to merge 1 commit into
base: dev
Choose a base branch
from
+33 −11
Open

fix(snapshot): scope restore and diff to the session directory #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,24 +382,43 @@ const layer: Layer.Layer<Service, never, FSUtil.Service | AppProcess.Service | C
const restore = Effect.fnUntraced(function* (snapshot: string) {
return yield* locked(
Effect.gen(function* () {
yield* Effect.logInfo("restore", { commit: snapshot })
const result = yield* git([...core, ...args(["read-tree", snapshot])], { cwd: state.worktree })
if (result.code === 0) {
const checkout = yield* git([...core, ...args(["checkout-index", "-a", "-f"])], {
cwd: state.worktree,
yield* Effect.logInfo("restore", { commit: snapshot, cwd: state.directory })
// The snapshot index is shared across the whole project, but a snapshot taken from a
// subdirectory only updates that subdirectory's entries. Scope the restore to files
// under the session directory so entries for sibling directories (which may be stale)
// are not written back over the current worktree with checkout-index -a.
const prefix = path.relative(state.worktree, state.directory).replaceAll("\\", "/")
const spec = prefix ? `${prefix}/` : "."
const listed = yield* git([...quote, ...args(["ls-tree", "-r", "--name-only", snapshot, "--", spec])], {
cwd: state.worktree,
})
if (listed.code !== 0) {
yield* Effect.logError("failed to list snapshot files", {
snapshot,
exitCode: listed.code,
stderr: listed.stderr,
})
if (checkout.code === 0) return
return
}
const files = listed.text.split("\n").filter(Boolean)
if (!files.length) return
const result = yield* git([...core, ...args(["read-tree", snapshot])], { cwd: state.worktree })
if (result.code !== 0) {
yield* Effect.logError("failed to restore snapshot", {
snapshot,
exitCode: checkout.code,
stderr: checkout.stderr,
exitCode: result.code,
stderr: result.stderr,
})
return
}
const checkout = yield* git([...core, ...args(["checkout-index", "-f", "--", ...files])], {
cwd: state.worktree,
})
if (checkout.code === 0) return
yield* Effect.logError("failed to restore snapshot", {
snapshot,
exitCode: result.code,
stderr: result.stderr,
exitCode: checkout.code,
stderr: checkout.stderr,
})
}),
)
Expand Down Expand Up @@ -527,8 +546,11 @@ const layer: Layer.Layer<Service, never, FSUtil.Service | AppProcess.Service | C
return yield* locked(
Effect.gen(function* () {
yield* add()
// Run from the session directory so the "-- ." path spec scopes the diff to the
// current directory, matching what restore() writes back, rather than reporting
// changes for sibling directories that share the project-wide snapshot index.
const result = yield* git([...quote, ...args(["diff", "--cached", "--no-ext-diff", hash, "--", "."])], {
cwd: state.worktree,
cwd: state.directory,
})
if (result.code !== 0) {
yield* Effect.logWarning("failed to get diff", {
Expand Down
Loading