Skip to content

[Fix] teach #2343's apply_diff outside-workspace doubles about the hardened guarded write #2372

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
easonLiangWorldedtech wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

[Fix] teach #2343's apply_diff outside-workspace doubles about the hardened guarded write #2372

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
13 changes: 12 additions & 1 deletion src/core/tools/__tests__/applyDiffTool.outsideWorkspace.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ vi.mock("@roo-code/telemetry", () => ({
vi.mock("fs/promises", () => ({
default: {
readFile: vi.fn(),
// ApplyDiffTool stats around its own read to capture the version token its guarded publish
// consumes, so the fs double has to carry a stat. Rejecting keeps the fixture honest about
// the case the code already tolerates: no stat, no token, publish unguarded-by-token.
stat: vi
.fn()
.mockRejectedValue(Object.assign(new Error("ENOENT: no such file or directory"), { code: "ENOENT" })),
},
}))

Expand Down Expand Up @@ -102,7 +108,12 @@ describe("ApplyDiffTool isOutsideWorkspace", () => {
diffViewProvider: {
editType: undefined,
originalContent: "",
open: vi.fn().mockResolvedValue(undefined),
open: vi.fn().mockImplementation(async function () {
// The real open() re-reads the file and records that text as the save baseline; ApplyDiffTool
// compares that baseline against its own read and fails closed when they differ, so the
// double has to emulate the re-read instead of a no-op.
task.diffViewProvider.originalContent = "old\n"
}),
update: vi.fn().mockResolvedValue(undefined),
reset: vi.fn().mockResolvedValue(undefined),
revertChanges: vi.fn().mockResolvedValue(undefined),
Expand Down
Loading