@machina.ai/cell-cli-core 1.49.0-rc6 → 1.51.0-rc1

package/dist/src/tools/at-reference-resolution.test.js

@@ -0,0 +1,402 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { ReadFileTool } from './read-file.js';
+import { WriteFileTool, getCorrectedFileContent } from './write-file.js';
+import { EditTool } from './edit.js';
+import { correctPath } from '../utils/pathCorrector.js';
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import { StandardFileSystemService } from '../services/fileSystemService.js';
+import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+import { isSubpath } from '../utils/paths.js';
+vi.mock('../telemetry/loggers.js', () => ({
+    logFileOperation: vi.fn(),
+    logEditStrategy: vi.fn(),
+    logEditCorrectionEvent: vi.fn(),
+}));
+vi.mock('./jit-context.js', () => ({
+    discoverJitContext: vi.fn().mockResolvedValue(''),
+    appendJitContext: vi.fn().mockImplementation((content) => content),
+    appendJitContextToParts: vi.fn().mockImplementation((content) => content),
+}));
+describe('Consolidated At-Reference Path Resolution Tests (b-495551283)', () => {
+    let tempRootDir;
+    let mockConfigInstance;
+    const abortSignal = new AbortController().signal;
+    beforeEach(async () => {
+        // Create a unique temporary root directory for each test run
+        const realTmp = await fsp.realpath(os.tmpdir());
+        tempRootDir = await fsp.mkdtemp(path.join(realTmp, 'at-ref-resolution-root-'));
+        mockConfigInstance = {
+            getFileService: () => new FileDiscoveryService(tempRootDir),
+            getFileSystemService: () => new StandardFileSystemService(),
+            getTargetDir: () => tempRootDir,
+            getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir),
+            getFileFilteringOptions: () => ({
+                respectGitIgnore: true,
+                respectGeminiIgnore: true,
+            }),
+            storage: {
+                getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+            },
+            isInteractive: () => false,
+            isPlanMode: () => false,
+            getActiveModel: () => undefined,
+            getBaseLlmClient: () => undefined,
+            getDisableLLMCorrection: () => true,
+            isPathAllowed(absolutePath) {
+                const workspaceContext = this.getWorkspaceContext();
+                if (workspaceContext.isPathWithinWorkspace(absolutePath)) {
+                    return true;
+                }
+                const projectTempDir = this.storage.getProjectTempDir();
+                return isSubpath(path.resolve(projectTempDir), absolutePath);
+            },
+            validatePathAccess(absolutePath) {
+                if (this.isPathAllowed(absolutePath)) {
+                    return null;
+                }
+                const workspaceDirs = this.getWorkspaceContext().getDirectories();
+                const projectTempDir = this.storage.getProjectTempDir();
+                return `Path not in workspace: Attempted path "${absolutePath}" resolves outside the allowed workspace directories: ${workspaceDirs.join(', ')} or the project temp directory: ${projectTempDir}`;
+            },
+        };
+        // Create the policies directory and new-policies.txt file
+        await fsp.mkdir(path.join(tempRootDir, 'policies'), { recursive: true });
+        await fsp.writeFile(path.join(tempRootDir, 'policies', 'new-policies.txt'), '[[rule]]\ntoolName = "run_shell_command"\ndecision = "allow"\n', 'utf8');
+    });
+    afterEach(async () => {
+        // Clean up the temporary root directory
+        if (fs.existsSync(tempRootDir)) {
+            await fsp.rm(tempRootDir, { recursive: true, force: true });
+        }
+    });
+    it('ReadFileTool successfully reads a file when the path is prefixed with @', async () => {
+        const readFileTool = new ReadFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = readFileTool.build({
+            file_path: '@policies/new-policies.txt',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed because it defensively strips the leading '@'
+        expect(result.error).toBeUndefined();
+        expect(result.llmContent).toContain('toolName = "run_shell_command"');
+    });
+    it('ReadFileTool successfully reads a file when the path is prefixed with @/', async () => {
+        const readFileTool = new ReadFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = readFileTool.build({
+            file_path: '@/policies/new-policies.txt',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed because it defensively strips the leading '@/'
+        expect(result.error).toBeUndefined();
+        expect(result.llmContent).toContain('toolName = "run_shell_command"');
+    });
+    it('WriteFileTool successfully writes to/updates a file when the path is prefixed with @', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@policies/new-policies.txt',
+            content: '[[rule]]\nupdated_content = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and update the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@policies', 'new-policies.txt');
+        const correctFilePath = path.join(tempRootDir, 'policies', 'new-policies.txt');
+        // It should NOT have created a literal "@policies" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It should have updated the correct file under "policies"
+        const updatedContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(updatedContent).toContain('updated_content = true');
+    });
+    it('WriteFileTool successfully creates a new file when the path is prefixed with @ and the parent directory exists', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@policies/brand-new-file.txt',
+            content: '[[rule]]\nbrand_new_file = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@policies', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'policies', 'brand-new-file.txt');
+        // It should NOT have created a literal "@policies" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It should have created the correct file under "policies"
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('brand_new_file = true');
+    });
+    it('WriteFileTool successfully creates a new file in a nested subdirectory when the path is prefixed with @ and the first segment exists', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@policies/sub/brand-new-file.txt',
+            content: '[[rule]]\nnested_brand_new_file = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@policies', 'sub', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'policies', 'sub', 'brand-new-file.txt');
+        // It should NOT have created a literal "@policies" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It should have created the correct file under "policies/sub"
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_file = true');
+    });
+    it('WriteFileTool successfully creates a new file in a nested subdirectory when the path is prefixed with @ and the first segment does NOT exist', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@new-policies/sub/brand-new-file.txt',
+            content: '[[rule]]\nnested_brand_new_file = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@new-policies', 'sub', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'new-policies', 'sub', 'brand-new-file.txt');
+        // It should NOT have created a literal "@new-policies" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It SHOULD have created the file under "new-policies/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_file = true');
+    });
+    it('WriteFileTool successfully creates a new file in a nested subdirectory when the path is prefixed with @/ and the first segment does NOT exist', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@/new-policies-alias/sub/brand-new-file.txt',
+            content: '[[rule]]\nnested_brand_new_file_alias = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const literalAtFilePath = path.join(tempRootDir, '@', 'new-policies-alias', 'sub', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'new-policies-alias', 'sub', 'brand-new-file.txt');
+        // It should NOT have created a literal "@" directory
+        expect(fs.existsSync(literalAtFilePath)).toBe(false);
+        expect(fs.existsSync(path.join(tempRootDir, '@'))).toBe(false);
+        // It should have created the file under "new-policies-alias/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_file_alias = true');
+    });
+    it('WriteFileTool successfully creates a new file in a nested subdirectory when the path is prefixed with @\\ and the first segment does NOT exist', async () => {
+        const writeFileTool = new WriteFileTool(mockConfigInstance, createMockMessageBus());
+        const invocation = writeFileTool.build({
+            file_path: '@\\new-policies-alias-win\\sub\\brand-new-file.txt',
+            content: '[[rule]]\nnested_brand_new_file_alias_win = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const isWindows = process.platform === 'win32';
+        const literalAtFilePath = isWindows
+            ? path.join(tempRootDir, '@', 'new-policies-alias-win', 'sub', 'brand-new-file.txt')
+            : path.join(tempRootDir, '@\\new-policies-alias-win\\sub\\brand-new-file.txt');
+        const correctFilePath = isWindows
+            ? path.join(tempRootDir, 'new-policies-alias-win', 'sub', 'brand-new-file.txt')
+            : path.join(tempRootDir, 'new-policies-alias-win\\sub\\brand-new-file.txt');
+        // It should NOT have created a literal "@" directory
+        expect(fs.existsSync(literalAtFilePath)).toBe(false);
+        expect(fs.existsSync(path.join(tempRootDir, '@'))).toBe(false);
+        // It should have created the file under "new-policies-alias-win/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_file_alias_win = true');
+    });
+    it('getCorrectedFileContent blocks path traversal outside the workspace', async () => {
+        const result = await getCorrectedFileContent(mockConfigInstance, '../../etc/passwd', 'malicious content', abortSignal);
+        // The utility should fail with a path validation error
+        expect(result.error).toBeDefined();
+        expect(result.error?.message).toContain('Path not in workspace');
+    });
+    it('EditTool.getModifyContext blocks path traversal outside the workspace', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const modifyContext = editTool.getModifyContext(abortSignal);
+        // The getCurrentContent method should throw a path validation error
+        await expect(modifyContext.getCurrentContent({
+            file_path: '../../etc/passwd',
+            instruction: 'read file',
+            old_string: '',
+            new_string: '',
+        })).rejects.toThrow('Path not in workspace');
+        // The getProposedContent method should throw a path validation error
+        await expect(modifyContext.getProposedContent({
+            file_path: '../../etc/passwd',
+            instruction: 'read file',
+            old_string: '',
+            new_string: '',
+        })).rejects.toThrow('Path not in workspace');
+    });
+    it('getCorrectedFileContent handles symlink loops gracefully', async () => {
+        const symlinkPath1 = path.join(tempRootDir, 'symlink1');
+        const symlinkPath2 = path.join(tempRootDir, 'symlink2');
+        await fsp.symlink(symlinkPath2, symlinkPath1);
+        await fsp.symlink(symlinkPath1, symlinkPath2);
+        const result = await getCorrectedFileContent(mockConfigInstance, 'symlink1', 'content', abortSignal);
+        // The utility should fail gracefully with a resolution error
+        expect(result.error).toBeDefined();
+        expect(result.error?.message).toContain('Failed to resolve path');
+    });
+    it('EditTool.getModifyContext handles symlink loops gracefully by throwing a descriptive error', async () => {
+        const symlinkPath1 = path.join(tempRootDir, 'symlink1');
+        const symlinkPath2 = path.join(tempRootDir, 'symlink2');
+        await fsp.symlink(symlinkPath2, symlinkPath1);
+        await fsp.symlink(symlinkPath1, symlinkPath2);
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const modifyContext = editTool.getModifyContext(abortSignal);
+        // The getCurrentContent method should throw a path resolution error
+        await expect(modifyContext.getCurrentContent({
+            file_path: 'symlink1',
+            instruction: 'read file',
+            old_string: '',
+            new_string: '',
+        })).rejects.toThrow('Failed to resolve path');
+        // The getProposedContent method should throw a path resolution error
+        await expect(modifyContext.getProposedContent({
+            file_path: 'symlink1',
+            instruction: 'read file',
+            old_string: '',
+            new_string: '',
+        })).rejects.toThrow('Failed to resolve path');
+    });
+    it('getCorrectedFileContent successfully resolves paths in Plan Mode', async () => {
+        const plansDir = path.join(tempRootDir, '.plans');
+        await fsp.mkdir(plansDir, { recursive: true });
+        await fsp.writeFile(path.join(plansDir, 'plan-file.txt'), 'plan content', 'utf8');
+        const planConfigInstance = Object.assign({}, mockConfigInstance, {
+            isPlanMode: () => true,
+            getProjectRoot: () => tempRootDir,
+            storage: {
+                getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+                getPlansDir: () => plansDir,
+            },
+        });
+        const result = await getCorrectedFileContent(planConfigInstance, 'plan-file.txt', 'new plan content', abortSignal);
+        expect(result.error).toBeUndefined();
+        expect(result.originalContent).toBe('plan content');
+    });
+    it('EditTool successfully edits an existing file when the path is prefixed with @', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const invocation = editTool.build({
+            file_path: '@policies/new-policies.txt',
+            instruction: 'update decision rule',
+            old_string: 'decision = "allow"',
+            new_string: 'decision = "deny"',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and update the correct file
+        expect(result.error).toBeUndefined();
+        const correctFilePath = path.join(tempRootDir, 'policies', 'new-policies.txt');
+        const updatedContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(updatedContent).toContain('decision = "deny"');
+    });
+    it('EditTool successfully creates a new file when the path is prefixed with @ and the parent directory exists', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const invocation = editTool.build({
+            file_path: '@policies/brand-new-edit-file.txt',
+            instruction: 'create new file',
+            old_string: '',
+            new_string: '[[rule]]\nbrand_new_edit_file = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@policies', 'brand-new-edit-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'policies', 'brand-new-edit-file.txt');
+        // It should NOT have created a literal "@policies" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It should have created the correct file under "policies"
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('brand_new_edit_file = true');
+    });
+    it('EditTool successfully creates a new file in a nested subdirectory when the path is prefixed with @ and the first segment does NOT exist', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const invocation = editTool.build({
+            file_path: '@new-policies-edit/sub/brand-new-file.txt',
+            instruction: 'create new file in nested subdirectory',
+            old_string: '',
+            new_string: '[[rule]]\nnested_brand_new_edit_file = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const incorrectFilePath = path.join(tempRootDir, '@new-policies-edit', 'sub', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'new-policies-edit', 'sub', 'brand-new-file.txt');
+        // It should NOT have created a literal "@new-policies-edit" directory
+        expect(fs.existsSync(incorrectFilePath)).toBe(false);
+        // It SHOULD have created the file under "new-policies-edit/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_edit_file = true');
+    });
+    it('EditTool successfully creates a new file in a nested subdirectory when the path is prefixed with @/ and the first segment does NOT exist', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const invocation = editTool.build({
+            file_path: '@/new-policies-edit-alias/sub/brand-new-file.txt',
+            instruction: 'create new file in nested subdirectory',
+            old_string: '',
+            new_string: '[[rule]]\nnested_brand_new_edit_file_alias = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const literalAtFilePath = path.join(tempRootDir, '@', 'new-policies-edit-alias', 'sub', 'brand-new-file.txt');
+        const correctFilePath = path.join(tempRootDir, 'new-policies-edit-alias', 'sub', 'brand-new-file.txt');
+        // It should NOT have created a literal "@" directory
+        expect(fs.existsSync(literalAtFilePath)).toBe(false);
+        expect(fs.existsSync(path.join(tempRootDir, '@'))).toBe(false);
+        // It should have created the file under "new-policies-edit-alias/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_edit_file_alias = true');
+    });
+    it('EditTool successfully creates a new file in a nested subdirectory when the path is prefixed with @\\ and the first segment does NOT exist', async () => {
+        const editTool = new EditTool(mockConfigInstance, createMockMessageBus());
+        const invocation = editTool.build({
+            file_path: '@\\new-policies-edit-alias-win\\sub\\brand-new-file.txt',
+            instruction: 'create new file in nested subdirectory',
+            old_string: '',
+            new_string: '[[rule]]\nnested_brand_new_edit_file_alias_win = true\n',
+        });
+        const result = await invocation.execute({ abortSignal });
+        // The tool should succeed and create the correct file
+        expect(result.error).toBeUndefined();
+        const isWindows = process.platform === 'win32';
+        const literalAtFilePath = isWindows
+            ? path.join(tempRootDir, '@', 'new-policies-edit-alias-win', 'sub', 'brand-new-file.txt')
+            : path.join(tempRootDir, '@\\new-policies-edit-alias-win\\sub\\brand-new-file.txt');
+        const correctFilePath = isWindows
+            ? path.join(tempRootDir, 'new-policies-edit-alias-win', 'sub', 'brand-new-file.txt')
+            : path.join(tempRootDir, 'new-policies-edit-alias-win\\sub\\brand-new-file.txt');
+        // It should NOT have created a literal "@" directory
+        expect(fs.existsSync(literalAtFilePath)).toBe(false);
+        expect(fs.existsSync(path.join(tempRootDir, '@'))).toBe(false);
+        // It should have created the file under "new-policies-edit-alias-win/sub"
+        expect(fs.existsSync(correctFilePath)).toBe(true);
+        // Verify the content of the created file
+        const createdContent = await fsp.readFile(correctFilePath, 'utf8');
+        expect(createdContent).toContain('nested_brand_new_edit_file_alias_win = true');
+    });
+    it('correctPath successfully resolves a path prefixed with @ to its clean counterpart', () => {
+        const result = correctPath('@policies/new-policies.txt', mockConfigInstance);
+        expect(result.success).toBe(true);
+        if (result.success) {
+            const expectedPath = path.join(tempRootDir, 'policies', 'new-policies.txt');
+            expect(result.correctedPath).toBe(expectedPath);
+        }
+    });
+});
+//# sourceMappingURL=at-reference-resolution.test.js.map

package/dist/src/tools/at-reference-resolution.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"at-reference-resolution.test.js","sourceRoot":"","sources":["../../../src/tools/at-reference-resolution.test.ts"],"names":[],"mappings":"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"}

package/dist/src/tools/edit.js

@@ -11,7 +11,7 @@ import * as Diff from 'diff';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind, } from './tools.js';
 import { buildFilePathArgsPattern } from '../policy/utils.js';
 import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
+import { makeRelative, shortenPath, resolveDefensiveToolPath, resolveToRealPath, } from '../utils/paths.js';
 import { isNodeError } from '../utils/errors.js';
 import { correctPath } from '../utils/pathCorrector.js';
 import { CoreToolCallStatus } from '../scheduler/types.js';
@@ -281,26 +281,45 @@ class EditToolInvocation extends BaseToolInvocation {
         this.config = config;
         if (this.config.isPlanMode()) {
             try {
-                this.resolvedPath = resolveAndValidatePlanPath(this.params.file_path, this.config.storage.getPlansDir(), this.config.getProjectRoot());
+                const cleanFilePath = this.params.file_path.replace(/\0/g, '');
+                const planPath = resolveAndValidatePlanPath(cleanFilePath, this.config.storage.getPlansDir(), this.config.getProjectRoot());
+                this.resolvedPath = resolveToRealPath(planPath);
             }
             catch (e) {
                 debugLogger.error('Failed to resolve plan path during EditTool invocation setup', e);
                 // Validation fails, set resolvedPath to something that will fail validation downstream or just the raw path.
                 // It's safer to store it so validation in execute() or getConfirmationDetails() catches it.
-                this.resolvedPath = this.params.file_path;
+                this.resolvedPath = this.params.file_path.replace(/\0/g, '');
             }
         }
         else if (!path.isAbsolute(this.params.file_path)) {
             const result = correctPath(this.params.file_path, this.config);
             if (result.success) {
-                this.resolvedPath = result.correctedPath;
+                try {
+                    this.resolvedPath = resolveToRealPath(result.correctedPath);
+                }
+                catch {
+                    this.resolvedPath = result.correctedPath;
+                }
             }
             else {
-                this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
+                const sanitizedPath = resolveDefensiveToolPath(this.params.file_path, this.config.getTargetDir());
+                try {
+                    this.resolvedPath = resolveToRealPath(path.resolve(this.config.getTargetDir(), sanitizedPath));
+                }
+                catch {
+                    this.resolvedPath = path.resolve(this.config.getTargetDir(), sanitizedPath);
+                }
             }
         }
         else {
-            this.resolvedPath = this.params.file_path;
+            const cleanPath = this.params.file_path.replace(/\0/g, '');
+            try {
+                this.resolvedPath = resolveToRealPath(cleanPath);
+            }
+            catch {
+                this.resolvedPath = cleanPath;
+            }
         }
     }
     toolLocations() {
@@ -754,7 +773,9 @@ export class EditTool extends BaseDeclarativeTool {
         let resolvedPath;
         if (this.config.isPlanMode()) {
             try {
-                resolvedPath = resolveAndValidatePlanPath(params.file_path, this.config.storage.getPlansDir(), this.config.getProjectRoot());
+                const cleanFilePath = params.file_path.replace(/\0/g, '');
+                const planPath = resolveAndValidatePlanPath(cleanFilePath, this.config.storage.getPlansDir(), this.config.getProjectRoot());
+                resolvedPath = resolveToRealPath(planPath);
             }
             catch (err) {
                 return err instanceof Error ? err.message : String(err);
@@ -763,14 +784,31 @@ export class EditTool extends BaseDeclarativeTool {
         else if (!path.isAbsolute(params.file_path)) {
             const result = correctPath(params.file_path, this.config);
             if (result.success) {
-                resolvedPath = result.correctedPath;
+                try {
+                    resolvedPath = resolveToRealPath(result.correctedPath);
+                }
+                catch (err) {
+                    return err instanceof Error ? err.message : String(err);
+                }
             }
             else {
-                resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
+                const sanitizedPath = resolveDefensiveToolPath(params.file_path, this.config.getTargetDir());
+                try {
+                    resolvedPath = resolveToRealPath(path.resolve(this.config.getTargetDir(), sanitizedPath));
+                }
+                catch (err) {
+                    return err instanceof Error ? err.message : String(err);
+                }
             }
         }
         else {
-            resolvedPath = params.file_path;
+            const cleanPath = params.file_path.replace(/\0/g, '');
+            try {
+                resolvedPath = resolveToRealPath(cleanPath);
+            }
+            catch (err) {
+                return err instanceof Error ? err.message : String(err);
+            }
         }
         const newPlaceholders = detectOmissionPlaceholders(params.new_string);
         if (newPlaceholders.length > 0) {
@@ -790,13 +828,53 @@ export class EditTool extends BaseDeclarativeTool {
         return resolveToolDeclaration(EDIT_DEFINITION, modelId);
     }
     getModifyContext(_) {
+        const resolvePath = (params) => {
+            let pathBeforeRealResolve;
+            try {
+                if (this.config.isPlanMode()) {
+                    const cleanFilePath = params.file_path.replace(/\0/g, '');
+                    pathBeforeRealResolve = resolveAndValidatePlanPath(cleanFilePath, this.config.storage.getPlansDir(), this.config.getProjectRoot());
+                }
+                else if (!path.isAbsolute(params.file_path)) {
+                    const result = correctPath(params.file_path, this.config);
+                    if (result.success) {
+                        pathBeforeRealResolve = result.correctedPath;
+                    }
+                    else {
+                        const sanitizedPath = resolveDefensiveToolPath(params.file_path, this.config.getTargetDir());
+                        pathBeforeRealResolve = path.resolve(this.config.getTargetDir(), sanitizedPath);
+                    }
+                }
+                else {
+                    pathBeforeRealResolve = params.file_path.replace(/\0/g, '');
+                }
+            }
+            catch (err) {
+                throw new Error('Failed to resolve path: ' +
+                    (err instanceof Error ? err.message : String(err)));
+            }
+            let resolved;
+            try {
+                resolved = resolveToRealPath(pathBeforeRealResolve);
+            }
+            catch (err) {
+                throw new Error('Failed to resolve path: ' +
+                    (err instanceof Error ? err.message : String(err)));
+            }
+            const validationError = this.config.validatePathAccess(resolved);
+            if (validationError) {
+                throw new Error(validationError);
+            }
+            return resolved;
+        };
         return {
             getFilePath: (params) => params.file_path,
             getCurrentContent: async (params) => {
                 try {
+                    const resolvedPath = resolvePath(params);
                     return await this.config
                         .getFileSystemService()
-                        .readTextFile(params.file_path);
+                        .readTextFile(resolvedPath);
                 }
                 catch (err) {
                     if (!isNodeError(err) || err.code !== 'ENOENT')
@@ -806,9 +884,10 @@ export class EditTool extends BaseDeclarativeTool {
             },
             getProposedContent: async (params) => {
                 try {
+                    const resolvedPath = resolvePath(params);
                     const currentContent = await this.config
                         .getFileSystemService()
-                        .readTextFile(params.file_path);
+                        .readTextFile(resolvedPath);
                     return applyReplacement(currentContent, params.old_string, params.new_string, params.old_string === '' && currentContent === '');
                 }
                 catch (err) {