@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.d.ts

@@ -1,4 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -6,7 +7,14 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { ITrustedDomainService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { ITerminalSandboxService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service";
+export interface ITerminalSandboxResolvedNetworkDomains {
+    allowedDomains: string[];
+    deniedDomains: string[];
+}
 export declare class TerminalSandboxService extends Disposable implements ITerminalSandboxService {
     private readonly _configurationService;
     private readonly _fileService;
@@ -14,6 +22,9 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private readonly _logService;
     private readonly _remoteAgentService;
     private readonly _trustedDomainService;
+    private readonly _workspaceContextService;
+    private readonly _productService;
+    private readonly _lifecycleService;
     readonly _serviceBrand: undefined;
     private _srtPath;
     private _rgPath;
@@ -28,8 +39,10 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private _appRoot;
     private _os;
     private _defaultWritePaths;
-    constructor(_configurationService: IConfigurationService, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _remoteAgentService: IRemoteAgentService, _trustedDomainService: ITrustedDomainService);
+    private static readonly _sandboxTempDirName;
+    constructor(_configurationService: IConfigurationService, _fileService: IFileService, _environmentService: IEnvironmentService, _logService: ILogService, _remoteAgentService: IRemoteAgentService, _trustedDomainService: ITrustedDomainService, _workspaceContextService: IWorkspaceContextService, _productService: IProductService, _lifecycleService: ILifecycleService);
     isEnabled(): Promise<boolean>;
+    getOS(): Promise<OperatingSystem>;
     wrapCommand(command: string): string;
     getTempDir(): URI | undefined;
     setNeedsForceUpdateConfigFile(): void;
@@ -39,5 +52,10 @@ export declare class TerminalSandboxService extends Disposable implements ITermi
     private _createSandboxConfig;
     private _pathJoin;
     private _initTempDir;
+    private _cleanupSandboxTempDir;
+    private _getSandboxTempDirPath;
+    private _getSandboxWindowTempDirName;
+    getResolvedNetworkDomains(): ITerminalSandboxResolvedNetworkDomains;
     private _addTrustedDomainsToAllowedDomains;
+    private _updateAllowWritePathsWithWorkspaceFolders;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.js

@@ -8,6 +8,7 @@ import { win32, posix, dirname } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { OS, OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -15,15 +16,29 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomainService.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { WillShutdownJoinerOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 
+var TerminalSandboxService_1;
 let TerminalSandboxService = class TerminalSandboxService extends Disposable {
+    static {
+        TerminalSandboxService_1 = this;
+    }
+    static {
+        this._sandboxTempDirName = "tmp";
+    }
     constructor(
         _configurationService,
         _fileService,
         _environmentService,
         _logService,
         _remoteAgentService,
-        _trustedDomainService
+        _trustedDomainService,
+        _workspaceContextService,
+        _productService,
+        _lifecycleService
     ) {
         super();
         this._configurationService = _configurationService;
@@ -32,6 +47,9 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         this._logService = _logService;
         this._remoteAgentService = _remoteAgentService;
         this._trustedDomainService = _trustedDomainService;
+        this._workspaceContextService = _workspaceContextService;
+        this._productService = _productService;
+        this._lifecycleService = _lifecycleService;
         this._srtPathResolved = false;
         this._needsForceUpdateConfigFile = true;
         this._remoteEnvDetails = null;
@@ -48,7 +66,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         this._remoteEnvDetailsPromise = this._remoteAgentService.getEnvironment();
         this._register(
             Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
-                if (e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem)) {
+                if (e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) || e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem)) {
                     this.setNeedsForceUpdateConfigFile();
                 }
             })
@@ -56,15 +74,32 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         this._register(this._trustedDomainService.onDidChangeTrustedDomains(() => {
             this.setNeedsForceUpdateConfigFile();
         }));
+        this._register(this._workspaceContextService.onDidChangeWorkspaceFolders(() => {
+            this.setNeedsForceUpdateConfigFile();
+        }));
+        this._register(this._lifecycleService.onWillShutdown(e => {
+            if (!this._tempDir) {
+                return;
+            }
+            e.join(this._cleanupSandboxTempDir(), {
+                id: "join.deleteFilesInSandboxTempDir",
+                label: ( localize(13961, "Delete Files in Sandbox Temp Dir")),
+                order: WillShutdownJoinerOrder.Default
+            });
+        }));
     }
     async isEnabled() {
-        this._remoteEnvDetails = await this._remoteEnvDetailsPromise;
-        this._os = this._remoteEnvDetails ? this._remoteEnvDetails.os : OS;
-        if (this._os === OperatingSystem.Windows) {
+        const os = await this.getOS();
+        if (os === OperatingSystem.Windows) {
             return false;
         }
         return this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled);
     }
+    async getOS() {
+        this._remoteEnvDetails = await this._remoteEnvDetailsPromise;
+        this._os = this._remoteEnvDetails ? this._remoteEnvDetails.os : OS;
+        return this._os;
+    }
     wrapCommand(command) {
         if (!this._sandboxConfigPath || !this._tempDir) {
             throw ( new Error("Sandbox config path or temp dir not initialized"));
@@ -78,7 +113,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         if (!this._rgPath) {
             throw ( new Error("Ripgrep path not resolved"));
         }
-        const wrappedCommand = `PATH="$PATH:${dirname(this._rgPath)}" TMPDIR="${this._tempDir.path}" "${this._execPath}" "${this._srtPath}" --settings "${this._sandboxConfigPath}" -c ${this._quoteShellArgument(command)}`;
+        const wrappedCommand = `PATH="$PATH:${dirname(this._rgPath)}" TMPDIR="${this._tempDir.path}" CLAUDE_TMPDIR="${this._tempDir.path}" "${this._execPath}" "${this._srtPath}" --settings "${this._sandboxConfigPath}" -c ${this._quoteShellArgument(command)}`;
         if (this._remoteEnvDetails) {
             return `${wrappedCommand}`;
         }
@@ -109,7 +144,7 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         const remoteEnv = this._remoteEnvDetails || (await this._remoteEnvDetailsPromise);
         if (remoteEnv) {
             this._appRoot = remoteEnv.appRoot.path;
-            this._execPath = this._pathJoin(this._appRoot, "node");
+            this._execPath = remoteEnv.execPath;
         }
         this._srtPath = this._pathJoin(
             this._appRoot,
@@ -126,21 +161,22 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             await this._initTempDir();
         }
         if (this._tempDir) {
-            const networkSetting = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) ?? {};
+            const allowedDomainsSetting = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ?? [];
+            const deniedDomainsSetting = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ?? [];
+            const allowTrustedDomains = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) ?? false;
             const linuxFileSystemSetting = this._os === OperatingSystem.Linux ? this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ?? {} : {};
             const macFileSystemSetting = this._os === OperatingSystem.Macintosh ? this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem) ?? {} : {};
             const configFileUri = URI.joinPath(this._tempDir, `vscode-sandbox-settings-${this._sandboxSettingsId}.json`);
-            const defaultAllowWrite = [...this._defaultWritePaths];
-            const linuxAllowWrite = [...( new Set([...(linuxFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite]))];
-            const macAllowWrite = [...( new Set([...(macFileSystemSetting.allowWrite ?? []), ...defaultAllowWrite]))];
-            let allowedDomains = networkSetting.allowedDomains ?? [];
-            if (networkSetting.allowTrustedDomains) {
+            const linuxAllowWrite = this._updateAllowWritePathsWithWorkspaceFolders(linuxFileSystemSetting.allowWrite);
+            const macAllowWrite = this._updateAllowWritePathsWithWorkspaceFolders(macFileSystemSetting.allowWrite);
+            let allowedDomains = allowedDomainsSetting;
+            if (allowTrustedDomains) {
                 allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
             }
             const sandboxSettings = {
                 network: {
                     allowedDomains,
-                    deniedDomains: networkSetting.deniedDomains ?? []
+                    deniedDomains: deniedDomainsSetting
                 },
                 filesystem: {
                     denyRead: this._os === OperatingSystem.Macintosh ? macFileSystemSetting.denyRead : linuxFileSystemSetting.denyRead,
@@ -164,13 +200,9 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         if (await this.isEnabled()) {
             this._needsForceUpdateConfigFile = true;
             const remoteEnv = this._remoteEnvDetails || (await this._remoteEnvDetailsPromise);
-            if (remoteEnv) {
-                this._tempDir = remoteEnv.tmpDir;
-            } else {
-                const environmentService = this._environmentService;
-                this._tempDir = environmentService.tmpDir;
-            }
+            this._tempDir = this._getSandboxTempDirPath(remoteEnv);
             if (this._tempDir) {
+                await this._fileService.createFolder(this._tempDir);
                 this._defaultWritePaths.push(this._tempDir.path);
             }
             if (!this._tempDir) {
@@ -180,6 +212,57 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
             }
         }
     }
+    async _cleanupSandboxTempDir() {
+        if (!this._tempDir) {
+            return;
+        }
+        try {
+            await this._fileService.del(this._tempDir, {
+                recursive: true,
+                useTrash: false
+            });
+        } catch (error) {
+            this._logService.warn("TerminalSandboxService: Failed to delete sandbox temp dir", error);
+        }
+    }
+    _getSandboxTempDirPath(remoteEnv) {
+        const sandboxTempDirName = this._getSandboxWindowTempDirName();
+        if (remoteEnv?.userHome) {
+            const sandboxRoot = URI.joinPath(
+                remoteEnv.userHome,
+                this._productService.serverDataFolderName ?? this._productService.dataFolderName,
+                TerminalSandboxService_1._sandboxTempDirName
+            );
+            return sandboxTempDirName ? URI.joinPath(sandboxRoot, sandboxTempDirName) : sandboxRoot;
+        }
+        const nativeEnv = this._environmentService;
+        if (nativeEnv.userHome) {
+            const sandboxRoot = URI.joinPath(
+                nativeEnv.userHome,
+                this._productService.dataFolderName,
+                TerminalSandboxService_1._sandboxTempDirName
+            );
+            return sandboxTempDirName ? URI.joinPath(sandboxRoot, sandboxTempDirName) : sandboxRoot;
+        }
+        return undefined;
+    }
+    _getSandboxWindowTempDirName() {
+        const workbenchEnv = this._environmentService;
+        const windowId = workbenchEnv.window?.id;
+        return typeof windowId === "number" ? `tmp_vscode_${windowId}` : undefined;
+    }
+    getResolvedNetworkDomains() {
+        let allowedDomains = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowedDomains) ?? [];
+        const deniedDomains = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkDeniedDomains) ?? [];
+        const allowTrustedDomains = this._configurationService.getValue(TerminalChatAgentToolsSettingId.TerminalSandboxNetworkAllowTrustedDomains) ?? false;
+        if (allowTrustedDomains) {
+            allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
+        }
+        return {
+            allowedDomains,
+            deniedDomains
+        };
+    }
     _addTrustedDomainsToAllowedDomains(allowedDomains) {
         const allowedDomainsSet = ( new Set(allowedDomains));
         for (const domain of this._trustedDomainService.trustedDomains) {
@@ -194,7 +277,15 @@ let TerminalSandboxService = class TerminalSandboxService extends Disposable {
         }
         return Array.from(allowedDomainsSet);
     }
+    _updateAllowWritePathsWithWorkspaceFolders(configuredAllowWrite) {
+        const workspaceFolderPaths = ( this._workspaceContextService.getWorkspace().folders.map(folder => folder.uri.path));
+        return [...( new Set([
+            ...workspaceFolderPaths,
+            ...this._defaultWritePaths,
+            ...(configuredAllowWrite ?? [])
+        ]))];
+    }
 };
-TerminalSandboxService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IRemoteAgentService)), ( __param(5, ITrustedDomainService))], TerminalSandboxService));
+TerminalSandboxService = TerminalSandboxService_1 = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IFileService)), ( __param(2, IEnvironmentService)), ( __param(3, ILogService)), ( __param(4, IRemoteAgentService)), ( __param(5, ITrustedDomainService)), ( __param(6, IWorkspaceContextService)), ( __param(7, IProductService)), ( __param(8, ILifecycleService))], TerminalSandboxService));
 
 export { TerminalSandboxService };

package/vscode/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.d.ts

@@ -1,53 +0,0 @@
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
-import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
-import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IAgentFeedbackService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.service";
-export interface IAgentFeedback {
-    readonly id: string;
-    readonly text: string;
-    readonly resourceUri: URI;
-    readonly range: IRange;
-    readonly sessionResource: URI;
-}
-export interface IAgentFeedbackChangeEvent {
-    readonly sessionResource: URI;
-    readonly feedbackItems: readonly IAgentFeedback[];
-}
-export interface IAgentFeedbackNavigationBearing {
-    readonly activeIdx: number;
-    readonly totalCount: number;
-}
-export declare class AgentFeedbackService extends Disposable implements IAgentFeedbackService {
-    private readonly _chatEditingService;
-    private readonly _agentSessionsService;
-    private readonly _editorService;
-    private readonly _chatWidgetService;
-    private readonly _commandService;
-    readonly _serviceBrand: undefined;
-    private readonly _onDidChangeFeedback;
-    readonly onDidChangeFeedback: Event<IAgentFeedbackChangeEvent>;
-    private readonly _onDidChangeNavigation;
-    readonly onDidChangeNavigation: Event<URI>;
-    /** sessionResource → feedback items */
-    private readonly _feedbackBySession;
-    private readonly _sessionUpdatedOrder;
-    private _sessionUpdatedSequence;
-    private readonly _navigationAnchorBySession;
-    constructor(_chatEditingService: IChatEditingService, _agentSessionsService: IAgentSessionsService, _editorService: IEditorService, _chatWidgetService: IChatWidgetService, _commandService: ICommandService);
-    addFeedback(sessionResource: URI, resourceUri: URI, range: IRange, text: string): IAgentFeedback;
-    removeFeedback(sessionResource: URI, feedbackId: string): void;
-    getFeedback(sessionResource: URI): readonly IAgentFeedback[];
-    getMostRecentSessionForResource(resourceUri: URI): URI | undefined;
-    private _sessionContainsResource;
-    revealFeedback(sessionResource: URI, feedbackId: string): Promise<void>;
-    getNextFeedback(sessionResource: URI, next: boolean): IAgentFeedback | undefined;
-    getNavigationBearing(sessionResource: URI): IAgentFeedbackNavigationBearing;
-    clearFeedback(sessionResource: URI): void;
-    addFeedbackAndSubmit(sessionResource: URI, resourceUri: URI, range: IRange, text: string): Promise<void>;
-}

package/vscode/src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackService.js

@@ -1,219 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
-import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
-import { editingEntriesContainResource, agentSessionContainsResource } from '../../../../workbench/contrib/chat/browser/sessionResourceMatching.js';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-
-let AgentFeedbackService = class AgentFeedbackService extends Disposable {
-    constructor(
-        _chatEditingService,
-        _agentSessionsService,
-        _editorService,
-        _chatWidgetService,
-        _commandService
-    ) {
-        super();
-        this._chatEditingService = _chatEditingService;
-        this._agentSessionsService = _agentSessionsService;
-        this._editorService = _editorService;
-        this._chatWidgetService = _chatWidgetService;
-        this._commandService = _commandService;
-        this._onDidChangeFeedback = this._store.add(( new Emitter()));
-        this.onDidChangeFeedback = this._onDidChangeFeedback.event;
-        this._onDidChangeNavigation = this._store.add(( new Emitter()));
-        this.onDidChangeNavigation = this._onDidChangeNavigation.event;
-        this._feedbackBySession = ( new Map());
-        this._sessionUpdatedOrder = ( new Map());
-        this._sessionUpdatedSequence = 0;
-        this._navigationAnchorBySession = ( new Map());
-    }
-    addFeedback(sessionResource, resourceUri, range, text) {
-        const key = ( sessionResource.toString());
-        let feedbackItems = this._feedbackBySession.get(key);
-        if (!feedbackItems) {
-            feedbackItems = [];
-            this._feedbackBySession.set(key, feedbackItems);
-        }
-        const feedback = {
-            id: generateUuid(),
-            text,
-            resourceUri,
-            range,
-            sessionResource
-        };
-        const resourceStr = ( resourceUri.toString());
-        const hasExistingForFile = ( feedbackItems.some(f => ( f.resourceUri.toString()) === resourceStr));
-        if (!hasExistingForFile) {
-            feedbackItems.push(feedback);
-        } else {
-            let insertIdx = feedbackItems.length;
-            for (let i = 0; i < feedbackItems.length; i++) {
-                if (( feedbackItems[i].resourceUri.toString()) === resourceStr && feedbackItems[i].range.startLineNumber > range.startLineNumber) {
-                    insertIdx = i;
-                    break;
-                }
-                if (( feedbackItems[i].resourceUri.toString()) === resourceStr) {
-                    insertIdx = i + 1;
-                }
-            }
-            feedbackItems.splice(insertIdx, 0, feedback);
-        }
-        this._sessionUpdatedOrder.set(key, ++this._sessionUpdatedSequence);
-        this._onDidChangeNavigation.fire(sessionResource);
-        this._onDidChangeFeedback.fire({
-            sessionResource,
-            feedbackItems
-        });
-        return feedback;
-    }
-    removeFeedback(sessionResource, feedbackId) {
-        const key = ( sessionResource.toString());
-        const feedbackItems = this._feedbackBySession.get(key);
-        if (!feedbackItems) {
-            return;
-        }
-        const idx = feedbackItems.findIndex(f => f.id === feedbackId);
-        if (idx >= 0) {
-            feedbackItems.splice(idx, 1);
-            if (this._navigationAnchorBySession.get(key) === feedbackId) {
-                this._navigationAnchorBySession.delete(key);
-                this._onDidChangeNavigation.fire(sessionResource);
-            }
-            if (feedbackItems.length > 0) {
-                this._sessionUpdatedOrder.set(key, ++this._sessionUpdatedSequence);
-            } else {
-                this._sessionUpdatedOrder.delete(key);
-            }
-            this._onDidChangeFeedback.fire({
-                sessionResource,
-                feedbackItems
-            });
-        }
-    }
-    getFeedback(sessionResource) {
-        return this._feedbackBySession.get(( sessionResource.toString())) ?? [];
-    }
-    getMostRecentSessionForResource(resourceUri) {
-        let bestSession;
-        let bestSequence = -1;
-        for (const [, feedbackItems] of this._feedbackBySession) {
-            if (!feedbackItems.length) {
-                continue;
-            }
-            const candidate = feedbackItems[0].sessionResource;
-            if (!this._sessionContainsResource(candidate, resourceUri, feedbackItems)) {
-                continue;
-            }
-            const sequence = this._sessionUpdatedOrder.get(( candidate.toString())) ?? 0;
-            if (sequence > bestSequence) {
-                bestSession = candidate;
-                bestSequence = sequence;
-            }
-        }
-        return bestSession;
-    }
-    _sessionContainsResource(sessionResource, resourceUri, feedbackItems) {
-        if (( feedbackItems.some(item => isEqual(item.resourceUri, resourceUri)))) {
-            return true;
-        }
-        for (const editingSession of this._chatEditingService.editingSessionsObs.get()) {
-            if (!isEqual(editingSession.chatSessionResource, sessionResource)) {
-                continue;
-            }
-            if (editingEntriesContainResource(editingSession.entries.get(), resourceUri)) {
-                return true;
-            }
-        }
-        for (const session of this._agentSessionsService.model.sessions) {
-            if (!isEqual(session.resource, sessionResource)) {
-                continue;
-            }
-            if (agentSessionContainsResource(session, resourceUri)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    async revealFeedback(sessionResource, feedbackId) {
-        const key = ( sessionResource.toString());
-        const feedbackItems = this._feedbackBySession.get(key);
-        const feedback = feedbackItems?.find(f => f.id === feedbackId);
-        if (!feedback) {
-            return;
-        }
-        await this._editorService.openEditor({
-            resource: feedback.resourceUri,
-            options: {
-                preserveFocus: false,
-                revealIfVisible: true
-            }
-        });
-        setTimeout(() => {
-            this._navigationAnchorBySession.set(key, feedbackId);
-            this._onDidChangeNavigation.fire(sessionResource);
-        }, 50);
-    }
-    getNextFeedback(sessionResource, next) {
-        const key = ( sessionResource.toString());
-        const feedbackItems = this._feedbackBySession.get(key);
-        if (!feedbackItems?.length) {
-            this._navigationAnchorBySession.delete(key);
-            return undefined;
-        }
-        const anchorId = this._navigationAnchorBySession.get(key);
-        let anchorIndex = anchorId ? feedbackItems.findIndex(item => item.id === anchorId) : -1;
-        if (anchorIndex < 0 && !next) {
-            anchorIndex = 0;
-        }
-        const nextIndex = next ? (anchorIndex + 1) % feedbackItems.length : (anchorIndex - 1 + feedbackItems.length) % feedbackItems.length;
-        const feedback = feedbackItems[nextIndex];
-        this._navigationAnchorBySession.set(key, feedback.id);
-        this._onDidChangeNavigation.fire(sessionResource);
-        return feedback;
-    }
-    getNavigationBearing(sessionResource) {
-        const key = ( sessionResource.toString());
-        const feedbackItems = this._feedbackBySession.get(key) ?? [];
-        const anchorId = this._navigationAnchorBySession.get(key);
-        const activeIdx = anchorId ? feedbackItems.findIndex(item => item.id === anchorId) : -1;
-        return {
-            activeIdx,
-            totalCount: feedbackItems.length
-        };
-    }
-    clearFeedback(sessionResource) {
-        const key = ( sessionResource.toString());
-        this._feedbackBySession.delete(key);
-        this._sessionUpdatedOrder.delete(key);
-        this._navigationAnchorBySession.delete(key);
-        this._onDidChangeNavigation.fire(sessionResource);
-        this._onDidChangeFeedback.fire({
-            sessionResource,
-            feedbackItems: []
-        });
-    }
-    async addFeedbackAndSubmit(sessionResource, resourceUri, range, text) {
-        this.addFeedback(sessionResource, resourceUri, range, text);
-        const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
-        if (widget) {
-            const attachmentId = "agentFeedback:" + ( sessionResource.toString());
-            const hasAttachment = () => ( widget.attachmentModel.attachments.some(a => a.id === attachmentId));
-            if (!hasAttachment()) {
-                await Event.toPromise(Event.filter(widget.attachmentModel.onDidChange, () => hasAttachment()));
-            }
-        } else {
-            await ( new Promise(resolve => setTimeout(resolve, 100)));
-        }
-        await this._commandService.executeCommand("agentFeedbackEditor.action.submit");
-    }
-};
-AgentFeedbackService = ( __decorate([( __param(0, IChatEditingService)), ( __param(1, IAgentSessionsService)), ( __param(2, IEditorService)), ( __param(3, IChatWidgetService)), ( __param(4, ICommandService))], AgentFeedbackService));
-
-export { AgentFeedbackService };

package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.d.ts

@@ -1,89 +0,0 @@
-import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { AICustomizationManagementSection, IStorageSourceFilter } from "../../../../workbench/contrib/chat/common/aiCustomizationWorkspaceService.js";
-import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
-import { IChatPromptSlashCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/sessionsManagementService.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
-import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
-/**
- * Agent Sessions override of IAICustomizationWorkspaceService.
- * Delegates to ISessionsManagementService to provide the active session's
- * worktree/repository as the project root, and supports worktree commit.
- *
- * Customization files are always committed to the main repository so they
- * persist across worktrees. When a worktree is active the file is also
- * copied into the worktree and committed there so the running session
- * picks it up immediately.
- */
-export declare class SessionsAICustomizationWorkspaceService implements IAICustomizationWorkspaceService {
-    private readonly sessionsService;
-    private readonly instantiationService;
-    private readonly promptsService;
-    private readonly commandService;
-    private readonly logService;
-    private readonly fileService;
-    private readonly notificationService;
-    readonly _serviceBrand: undefined;
-    readonly activeProjectRoot: IObservable<URI | undefined>;
-    readonly hasOverrideProjectRoot: IObservable<boolean>;
-    /**
-     * Transient override for the project root. When set, `activeProjectRoot`
-     * returns this value instead of the session-derived root.
-     */
-    private readonly _overrideRoot;
-    /**
-     * CLI-accessible user directories for customization file filtering and creation.
-     */
-    private readonly _cliUserRoots;
-    /**
-     * Pre-built filter for types that should only show CLI-accessible user roots.
-     */
-    private readonly _cliUserFilter;
-    constructor(sessionsService: ISessionsManagementService, instantiationService: IInstantiationService, promptsService: IPromptsService, pathService: IPathService, commandService: ICommandService, logService: ILogService, fileService: IFileService, notificationService: INotificationService);
-    getActiveProjectRoot(): URI | undefined;
-    setOverrideProjectRoot(root: URI): void;
-    clearOverrideProjectRoot(): void;
-    readonly managementSections: readonly AICustomizationManagementSection[];
-    private static readonly _hooksFilter;
-    private static readonly _allUserRootsFilter;
-    getStorageSourceFilter(type: PromptsType): IStorageSourceFilter;
-    readonly isSessionsWindow = true;
-    /**
-     * Commits customization files. Always commits to the main repository
-     * so the change persists across worktrees. When a worktree is active
-     * the file is also committed there so the session sees it immediately.
-     */
-    commitFiles(_projectRoot: URI, fileUris: URI[]): Promise<void>;
-    /**
-     * Commits the deletion of files that have already been removed from disk.
-     * Always stages + commits the removal in the main repository, and also
-     * in the worktree if one is active.
-     */
-    deleteFiles(_projectRoot: URI, fileUris: URI[]): Promise<void>;
-    /**
-     * Computes the repository-relative path for a file. The file may be
-     * located under the worktree or the repository root.
-     */
-    private getRelativePath;
-    /**
-     * Commits a single file to the main repository and optionally the worktree.
-     * Copies the file content between trees when needed.
-     */
-    private commitFileToRepos;
-    /**
-     * Commits the deletion of a file to the main repository and optionally
-     * the worktree. The file is already deleted from disk before this is called;
-     * `git add` on a deleted path stages the removal.
-     */
-    private commitDeletionToRepos;
-    generateCustomization(type: PromptsType): Promise<void>;
-    getFilteredPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
-}