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

package/lib/browser/workspace-functions.d.ts

@@ -1,5 +1,7 @@
 import { AiConfigurationService, ToolProvider, ToolRequest } from '@theia/ai-core';
-import { CancellationToken, PreferenceService, URI } from '@theia/core';
+import { FileReadTracker } from '@theia/ai-chat';
+import { CancellationToken, PreferenceService, URI, ILogger } from '@theia/core';
+import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
@@ -10,6 +12,20 @@ import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { ProblemManager } from '@theia/markers/lib/browser';
 import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
+export declare const AccessibleRootContribution: unique symbol;
+/**
+ * Contributes directories outside the workspace roots that the AI workspace tools may access, in
+ * addition to the user-configured `ai-features.workspaceFunctions.allowedExternalPaths`. This is meant
+ * for locations Theia owns and resolves itself, such as the memory store of the current workspace,
+ * whose path is generated and can therefore not be named in a preference by the user.
+ */
+export interface AccessibleRootContribution {
+    /**
+     * The currently accessible roots. Queried on every check rather than once, so that a root which
+     * moves with the workspace is picked up without invalidation.
+     */
+    getRoots(): Promise<URI[]>;
+}
 export declare class WorkspaceFunctionScope {
     protected readonly GITIGNORE_FILE_NAME = ".gitignore";
     protected readonly workspaceService: WorkspaceService;
@@ -17,6 +33,8 @@ export declare class WorkspaceFunctionScope {
     protected readonly preferences: PreferenceService;
     protected readonly aiConfiguration: AiConfigurationService;
     protected readonly envVariablesServer: EnvVariablesServer;
+    protected readonly logger: ILogger;
+    protected readonly accessibleRootContributions: ContributionProvider<AccessibleRootContribution> | undefined;
     private gitignoreMatchers;
     private gitignoreWatchersInitialized;
     private _rootMapping;
@@ -70,13 +88,19 @@ export declare class WorkspaceFunctionScope {
      */
     resolveRelativePath(relativePath: string): URI;
     resolveToUri(pathOrUri: string | URI): Promise<URI | undefined>;
-    ensureWithinWorkspace(targetUri: URI, workspaceRootUri: URI): void;
     /**
-     * Asserts the target URI is reachable by AI tools that honor the external
-     * allow-list. Allowed when the URI is inside any workspace root, or when it
-     * is covered by an entry of the `ai-features.workspaceFunctions.allowedExternalPaths`
-     * preference. Workspace-scoped overrides of that preference are dropped when
-     * the workspace is not trusted.
+     * Resolves a tool argument and asserts that it may be accessed. This is the single entry point every
+     * tool uses, so that a path is subjected to the same parsing and the same boundary check no matter
+     * which tool received it.
+     *
+     * @throws if the path cannot be resolved or points outside the accessible roots.
+     */
+    resolveAccessiblePath(pathOrUri: string): Promise<URI>;
+    /**
+     * Asserts the target URI is reachable by the AI tools. Allowed when the URI is inside any workspace
+     * root, below a root contributed by an {@link AccessibleRootContribution}, or covered by an entry of
+     * the `ai-features.workspaceFunctions.allowedExternalPaths` preference. Workspace-scoped overrides of
+     * that preference are dropped when the workspace is not trusted.
      *
      * The target URI is normalized before the check so that literal `..`
      * segments and percent-encoded equivalents (e.g. `%2e%2e`) are resolved
@@ -86,6 +110,12 @@ export declare class WorkspaceFunctionScope {
      * before the check. Only allow-list directories whose contents you trust.
      */
     ensureAccessible(targetUri: URI): Promise<void>;
+    protected isUnderAny(roots: URI[], normalizedTarget: URI): boolean;
+    /**
+     * The roots contributed by {@link AccessibleRootContribution}s, normalized like the allow-list. A
+     * contribution that fails to resolve is skipped rather than allowed to fail every path check.
+     */
+    protected getContributedRootUris(): Promise<URI[]>;
     isInWorkspace(uri: URI): boolean;
     isInPrimaryWorkspace(uri: URI): boolean;
     /**
@@ -166,9 +196,16 @@ export declare class FileContentFunction implements ToolProvider {
     protected readonly workspaceScope: WorkspaceFunctionScope;
     protected readonly monacoWorkspace: MonacoWorkspace;
     protected readonly preferences: PreferenceService;
+    /** Optional: tracking is advisory, so containers without a tracker still get a working tool. */
+    protected readonly fileReadTracker: FileReadTracker | undefined;
     private parseArg;
     private getFileContent;
     private handleEditorContent;
+    /**
+     * Remembers the content handed to the agent, if it came from a chat session at all. Only full reads are
+     * tracked: a slice says nothing about the rest of the file, so the streaming path is skipped.
+     */
+    private trackRead;
     private handleFullDiskRead;
     private readStreamedSlice;
     private sizeInKB;
@@ -188,6 +225,7 @@ export declare class FileDiagnosticProvider implements ToolProvider {
     protected readonly workspaceScope: WorkspaceFunctionScope;
     protected readonly problemManager: ProblemManager;
     protected readonly modelService: MonacoTextModelService;
+    protected readonly logger: ILogger;
     getTool(): ToolRequest;
     protected getDiagnosticsForFile(uri: URI, cancellationToken?: CancellationToken): Promise<string>;
     /**

package/lib/browser/workspace-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-functions.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-functions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-functions.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-functions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,sBAAsB,EAAyB,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC1G,OAAO,EAAmB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAkB,iBAAiB,EAAE,GAAG,EAAQ,OAAO,EAAE,MAAM,aAAa,CAAC;AACvG,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,QAAQ,EAA2C,MAAM,oCAAoC,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAOhE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAsB,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE9F,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAE/E;;;;;GAKG;AACH,MAAM,WAAW,0BAA0B;IACvC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CAC9B;AAED,qBACa,sBAAsB;IAC/B,SAAS,CAAC,QAAQ,CAAC,mBAAmB,gBAAgB;IAGtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,GAAG,SAAS,CAAC;IAE7G,OAAO,CAAC,iBAAiB,CAA4D;IACrF,OAAO,CAAC,4BAA4B,CAAqB;IAEzD,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,YAAY,CAAoB;IAExC,OAAO,CAAC,UAAU,CAAuC;IAKzD,SAAS,CAAC,IAAI,IAAI,IAAI;IAStB;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;;;;;;;;;;;;OAaG;IACH,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IA0BlC;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAU7C;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;IAc5C;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAqBrD;;;;;;;;;;;OAWG;IACH,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG;IA4DxC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAyCrE;;;;;;OAMG;IACG,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAS5D;;;;;;;;;;;;OAYG;IACG,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,gBAAgB,EAAE,GAAG,GAAG,OAAO;IAKlE;;;OAGG;cACa,sBAAsB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAcxD,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAoBhC,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAiBvC;;;;;;;OAOG;IACG,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAsBlE;;;;;;;OAOG;IACH,MAAM,KAAK,iBAAiB,IAAI,OAAO,CAEtC;IAED;;;;OAIG;cACa,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAmBtE;;;;;;;OAOG;cACa,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAclF;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAOlD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG;IAQ9C,SAAS,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IASnD;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;YAM1C,0BAA0B;IAkBlC,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBrD,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,OAAO;cAIlE,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAalF;;;;;OAKG;cACa,mBAAmB,CAAC,aAAa,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,GAAG,SAAS,CAAC;CAoB1G;AAED,qBACa,8BAA+B,YAAW,YAAY;IAC/D,MAAM,CAAC,EAAE,SAAiD;IAE1D,OAAO,IAAI,WAAW;IAsCtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC;YAEnC,qBAAqB;YA8BrB,uBAAuB;CAgCxC;AAED,qBACa,mBAAoB,YAAW,YAAY;IACpD,MAAM,CAAC,EAAE,SAA4B;IAErC,OAAO,IAAI,WAAW;IAgEtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,gGAAgG;IAEhG,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAEhE,OAAO,CAAC,QAAQ;YAKF,cAAc;YAsCd,mBAAmB;IA0BjC;;;OAGG;YACW,SAAS;YAMT,kBAAkB;YAgClB,iBAAiB;IAwE/B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,wBAAwB;CAQnC;AAED,qBACa,oBAAqB,YAAW,YAAY;IACrD,MAAM,CAAC,EAAE,SAAuC;IAEhD,OAAO,IAAI,WAAW;IAgCtB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAE3C,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;YAwCjF,iBAAiB;CAwBlC;AAED,qBACa,sBAAuB,YAAW,YAAY;IACvD,MAAM,CAAC,EAAE,SAA2B;IAGpC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,IAAI,WAAW;cAoCN,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuEvG;;;OAGG;IACH,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,GAAG,KAAK;CAmBhG;AAED,qBACa,kBAAmB,YAAW,YAAY;IACnD,MAAM,CAAC,EAAE,SAAqC;IAG9C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,OAAO,IAAI,WAAW;YA8DR,SAAS;IAiFvB;;;;OAIG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE;QAAE,OAAO,EAAE,GAAG,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,GAAG,SAAS;CAU1H"}

package/lib/browser/workspace-functions.js

@@ -1,7 +1,7 @@
 "use strict";
 var WorkspaceFunctionScope_1, GetWorkspaceDirectoryStructure_1, FileContentFunction_1, GetWorkspaceFileList_1, FileDiagnosticProvider_1, FindFilesByPattern_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FindFilesByPattern = exports.FileDiagnosticProvider = exports.GetWorkspaceFileList = exports.FileContentFunction = exports.GetWorkspaceDirectoryStructure = exports.WorkspaceFunctionScope = void 0;
+exports.FindFilesByPattern = exports.FileDiagnosticProvider = exports.GetWorkspaceFileList = exports.FileContentFunction = exports.GetWorkspaceDirectoryStructure = exports.WorkspaceFunctionScope = exports.AccessibleRootContribution = void 0;
 const tslib_1 = require("tslib");
 // *****************************************************************************
 // Copyright (C) 2024 EclipseSource GmbH.
@@ -19,7 +19,9 @@ const tslib_1 = require("tslib");
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 const ai_core_1 = require("@theia/ai-core");
+const ai_chat_1 = require("@theia/ai-chat");
 const core_1 = require("@theia/core");
+const contribution_provider_1 = require("@theia/core/lib/common/contribution-provider");
 const env_variables_1 = require("@theia/core/lib/common/env-variables");
 const inversify_1 = require("@theia/core/shared/inversify");
 const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
@@ -35,6 +37,7 @@ const monaco_workspace_1 = require("@theia/monaco/lib/browser/monaco-workspace")
 const monaco_text_model_service_1 = require("@theia/monaco/lib/browser/monaco-text-model-service");
 const browser_2 = require("@theia/markers/lib/browser");
 const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
+exports.AccessibleRootContribution = Symbol('AccessibleRootContribution');
 let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionScope {
     constructor() {
         this.GITIGNORE_FILE_NAME = '.gitignore';
@@ -82,7 +85,7 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
         for (const root of sortedRoots) {
             const basename = root.resource.path.base;
             if (mapping.has(basename)) {
-                console.debug(`Multiple workspace roots share the basename '${basename}'. ` +
+                this.logger.debug(`Multiple workspace roots share the basename '${basename}'. ` +
                     `Only '${mapping.get(basename).toString()}' is addressable as '${basename}'. ` +
                     `'${root.resource.toString()}' can still be accessed but may require full paths.`);
                 continue;
@@ -236,19 +239,26 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
         return this.resolveRelativePath(normalizedPath);
     }
     // ── Access control ──────────────────────────────────────────────────
-    ensureWithinWorkspace(targetUri, workspaceRootUri) {
-        const normalized = targetUri.normalizePath();
-        if (workspaceRootUri.scheme !== normalized.scheme
-            || !workspaceRootUri.isEqualOrParent(normalized, WorkspaceFunctionScope_1.pathCaseSensitive)) {
-            throw new Error('Access outside of the workspace is not allowed');
+    /**
+     * Resolves a tool argument and asserts that it may be accessed. This is the single entry point every
+     * tool uses, so that a path is subjected to the same parsing and the same boundary check no matter
+     * which tool received it.
+     *
+     * @throws if the path cannot be resolved or points outside the accessible roots.
+     */
+    async resolveAccessiblePath(pathOrUri) {
+        const resolved = await this.resolveToUri(pathOrUri);
+        if (!resolved) {
+            throw new Error(`Invalid path: '${pathOrUri}'`);
         }
+        await this.ensureAccessible(resolved);
+        return resolved;
     }
     /**
-     * Asserts the target URI is reachable by AI tools that honor the external
-     * allow-list. Allowed when the URI is inside any workspace root, or when it
-     * is covered by an entry of the `ai-features.workspaceFunctions.allowedExternalPaths`
-     * preference. Workspace-scoped overrides of that preference are dropped when
-     * the workspace is not trusted.
+     * Asserts the target URI is reachable by the AI tools. Allowed when the URI is inside any workspace
+     * root, below a root contributed by an {@link AccessibleRootContribution}, or covered by an entry of
+     * the `ai-features.workspaceFunctions.allowedExternalPaths` preference. Workspace-scoped overrides of
+     * that preference are dropped when the workspace is not trusted.
      *
      * The target URI is normalized before the check so that literal `..`
      * segments and percent-encoded equivalents (e.g. `%2e%2e`) are resolved
@@ -259,20 +269,36 @@ let WorkspaceFunctionScope = WorkspaceFunctionScope_1 = class WorkspaceFunctionS
      */
     async ensureAccessible(targetUri) {
         const normalized = targetUri.normalizePath();
-        const caseSensitive = WorkspaceFunctionScope_1.pathCaseSensitive;
-        const roots = this.getAllRootUris();
-        for (const rootUri of roots) {
-            if (rootUri.scheme === normalized.scheme && rootUri.isEqualOrParent(normalized, caseSensitive)) {
-                return;
-            }
-        }
-        const allowed = await this.getAllowedExternalUris();
-        if (allowed.some(allowedUri => allowedUri.scheme === normalized.scheme && allowedUri.isEqualOrParent(normalized, caseSensitive))) {
+        if (this.isUnderAny(this.getAllRootUris(), normalized)
+            || this.isUnderAny(await this.getContributedRootUris(), normalized)
+            || this.isUnderAny(await this.getAllowedExternalUris(), normalized)) {
             return;
         }
         throw new Error(`Access to '${normalized.path.toString()}' is not allowed. ` +
             `Path is outside the workspace and not covered by the '${workspace_preferences_1.ALLOWED_EXTERNAL_PATHS_PREF}' preference.`);
     }
+    isUnderAny(roots, normalizedTarget) {
+        const caseSensitive = WorkspaceFunctionScope_1.pathCaseSensitive;
+        return roots.some(root => root.scheme === normalizedTarget.scheme && root.isEqualOrParent(normalizedTarget, caseSensitive));
+    }
+    /**
+     * The roots contributed by {@link AccessibleRootContribution}s, normalized like the allow-list. A
+     * contribution that fails to resolve is skipped rather than allowed to fail every path check.
+     */
+    async getContributedRootUris() {
+        const roots = [];
+        for (const contribution of this.accessibleRootContributions?.getContributions() ?? []) {
+            try {
+                for (const root of await contribution.getRoots()) {
+                    roots.push(WorkspaceFunctionScope_1.withoutTrailingSeparator(root.normalizePath()));
+                }
+            }
+            catch (error) {
+                this.logger.warn('Failed to resolve accessible roots from a contribution.', error);
+            }
+        }
+        return roots;
+    }
     isInWorkspace(uri) {
         try {
             const roots = this.getAllRootUris();
@@ -518,6 +544,17 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(env_variables_1.EnvVariablesServer),
     tslib_1.__metadata("design:type", Object)
 ], WorkspaceFunctionScope.prototype, "envVariablesServer", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    (0, inversify_1.named)('ai-ide:WorkspaceFunctionScope'),
+    tslib_1.__metadata("design:type", Object)
+], WorkspaceFunctionScope.prototype, "logger", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(contribution_provider_1.ContributionProvider),
+    (0, inversify_1.named)(exports.AccessibleRootContribution),
+    (0, inversify_1.optional)(),
+    tslib_1.__metadata("design:type", Object)
+], WorkspaceFunctionScope.prototype, "accessibleRootContributions", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     tslib_1.__metadata("design:type", Function),
@@ -536,8 +573,8 @@ let GetWorkspaceDirectoryStructure = class GetWorkspaceDirectoryStructure {
             name: GetWorkspaceDirectoryStructure_1.ID,
             description: 'Retrieves the directory tree structure as a nested JSON object. ' +
                 'By default returns all workspace roots with root names as keys. ' +
-                'Pass `root` to inspect a specific directory listed in the ' +
-                '`ai-features.workspaceFunctions.allowedExternalPaths` preference instead. ' +
+                'Pass `root` to inspect a specific directory the tools may access, such as one listed in the ' +
+                '`ai-features.workspaceFunctions.allowedExternalPaths` preference, instead. ' +
                 'Lists only directories (no files), excluding common non-essential directories (node_modules, hidden files, etc.). ' +
                 'Useful for getting a high-level overview of project organization. ' +
                 'For listing files within a specific directory, use getWorkspaceFileList instead. ' +
@@ -548,7 +585,7 @@ let GetWorkspaceDirectoryStructure = class GetWorkspaceDirectoryStructure {
                     root: {
                         type: 'string',
                         description: 'Optional absolute path or `file://` URI to inspect instead of the workspace. ' +
-                            'Must be inside, or equal to, an entry of the `allowedExternalPaths` preference. ' +
+                            'Must point to a directory the tools may access, such as one listed in the `allowedExternalPaths` preference. ' +
                             'When omitted, all workspace roots are returned.'
                     }
                 },
@@ -573,11 +610,7 @@ let GetWorkspaceDirectoryStructure = class GetWorkspaceDirectoryStructure {
         }
         try {
             if (root) {
-                const resolved = await this.workspaceScope.resolveToUri(root);
-                if (!resolved) {
-                    return { error: `Invalid root: '${root}'` };
-                }
-                await this.workspaceScope.ensureAccessible(resolved);
+                const resolved = await this.workspaceScope.resolveAccessiblePath(root);
                 return this.buildDirectoryStructure(resolved, cancellationToken);
             }
             else {
@@ -649,8 +682,8 @@ let FileContentFunction = class FileContentFunction {
             description: 'Returns the content of a specified file as a raw string. ' +
                 'File paths use the same format returned by other workspace tools ' +
                 '(e.g., "my-project/src/index.ts"). ' +
-                'Absolute paths and `file://` URIs are accepted when the target is inside the workspace ' +
-                'or covered by the `ai-features.workspaceFunctions.allowedExternalPaths` preference. ' +
+                'Absolute paths and `file://` URIs are accepted when the target is a location the tools may access, ' +
+                'such as a directory listed in the `ai-features.workspaceFunctions.allowedExternalPaths` preference. ' +
                 'If the file is currently open in an editor with unsaved changes, returns the editor\'s current content (not the saved file on disk). ' +
                 'Binary files may not be readable and will return an error. ' +
                 'Use this tool to read file contents before making any edits with replacement functions. ' +
@@ -667,8 +700,8 @@ let FileContentFunction = class FileContentFunction {
                         type: 'string',
                         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 inside the workspace ' +
-                            'or inside a directory listed in the `allowedExternalPaths` preference.',
+                            'Absolute / URI forms must point to a location the tools may access, such as a directory listed in the ' +
+                            '`allowedExternalPaths` preference.',
                     },
                     offset: {
                         type: 'number',
@@ -684,7 +717,7 @@ let FileContentFunction = class FileContentFunction {
             },
             handler: (arg_string, ctx) => {
                 const { file, offset, limit } = this.parseArg(arg_string);
-                return this.getFileContent(file, ctx?.cancellationToken, offset, limit);
+                return this.getFileContent(file, ctx, offset, limit);
             },
             providerName: undefined,
             getArgumentsShortLabel: (args) => {
@@ -709,7 +742,8 @@ let FileContentFunction = class FileContentFunction {
         const result = JSON.parse(arg_string);
         return { file: result.file, offset: result.offset, limit: result.limit };
     }
-    async getFileContent(file, cancellationToken, offset, limit) {
+    async getFileContent(file, ctx, offset, limit) {
+        const cancellationToken = ctx?.cancellationToken;
         if (cancellationToken?.isCancellationRequested) {
             return JSON.stringify({ error: 'Operation cancelled by user' });
         }
@@ -721,12 +755,7 @@ let FileContentFunction = class FileContentFunction {
         }
         let targetUri;
         try {
-            const resolved = await this.workspaceScope.resolveToUri(file);
-            if (!resolved) {
-                return JSON.stringify({ error: `Invalid file path: '${file}'` });
-            }
-            targetUri = resolved;
-            await this.workspaceScope.ensureAccessible(targetUri);
+            targetUri = await this.workspaceScope.resolveAccessiblePath(file);
         }
         catch (error) {
             return JSON.stringify({ error: error.message });
@@ -739,21 +768,22 @@ let FileContentFunction = class FileContentFunction {
         const isEditorOpen = openEditorValue !== undefined;
         const isPaginated = offset !== undefined || limit !== undefined;
         if (isEditorOpen) {
-            return this.handleEditorContent(openEditorValue, maxSizeKB, offset, limit);
+            return this.handleEditorContent(targetUri, openEditorValue, maxSizeKB, ctx, offset, limit);
         }
         else if (isPaginated) {
             return this.readStreamedSlice(targetUri, maxSizeKB, offset, limit);
         }
         else {
-            return this.handleFullDiskRead(targetUri, maxSizeKB);
+            return this.handleFullDiskRead(targetUri, maxSizeKB, ctx);
         }
     }
-    handleEditorContent(content, maxSizeKB, offset, limit) {
+    async handleEditorContent(targetUri, content, maxSizeKB, ctx, offset, limit) {
         if (offset === undefined && limit === undefined) {
             const sizeKB = this.sizeInKB(content);
             if (sizeKB > maxSizeKB) {
                 return this.buildFileSizeLimitError(sizeKB, maxSizeKB);
             }
+            await this.trackRead(targetUri, content, ctx);
             return content;
         }
         const lines = content.split('\n');
@@ -769,7 +799,16 @@ let FileContentFunction = class FileContentFunction {
         const header = `[Lines ${startLine}\u2013${endLine} of ${lines.length} total. Use offset and limit to read other ranges.]`;
         return `${header}\n${result}`;
     }
-    async handleFullDiskRead(targetUri, maxSizeKB) {
+    /**
+     * Remembers the content handed to the agent, if it came from a chat session at all. Only full reads are
+     * tracked: a slice says nothing about the rest of the file, so the streaming path is skipped.
+     */
+    async trackRead(targetUri, content, ctx) {
+        if (ai_chat_1.ChatToolContext.is(ctx)) {
+            await this.fileReadTracker?.recordRead(ctx.request.session.id, targetUri, content);
+        }
+    }
+    async handleFullDiskRead(targetUri, maxSizeKB, ctx) {
         try {
             const stat = await this.fileService.resolve(targetUri);
             if (stat.size !== undefined) {
@@ -788,6 +827,7 @@ let FileContentFunction = class FileContentFunction {
             if (sizeKB > maxSizeKB) {
                 return this.buildFileSizeLimitError(sizeKB, maxSizeKB);
             }
+            await this.trackRead(targetUri, rawContent, ctx);
             return rawContent;
         }
         catch (error) {
@@ -906,6 +946,11 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(core_1.PreferenceService),
     tslib_1.__metadata("design:type", Object)
 ], FileContentFunction.prototype, "preferences", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(ai_chat_1.FileReadTracker),
+    (0, inversify_1.optional)(),
+    tslib_1.__metadata("design:type", Object)
+], FileContentFunction.prototype, "fileReadTracker", void 0);
 exports.FileContentFunction = FileContentFunction = FileContentFunction_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], FileContentFunction);
@@ -924,7 +969,8 @@ let GetWorkspaceFileList = class GetWorkspaceFileList {
                         description: 'Path to a directory. Workspace-relative paths use the format \'rootName/path\' ' +
                             '(e.g., \'my-project/src\', \'backend/src/components\'). ' +
                             'Use \'\' or \'.\' to list the workspace top-level directories. ' +
-                            'Absolute paths and `file://` URIs are accepted when covered by the `allowedExternalPaths` preference.'
+                            'Absolute paths and `file://` URIs are accepted when they point to a location the tools may access, ' +
+                            'such as a directory listed in the `allowedExternalPaths` preference.'
                     }
                 },
                 required: ['path']
@@ -959,12 +1005,7 @@ let GetWorkspaceFileList = class GetWorkspaceFileList {
             }
             let targetUri;
             try {
-                const resolved = await this.workspaceScope.resolveToUri(path);
-                if (!resolved) {
-                    return JSON.stringify({ error: `Invalid path: '${path}'` });
-                }
-                targetUri = resolved;
-                await this.workspaceScope.ensureAccessible(targetUri);
+                targetUri = await this.workspaceScope.resolveAccessiblePath(path);
             }
             catch (error) {
                 return JSON.stringify({ error: error.message });
@@ -1033,8 +1074,9 @@ let FileDiagnosticProvider = class FileDiagnosticProvider {
                 properties: {
                     file: {
                         type: 'string',
-                        description: 'The path to the target file within the workspace ' +
-                            '(e.g., "my-project/src/index.ts", "backend/src/main.ts").'
+                        description: 'The path to the target file. May be workspace-relative ' +
+                            '(e.g., "my-project/src/index.ts", "backend/src/main.ts"), an absolute path, or a `file://` URI ' +
+                            'pointing to a location the tools may access.'
                     }
                 },
                 required: ['file']
@@ -1042,12 +1084,7 @@ let FileDiagnosticProvider = class FileDiagnosticProvider {
             handler: async (arg, ctx) => {
                 try {
                     const { file } = JSON.parse(arg);
-                    const targetUri = await this.workspaceScope.resolveRelativePath(file);
-                    const containingRoot = this.workspaceScope.getContainingRoot(targetUri);
-                    if (!containingRoot) {
-                        return JSON.stringify({ error: 'Access outside of the workspace is not allowed' });
-                    }
-                    this.workspaceScope.ensureWithinWorkspace(targetUri, containingRoot);
+                    const targetUri = await this.workspaceScope.resolveAccessiblePath(file);
                     return this.getDiagnosticsForFile(targetUri, ctx?.cancellationToken);
                 }
                 catch (error) {
@@ -1112,7 +1149,7 @@ let FileDiagnosticProvider = class FileDiagnosticProvider {
             if (err.message === 'Operation cancelled by user') {
                 return JSON.stringify({ error: 'Operation cancelled by user' });
             }
-            console.warn('Error when fetching markers for', uri.toString(), err);
+            this.logger.warn('Error when fetching markers for', uri.toString(), err);
             return JSON.stringify({ error: err instanceof Error ? err.message : 'Unknown error when fetching for problems for ' + uri.toString() });
         }
         finally {
@@ -1157,6 +1194,11 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
     tslib_1.__metadata("design:type", monaco_text_model_service_1.MonacoTextModelService)
 ], FileDiagnosticProvider.prototype, "modelService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    (0, inversify_1.named)('ai-ide:FileDiagnosticProvider'),
+    tslib_1.__metadata("design:type", Object)
+], FileDiagnosticProvider.prototype, "logger", void 0);
 exports.FileDiagnosticProvider = FileDiagnosticProvider = FileDiagnosticProvider_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], FileDiagnosticProvider);
@@ -1169,8 +1211,8 @@ let FindFilesByPattern = class FindFilesByPattern {
             name: FindFilesByPattern_1.ID,
             description: 'Find files matching a given glob pattern. ' +
                 'By default searches across all workspace roots. ' +
-                'Pass `searchRoot` to search a directory listed in the ' +
-                '`ai-features.workspaceFunctions.allowedExternalPaths` preference instead. ' +
+                'Pass `searchRoot` to search a directory the tools may access, such as one listed in the ' +
+                '`ai-features.workspaceFunctions.allowedExternalPaths` preference, instead. ' +
                 'This function allows efficient discovery of files using patterns like \'**/*.ts\' for all TypeScript files or ' +
                 '\'src/**/*.js\' for JavaScript files in the src directory. The function respects gitignore patterns and user exclusions, ' +
                 'returns workspace-relative paths (e.g., "my-project/src/index.ts") or absolute paths for external roots, ' +
@@ -1195,7 +1237,7 @@ let FindFilesByPattern = class FindFilesByPattern {
                     searchRoot: {
                         type: 'string',
                         description: 'Optional absolute path or `file://` URI to search instead of the workspace. ' +
-                            'Must be inside, or equal to, an entry of the `allowedExternalPaths` preference. ' +
+                            'Must point to a directory the tools may access, such as one listed in the `allowedExternalPaths` preference. ' +
                             'When set, results are returned as absolute paths so they can be passed back to getFileContent. ' +
                             'When omitted (default), all workspace roots are searched and results are workspace-relative.'
                     }
@@ -1237,11 +1279,7 @@ let FindFilesByPattern = class FindFilesByPattern {
             // Resolve the set of roots to search and how each root's results should be rendered.
             const targets = [];
             if (searchRoot) {
-                const resolved = await this.workspaceScope.resolveToUri(searchRoot);
-                if (!resolved) {
-                    return JSON.stringify({ error: `Invalid searchRoot: '${searchRoot}'` });
-                }
-                await this.workspaceScope.ensureAccessible(resolved);
+                const resolved = await this.workspaceScope.resolveAccessiblePath(searchRoot);
                 targets.push({ rootUri: resolved, external: !this.workspaceScope.isInWorkspace(resolved) });
             }
             else {
@@ -1306,7 +1344,7 @@ let FindFilesByPattern = class FindFilesByPattern {
      */
     toDisplayPath(match, target) {
         if (target.external) {
-            return match.path.toString();
+            return match.path.fsPath();
         }
         const relativePath = target.rootUri.relative(match)?.toString();
         if (relativePath === undefined) {