@theia/ai-ide 1.75.0-next.8 → 1.75.0

package/src/browser/coder-agent.ts

@@ -17,7 +17,7 @@ import {
     ChatMode, ChatRequestModel, ChatService, ChatSession,
     MutableChatModel, MutableChatRequestModel
 } from '@theia/ai-chat/lib/common';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import {
     CODER_SYSTEM_PROMPT_ID,
     CODER_EDIT_TEMPLATE_ID,
@@ -25,11 +25,10 @@ import {
     CODER_AGENT_MODE_NEXT_TEMPLATE_ID,
     getCoderAgentModePromptTemplate,
     getCoderAgentModeNextPromptTemplate,
-    getCoderPromptTemplateEdit,
-    getCoderPromptTemplateEditNext
+    getCoderPromptTemplateEdit
 } from '../common/coder-replace-prompt-template';
 import { LanguageModelRequirement, PromptVariantSet } from '@theia/ai-core';
-import { nls } from '@theia/core';
+import { ILogger, nls } from '@theia/core';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
 import { AI_CHAT_HOME, ChatCommands } from '@theia/ai-chat-ui/lib/browser/chat-view-commands';
@@ -40,6 +39,9 @@ export const CoderAgentId = 'Coder';
 
 @injectable()
 export class CoderAgent extends AbstractModeAwareChatAgent {
+    @inject(ILogger) @named('ai-ide:CoderAgent')
+    protected override readonly logger: ILogger;
+
     @inject(ChatService) protected readonly chatService: ChatService;
     @inject(AgentModeConfirmationService) protected readonly agentModeConfirmation: AgentModeConfirmationService;
     id: string = CoderAgentId;
@@ -75,7 +77,7 @@ export class CoderAgent extends AbstractModeAwareChatAgent {
     override prompts: PromptVariantSet[] = [{
         id: CODER_SYSTEM_PROMPT_ID,
         defaultVariant: getCoderAgentModePromptTemplate(),
-        variants: [getCoderPromptTemplateEdit(), getCoderAgentModeNextPromptTemplate(), getCoderPromptTemplateEditNext()]
+        variants: [getCoderPromptTemplateEdit(), getCoderAgentModeNextPromptTemplate()]
     }];
     protected override systemPromptId: string | undefined = CODER_SYSTEM_PROMPT_ID;
 

package/src/browser/context-file-validation-service-impl.spec.ts

@@ -21,7 +21,7 @@ FrontendApplicationConfigProvider.set({});
 
 import { expect } from 'chai';
 import { Container } from '@theia/core/shared/inversify';
-import { URI, PreferenceService } from '@theia/core';
+import { URI, PreferenceService, ILogger } from '@theia/core';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
@@ -30,6 +30,7 @@ import { ContextFileValidationServiceImpl } from './context-file-validation-serv
 import { WorkspaceFunctionScope } from './workspace-functions';
 import { AiConfigurationService } from '@theia/ai-core';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 
 disableJSDOM();
 
@@ -68,7 +69,7 @@ describe('ContextFileValidationService', () => {
 
     beforeEach(async () => {
         container = new Container();
-
+        container.bind(ILogger).to(MockLogger).inSingletonScope();
         // Mock WorkspaceService
         mockWorkspaceService = {
             tryGetRoots: () => [{

package/src/browser/create-skill-agent.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 import { ChatMode } from '@theia/ai-chat';
 import { LanguageModelRequirement } from '@theia/ai-core';
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import {
     createSkillSystemVariants,
     CREATE_SKILL_SYSTEM_PROMPT_TEMPLATE_ID,
@@ -23,11 +23,14 @@ import {
     CREATE_SKILL_SYSTEM_AGENT_MODE_TEMPLATE_ID,
 } from '../common/create-skill-prompt-template';
 import { AbstractModeAwareChatAgent } from './mode-aware-chat-agent';
-import { nls } from '@theia/core';
+import { ILogger, nls } from '@theia/core';
 
 @injectable()
 export class CreateSkillAgent extends AbstractModeAwareChatAgent {
 
+    @inject(ILogger) @named('ai-ide:CreateSkillAgent')
+    protected override readonly logger: ILogger;
+
     name = 'CreateSkill';
     id = 'CreateSkill';
     languageModelRequirements: LanguageModelRequirement[] = [{

package/src/browser/explore-agent.ts

@@ -16,8 +16,8 @@
 
 import { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common/chat-agents';
 import { LanguageModelRequirement } from '@theia/ai-core/lib/common';
-import { nls } from '@theia/core';
-import { injectable } from '@theia/core/shared/inversify';
+import { ILogger, nls } from '@theia/core';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { exploreSystemPrompt, EXPLORE_SYSTEM_PROMPT_ID } from './explore-prompt-template';
 import { ExploreAgentId } from '../common/agent-ids';
 
@@ -25,6 +25,9 @@ export { ExploreAgentId };
 
 @injectable()
 export class ExploreAgent extends AbstractStreamParsingChatAgent {
+    @inject(ILogger) @named('ai-ide:ExploreAgent')
+    protected override readonly logger: ILogger;
+
     name = 'Explore';
     id = ExploreAgentId;
     languageModelRequirements: LanguageModelRequirement[] = [{

package/src/browser/file-changeset-functions.spec.ts

@@ -20,7 +20,7 @@ import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/front
 FrontendApplicationConfigProvider.set({});
 
 import { expect } from 'chai';
-import { CancellationTokenSource } from '@theia/core';
+import { CancellationTokenSource, PreferenceService, ILogger } from '@theia/core';
 import {
     SuggestFileContent,
     WriteFileContent,
@@ -35,13 +35,18 @@ import {
     DefaultFileChangeSetTitleProvider,
     ReplaceContentInFileFunctionHelperV2
 } from './file-changeset-functions';
-import { ChatToolContext, MutableChatRequestModel, MutableChatResponseModel, MutableChatModel } from '@theia/ai-chat';
+import { ChatToolContext, FileReadTracker, MutableChatRequestModel, MutableChatResponseModel, MutableChatModel } from '@theia/ai-chat';
 import { ChangeSet, ChangeSetElement } from '@theia/ai-chat/lib/common/change-set';
 import { Container } from '@theia/core/shared/inversify';
-import { WorkspaceFunctionScope } from './workspace-functions';
+import { AccessibleRootContribution, WorkspaceFunctionScope } from './workspace-functions';
+import { bindRootContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { AiConfigurationService } from '@theia/ai-core';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { ChangeSetFileElementFactory, ChangeSetFileElement } from '@theia/ai-chat/lib/browser/change-set-file-element';
+import { ChangeSetElementArgs, ChangeSetFileElementFactory, ChangeSetFileElement } from '@theia/ai-chat/lib/browser/change-set-file-element';
 import { URI } from '@theia/core/lib/common/uri';
+import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 
 disableJSDOM();
 
@@ -86,7 +91,7 @@ describe('File Changeset Functions Cancellation Tests', () => {
 
         // Mock dependencies
         const mockWorkspaceScope = {
-            resolveRelativePath: () => new URI('file:///workspace/test.txt')
+            resolveAccessiblePath: async () => new URI('file:///workspace/test.txt')
         } as unknown as WorkspaceFunctionScope;
 
         const mockFileService = {
@@ -104,6 +109,7 @@ describe('File Changeset Functions Cancellation Tests', () => {
 
         // Register mocks in the container
         container.bind(WorkspaceFunctionScope).toConstantValue(mockWorkspaceScope);
+        container.bind(ILogger).to(MockLogger).inSingletonScope();
         container.bind(FileService).toConstantValue(mockFileService);
         container.bind(ChangeSetFileElementFactory).toConstantValue(mockFileChangeFactory);
         container.bind(FileChangeSetTitleProvider).to(DefaultFileChangeSetTitleProvider).inSingletonScope();
@@ -264,4 +270,151 @@ describe('File Changeset Functions Cancellation Tests', () => {
         expect(SuggestFileReplacements.ID).to.equal('suggestFileReplacements');
         expect(suggestFileReplacements.getTool().id).to.equal('suggestFileReplacements');
     });
+
+    describe('stale file guard', () => {
+        /** Stands in for the tracker: the file counts as changed until the agent reads it again. */
+        function bindTracker(): FileReadTracker & { stale: boolean } {
+            const tracker: FileReadTracker & { stale: boolean } = {
+                stale: true,
+                recordRead: async () => { tracker.stale = false; },
+                isStale: async () => tracker.stale,
+                getChangedFiles: async () => []
+            };
+            container.bind(FileReadTracker).toConstantValue(tracker);
+            return tracker;
+        }
+
+        it('WriteFileContent refuses to overwrite a file that changed since it was read', async () => {
+            bindTracker();
+            const handler = container.get(WriteFileContent).getTool().handler;
+
+            const result = await handler(JSON.stringify({ path: 'test.txt', content: 'new content' }), mockCtx);
+
+            const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+            expect(jsonResponse.error).to.match(/changed since you last read it/);
+        });
+
+        it('SuggestFileContent refuses to propose overwriting a file that changed since it was read', async () => {
+            bindTracker();
+            const handler = container.get(SuggestFileContent).getTool().handler;
+
+            const result = await handler(JSON.stringify({ path: 'test.txt', content: 'new content' }), mockCtx);
+
+            const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+            expect(jsonResponse.error).to.match(/changed since you last read it/);
+        });
+
+        it('WriteFileContent writes once the agent has read the file again', async () => {
+            const tracker = bindTracker();
+            const handler = container.get(WriteFileContent).getTool().handler;
+            await handler(JSON.stringify({ path: 'test.txt', content: 'new content' }), mockCtx);
+
+            await tracker.recordRead(mockCtx.request.session.id, new URI('file:///workspace/test.txt'));
+
+            const result = await handler(JSON.stringify({ path: 'test.txt', content: 'new content' }), mockCtx);
+            expect(result).to.equal('Successfully wrote content to file test.txt.');
+        });
+    });
+});
+
+describe('File Changeset Functions access control', () => {
+    let container: Container;
+    let ctx: ChatToolContext;
+    let written: Array<{ uri: URI; content: string }>;
+    let contributedRoots: URI[];
+
+    before(() => { disableJSDOM = enableJSDOM(); });
+    after(() => { disableJSDOM(); });
+
+    beforeEach(() => {
+        written = [];
+        contributedRoots = [];
+
+        const changeSet: Partial<ChangeSet> = {
+            addElements: () => true,
+            setTitle: () => { },
+            removeElements: () => true,
+            getElementByURI: () => undefined
+        };
+        ctx = {
+            request: {
+                id: 'request-id',
+                session: { id: 'session-id', changeSet: changeSet as ChangeSet } as MutableChatModel
+            } as MutableChatRequestModel,
+            response: {} as MutableChatResponseModel
+        };
+
+        container = new Container();
+        container.bind(ILogger).to(MockLogger).inSingletonScope();
+        container.bind(WorkspaceService).toConstantValue({
+            roots: [{ resource: new URI('file:///workspace') }],
+            tryGetRoots: () => [{ resource: new URI('file:///workspace') }],
+            onWorkspaceChanged: () => ({ dispose: () => { } })
+        } as unknown as WorkspaceService);
+        container.bind(FileService).toConstantValue({
+            exists: async () => true,
+            read: async () => ({ value: { toString: () => 'old content' } }),
+            watch: () => ({ dispose: () => { } }),
+            onDidFilesChange: () => ({ dispose: () => { } })
+        } as unknown as FileService);
+        container.bind(PreferenceService).toConstantValue({ get: <T>(_path: string, defaultValue: T) => defaultValue });
+        container.bind(AiConfigurationService).toConstantValue({
+            get: <T>(_name: string, fallback?: T) => fallback,
+            ready: Promise.resolve(),
+            onDidChangeTrust: () => ({ dispose: () => { } })
+        } as unknown as AiConfigurationService);
+        container.bind(EnvVariablesServer).toConstantValue({
+            getHomeDirUri: async () => 'file:///home/test',
+            getConfigDirUri: async () => 'file:///home/test/.theia'
+        } as unknown as EnvVariablesServer);
+        bindRootContributionProvider(container, AccessibleRootContribution);
+        container.bind(AccessibleRootContribution).toConstantValue({ getRoots: async () => contributedRoots });
+        container.bind(WorkspaceFunctionScope).toSelf();
+        container.bind(ChangeSetFileElementFactory).toConstantValue((args: ChangeSetElementArgs) => ({
+            uri: args.uri,
+            apply: async () => {
+                written.push({ uri: args.uri, content: args.targetState ?? '' });
+            }
+        } as ChangeSetFileElement));
+        container.bind(FileChangeSetTitleProvider).to(DefaultFileChangeSetTitleProvider).inSingletonScope();
+        container.bind(ReplaceContentInFileFunctionHelperV2).toSelf();
+        container.bind(WriteFileContent).toSelf();
+        container.bind(WriteFileReplacements).toSelf();
+    });
+
+    const writeContent = (path: string) =>
+        container.get(WriteFileContent).getTool().handler(JSON.stringify({ path, content: 'new content' }), ctx) as Promise<string>;
+    const writeReplacements = (path: string) =>
+        container.get(WriteFileReplacements).getTool().handler(
+            JSON.stringify({ path, replacements: [{ oldContent: 'old content', newContent: 'new content' }] }), ctx
+        ) as Promise<string>;
+
+    it('refuses to write through a .. traversal instead of escaping the workspace', async () => {
+        expect(JSON.parse(await writeContent('../../etc/passwd')).error).to.include('Invalid path');
+        expect(JSON.parse(await writeReplacements('../../etc/passwd')).error).to.include('Invalid path');
+        expect(written).to.be.empty;
+    });
+
+    it('refuses to write to an absolute path outside the workspace', async () => {
+        expect(JSON.parse(await writeContent('/etc/passwd')).error).to.include('not allowed');
+        expect(JSON.parse(await writeReplacements('/etc/passwd')).error).to.include('not allowed');
+        expect(written).to.be.empty;
+    });
+
+    it('refuses to write to the user home directory', async () => {
+        expect(JSON.parse(await writeContent('~/.ssh/authorized_keys')).error).to.include('not allowed');
+        expect(written).to.be.empty;
+    });
+
+    it('writes inside the workspace', async () => {
+        expect(await writeContent('src/index.ts')).to.include('Successfully');
+        expect(written.map(w => w.uri.toString())).to.deep.equal(['file:///workspace/src/index.ts']);
+    });
+
+    it('writes to a contributed root such as the memory directory', async () => {
+        contributedRoots = [new URI('file:///home/test/.theia/workspace-metadata/uuid/memory')];
+        const result = await writeContent('/home/test/.theia/workspace-metadata/uuid/memory/wiki/index.md');
+        expect(result).to.include('Successfully');
+        expect(written.map(w => w.uri.toString())).to.deep.equal(['file:///home/test/.theia/workspace-metadata/uuid/memory/wiki/index.md']);
+    });
 });

package/src/browser/file-changeset-functions.ts

@@ -13,18 +13,18 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { assertChatContext, ChatToolContext } from '@theia/ai-chat';
+import { assertChatContext, ChatToolContext, FileReadTracker } from '@theia/ai-chat';
 import { ChangeSet } from '@theia/ai-chat/lib/common/change-set';
 import { ChangeSetElementArgs, ChangeSetFileElement, ChangeSetFileElementFactory } from '@theia/ai-chat/lib/browser/change-set-file-element';
 import { ToolInvocationContext, ToolProvider, ToolRequest, ToolRequestParameters, ToolRequestParametersProperties } from '@theia/ai-core';
 import { ContentReplacerV1Impl, Replacement, ContentReplacer } from '@theia/core/lib/common/content-replacer';
 import { ContentReplacerV2Impl } from '@theia/core/lib/common/content-replacer-v2-impl';
 import { URI } from '@theia/core/lib/common/uri';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named, optional } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceFunctionScope } from './workspace-functions';
 
-import { nls } from '@theia/core';
+import { nls, ILogger } from '@theia/core';
 import { extractJsonStringField } from '@theia/ai-chat-ui/lib/browser/chat-response-renderer/toolcall-utils';
 import {
     CLEAR_FILE_CHANGES_ID,
@@ -37,6 +37,15 @@ import {
     WRITE_FILE_REPLACEMENTS_SIMPLE_ID
 } from '../common/file-changeset-function-ids';
 
+/**
+ * Description of the `path` parameter shared by all file changeset tools, so that they advertise the
+ * same accepted forms as the read-only workspace tools.
+ */
+const FILE_PATH_PARAMETER_DESCRIPTION = 'Path to the target file. May be workspace-relative ' +
+    '(e.g., "my-project/src/index.ts"), an absolute path, or a `file://` URI. ' +
+    'Absolute / URI forms must point to a location the tools may access, such as a directory listed in the ' +
+    '`ai-features.workspaceFunctions.allowedExternalPaths` preference.';
+
 function createPathShortLabel(args: string, hasMore: boolean): { label: string; hasMore: boolean } | undefined {
     const path = extractJsonStringField(args, 'path');
     if (path) {
@@ -45,6 +54,14 @@ function createPathShortLabel(args: string, hasMore: boolean): { label: string;
     return undefined;
 }
 
+/**
+ * Whole-file writes from an outdated read would silently discard whatever changed in between. The replacement
+ * tools need no such guard: they re-read and fail when their matched content is gone.
+ */
+function staleFileError(path: string): string {
+    return `File ${path} changed since you last read it. Read it again before overwriting it, so that the changes made in the meantime are not lost.`;
+}
+
 export const FileChangeSetTitleProvider = Symbol('FileChangeSetTitleProvider');
 
 export interface FileChangeSetTitleProvider {
@@ -67,6 +84,10 @@ export class SuggestFileContent implements ToolProvider {
     @inject(FileChangeSetTitleProvider)
     protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
 
+    /** Optional: the guard is advisory, so containers without a tracker still get a working tool. */
+    @inject(FileReadTracker) @optional()
+    protected readonly fileReadTracker: FileReadTracker | undefined;
+
     getTool(): ToolRequest {
         return {
             id: SuggestFileContent.ID,
@@ -82,8 +103,7 @@ export class SuggestFileContent implements ToolProvider {
                 properties: {
                     path: {
                         type: 'string',
-                        description: 'The path to the file within the workspace ' +
-                            '(e.g., "my-project/src/index.ts", "backend/config/settings.json").'
+                        description: FILE_PATH_PARAMETER_DESCRIPTION
                     },
                     content: {
                         type: 'string',
@@ -100,7 +120,15 @@ export class SuggestFileContent implements ToolProvider {
                 }
                 const { path, content } = JSON.parse(args);
                 const chatSessionId = ctx.request.session.id;
-                const uri = await this.workspaceFunctionScope.resolveRelativePath(path);
+                let uri: URI;
+                try {
+                    uri = await this.workspaceFunctionScope.resolveAccessiblePath(path);
+                } catch (error) {
+                    return JSON.stringify({ error: error.message });
+                }
+                if (await this.fileReadTracker?.isStale(chatSessionId, uri)) {
+                    return JSON.stringify({ error: staleFileError(path) });
+                }
                 let type: ChangeSetElementArgs['type'] = 'modify';
                 if (content === '') {
                     type = 'delete';
@@ -143,6 +171,10 @@ export class WriteFileContent implements ToolProvider {
     @inject(FileChangeSetTitleProvider)
     protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
 
+    /** Optional: the guard is advisory, so containers without a tracker still get a working tool. */
+    @inject(FileReadTracker) @optional()
+    protected readonly fileReadTracker: FileReadTracker | undefined;
+
     getTool(): ToolRequest {
         return {
             id: WriteFileContent.ID,
@@ -158,8 +190,7 @@ export class WriteFileContent implements ToolProvider {
                 properties: {
                     path: {
                         type: 'string',
-                        description: 'The path to the file within the workspace ' +
-                            '(e.g., "my-project/src/index.ts", "backend/config/settings.json").'
+                        description: FILE_PATH_PARAMETER_DESCRIPTION
                     },
                     content: {
                         type: 'string',
@@ -176,7 +207,15 @@ export class WriteFileContent implements ToolProvider {
                 }
                 const { path, content } = JSON.parse(args);
                 const chatSessionId = ctx.request.session.id;
-                const uri = await this.workspaceFunctionScope.resolveRelativePath(path);
+                let uri: URI;
+                try {
+                    uri = await this.workspaceFunctionScope.resolveAccessiblePath(path);
+                } catch (error) {
+                    return JSON.stringify({ error: error.message });
+                }
+                if (await this.fileReadTracker?.isStale(chatSessionId, uri)) {
+                    return JSON.stringify({ error: staleFileError(path) });
+                }
                 let type = 'modify';
                 if (content === '') {
                     type = 'delete';
@@ -223,6 +262,9 @@ export class ReplaceContentInFileFunctionHelper {
     @inject(FileChangeSetTitleProvider)
     protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
 
+    @inject(ILogger) @named('ai-ide:ReplaceContentInFileFunctionHelper')
+    protected readonly logger: ILogger;
+
     private replacer: ContentReplacer;
 
     constructor() {
@@ -256,9 +298,7 @@ export class ReplaceContentInFileFunctionHelper {
             properties: {
                 path: {
                     type: 'string',
-                    description: 'The path to the file within the workspace ' +
-                        '(e.g., "my-project/src/index.ts", "backend/src/main.ts"). ' +
-                        'Must read the file with getFileContent first.'
+                    description: FILE_PATH_PARAMETER_DESCRIPTION + ' Must read the file with getFileContent first.'
                 },
                 replacements: {
                     type: 'array',
@@ -324,7 +364,7 @@ export class ReplaceContentInFileFunctionHelper {
                 return `No changes needed for file ${result.path}. Content already matches the requested state.`;
             }
         } catch (error) {
-            console.debug('Error processing replacements:', error.message);
+            this.logger.debug('Error processing replacements:', error.message);
             return JSON.stringify({ error: error.message });
         }
     }
@@ -350,7 +390,7 @@ export class ReplaceContentInFileFunctionHelper {
                 return `No changes needed for file ${result.path}. Content already matches the requested state.`;
             }
         } catch (error) {
-            console.debug('Error processing replacements:', error.message);
+            this.logger.debug('Error processing replacements:', error.message);
             return JSON.stringify({ error: error.message });
         }
     }
@@ -365,7 +405,7 @@ export class ReplaceContentInFileFunctionHelper {
         }
 
         const { path, replacements, reset } = JSON.parse(toolCallString) as { path: string, replacements: Replacement[], reset?: boolean };
-        const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+        const fileUri = await this.workspaceFunctionScope.resolveAccessiblePath(path);
 
         let startingContent: string;
         if (reset || !ctx.request.session.changeSet) {
@@ -423,14 +463,14 @@ export class ReplaceContentInFileFunctionHelper {
                 return JSON.stringify({ error: 'Operation cancelled by user' });
             }
 
-            const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+            const fileUri = await this.workspaceFunctionScope.resolveAccessiblePath(path);
             if (ctx.request.session.changeSet.removeElements(fileUri)) {
                 return `Cleared pending change(s) for file ${path}.`;
             } else {
                 return `No pending changes found for file ${path}.`;
             }
         } catch (error) {
-            console.debug('Error clearing file changes:', error.message);
+            this.logger.debug('Error clearing file changes:', error.message);
             return JSON.stringify({ error: error.message });
         }
     }
@@ -441,7 +481,7 @@ export class ReplaceContentInFileFunctionHelper {
                 return JSON.stringify({ error: 'Operation cancelled by user' });
             }
 
-            const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+            const fileUri = await this.workspaceFunctionScope.resolveAccessiblePath(path);
 
             if (!ctx.request.session.changeSet) {
                 const originalContent = (await this.fileService.read(fileUri)).value.toString();
@@ -456,7 +496,7 @@ export class ReplaceContentInFileFunctionHelper {
                 return `File ${path} has no pending changes. Original content:\n\n${originalContent}`;
             }
         } catch (error) {
-            console.debug('Error getting proposed file state:', error.message);
+            this.logger.debug('Error getting proposed file state:', error.message);
             return JSON.stringify({ error: error.message });
         }
     }
@@ -584,8 +624,7 @@ export class ClearFileChanges implements ToolProvider {
                 properties: {
                     path: {
                         type: 'string',
-                        description: 'The path to the file within the workspace ' +
-                            '(e.g., "my-project/src/index.ts", "backend/src/main.ts").'
+                        description: FILE_PATH_PARAMETER_DESCRIPTION
                     }
                 },
                 required: ['path']
@@ -622,8 +661,7 @@ export class GetProposedFileState implements ToolProvider {
                 properties: {
                     path: {
                         type: 'string',
-                        description: 'The path to the file within the workspace ' +
-                            '(e.g., "my-project/src/index.ts", "backend/src/main.ts").'
+                        description: FILE_PATH_PARAMETER_DESCRIPTION
                     }
                 },
                 required: ['path']