@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.1

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js

@@ -33,7 +33,7 @@ import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { clearChatMarks, markChat, ChatPerfMark } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatPerf';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, ChatRequestModel, updateRanges, toChatHistoryContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { logChangesToStateModel, normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, ChatRequestModel, updateRanges, toChatHistoryContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatModelStore } from '../model/chatModelStore.js';
 import { ChatRequestTextPart, ChatRequestSlashCommandPart, getPromptText, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
@@ -45,7 +45,7 @@ import { ChatSessionStore } from '../model/chatSessionStore.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
 import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service';
 import { LocalChatSessionUri, getChatSessionType, chatSessionResourceToId, isUntitledChatSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { IChatRequestVariableEntry, ChatRequestVariableSet, isPromptTextVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { isExplicitFileOrImageVariableEntry, IChatRequestVariableEntry, ChatRequestVariableSet, isPromptTextVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -182,11 +182,32 @@ let ChatService = class ChatService extends Disposable {
                 const localSessionId = LocalChatSessionUri.parseLocalSessionId(model.sessionResource);
                 if (localSessionId && this.shouldStoreSession(model)) {
                     if (model.getRequests().length === 0 && !model.customTitle) {
+                        logChangesToStateModel(
+                            model.inputModel,
+                            `disposing session ${model.sessionResource} (${localSessionId}) without title, deleting from storage`,
+                            undefined,
+                            undefined,
+                            this.logService
+                        );
                         await this._chatSessionStore.deleteSession(localSessionId);
                     } else if (this._saveModelsEnabled) {
+                        logChangesToStateModel(
+                            model.inputModel,
+                            `disposing session ${model.sessionResource} (${localSessionId}) with title, storing to storage`,
+                            undefined,
+                            undefined,
+                            this.logService
+                        );
                         await this._chatSessionStore.storeSessions([model]);
                     }
                 } else if (!localSessionId && (model.getRequests().length > 0 || hasDraftInput(model))) {
+                    logChangesToStateModel(
+                        model.inputModel,
+                        `disposing external session ${model.sessionResource} with requests or draft input, storing metadata to storage`,
+                        undefined,
+                        undefined,
+                        this.logService
+                    );
                     await this._chatSessionStore.storeSessionsMetadataOnly([model]);
                 }
             }
@@ -524,7 +545,6 @@ let ChatService = class ChatService extends Disposable {
         {
             const existingRef = this.acquireExistingSession(sessionResource, debugOwner);
             if (existingRef) {
-                providedSession.dispose();
                 return existingRef;
             }
         }
@@ -541,6 +561,7 @@ let ChatService = class ChatService extends Disposable {
         const storedPermissionLevel = storedMetadata?.permissionLevel;
         const storedInputState = storedMetadata?.inputState;
         let initialData = undefined;
+        let historySelectedModel = undefined;
         if ((modelId || agentUri)) {
             const mode = agentUri ? {
                 kind: ChatModeKind.Agent,
@@ -554,6 +575,7 @@ let ChatService = class ChatService extends Disposable {
                 identifier: modelId,
                 metadata: modelMetadata
             } : undefined;
+            historySelectedModel = selectedModel?.identifier;
             initialData = {
                 serializer: ( new ChatSessionOperationLog()),
                 value: {
@@ -584,8 +606,15 @@ let ChatService = class ChatService extends Disposable {
             sessionResource: sessionResource,
             canUseTools: false,
             transferEditingSession: providedSession.transferredState?.editingSession,
-            inputState: providedSession.transferredState?.inputState ?? storedInputState
+            inputState: providedSession.transferredState?.inputState
         }, debugOwner ?? "ChatService#loadRemoteSession");
+        logChangesToStateModel(
+            modelRef.object.inputModel,
+            `loadRemoteSession inputState source: session=${( sessionResource.toString())}, chatSessionType=${chatSessionType}, historyModelId=${modelId}, agentUri=${agentUri?.toString()}, historySelectedModel=${historySelectedModel}, transferredSelectedModel=${providedSession.transferredState?.inputState?.selectedModel?.identifier}, storedSelectedModel=${storedInputState?.selectedModel?.identifier}, finalSelectedModel=${modelRef.object.inputModel.state.get()?.selectedModel?.identifier}, hasTransferredInputState=${!!providedSession.transferredState?.inputState}, hasStoredInputState=${!!storedInputState}, hasInitialData=${!!initialData}`,
+            modelRef.object.inputModel.state.get(),
+            undefined,
+            this.logService
+        );
         if (storedPermissionLevel && !initialData && !storedInputState) {
             modelRef.object.inputModel.setState({
                 permissionLevel: storedPermissionLevel
@@ -656,7 +685,7 @@ let ChatService = class ChatService extends Disposable {
                 undefined,
                 undefined,
                 false,
-                message.modelId, undefined, message.id);
+                message.modelId, undefined, message.id, message.isSystemInitiated, message.systemInitiatedLabel);
             } else {
                 if (lastRequest) {
                     for (const part of message.parts) {
@@ -705,7 +734,9 @@ let ChatService = class ChatService extends Disposable {
                 disposables.add(providedSession.onDidStartServerRequest((
                     {
                         prompt,
-                        variableData
+                        variableData,
+                        isSystemInitiated,
+                        systemInitiatedLabel
                     }
                 ) => {
                     if (lastRequest?.response && !lastRequest.response.isComplete) {
@@ -715,7 +746,17 @@ let ChatService = class ChatService extends Disposable {
                     const parsedRequest = parseAgentHostHistoryPrompt(prompt, agent);
                     lastRequest = model.addRequest(parsedRequest, variableData ?? {
                         variables: []
-                    }, 0, undefined, agent);
+                    }, 0,
+                    undefined,
+                    agent, undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    isSystemInitiated, systemInitiatedLabel);
                     lastProgressLength = 0;
                     ensureCancellationTracking();
                 }));
@@ -822,7 +863,8 @@ let ChatService = class ChatService extends Disposable {
     }
     async sendRequest(sessionResource, request, options) {
         this.trace("sendRequest", `sessionResource: ${( sessionResource.toString())}, message: ${request.substring(0, 20)}${request.length > 20 ? "[...]" : ""}}`);
-        if (!request.trim() && !options?.slashCommand && !options?.agentId && !options?.agentIdSilent) {
+        const hasExplicitFileOrImageAttachment = ( [...(options?.attachedContext ?? []), ...(options?.resolvedVariables ?? [])].some(isExplicitFileOrImageVariableEntry));
+        if (!request.trim() && !hasExplicitFileOrImageAttachment && !options?.slashCommand && !options?.agentId && !options?.agentIdSilent) {
             this.trace("sendRequest", "Rejected empty message");
             return {
                 kind: "rejected",
@@ -1049,7 +1091,7 @@ let ChatService = class ChatService extends Disposable {
                         model.acceptResponseProgress(request, {
                             kind: "markdownContent",
                             content: ( new MarkdownString(( localize(
-                                7786,
+                                7939,
                                 "The `{0}` skill requires `{1}` to be enabled. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
                                 TROUBLESHOOT_COMMAND_NAME,
                                 AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING,
@@ -1351,7 +1393,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(7787, "Provider returned null response"))
+                                message: ( localize(7940, "Provider returned null response"))
                             }
                         };
                     }
@@ -1433,7 +1475,7 @@ let ChatService = class ChatService extends Disposable {
                 this.processNextPendingRequest(model);
             }
         });
-        if (options?.userSelectedModelId) {
+        if (options?.userSelectedModelId && !options.isSystemInitiated) {
             this.languageModelsService.addToRecentlyUsedList(options.userSelectedModelId);
         }
         this._onDidSubmitRequest.fire({
@@ -1835,7 +1877,7 @@ let ChatService = class ChatService extends Disposable {
 };
 ChatService = ( __decorate([( __param(0, IStorageService)), ( __param(1, ILogService)), ( __param(2, ITelemetryService)), ( __param(3, IExtensionService)), ( __param(4, IInstantiationService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IChatSlashCommandService)), ( __param(7, IChatAgentService)), ( __param(8, IConfigurationService)), ( __param(9, IChatTransferService)), ( __param(10, IChatSessionsService)), ( __param(11, IMcpService)), ( __param(12, IPromptsService)), ( __param(13, IChatEntitlementService)), ( __param(14, ILanguageModelsService)), ( __param(15, IChatDebugService))], ChatService));
 async function chatModelToChatDetail(model) {
-    const title = model.title || ( localize(7788, "New Chat"));
+    const title = model.title || ( localize(7941, "New Chat"));
     return {
         sessionResource: model.sessionResource,
         title,

package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.js

@@ -58,6 +58,7 @@ const responsePartSchema = v(
             case "info":
             case "treeData":
             case "workspaceEdit":
+            case "externalEdit":
             case "disabledClaudeHooks":
                 return a.kind === b.kind;
             default:

package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionStore.js

@@ -98,7 +98,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: "join.chatSessionStore",
-                label: ( localize(7823, "Saving chat history"))
+                label: ( localize(7976, "Saving chat history"))
             });
         }));
     }
@@ -356,14 +356,14 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
                             this._didReportIssue = true;
                             this.dialogService.prompt({
                                 custom: true,
-                                title: ( localize(7824, "Error saving chat session")),
+                                title: ( localize(7977, "Error saving chat session")),
                                 message: ( localize(
-                                    7825,
+                                    7978,
                                     "Error serializing chat session for storage. The session will be lost if the window is closed. Please report this issue to the VS Code team:\n\n{0}",
                                     e.stack || toErrorMessage(e)
                                 )),
                                 buttons: [{
-                                    label: ( localize(7826, "Report Issue")),
+                                    label: ( localize(7979, "Report Issue")),
                                     run: () => this.openerService.open("https://github.com/microsoft/vscode/issues/new?template=bug_report.md")
                                 }]
                             });
@@ -724,7 +724,7 @@ function getSessionMetadataSync(session) {
     } : undefined;
     return {
         sessionId: session.sessionId,
-        title: title || ( localize(7827, "New Chat")),
+        title: title || ( localize(7980, "New Chat")),
         lastMessageDate: session.lastMessageDate,
         timing: session.timing,
         initialLocation: session.initialLocation,
@@ -746,7 +746,7 @@ async function getSessionMetadata(session) {
     const lastMessageDate = session.requests.at(-1)?.timestamp ?? session.creationDate;
     return {
         sessionId: session.sessionId,
-        title: session.customTitle || ( localize(7827, "New Chat")),
+        title: session.customTitle || ( localize(7980, "New Chat")),
         lastMessageDate,
         timing: {
             created: session.creationDate,

package/vscode/src/vs/workbench/contrib/chat/common/model/objectMutationLog.d.ts

@@ -68,6 +68,45 @@ export declare function t<T, O, R>(getter: (obj: T) => O, schema: Transform<O, R
 /** Shortcut for t(fn, value()) */
 export declare function v<T, R extends string | number | boolean | undefined>(getter: (obj: T) => R): TransformValue<T, R>;
 export declare function v<T, R>(getter: (obj: T) => R, comparator: (a: R, b: R) => boolean): TransformValue<T, R>;
+/**
+ * Per-string cap (in UTF-16 code units, matching `string.length`) applied when
+ * {@link stringifyEntryWithFallback} retries after `JSON.stringify` throws
+ * `RangeError: Invalid string length` (V8's max string length is ~512 MiB on
+ * 64-bit). Any single string longer than this is replaced with a marker on
+ * retry. Generous so it triggers only on outliers.
+ */
+export declare const PERSIST_ENTRY_MAX_STRING_CHARS: number;
+/**
+ * Total-size budget (sum of `string.length` for tracked strings, in UTF-16
+ * code units) for the retry of {@link stringifyEntryWithFallback}. Once the
+ * cumulative tracked size during serialization exceeds this, remaining values
+ * are replaced with a marker.
+ *
+ * This is an approximation: JSON escaping, property keys, and non-string
+ * payload are not counted, so the actual output may be moderately larger.
+ * The cap is sized well under V8's max string length to leave ample headroom
+ * for that overhead.
+ */
+export declare const PERSIST_ENTRY_MAX_TOTAL_CHARS: number;
+/**
+ * Wraps `JSON.stringify(entry)` with a safety net for the V8 max-string-length
+ * limit. The common path is a single `JSON.stringify` with zero overhead. If
+ * stringification throws `RangeError` (the resulting JSON would exceed V8's
+ * ~512 MiB max string length — see microsoft/vscode#308843), retry with a
+ * replacer that truncates oversized strings. Extensions sometimes put very
+ * large content (browser dumps, command output, …) into chat result metadata;
+ * losing the tail of one such value is dramatically better than losing the
+ * entire chat session.
+ */
+export declare function stringifyEntryWithFallback(entry: unknown): string;
+/**
+ * Exported for testing only. Builds the stateful `JSON.stringify` replacer
+ * used by {@link stringifyEntryWithFallback} on its retry path.
+ *
+ * Sizes are tracked in UTF-16 code units (`string.length`); JSON escaping,
+ * property keys, and non-string payload are not counted.
+ */
+export declare function makeTruncatingReplacer(maxStringChars: number, maxTotalChars: number): (key: string, value: unknown) => unknown;
 /**
  * An implementation of an append-based mutation logger. Given a `Transform`
  * definition of an object, it can recreate it from a file on disk. It is

package/vscode/src/vs/workbench/contrib/chat/common/model/objectMutationLog.js

@@ -101,6 +101,42 @@ var EntryKind;
     EntryKind[EntryKind["Delete"] = 3] = "Delete";
 })(EntryKind || (EntryKind = {}));
 const LF = VSBuffer.fromString("\n");
+const PERSIST_ENTRY_MAX_STRING_CHARS = 1 * 1024 * 1024;
+const PERSIST_ENTRY_MAX_TOTAL_CHARS = 100 * 1024 * 1024;
+const TRUNCATION_MARKER_PREFIX = "[VS Code: value truncated for persistence";
+const TRUNCATION_MARKER_TOTAL = `${TRUNCATION_MARKER_PREFIX}; entry exceeded size budget]`;
+function stringifyEntryWithFallback(entry) {
+    try {
+        return JSON.stringify(entry);
+    } catch (e) {
+        if (!(e instanceof RangeError)) {
+            throw e;
+        }
+        return JSON.stringify(
+            entry,
+            makeTruncatingReplacer(PERSIST_ENTRY_MAX_STRING_CHARS, PERSIST_ENTRY_MAX_TOTAL_CHARS)
+        );
+    }
+}
+function makeTruncatingReplacer(maxStringChars, maxTotalChars) {
+    let total = 0;
+    return (_key, val) => {
+        if (typeof val === "string") {
+            let emitted;
+            if (val.length > maxStringChars) {
+                emitted = `${TRUNCATION_MARKER_PREFIX}; original ${val.length} chars]`;
+            } else if (total + val.length + 2 > maxTotalChars) {
+                emitted = TRUNCATION_MARKER_TOTAL;
+            } else {
+                total += val.length + 2;
+                return val;
+            }
+            total += emitted.length + 2;
+            return emitted;
+        }
+        return val;
+    };
+}
 class ObjectMutationLog {
     constructor(_transform, _compactAfterEntries = 512) {
         this._transform = _transform;
@@ -120,7 +156,7 @@ class ObjectMutationLog {
             kind: EntryKind.Initial,
             v: value
         };
-        return VSBuffer.fromString(JSON.stringify(entry) + "\n");
+        return VSBuffer.fromString(stringifyEntryWithFallback(entry) + "\n");
     }
     read(content) {
         let state;
@@ -186,7 +222,7 @@ class ObjectMutationLog {
             };
             return {
                 op: "replace",
-                data: VSBuffer.fromString(JSON.stringify(entry) + "\n")
+                data: VSBuffer.fromString(stringifyEntryWithFallback(entry) + "\n")
             };
         }
         const entries = [];
@@ -212,7 +248,7 @@ class ObjectMutationLog {
         this._pendingPrevious = currentValue;
         let data = "";
         for (const e of entries) {
-            data += JSON.stringify(e) + "\n";
+            data += stringifyEntryWithFallback(e) + "\n";
         }
         return {
             op: "append",
@@ -407,4 +443,4 @@ class ObjectMutationLog {
     }
 }
 
-export { ObjectMutationLog, array, key, object, t, v, value };
+export { ObjectMutationLog, PERSIST_ENTRY_MAX_STRING_CHARS, PERSIST_ENTRY_MAX_TOTAL_CHARS, array, key, makeTruncatingReplacer, object, stringifyEntryWithFallback, t, v, value };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginServiceImpl.d.ts

@@ -17,12 +17,27 @@ import { IAgentPlugin, IAgentPluginDiscovery } from "@codingame/monaco-vscode-ap
 import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
 import { IMarketplacePlugin } from "./pluginMarketplaceService.js";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
-export { shellQuotePluginRootInCommand, resolveMcpServersMap, convertBareEnvVarsToVsCodeSyntax } from "../../../../../platform/agentPlugins/common/pluginParsers.js";
+export { shellQuotePluginRootInCommand, resolveMcpServersMap, convertBareEnvVarsToVsCodeSyntax } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentPlugins/common/pluginParsers";
 export declare class AgentPluginService extends Disposable implements IAgentPluginService {
     readonly _serviceBrand: undefined;
     readonly plugins: IObservable<readonly IAgentPlugin[]>;
     readonly enablementModel: IEnablementModel;
-    constructor(instantiationService: IInstantiationService, configurationService: IConfigurationService, storageService: IStorageService);
+    constructor(instantiationService: IInstantiationService, configurationService: IConfigurationService, storageService: IStorageService, pluginMarketplaceService: IPluginMarketplaceService, logService: ILogService);
+    /**
+     * Determines whether a plugin is blocked by enterprise policy:
+     * - If `chat.plugins.enabledPlugins` (policy-managed via `ChatEnabledPlugins`)
+     *   is set, only plugins whose ID appears with value `true` are allowed.
+     * - If `chat.plugins.strictMarketplaces` is on, only plugins from a
+     *   marketplace listed in `chat.plugins.extraMarketplaces` are allowed.
+     *
+     * Plugins without a marketplace provenance (e.g. user-configured filesystem
+     * paths from `chat.pluginLocations`) are never blocked — they are user-side
+     * concerns outside the enterprise enforcement boundary. Copilot-CLI-installed
+     * plugins under `~/.copilot/installed-plugins/<marketplace>/<plugin>/` are
+     * gated using their install-path identity even when they lack rich
+     * marketplace metadata.
+     */
+    private _isBlockedByPolicy;
     private _dedupeAndSort;
 }
 /**
@@ -34,8 +49,8 @@ interface IPluginSource {
     readonly fromMarketplace: IMarketplacePlugin | undefined;
     /** Repository root that serves as the boundary for component path resolution. */
     readonly repositoryUri?: URI;
-    /** Called when remove is invoked on the plugin */
-    remove(): void;
+    /** Called when remove is invoked on the plugin; absent for policy-managed plugins */
+    remove?(): void;
 }
 /**
  * Shared base class for plugin discovery implementations. Contains the common
@@ -90,17 +105,24 @@ export declare class ConfiguredAgentPluginDiscovery extends AbstractAgentPluginD
     private readonly _configurationService;
     private readonly _pluginMarketplaceService;
     private readonly _pluginLocationsConfig;
+    private readonly _enterpriseEnabledPluginsConfig;
     constructor(_configurationService: IConfigurationService, fileService: IFileService, _pluginMarketplaceService: IPluginMarketplaceService, workspaceContextService: IWorkspaceContextService, pathService: IPathService, logService: ILogService);
     start(enablementModel: IEnablementModel): void;
     protected _discoverPluginSources(): Promise<readonly IPluginSource[]>;
+    private _addPluginSource;
     private _getUserHome;
     /**
-     * Resolves a plugin path to one or more resource URIs. Supports:
-     * - Absolute paths (used directly)
-     * - Tilde paths (expanded to user home directory)
-     * - Relative paths (resolved against each workspace folder)
+     * Resolves a user-configured plugin path to one or more resource URIs.
+     * Supports absolute paths, tilde paths (expanded to user home), and
+     * workspace-relative paths.
      */
     private _resolvePluginPath;
+    /**
+     * Resolves an enterprise plugin ID of the form `<plugin>@<marketplace>` to
+     * the Copilot CLI install convention `~/.copilot/installed-plugins/<marketplace>/<plugin>/`.
+     * Returns `undefined` for anything that doesn't match the ID shape.
+     */
+    private _resolveEnterprisePluginId;
     /**
      * Removes a plugin path from `chat.pluginLocations` in the most specific
      * config target where the key is defined.