Skip to content

fix(snapshot): fail closed when git check-ignore errors #8

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

Merged
CreatorGhost merged 2 commits into from
Jul 12, 2026
+14 −2
Merged

fix(snapshot): fail closed when git check-ignore errors #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf324e
fix(snapshot): fail closed when git check-ignore errors
CreatorGhost Jul 11, 2026
bafe8dd
fix(snapshot): use distinct sentinel for git spawn failures
CreatorGhost Jul 12, 2026
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
16 changes: 14 additions & 2 deletions packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ const layer: Layer.Layer<Service, never, FSUtil.Service | AppProcess.Service | C
},
Effect.catch((err) =>
Effect.succeed({
code: ChildProcessSpawner.ExitCode(1),
// -1 is a sentinel for "git failed to run at all". Callers that give
// exit code 1 a meaning (check-ignore: "none ignored") must not see
// spawn failures as code 1, otherwise fail-closed paths get bypassed.
code: ChildProcessSpawner.ExitCode(-1),
text: "",
stderr: err instanceof Error ? err.message : String(err),
}),
Expand Down Expand Up @@ -120,7 +123,16 @@ const layer: Layer.Layer<Service, never, FSUtil.Service | AppProcess.Service | C
stdin: encodeNulTerminatedPaths(checkIgnorePaths),
},
)
if (check.code !== 0 && check.code !== 1) return new Set<string>()
// git check-ignore: 0 = some ignored, 1 = none ignored; any other code is an error.
// Fail closed: treat every candidate as ignored so gitignored files cannot leak into
// snapshot patches and later be restored or deleted by /undo (see #28033).
if (check.code !== 0 && check.code !== 1) {
yield* Effect.logWarning("git check-ignore failed; treating all candidates as ignored", {
code: check.code,
stderr: check.stderr,
})
return new Set(files)
}
return new Set(
check.text
.split("\0")
Expand Down
Loading