Skip to content

Fix: Enforce file restrictions for all editing tools #10896

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
mrubens merged 2 commits into from
Jan 22, 2026
Merged

Fix: Enforce file restrictions for all editing tools #10896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aba0e89
fix: enforce file restrictions for all editing tools
roomote Jan 22, 2026
a3c18ff
fix: parse apply_patch content to extract file paths for validation
roomote Jan 22, 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
15 changes: 13 additions & 2 deletions src/core/tools/validateToolUse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@ export function validateToolUse(
}
}

const EDIT_OPERATION_PARAMS = ["diff", "content", "operations", "search", "replace", "args", "line"] as const
const EDIT_OPERATION_PARAMS = [
"diff",
"content",
"operations",
"search",
"replace",
"args",
"line",
"patch", // Used by apply_patch
"old_string", // Used by search_replace and edit_file
"new_string", // Used by search_replace and edit_file
] as const

function getGroupOptions(group: GroupEntry): GroupOptions | undefined {
return Array.isArray(group) ? group[1] : undefined
Expand Down Expand Up @@ -155,7 +166,7 @@ export function isToolAllowedForMode(

// For the edit group, check file regex if specified
if (groupName === "edit" && options.fileRegex) {
const filePath = toolParams?.path
const filePath = toolParams?.path || toolParams?.file_path
// Check if this is an actual edit operation (not just path-only for streaming)
const isEditOperation = EDIT_OPERATION_PARAMS.some((param) => toolParams?.[param])

Expand Down
246 changes: 246 additions & 0 deletions src/shared/__tests__/modes.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,252 @@ describe("isToolAllowedForMode", () => {
}),
).toThrow(/Markdown files only/)
})

it("applies restrictions to apply_patch (custom tool)", () => {
// Test that apply_patch respects file restrictions when included
const patchResult = isToolAllowedForMode(
"apply_patch",
"markdown-editor",
customModes,
undefined,
{
path: "test.md",
patch: "diff --git a/test.md b/test.md\n--- a/test.md\n+++ b/test.md\n@@ -1 +1 @@\n-old\n+new",
},
undefined,
["apply_patch"], // Include custom tool
)
expect(patchResult).toBe(true)

// Test apply_patch with non-matching file
expect(() =>
isToolAllowedForMode(
"apply_patch",
"markdown-editor",
customModes,
undefined,
{
path: "test.js",
patch: "diff --git a/test.js b/test.js\n--- a/test.js\n+++ b/test.js\n@@ -1 +1 @@\n-old\n+new",
},
undefined,
["apply_patch"], // Include custom tool
),
).toThrow(FileRestrictionError)
expect(() =>
isToolAllowedForMode(
"apply_patch",
"markdown-editor",
customModes,
undefined,
{
path: "test.js",
patch: "diff --git a/test.js b/test.js\n--- a/test.js\n+++ b/test.js\n@@ -1 +1 @@\n-old\n+new",
},
undefined,
["apply_patch"], // Include custom tool
),
).toThrow(/\\.md\$/)
})

it("applies restrictions to search_replace (custom tool)", () => {
// Test that search_replace respects file restrictions when included
const searchReplaceResult = isToolAllowedForMode(
"search_replace",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.md",
old_string: "old text",
new_string: "new text",
},
undefined,
["search_replace"], // Include custom tool
)
expect(searchReplaceResult).toBe(true)

// Test search_replace with non-matching file
expect(() =>
isToolAllowedForMode(
"search_replace",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["search_replace"], // Include custom tool
),
).toThrow(FileRestrictionError)
expect(() =>
isToolAllowedForMode(
"search_replace",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["search_replace"], // Include custom tool
),
).toThrow(/\\.md\$/)
})

it("applies restrictions to edit_file (custom tool)", () => {
// Test that edit_file respects file restrictions when included
const editFileResult = isToolAllowedForMode(
"edit_file",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.md",
old_string: "old text",
new_string: "new text",
},
undefined,
["edit_file"], // Include custom tool
)
expect(editFileResult).toBe(true)

// Test edit_file with non-matching file
expect(() =>
isToolAllowedForMode(
"edit_file",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["edit_file"], // Include custom tool
),
).toThrow(FileRestrictionError)
expect(() =>
isToolAllowedForMode(
"edit_file",
"markdown-editor",
customModes,
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["edit_file"], // Include custom tool
),
).toThrow(/\\.md\$/)
})

it("applies restrictions to all editing tools in architect mode (custom tools)", () => {
// Test apply_patch in architect mode
expect(
isToolAllowedForMode(
"apply_patch",
"architect",
[],
undefined,
{
path: "test.md",
patch: "diff --git a/test.md b/test.md\n--- a/test.md\n+++ b/test.md\n@@ -1 +1 @@\n-old\n+new",
},
undefined,
["apply_patch"], // Include custom tool
),
).toBe(true)

expect(() =>
isToolAllowedForMode(
"apply_patch",
"architect",
[],
undefined,
{
path: "test.js",
patch: "diff --git a/test.js b/test.js\n--- a/test.js\n+++ b/test.js\n@@ -1 +1 @@\n-old\n+new",
},
undefined,
["apply_patch"], // Include custom tool
),
).toThrow(FileRestrictionError)

// Test search_replace in architect mode
expect(
isToolAllowedForMode(
"search_replace",
"architect",
[],
undefined,
{
file_path: "test.md",
old_string: "old text",
new_string: "new text",
},
undefined,
["search_replace"], // Include custom tool
),
).toBe(true)

expect(() =>
isToolAllowedForMode(
"search_replace",
"architect",
[],
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["search_replace"], // Include custom tool
),
).toThrow(FileRestrictionError)

// Test edit_file in architect mode
expect(
isToolAllowedForMode(
"edit_file",
"architect",
[],
undefined,
{
file_path: "test.md",
old_string: "old text",
new_string: "new text",
},
undefined,
["edit_file"], // Include custom tool
),
).toBe(true)

expect(() =>
isToolAllowedForMode(
"edit_file",
"architect",
[],
undefined,
{
file_path: "test.js",
old_string: "old text",
new_string: "new text",
},
undefined,
["edit_file"], // Include custom tool
),
).toThrow(FileRestrictionError)
})
})

it("handles non-existent modes", () => {
Expand Down
Loading