ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(opencode): handle snapshot paths from subdirectories (#33506)

Browse source
This commit is contained in:
Kit Langton 2026-06-23 20:51:56 +02:00 • committed by GitHub
commit dcf7b4e792
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 112 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

93
packages/opencode/test/snapshot/snapshot.test.ts
View file

@ -16,6 +16,8 @@ import {
import { testEffect } from "../lib/effect"
const it = testEffect(Layer.mergeAll(Snapshot.defaultLayer, FSUtil.defaultLayer, testInstanceStoreLayer))
// Windows forbids both * and : in directory names.
const nonWindowsIt = process.platform === "win32" ? it.live.skip : it.live
// Git always outputs /-separated paths internally. Snapshot.patch() joins them
// with path.join (which produces \ on Windows) then normalizes back to /.
@ -448,6 +450,97 @@ it.live(
}),
)
it.live(
"subdirectory snapshots include scoped changes only",
Effect.gen(function* () {
const dir = yield* scopedGitTmpdir()
const frontend = path.join(dir, "frontend")
yield* write(`${frontend}/tracked.txt`, "initial")
yield* write(`${frontend}/deleted.txt`, "initial")
yield* write(`${dir}/backend/tracked.txt`, "initial")
yield* write(`${dir}/backend/deleted.txt`, "initial")
yield* exec(dir, ["git", "add", "."])
yield* exec(dir, ["git", "commit", "-m", "init"])
yield* Effect.gen(function* () {
const snapshot = yield* Snapshot.Service
const before = yield* snapshot.track()
expect(before).toBeTruthy()
yield* write(`${frontend}/tracked.txt`, "changed")
yield* write(`${frontend}/untracked.txt`, "new")
yield* rm(`${frontend}/deleted.txt`)
yield* write(`${dir}/backend/tracked.txt`, "changed")
yield* rm(`${dir}/backend/deleted.txt`)
const patch = yield* snapshot.patch(before!)
const diff = yield* snapshot.diff(before!)
expect(patch.files).toContain(fwd(frontend, "tracked.txt"))
expect(patch.files).toContain(fwd(frontend, "untracked.txt"))
expect(patch.files).toContain(fwd(frontend, "deleted.txt"))
expect(patch.files).not.toContain(fwd(dir, "backend", "tracked.txt"))
expect(patch.files).not.toContain(fwd(dir, "backend", "deleted.txt"))
expect(diff).not.toContain("backend/tracked.txt")
expect(diff).not.toContain("backend/deleted.txt")
}).pipe(provideInstance(frontend))
}),
)
nonWindowsIt(
"subdirectory snapshots treat wildcard characters literally",
Effect.gen(function* () {
const dir = yield* scopedGitTmpdir()
const subdir = path.join(dir, "src*")
yield* write(`${subdir}/file.txt`, "initial")
yield* write(`${subdir}/later-ignored.txt`, "initial")
yield* write(`${dir}/srca/file.txt`, "initial")
yield* exec(dir, ["git", "add", "."])
yield* exec(dir, ["git", "commit", "-m", "init"])
yield* Effect.gen(function* () {
const snapshot = yield* Snapshot.Service
const before = yield* snapshot.track()
expect(before).toBeTruthy()
yield* write(`${subdir}/file.txt`, "changed")
yield* write(`${subdir}/later-ignored.txt`, "changed")
yield* write(`${subdir}/.gitignore`, "later-ignored.txt\n")
yield* write(`${dir}/srca/file.txt`, "changed")
const patch = yield* snapshot.patch(before!)
const diff = yield* snapshot.diff(before!)
expect(patch.files).toContain(fwd(subdir, "file.txt"))
expect(patch.files).toContain(fwd(subdir, ".gitignore"))
expect(patch.files).not.toContain(fwd(subdir, "later-ignored.txt"))
expect(patch.files).not.toContain(fwd(dir, "srca", "file.txt"))
expect(diff).toContain("src*/later-ignored.txt")
expect(diff).toContain("deleted file mode")
expect(diff).not.toContain("srca/file.txt")
}).pipe(provideInstance(subdir))
}),
)
nonWindowsIt(
"subdirectory snapshots treat leading colons literally",
Effect.gen(function* () {
const dir = yield* scopedGitTmpdir()
const subdir = path.join(dir, ":src")
yield* write(`${subdir}/kept.txt`, "initial")
yield* write(`${subdir}/later-ignored.txt`, "initial")
yield* exec(dir, ["git", "add", "."])
yield* exec(dir, ["git", "commit", "-m", "init"])
yield* Effect.gen(function* () {
const snapshot = yield* Snapshot.Service
const before = yield* snapshot.track()
expect(before).toBeTruthy()
yield* write(`${subdir}/kept.txt`, "changed")
yield* write(`${subdir}/later-ignored.txt`, "changed")
yield* write(`${subdir}/.gitignore`, "later-ignored.txt\n")
const patch = yield* snapshot.patch(before!)
const diff = yield* snapshot.diff(before!)
expect(patch.files).toContain(fwd(subdir, "kept.txt"))
expect(patch.files).toContain(fwd(subdir, ".gitignore"))
expect(patch.files).not.toContain(fwd(subdir, "later-ignored.txt"))
expect(diff).toContain(":src/later-ignored.txt")
expect(diff).toContain("deleted file mode")
}).pipe(provideInstance(subdir))
}),
)
it.instance(
"gitignore changes",
withTrackedSnapshot(({ tmp, snapshot, before }) =>