fix(tool/read): match permission patterns against worktree-relative path
Read permission checks now use the same worktree-relative path basis as edit/write/apply_patch, so configured patterns apply consistently.
This commit is contained in:
@@ -178,7 +178,7 @@ export const ReadTool = Tool.define(
|
|||||||
|
|
||||||
yield* ctx.ask({
|
yield* ctx.ask({
|
||||||
permission: "read",
|
permission: "read",
|
||||||
patterns: [filepath],
|
patterns: [path.relative(instance.worktree, filepath)],
|
||||||
always: ["*"],
|
always: ["*"],
|
||||||
metadata: {},
|
metadata: {},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -155,11 +155,24 @@ describe("tool.read external_directory permission", () => {
|
|||||||
yield* exec(dir, { filePath: alt }, next)
|
yield* exec(dir, { filePath: alt }, next)
|
||||||
const read = items.find((item) => item.permission === "read")
|
const read = items.find((item) => item.permission === "read")
|
||||||
expect(read).toBeDefined()
|
expect(read).toBeDefined()
|
||||||
expect(read!.patterns).toEqual([full(target)])
|
expect(read!.patterns).toEqual([path.relative(dir, full(target))])
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
it.live("uses worktree-relative path for read permission so user rules match like edit/write", () =>
|
||||||
|
Effect.gen(function* () {
|
||||||
|
const dir = yield* tmpdirScoped({ git: true })
|
||||||
|
yield* put(path.join(dir, "src", "secret.ts"), "shh")
|
||||||
|
|
||||||
|
const { items, next } = asks()
|
||||||
|
yield* exec(dir, { filePath: path.join(dir, "src", "secret.ts") }, next)
|
||||||
|
const read = items.find((item) => item.permission === "read")
|
||||||
|
expect(read).toBeDefined()
|
||||||
|
expect(read!.patterns).toEqual([path.join("src", "secret.ts")])
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
it.live("asks for directory-scoped external_directory permission when reading external directory", () =>
|
it.live("asks for directory-scoped external_directory permission when reading external directory", () =>
|
||||||
Effect.gen(function* () {
|
Effect.gen(function* () {
|
||||||
const outer = yield* tmpdirScoped()
|
const outer = yield* tmpdirScoped()
|
||||||
|
|||||||
Reference in New Issue
Block a user