refactor(tools): accept optional allowSymlinks in resolveIsOutsideWorkspace; consolidate ListFiles state read; cover symlinked-ancestor ENOENT case (#169)

Author: proyectoauraorg

src/core/tools/BaseTool.ts

@@ -104,11 +104,21 @@ export abstract class BaseTool<TName extends ToolName> {
 	 * `allowSymlinksOutsideWorkspace` setting (#169 / #241). When that setting is enabled,
 	 * a symlink resolving outside the workspace is treated by its lexical path rather than
 	 * being blocked; otherwise symlink targets are resolved and the check fails closed.
+	 *
+	 * Callers that already read provider state in the same execution path can pass
+	 * `allowSymlinksOutsideWorkspace` to avoid a redundant `getState()` call; when omitted
+	 * it is read here.
 	 */
-	protected async resolveIsOutsideWorkspace(task: Task, absolutePath: string): Promise<boolean> {
-		const allowSymlinksOutsideWorkspace =
-			(await task.providerRef.deref()?.getState())?.allowSymlinksOutsideWorkspace ?? false
-		return isPathOutsideWorkspace(absolutePath, { allowSymlinksOutsideWorkspace })
+	protected async resolveIsOutsideWorkspace(
+		task: Task,
+		absolutePath: string,
+		allowSymlinksOutsideWorkspace?: boolean,
+	): Promise<boolean> {
+		const allow =
+			allowSymlinksOutsideWorkspace ??
+			(await task.providerRef.deref()?.getState())?.allowSymlinksOutsideWorkspace ??
+			false
+		return isPathOutsideWorkspace(absolutePath, { allowSymlinksOutsideWorkspace: allow })
 	}
 
 	/**

src/core/tools/ListFilesTool.ts

@@ -34,10 +34,18 @@ export class ListFilesTool extends BaseTool<"list_files"> {
 			task.consecutiveMistakeCount = 0
 
 			const absolutePath = path.resolve(task.cwd, relDirPath)
-			const isOutsideWorkspace = await this.resolveIsOutsideWorkspace(task, absolutePath)
+
+			// Read provider state once and reuse it for both the workspace-boundary check
+			// and the rooignore display preference.
+			const { allowSymlinksOutsideWorkspace = false, showRooIgnoredFiles = false } =
+				(await task.providerRef.deref()?.getState()) ?? {}
+			const isOutsideWorkspace = await this.resolveIsOutsideWorkspace(
+				task,
+				absolutePath,
+				allowSymlinksOutsideWorkspace,
+			)
 
 			const [files, didHitLimit] = await listFiles(absolutePath, recursive || false, 200)
-			const { showRooIgnoredFiles = false } = (await task.providerRef.deref()?.getState()) ?? {}
 
 			const result = formatResponse.formatFilesList(
 				absolutePath,

src/core/webview/webviewMessageHandler.ts

@@ -1208,8 +1208,12 @@ export const webviewMessageHandler = async (
 				// Workspace-boundary validation: prevent path traversal attacks.
 				// Honor the `allowSymlinksOutsideWorkspace` setting (#169 / #241) so symlink
 				// targets are resolved (fail-closed) unless the user opted in.
-				const { allowSymlinksOutsideWorkspace } = await provider.getState()
-				if (isPathOutsideWorkspace(absPath, { allowSymlinksOutsideWorkspace })) {
+				const state = await provider.getState()
+				if (
+					isPathOutsideWorkspace(absPath, {
+						allowSymlinksOutsideWorkspace: state.allowSymlinksOutsideWorkspace,
+					})
+				) {
 					provider.postMessageToWebview({
 						type: "fileContent",
 						fileContent: { path: relPath, content: null, error: "Path is outside workspace" },

src/utils/__tests__/pathUtils.spec.ts

@@ -72,6 +72,20 @@ describe("isPathOutsideWorkspace", () => {
 		expect(isPathOutsideWorkspace(path.join(linkDir, "deep.txt"))).toBe(true)
 	})
 
+	it("treats a not-yet-existing file under a symlinked ancestor directory as OUTSIDE (#169)", () => {
+		// Intersection of the ENOENT walk-up and symlink resolution: linked-dir is a
+		// symlink to outsideDir and the target file doesn't exist yet. The walk-up resolves
+		// the symlinked ancestor and re-appends the basename, landing outside the workspace.
+		const linkDir = path.join(workspaceDir, "linked-dir")
+		fs.symlinkSync(outsideDir, linkDir)
+
+		expect(isPathOutsideWorkspace(path.join(linkDir, "new-file.ts"))).toBe(true)
+		// Opt-in (#246) keeps the lexical (inside) location and does not resolve the symlink.
+		expect(isPathOutsideWorkspace(path.join(linkDir, "new-file.ts"), { allowSymlinksOutsideWorkspace: true })).toBe(
+			false,
+		)
+	})
+
 	it("allows a symlink pointing outside when allowSymlinksOutsideWorkspace is enabled (#246)", () => {
 		const secret = path.join(outsideDir, "secret.txt")
 		fs.writeFileSync(secret, "secret")