@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.d.ts

@@ -4,14 +4,18 @@ import { IAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import type { ResolveSessionConfigResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/commands";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IAgentHostNewSessionFolderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostNewSessionFolderService.service";
 import { IAgentHostUntitledProvisionalSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service";
 export declare class AgentHostUntitledProvisionalSessionService extends Disposable implements IAgentHostUntitledProvisionalSessionService {
     private readonly _agentHostService;
     private readonly _logService;
     private readonly _configurationService;
     private readonly _environmentService;
+    private readonly _newSessionFolderService;
+    private readonly _workspaceTrustManagementService;
     readonly _serviceBrand: undefined;
     private readonly _entries;
     private readonly _pending;
@@ -21,11 +25,27 @@ export declare class AgentHostUntitledProvisionalSessionService extends Disposab
     private readonly _sequencer;
     private readonly _onDidChange;
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<URI>;
-    constructor(_agentHostService: IAgentHostService, _logService: ILogService, chatService: IChatService, _configurationService: IConfigurationService, _environmentService: IWorkbenchEnvironmentService);
+    constructor(_agentHostService: IAgentHostService, _logService: ILogService, chatService: IChatService, _configurationService: IConfigurationService, _environmentService: IWorkbenchEnvironmentService, _newSessionFolderService: IAgentHostNewSessionFolderService, _workspaceTrustManagementService: IWorkspaceTrustManagementService);
     get(sessionResource: URI): URI | undefined;
     waitForPending(sessionResource: URI): Promise<URI | undefined>;
     getOrCreate(sessionResource: URI, provider: string, workingDirectory: URI | undefined): Promise<URI | undefined>;
+    /**
+     * Whether the folder the provisional agent would run in is trusted. When a
+     * working directory is known (it may be a standalone folder outside the
+     * open workspace, e.g. a per-session folder), gate on that folder's trust;
+     * otherwise fall back to whole-workspace trust.
+     */
+    private _isTargetFolderTrusted;
     tryRebind(oldSessionResource: URI, newSessionResource: URI, provider: string, workingDirectory: URI | undefined): Promise<URI | undefined>;
+    /**
+     * Recreate the provisional backend session for `sessionResource` at a new
+     * working directory, preserving the user's config choices. A created
+     * session's cwd is immutable, so the only way to honor a folder change is to
+     * dispose and recreate. Reuses the same deterministic backend URI so the
+     * chat-resource-to-backend mapping stays stable. Sequencer-queued so it
+     * settles in order with config-chip changes for the same resource.
+     */
+    private _changeWorkingDirectory;
     disposeSession(sessionResource: URI): Promise<void>;
     dispose(): void;
     /**
@@ -44,8 +64,11 @@ export declare class AgentHostUntitledProvisionalSessionService extends Disposab
      * drops the workbench defaults.
      *
      * - `isolation`: workbench has no isolation picker, so always `'folder'`.
-     * - `autoApprove`: seeded from `chat.permissions.default`, clamped to
-     *   `'default'` when the `chat.tools.global.autoApprove` policy is off.
+     * - `mode` / `autoApprove`: seeded from the single
+     *   `chat.defaultConfiguration` object setting (`mode` and
+     *   `approvals` properties). The approval seed is clamped to `'default'`
+     *   when the `chat.tools.global.autoApprove` policy is off. The local-only
+     *   `chat.permissions.default` setting is NOT used.
      *
      * Skipped entirely in the Agents window, where the sessions provider
      * supplies config via `request.agentHostSessionConfig` instead.

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.js

@@ -7,14 +7,17 @@ import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service';
-import { SessionConfigKey, KNOWN_AUTO_APPROVE_VALUES } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/sessionConfigKeys';
+import { SessionConfigKey, KNOWN_AUTO_APPROVE_VALUES, KNOWN_MODE_VALUES } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/sessionConfigKeys';
+import { migrateLegacyAutopilotConfig } from '../../../../../../platform/agentHost/common/agentHostSchema.js';
 import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { IAgentHostNewSessionFolderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostNewSessionFolderService.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisionalSessionService extends Disposable {
@@ -23,13 +26,17 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
         _logService,
         chatService,
         _configurationService,
-        _environmentService
+        _environmentService,
+        _newSessionFolderService,
+        _workspaceTrustManagementService
     ) {
         super();
         this._agentHostService = _agentHostService;
         this._logService = _logService;
         this._configurationService = _configurationService;
         this._environmentService = _environmentService;
+        this._newSessionFolderService = _newSessionFolderService;
+        this._workspaceTrustManagementService = _workspaceTrustManagementService;
         this._entries = ( new ResourceMap());
         this._pending = ( new ResourceMap());
         this._resolvedConfigs = ( new ResourceMap());
@@ -48,6 +55,12 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
                 this._rebound.delete(sessionResource);
             }
         }));
+        this._register(this._newSessionFolderService.onDidChangeFolder(sessionResource => {
+            const folder = this._newSessionFolderService.getFolder(sessionResource);
+            if (folder && ( this._entries.has(sessionResource))) {
+                void this._changeWorkingDirectory(sessionResource, folder);
+            }
+        }));
     }
     get(sessionResource) {
         return this._entries.get(sessionResource)?.backendSession;
@@ -76,6 +89,9 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
             if (settled) {
                 return settled;
             }
+            if (!(await this._isTargetFolderTrusted(workingDirectory))) {
+                return undefined;
+            }
             const backendSession = this._toBackendUri(sessionResource, provider);
             const initialConfig = this._getInitialConfig();
             try {
@@ -89,7 +105,8 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
                     backendSession: created,
                     config: {
                         ...(initialConfig ?? {})
-                    }
+                    },
+                    workingDirectory
                 });
                 this._onDidChange.fire(sessionResource);
                 return created;
@@ -108,6 +125,15 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
         });
         return work;
     }
+    async _isTargetFolderTrusted(workingDirectory) {
+        if (workingDirectory) {
+            const {
+                trusted
+            } = await this._workspaceTrustManagementService.getUriTrustInfo(workingDirectory);
+            return trusted;
+        }
+        return this._workspaceTrustManagementService.isWorkspaceTrusted();
+    }
     async tryRebind(oldSessionResource, newSessionResource, provider, workingDirectory) {
         const alreadyBound = this.get(newSessionResource);
         if (alreadyBound) {
@@ -139,6 +165,7 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
             config: {
                 ...config
             },
+            workingDirectory,
             resolvedConfig: oldEntry.resolvedConfig
         });
         this._entries.delete(oldSessionResource);
@@ -153,6 +180,72 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
         });
         return created;
     }
+    _changeWorkingDirectory(sessionResource, newWorkingDirectory) {
+        return this._sequencer.queue(( sessionResource.toString()), async () => {
+            const entry = this._entries.get(sessionResource);
+            if (!entry) {
+                return;
+            }
+            if (entry.workingDirectory?.toString() === ( newWorkingDirectory.toString())) {
+                return;
+            }
+            const provider = entry.backendSession.scheme;
+            const config = {
+                ...entry.config
+            };
+            try {
+                await this._agentHostService.disposeSession(entry.backendSession);
+            } catch (err) {
+                this._logService.warn(
+                    `[AgentHostProvisional] Failed to dispose provisional before cwd change ${( entry.backendSession.toString())}: ${err instanceof Error ? err.message : String(err)}`
+                );
+            }
+            let created;
+            try {
+                created = await this._agentHostService.createSession({
+                    provider,
+                    session: entry.backendSession,
+                    workingDirectory: newWorkingDirectory,
+                    config
+                });
+            } catch (err) {
+                this._logService.warn(
+                    `[AgentHostProvisional] Failed to recreate provisional at new cwd: ${err instanceof Error ? err.message : String(err)}`
+                );
+                this._entries.delete(sessionResource);
+                this._onDidChange.fire(sessionResource);
+                return;
+            }
+            this._entries.set(sessionResource, {
+                backendSession: created,
+                config,
+                workingDirectory: newWorkingDirectory,
+                resolvedConfig: entry.resolvedConfig
+            });
+            try {
+                const resolved = await this._agentHostService.resolveSessionConfig({
+                    provider,
+                    workingDirectory: newWorkingDirectory,
+                    config: {
+                        ...config
+                    }
+                });
+                const current = this._entries.get(sessionResource);
+                if (current && ( current.backendSession.toString()) === ( created.toString())) {
+                    current.config = {
+                        ...current.config,
+                        ...resolved.values
+                    };
+                    current.resolvedConfig = resolved;
+                }
+            } catch (err) {
+                this._logService.warn(
+                    `[AgentHostProvisional] schema re-resolve after cwd change failed: ${err instanceof Error ? err.message : String(err)}`
+                );
+            }
+            this._onDidChange.fire(sessionResource);
+        });
+    }
     async disposeSession(sessionResource) {
         await this.waitForPending(sessionResource);
         const entry = this._entries.get(sessionResource);
@@ -292,15 +385,20 @@ let AgentHostUntitledProvisionalSessionService = class AgentHostUntitledProvisio
         const config = {
             [SessionConfigKey.Isolation]: "folder"
         };
-        const configured = this._configurationService.getValue(ChatConfiguration.DefaultPermissionLevel);
+        const configuredDefaults = this._configurationService.getValue(ChatConfiguration.DefaultConfiguration);
         const policyValue = this._configurationService.inspect(ChatConfiguration.GlobalAutoApprove).policyValue;
-        if (typeof configured === "string" && ( KNOWN_AUTO_APPROVE_VALUES.has(configured))) {
+        const configuredApprovals = configuredDefaults?.approvals;
+        if (typeof configuredApprovals === "string" && ( KNOWN_AUTO_APPROVE_VALUES.has(configuredApprovals))) {
             const policyRestricted = policyValue === false;
-            config[SessionConfigKey.AutoApprove] = policyRestricted ? "default" : configured;
+            config[SessionConfigKey.AutoApprove] = policyRestricted && configuredApprovals !== "default" ? "default" : configuredApprovals;
+        }
+        const configuredMode = configuredDefaults?.mode;
+        if (typeof configuredMode === "string" && ( KNOWN_MODE_VALUES.has(configuredMode))) {
+            config[SessionConfigKey.Mode] = configuredMode;
         }
-        return config;
+        return migrateLegacyAutopilotConfig(config);
     }
 };
-AgentHostUntitledProvisionalSessionService = ( __decorate([( __param(0, IAgentHostService)), ( __param(1, ILogService)), ( __param(2, IChatService)), ( __param(3, IConfigurationService)), ( __param(4, IWorkbenchEnvironmentService))], AgentHostUntitledProvisionalSessionService));
+AgentHostUntitledProvisionalSessionService = ( __decorate([( __param(0, IAgentHostService)), ( __param(1, ILogService)), ( __param(2, IChatService)), ( __param(3, IConfigurationService)), ( __param(4, IWorkbenchEnvironmentService)), ( __param(5, IAgentHostNewSessionFolderService)), ( __param(6, IWorkspaceTrustManagementService))], AgentHostUntitledProvisionalSessionService));
 
 export { AgentHostUntitledProvisionalSessionService };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.d.ts

@@ -1,6 +1,7 @@
 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 { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IMcpServerConfiguration } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes";
 import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { type ClientPluginCustomization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
 import { SYNCED_CUSTOMIZATION_SCHEME } from "../../../../../services/agentHost/common/agentHostFileSystemService.js";
@@ -10,6 +11,15 @@ interface ISyncableFile {
     readonly uri: URI;
     readonly type: PromptsType;
 }
+/**
+ * An MCP server configured directly in VS Code (i.e. not contributed by an
+ * agent plugin) that should be bundled into the synthetic plugin so the
+ * agent host can launch it.
+ */
+export interface ISyncableMcpServer {
+    readonly name: string;
+    readonly configuration: IMcpServerConfiguration;
+}
 interface IBundleResult {
     readonly ref: ClientPluginCustomization;
 }
@@ -24,6 +34,7 @@ interface IBundleResult {
  *
  * ```
  * .plugin/plugin.json
+ * .mcp.json        ← MCP servers configured in VS Code
  * rules/          ← instruction files
  * commands/       ← prompt files
  * agents/         ← agent files
@@ -37,6 +48,7 @@ export declare class SyncedCustomizationBundler extends Disposable {
     private readonly _fileService;
     private readonly _authority;
     private _lastNonce;
+    private _lastRef;
     constructor(authority: string, _fileService: IFileService, agentHostFileSystemService: IAgentHostFileSystemService);
     /**
      * Root URI of the virtual plugin directory for this bundler.
@@ -45,14 +57,15 @@ export declare class SyncedCustomizationBundler extends Disposable {
      */
     private get _rootUri();
     /**
-     * Bundles the given files into the in-memory plugin filesystem.
+     * Bundles the given files and MCP servers into the in-memory plugin
+     * filesystem.
      *
      * Overwrites any previous bundle content. Returns a {@link ClientPluginCustomization}
      * pointing at the virtual plugin directory with a content-based nonce.
      *
-     * @returns The bundle result, or `undefined` if no syncable files were provided.
+     * @returns The bundle result, or `undefined` if there is nothing to sync.
      */
-    bundle(files: readonly ISyncableFile[]): Promise<IBundleResult | undefined>;
+    bundle(files: readonly ISyncableFile[], mcpServers?: readonly ISyncableMcpServer[]): Promise<IBundleResult | undefined>;
     /**
      * Returns the last computed nonce, or `undefined` if no bundle has been created.
      */

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/syncedCustomizationBundler.js

@@ -10,6 +10,7 @@ import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { customizationId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
 import { CustomizationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
@@ -49,20 +50,13 @@ let SyncedCustomizationBundler = class SyncedCustomizationBundler extends Dispos
             path: `/${this._authority}`
         }));
     }
-    async bundle(files) {
+    async bundle(files, mcpServers = []) {
         const syncable = files.filter(f => pluginDirForType(f.type) !== undefined);
-        if (syncable.length === 0) {
+        if (syncable.length === 0 && mcpServers.length === 0) {
             return undefined;
         }
-        try {
-            await this._fileService.del(this._rootUri, {
-                recursive: true
-            });
-        } catch {}
-        const manifestUri = URI.joinPath(this._rootUri, ".plugin", "plugin.json");
-        await this._fileService.writeFile(manifestUri, VSBuffer.fromString(MANIFEST_CONTENT));
-        const hashParts = [];
-        for (const file of syncable) {
+        const entries = [];
+        await Promise.all(( syncable.map(async file => {
             const dir = pluginDirForType(file.type);
             const fileName = basename(file.uri);
             let destUri;
@@ -76,14 +70,48 @@ let SyncedCustomizationBundler = class SyncedCustomizationBundler extends Dispos
                 hashKey = `${dir}/${fileName}`;
             }
             const content = await this._fileService.readFile(file.uri);
-            await this._fileService.writeFile(destUri, content.value);
-            hashParts.push(`${hashKey}:${( content.value.toString())}`);
+            entries.push({
+                destUri,
+                content: content.value,
+                hashPart: `${hashKey}:${( content.value.toString())}`
+            });
+        })));
+        let mcpContent;
+        if (mcpServers.length > 0) {
+            const servers = {};
+            for (const server of [...mcpServers].sort((a, b) => a.name.localeCompare(b.name))) {
+                servers[server.name] = server.configuration;
+            }
+            mcpContent = JSON.stringify({
+                mcpServers: servers
+            }, null, "\t");
+        }
+        const hashParts = ( entries.map(e => e.hashPart));
+        if (mcpContent !== undefined) {
+            hashParts.push(`.mcp.json:${mcpContent}`);
         }
         hashParts.sort();
         const nonce = String(hash(hashParts.join("\n")));
+        if (nonce === this._lastNonce && this._lastRef) {
+            return this._lastRef;
+        }
+        try {
+            await this._fileService.del(this._rootUri, {
+                recursive: true
+            });
+        } catch {}
+        const manifestUri = URI.joinPath(this._rootUri, ".plugin", "plugin.json");
+        await this._fileService.writeFile(manifestUri, VSBuffer.fromString(MANIFEST_CONTENT));
+        for (const entry of entries) {
+            await this._fileService.writeFile(entry.destUri, entry.content);
+        }
+        if (mcpContent !== undefined) {
+            const mcpUri = URI.joinPath(this._rootUri, ".mcp.json");
+            await this._fileService.writeFile(mcpUri, VSBuffer.fromString(mcpContent));
+        }
         this._lastNonce = nonce;
         const rootUriString = ( this._rootUri.toString());
-        return {
+        const result = {
             ref: {
                 type: CustomizationType.Plugin,
                 id: customizationId(rootUriString),
@@ -93,6 +121,8 @@ let SyncedCustomizationBundler = class SyncedCustomizationBundler extends Dispos
                 nonce
             }
         };
+        this._lastRef = result;
+        return result;
     }
     get lastNonce() {
         return this._lastNonce;

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.js

@@ -49,7 +49,7 @@ registerAction2(SetAgentSessionsOrientationStackedAction);
 registerAction2(SetAgentSessionsOrientationSideBySideAction);
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
     submenu: MenuId.AgentSessionsViewerFilterSubMenu,
-    title: ( localize2(5293, "Filter Agent Sessions")),
+    title: ( localize2(5521, "Filter Agent Sessions")),
     group: "navigation",
     order: 3,
     icon: Codicon.filter
@@ -119,9 +119,9 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
     contextKey: "inAgentSessionsPicker",
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(5294, "Search agent sessions by name")),
+    placeholder: ( localize(5522, "Search agent sessions by name")),
     helpEntries: [{
-        description: ( localize(5295, "Show All Agent Sessions")),
+        description: ( localize(5523, "Show All Agent Sessions")),
         commandId: "workbench.action.chat.history"
     }]
 });