Validation fixes

2025-12-22 13:21:07 -05:00 · 2025-01-24 10:03:35 -05:00
parent 569e104bf2
commit 5f8a8887fb
6 changed files with 108 additions and 98 deletions
--- a/src/shared/tests/modes.test.ts
+++ b/src/shared/tests/modes.test.ts
@@ -29,59 +29,57 @@ describe("isToolAllowedForMode", () => {
 	describe("file restrictions", () => {
 		it("allows editing matching files", () => {
 			// Test markdown editor mode
-			const mdResult = isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, "test.md")
+			const mdResult = isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, {
+				path: "test.md",
+			})
 			expect(mdResult).toBe(true)

 			// Test CSS editor mode
-			const cssResult = isToolAllowedForMode("write_to_file", "css-editor", customModes, undefined, "styles.css")
+			const cssResult = isToolAllowedForMode("write_to_file", "css-editor", customModes, undefined, {
+				path: "styles.css",
+			})
 			expect(cssResult).toBe(true)
 		})

 		it("rejects editing non-matching files", () => {
 			// Test markdown editor mode with non-markdown file
-			const mdError = isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, "test.js")
-			expect(mdError).toBeInstanceOf(FileRestrictionError)
-			expect((mdError as FileRestrictionError).message).toContain("\\.md$")
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(/\\.md\$/)

 			// Test CSS editor mode with non-CSS file
-			const cssError = isToolAllowedForMode("write_to_file", "css-editor", customModes, undefined, "test.js")
-			expect(cssError).toBeInstanceOf(FileRestrictionError)
-			expect((cssError as FileRestrictionError).message).toContain("\\.css$")
-		})
-
-		it("requires file path for restricted edit operations", () => {
-			const result = isToolAllowedForMode("write_to_file", "markdown-editor", customModes)
-			expect(result).toBeInstanceOf(FileRestrictionError)
-			expect((result as FileRestrictionError).message).toContain("\\.md$")
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "css-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "css-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(/\\.css\$/)
 		})

 		it("applies restrictions to both write_to_file and apply_diff", () => {
 			// Test write_to_file
-			const writeResult = isToolAllowedForMode(
-				"write_to_file",
-				"markdown-editor",
-				customModes,
-				undefined,
-				"test.md",
-			)
+			const writeResult = isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, {
+				path: "test.md",
+			})
 			expect(writeResult).toBe(true)

 			// Test apply_diff
-			const diffResult = isToolAllowedForMode("apply_diff", "markdown-editor", customModes, undefined, "test.md")
+			const diffResult = isToolAllowedForMode("apply_diff", "markdown-editor", customModes, undefined, {
+				path: "test.md",
+			})
 			expect(diffResult).toBe(true)

 			// Test both with non-matching file
-			const writeError = isToolAllowedForMode(
-				"write_to_file",
-				"markdown-editor",
-				customModes,
-				undefined,
-				"test.js",
-			)
-			expect(writeError).toBeInstanceOf(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "markdown-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(FileRestrictionError)

-			const diffError = isToolAllowedForMode("apply_diff", "markdown-editor", customModes, undefined, "test.js")
-			expect(diffError).toBeInstanceOf(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("apply_diff", "markdown-editor", customModes, undefined, { path: "test.js" }),
+			).toThrow(FileRestrictionError)
 		})

 		it("uses description in file restriction error for custom modes", () => {
@@ -99,60 +97,57 @@ describe("isToolAllowedForMode", () => {
 			]

 			// Test write_to_file with non-matching file
-			const writeError = isToolAllowedForMode(
-				"write_to_file",
-				"docs-editor",
-				customModesWithDescription,
-				undefined,
-				"test.js",
-			)
-			expect(writeError).toBeInstanceOf(FileRestrictionError)
-			expect((writeError as FileRestrictionError).message).toContain("Documentation files only")
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.js",
+				}),
+			).toThrow(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("write_to_file", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.js",
+				}),
+			).toThrow(/Documentation files only/)

 			// Test apply_diff with non-matching file
-			const diffError = isToolAllowedForMode(
-				"apply_diff",
-				"docs-editor",
-				customModesWithDescription,
-				undefined,
-				"test.js",
-			)
-			expect(diffError).toBeInstanceOf(FileRestrictionError)
-			expect((diffError as FileRestrictionError).message).toContain("Documentation files only")
+			expect(() =>
+				isToolAllowedForMode("apply_diff", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.js",
+				}),
+			).toThrow(FileRestrictionError)
+			expect(() =>
+				isToolAllowedForMode("apply_diff", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.js",
+				}),
+			).toThrow(/Documentation files only/)

 			// Test that matching files are allowed
-			const mdResult = isToolAllowedForMode(
-				"write_to_file",
-				"docs-editor",
-				customModesWithDescription,
-				undefined,
-				"test.md",
-			)
-			expect(mdResult).toBe(true)
+			expect(
+				isToolAllowedForMode("write_to_file", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.md",
+				}),
+			).toBe(true)

-			const txtResult = isToolAllowedForMode(
-				"write_to_file",
-				"docs-editor",
-				customModesWithDescription,
-				undefined,
-				"test.txt",
-			)
-			expect(txtResult).toBe(true)
+			expect(
+				isToolAllowedForMode("write_to_file", "docs-editor", customModesWithDescription, undefined, {
+					path: "test.txt",
+				}),
+			).toBe(true)
 		})

 		it("allows ask mode to edit markdown files only", () => {
 			// Should allow editing markdown files
-			const mdResult = isToolAllowedForMode("write_to_file", "ask", [], undefined, "test.md")
-			expect(mdResult).toBe(true)
+			expect(isToolAllowedForMode("write_to_file", "ask", [], undefined, { path: "test.md" })).toBe(true)

 			// Should allow applying diffs to markdown files
-			const diffResult = isToolAllowedForMode("apply_diff", "ask", [], undefined, "readme.md")
-			expect(diffResult).toBe(true)
+			expect(isToolAllowedForMode("apply_diff", "ask", [], undefined, { path: "readme.md" })).toBe(true)

 			// Should reject non-markdown files
-			const jsResult = isToolAllowedForMode("write_to_file", "ask", [], undefined, "test.js")
-			expect(jsResult).toBeInstanceOf(FileRestrictionError)
-			expect((jsResult as FileRestrictionError).message).toContain("Markdown files only")
+			expect(() => isToolAllowedForMode("write_to_file", "ask", [], undefined, { path: "test.js" })).toThrow(
+				FileRestrictionError,
+			)
+			expect(() => isToolAllowedForMode("write_to_file", "ask", [], undefined, { path: "test.js" })).toThrow(
+				/Markdown files only/,
+			)

 			// Should maintain read capabilities
 			expect(isToolAllowedForMode("read_file", "ask", [])).toBe(true)
@@ -176,14 +171,18 @@ describe("isToolAllowedForMode", () => {

 describe("FileRestrictionError", () => {
 	it("formats error message with pattern when no description provided", () => {
-		const error = new FileRestrictionError("Markdown Editor", "\\.md$")
-		expect(error.message).toBe("This mode (Markdown Editor) can only edit files matching the pattern: \\.md$")
+		const error = new FileRestrictionError("Markdown Editor", "\\.md$", undefined, "test.js")
+		expect(error.message).toBe(
+			"This mode (Markdown Editor) can only edit files matching pattern: \\.md$. Got: test.js",
+		)
 		expect(error.name).toBe("FileRestrictionError")
 	})

 	it("formats error message with description when provided", () => {
-		const error = new FileRestrictionError("Markdown Editor", "\\.md$", "Markdown files only")
-		expect(error.message).toBe("This mode (Markdown Editor) can only edit files matching Markdown files only")
+		const error = new FileRestrictionError("Markdown Editor", "\\.md$", "Markdown files only", "test.js")
+		expect(error.message).toBe(
+			"This mode (Markdown Editor) can only edit files matching pattern: \\.md$ (Markdown files only). Got: test.js",
+		)
 		expect(error.name).toBe("FileRestrictionError")
 	})
 })
--- a/src/shared/modes.ts
+++ b/src/shared/modes.ts
@@ -146,9 +146,9 @@ export function isCustomMode(slug: string, customModes?: ModeConfig[]): boolean

 // Custom error class for file restrictions
 export class FileRestrictionError extends Error {
-	constructor(mode: string, pattern: string, description?: string) {
+	constructor(mode: string, pattern: string, description: string | undefined, filePath: string) {
 		super(
-			`This mode (${mode}) can only edit files matching ${description ? description : `the pattern: ${pattern}`}`,
+			`This mode (${mode}) can only edit files matching pattern: ${pattern}${description ? ` (${description})` : ""}. Got: ${filePath}`,
 		)
 		this.name = "FileRestrictionError"
 	}
@@ -159,8 +159,8 @@ export function isToolAllowedForMode(
 	modeSlug: string,
 	customModes: ModeConfig[],
 	toolRequirements?: Record<string, boolean>,
-	filePath?: string, // Optional file path for checking regex patterns
-): boolean | FileRestrictionError {
+	toolParams?: Record<string, any>, // All tool parameters
+): boolean {
 	// Always allow these tools
 	if (ALWAYS_AVAILABLE_TOOLS.includes(tool as any)) {
 		return true
@@ -195,8 +195,10 @@ export function isToolAllowedForMode(

 		// For the edit group, check file regex if specified
 		if (groupName === "edit" && options.fileRegex) {
-			if (!filePath || !doesFileMatchRegex(filePath, options.fileRegex)) {
-				return new FileRestrictionError(mode.name, options.fileRegex, options.description)
+			const filePath = toolParams?.path
+			// Only validate regex if a path is provided
+			if (filePath && !doesFileMatchRegex(filePath, options.fileRegex)) {
+				throw new FileRestrictionError(mode.name, options.fileRegex, options.description, filePath)
 			}
 			return true
 		}