@codingame/monaco-vscode-chat-service-override 36.2.6 → 37.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.js

@@ -0,0 +1,86 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { isCancellationError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { withChatSurfaceMeta } from '../../../../../platform/agentHost/common/meta/agentChatSurfaceMeta.js';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatConfiguration, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { SessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+
+function getTerminalChatSessionMeta(shellType, os) {
+    return withChatSurfaceMeta(undefined, {
+        surface: "terminal",
+        shellType,
+        osName: getOperatingSystemName(os)
+    });
+}
+function getOperatingSystemName(os) {
+    switch (os) {
+    case OperatingSystem.Windows:
+        return "Windows";
+    case OperatingSystem.Macintosh:
+        return "macOS";
+    case OperatingSystem.Linux:
+        return "Linux";
+    }
+}
+let TerminalChatSessionResolver = class TerminalChatSessionResolver {
+    constructor(_chatSessionsService, _chatService, _configurationService) {
+        this._chatSessionsService = _chatSessionsService;
+        this._chatService = _chatService;
+        this._configurationService = _configurationService;
+    }
+    async resolve(token, shellType, os) {
+        if (token.isCancellationRequested) {
+            return undefined;
+        }
+        const meta = getTerminalChatSessionMeta(shellType, os);
+        let modelRef;
+        const agentHostEnabled = this._configurationService.getValue(ChatConfiguration.TerminalAgentHostEnabled) === true;
+        const contribution = agentHostEnabled ? this._chatSessionsService.getChatSessionContribution(SessionType.AgentHostCopilot) : undefined;
+        if (contribution?.locations?.includes(ChatAgentLocation.Terminal)) {
+            try {
+                const item = await this._chatSessionsService.createNewChatSessionItem(SessionType.AgentHostCopilot, {
+                    prompt: "",
+                    isEphemeral: true,
+                    _meta: meta
+                }, token);
+                modelRef = item && (await this._chatService.acquireOrLoadSession(
+                    item.resource,
+                    ChatAgentLocation.Terminal,
+                    token,
+                    "TerminalChatSessionResolver#resolve"
+                ));
+            } catch (error) {
+                if (isCancellationError(error) || token.isCancellationRequested) {
+                    throw error;
+                }
+                onUnexpectedError(error);
+            }
+        }
+        if (token.isCancellationRequested) {
+            modelRef?.dispose();
+            return undefined;
+        }
+        if (modelRef) {
+            return {
+                modelRef,
+                lockToAgent: contribution
+            };
+        }
+        modelRef = this._chatService.startNewLocalSession(ChatAgentLocation.Terminal);
+        if (token.isCancellationRequested) {
+            modelRef.dispose();
+            return undefined;
+        }
+        return {
+            modelRef,
+            lockToAgent: undefined
+        };
+    }
+};
+TerminalChatSessionResolver = ( __decorate([( __param(0, IChatSessionsService)), ( __param(1, IChatService)), ( __param(2, IConfigurationService))], TerminalChatSessionResolver));
+
+export { TerminalChatSessionResolver, getTerminalChatSessionMeta };

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.d.ts

@@ -11,6 +11,7 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IChatModel, IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IInlineChatWidgetConstructionOptions, InlineChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
 import { ITerminalInstance, type IXtermTerminal } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
@@ -24,11 +25,14 @@ import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatWidgetLocationOptions } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
+import { ITerminalChatSessionResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.service";
 export declare class TerminalChatWidget extends Disposable {
     private readonly _terminalElement;
     private readonly _instance;
     private readonly _xterm;
     private readonly _chatService;
+    private readonly _sessionResolver;
+    private readonly _chatSessionsService;
     private readonly _storageService;
     private readonly _chatAgentService;
     private readonly _chatWidgetService;
@@ -43,6 +47,7 @@ export declare class TerminalChatWidget extends Disposable {
     private readonly _requestActiveContextKey;
     private readonly _responseContainsCodeBlockContextKey;
     private readonly _responseContainsMulitpleCodeBlocksContextKey;
+    private readonly _usesAgentHostContextKey;
     private _messages;
     private _viewStateStorageKey;
     private _lastResponseContent;
@@ -51,13 +56,14 @@ export declare class TerminalChatWidget extends Disposable {
     private readonly _model;
     private readonly _sessionDisposables;
     private _sessionCtor;
+    private _agentHostSessionResource;
     private _currentRequestId;
     private _activeRequestCts?;
     private readonly _requestInProgress;
     readonly requestInProgress: IObservable<boolean>;
     constructor(_terminalElement: HTMLElement, _instance: ITerminalInstance, _xterm: IXtermTerminal & {
         raw: RawXtermTerminal;
-    }, contextKeyService: IContextKeyService, _chatService: IChatService, _storageService: IStorageService, instantiationService: IInstantiationService, _chatAgentService: IChatAgentService, _chatWidgetService: IChatWidgetService);
+    }, contextKeyService: IContextKeyService, _chatService: IChatService, _sessionResolver: ITerminalChatSessionResolver, _chatSessionsService: IChatSessionsService, _storageService: IStorageService, instantiationService: IInstantiationService, _chatAgentService: IChatAgentService, _chatWidgetService: IChatWidgetService);
     private _dimension?;
     private _relayout;
     private _doLayout;
@@ -74,7 +80,9 @@ export declare class TerminalChatWidget extends Disposable {
     acceptCommand(shouldExecute: boolean): Promise<void>;
     get focusTracker(): IFocusTracker;
     private _createSession;
-    private _saveViewState;
+    private _refreshAgentHostSessionMetadata;
+    private _waitForSession;
+    private _saveInputState;
     clear(): void;
     acceptInput(query?: string, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined>;
     cancel(): void;

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js

@@ -4,12 +4,14 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { createElement, DisposableResizeObserver, trackFocus, getActiveWindow, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { createCancelablePromise, DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { isCancellationError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { MicrotaskDelay } from '@codingame/monaco-vscode-api/vscode/vs/base/common/symbols';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -20,11 +22,12 @@ import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscod
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { InlineChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
 import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
 import * as terminalChatWidget from './media/terminalChatWidget.css';
-import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from './terminalChat.js';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
@@ -36,6 +39,8 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
+import { getTerminalChatSessionMeta } from './terminalChatSessionResolver.js';
+import { ITerminalChatSessionResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -72,6 +77,8 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         _xterm,
         contextKeyService,
         _chatService,
+        _sessionResolver,
+        _chatSessionsService,
         _storageService,
         instantiationService,
         _chatAgentService,
@@ -82,6 +89,8 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._instance = _instance;
         this._xterm = _xterm;
         this._chatService = _chatService;
+        this._sessionResolver = _sessionResolver;
+        this._chatSessionsService = _chatSessionsService;
         this._storageService = _storageService;
         this._chatAgentService = _chatAgentService;
         this._chatWidgetService = _chatWidgetService;
@@ -99,6 +108,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._requestActiveContextKey = TerminalChatContextKeys.requestActive.bindTo(contextKeyService);
         this._responseContainsCodeBlockContextKey = TerminalChatContextKeys.responseContainsCodeBlock.bindTo(contextKeyService);
         this._responseContainsMulitpleCodeBlocksContextKey = TerminalChatContextKeys.responseContainsMultipleCodeBlocks.bindTo(contextKeyService);
+        this._usesAgentHostContextKey = TerminalChatContextKeys.usesAgentHost.bindTo(contextKeyService);
         this._container = createElement("div");
         this._container.classList.add("terminal-inline-chat");
         this._terminalElement.appendChild(this._container);
@@ -129,7 +139,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
             }
         });
         this._register(
-            this._inlineChatWidget.chatWidget.onDidChangeViewModel(() => this._saveViewState())
+            this._inlineChatWidget.chatWidget.onDidChangeViewModel(() => this._saveInputState())
         );
         this._register(Event.any(
             this._inlineChatWidget.onDidChangeHeight,
@@ -138,6 +148,9 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
             Event.fromObservableLight(this._inlineChatWidget.chatWidget.input.selectedLanguageModel),
             Event.debounce(this._xterm.raw.onCursorMove, () => void 0, MicrotaskDelay)
         )(() => this._relayout()));
+        this._register(
+            this._instance.onDidChangeShellType(() => this._refreshAgentHostSessionMetadata())
+        );
         const observer = this._register(( new DisposableResizeObserver("TerminalChatWidget.terminalElementResize", () => this._relayout())));
         observer.observe(this._terminalElement);
         this._resetPlaceholder();
@@ -198,10 +211,10 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(15273, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(17038, "Ask about commands"));
     }
     async reveal() {
-        await this._createSession();
+        this._createSession();
         this._doLayout();
         this._container.classList.remove("hide");
         this._visibleContextKey.set(true);
@@ -288,24 +301,84 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     get focusTracker() {
         return this._focusTracker;
     }
-    async _createSession() {
-        this._sessionCtor = createCancelablePromise(async token => {
-            if (!this._model.value) {
-                const modelRef = this._chatService.startNewLocalSession(ChatAgentLocation.Terminal);
-                this._model.value = modelRef;
-                const model = modelRef.object;
-                this._inlineChatWidget.setChatModel(model);
-                this._resetPlaceholder();
+    _createSession() {
+        if (this._model.value || this._sessionCtor) {
+            return;
+        }
+        const sessionCtor = createCancelablePromise(async token => {
+            const resolution = await this._sessionResolver.resolve(
+                token,
+                this._instance.shellType ?? this._instance.processName,
+                this._instance.os ?? OS
+            );
+            if (!resolution || token.isCancellationRequested) {
+                resolution?.modelRef.dispose();
+                return;
+            }
+            this._model.value = resolution.modelRef;
+            const model = resolution.modelRef.object;
+            this._inlineChatWidget.setChatModel(model);
+            const lockToAgent = resolution.lockToAgent;
+            if (lockToAgent) {
+                this._inlineChatWidget.chatWidget.lockToCodingAgent(
+                    lockToAgent.name,
+                    lockToAgent.displayName,
+                    lockToAgent.type,
+                    lockToAgent.agentHostProviderId
+                );
+                this._agentHostSessionResource = model.sessionResource;
+                this._usesAgentHostContextKey.set(true);
+                this._refreshAgentHostSessionMetadata();
+            } else {
+                this._inlineChatWidget.chatWidget.unlockFromCodingAgent();
+                this._agentHostSessionResource = undefined;
+                this._usesAgentHostContextKey.set(false);
+            }
+            this._resetPlaceholder();
+        });
+        this._sessionCtor = sessionCtor;
+        this._sessionDisposables.value = toDisposable(() => sessionCtor.cancel());
+        void sessionCtor.catch(error => {
+            if (this._sessionCtor === sessionCtor) {
+                this._sessionCtor = undefined;
+            }
+            if (!isCancellationError(error)) {
+                onUnexpectedError(error);
             }
         });
-        this._sessionDisposables.value = toDisposable(() => this._sessionCtor?.cancel());
     }
-    _saveViewState() {
-        const viewState = this._inlineChatWidget.chatWidget.getViewState();
-        if (viewState) {
+    _refreshAgentHostSessionMetadata() {
+        if (this._agentHostSessionResource) {
+            this._chatSessionsService.updateChatSessionMetadata(this._agentHostSessionResource, getTerminalChatSessionMeta(
+                this._instance.shellType ?? this._instance.processName,
+                this._instance.os ?? OS
+            ));
+        }
+    }
+    async _waitForSession() {
+        if (this._model.value) {
+            return true;
+        }
+        const sessionCtor = this._sessionCtor;
+        if (!sessionCtor) {
+            return false;
+        }
+        try {
+            await sessionCtor;
+            return !!this._model.value;
+        } catch (error) {
+            if (isCancellationError(error)) {
+                return false;
+            }
+            throw error;
+        }
+    }
+    _saveInputState() {
+        const inputState = this._inlineChatWidget.chatWidget.getInputState();
+        if (inputState) {
             this._storageService.store(
                 this._viewStateStorageKey,
-                JSON.stringify(viewState),
+                JSON.stringify(inputState),
                 StorageScope.PROFILE,
                 StorageTarget.USER
             );
@@ -314,6 +387,9 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     clear() {
         this.cancel();
         this._model.clear();
+        this._agentHostSessionResource = undefined;
+        this._usesAgentHostContextKey.reset();
+        this._inlineChatWidget.chatWidget.unlockFromCodingAgent();
         this._responseContainsCodeBlockContextKey.reset();
         this._requestActiveContextKey.reset();
         this.hide();
@@ -323,6 +399,9 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         if (!this._model.value) {
             await this.reveal();
         }
+        if (!(await this._waitForSession())) {
+            return undefined;
+        }
         this._messages.fire(Message.AcceptInput);
         const lastInput = this._inlineChatWidget.value;
         if (!lastInput) {
@@ -430,7 +509,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this.hide();
     }
 };
-TerminalChatWidget = ( __decorate([( __param(3, IContextKeyService)), ( __param(4, IChatService)), ( __param(5, IStorageService)), ( __param(6, IInstantiationService)), ( __param(7, IChatAgentService)), ( __param(8, IChatWidgetService))], TerminalChatWidget));
+TerminalChatWidget = ( __decorate([( __param(3, IContextKeyService)), ( __param(4, IChatService)), ( __param(5, ITerminalChatSessionResolver)), ( __param(6, IChatSessionsService)), ( __param(7, IStorageService)), ( __param(8, IInstantiationService)), ( __param(9, IChatAgentService)), ( __param(10, IChatWidgetService))], TerminalChatWidget));
 let TerminalInlineChatWidget = class TerminalInlineChatWidget extends InlineChatWidget {
     constructor(
         location,

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.d.ts

@@ -4,9 +4,8 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 /**
- * Forwards the workbench user's sandbox setting values into every connected
- * agent host (local + remote) via `RootConfigChanged` actions, so the
- * agent-host terminal sandbox engine can mirror the user's preferences.
+ * Forwards the workbench user's applicable sandbox setting values into every
+ * connected agent host (local + remote) via `RootConfigChanged` actions.
  *
  * The forwarder is deliberately one-directional: it pushes only when
  *  - a connection comes online (initial push, deferred until the host
@@ -49,25 +48,6 @@ export declare class AgentHostSandboxForwarder extends Disposable implements IWo
      */
     private _tryPush;
     private _getDesired;
-    /**
-     * Compute the sandbox config to forward to the Agent Host.
-     *
-     *  - When the Agent Host's own terminal sandbox engine is enabled
-     *    (`chat.agentHost.customTerminalTool.enabled === true`), forward the
-     *    user's full `chat.agent.sandbox.*` policy verbatim. The engine reads
-     *    those values directly.
-     *
-     *  - Otherwise (the SDK runs the shell tool), gate on
-     *    `chat.agentHost.sdkSandbox.enabled`:
-     *      - `'off'` (the default) — forward an empty object so any
-     *        previously-pushed values are cleared and the SDK runs commands
-     *        unsandboxed.
-     *      - `'on'` / `'allowNetwork'` — forward the user's policy but
-     *        override both `enabled` and `enabled.windows` with the SDK
-     *        sandbox value. The SDK sandbox mode is independent of the
-     *        engine sandbox mode, so the user can run the SDK sandboxed
-     *        even when the engine sandbox is off.
-     */
     private _computeDesired;
     dispose(): void;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/agentHostSandboxForwarder.js

@@ -2,19 +2,21 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
-import { AgentHostCustomTerminalToolEnabledSettingId, AgentHostSdkSandboxEnabledSettingId } from '../../../../../platform/agentHost/common/agentService.js';
+import { AgentHostSdkSandboxEnabledSettingId, AgentHostSdkSandboxWindowsEnabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService';
+import { AgentHostCustomTerminalToolEnabledSettingId } from '@codingame/monaco-vscode-katex-common/vscode/vs/platform/agentHost/common/copilotCliConfig';
 import { IAgentHostConnectionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service';
 import { AgentHostSandboxConfigKey, AgentHostSandboxKey } from '../../../../../platform/agentHost/common/sandboxConfigSchema.js';
-import { AgentSandboxEnabledValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
 import { ROOT_STATE_URI } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 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 { AgentSandboxEnabledValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/settings';
 import { SANDBOX_SETTING_KEYS, readAgentHostSandboxValues } from '../common/sandboxSettingsReader.js';
 
 const HOST_POLICY_SETTING_KEYS = [
     AgentHostCustomTerminalToolEnabledSettingId,
-    AgentHostSdkSandboxEnabledSettingId
+    AgentHostSdkSandboxEnabledSettingId,
+    AgentHostSdkSandboxWindowsEnabledSettingId
 ];
 let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposable {
     static {
@@ -109,11 +111,11 @@ let AgentHostSandboxForwarder = class AgentHostSandboxForwarder extends Disposab
             return values;
         }
         const sdkSandbox = this._configurationService.getValue(AgentHostSdkSandboxEnabledSettingId) ?? AgentSandboxEnabledValue.Off;
-        if (sdkSandbox !== AgentSandboxEnabledValue.On && sdkSandbox !== AgentSandboxEnabledValue.AllowNetwork) {
-            return {};
-        }
-        values[AgentHostSandboxKey.Enabled] = sdkSandbox;
-        values[AgentHostSandboxKey.WindowsEnabled] = sdkSandbox;
+        const windowsSdkSandbox = this._configurationService.getValue(AgentHostSdkSandboxWindowsEnabledSettingId) ?? AgentSandboxEnabledValue.Off;
+        const sdkSandboxEnabled = sdkSandbox === AgentSandboxEnabledValue.On;
+        const windowsSdkSandboxEnabled = windowsSdkSandbox === AgentSandboxEnabledValue.On;
+        values[AgentHostSandboxKey.Enabled] = sdkSandboxEnabled ? AgentSandboxEnabledValue.On : AgentSandboxEnabledValue.Off;
+        values[AgentHostSandboxKey.WindowsEnabled] = windowsSdkSandboxEnabled ? AgentSandboxEnabledValue.On : AgentSandboxEnabledValue.Off;
         return values;
     }
     dispose() {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/largeOutputFileWriter.js

@@ -8,6 +8,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { MAX_OUTPUT_LENGTH, truncateLargeOutput } from './outputHelpers.js';
+import { getTerminalOutputDirectory } from '../common/terminalOutput.js';
 
 let LargeOutputFileWriter = class LargeOutputFileWriter extends Disposable {
     constructor(_fileService, _logService, _environmentService) {
@@ -30,7 +31,7 @@ let LargeOutputFileWriter = class LargeOutputFileWriter extends Disposable {
     async _writeToTempFile(output) {
         try {
             const fileName = `copilot-terminal-output-${generateUuid()}.txt`;
-            const dirUri = URI.joinPath(this._environmentService.cacheHome, "copilot-terminal-output");
+            const dirUri = getTerminalOutputDirectory(this._environmentService.cacheHome);
             const fileUri = URI.joinPath(dirUri, fileName);
             const fileContent = this._prettyPrintIfJson(output);
             await this._fileService.writeFile(fileUri, VSBuffer.fromString(fileContent));

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.d.ts

@@ -37,6 +37,8 @@ export declare function isMultilineCommand(command: string): boolean;
 export declare function generateAutoApproveActions(commandLine: string, subCommands: string[], autoApproveResult: {
     subCommandResults: ICommandApprovalResultWithReason[];
     commandLineResult: ICommandApprovalResultWithReason;
+}, options?: {
+    skipSessionScoped?: boolean;
 }): ToolConfirmationAction[];
 export declare function dedupeRules(rules: ICommandApprovalResultWithReason[]): ICommandApprovalResultWithReason[];
 export interface IExtractedCdPrefix {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.js

@@ -48,7 +48,7 @@ function isMultilineCommand(command) {
     const normalized = command.replace(/\r\n|\r/g, "\n");
     return /(?<!\\)\n/.test(normalized);
 }
-function generateAutoApproveActions(commandLine, subCommands, autoApproveResult) {
+function generateAutoApproveActions(commandLine, subCommands, autoApproveResult, options) {
     const actions = [];
     const canCreateAutoApproval = (autoApproveResult.subCommandResults.every(e => e.result !== "denied") && autoApproveResult.commandLineResult.result !== "denied");
     if (canCreateAutoApproval) {
@@ -113,17 +113,19 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
             } else {
                 subCommandLabel = `Commands ${( subCommandsToSuggest.map(e => `\`${e} \u2026\``)).join(", ")}`;
             }
-            actions.push({
-                label: `Allow ${subCommandLabel} in this Session`,
-                data: {
-                    type: "newRule",
-                    rule: ( subCommandsToSuggest.map(key => ({
-                        key,
-                        value: true,
-                        scope: "session"
-                    })))
-                }
-            });
+            if (!options?.skipSessionScoped) {
+                actions.push({
+                    label: `Allow ${subCommandLabel} in this Session`,
+                    data: {
+                        type: "newRule",
+                        rule: ( subCommandsToSuggest.map(key => ({
+                            key,
+                            value: true,
+                            scope: "session"
+                        })))
+                    }
+                });
+            }
             actions.push({
                 label: `Allow ${subCommandLabel} in this Workspace`,
                 data: {
@@ -152,22 +154,24 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         }
         const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(" ")[0] : "";
         if (firstSubcommandFirstWord !== commandLine && !( commandsWithSubcommands.has(commandLine)) && !( commandsWithSubSubCommands.has(commandLine))) {
-            actions.push({
-                label: ( localize(15274, "Allow Exact Command Line in this Session")),
-                data: {
-                    type: "newRule",
-                    rule: {
-                        key: `/^${escapeRegExpCharacters(commandLine)}$/`,
-                        value: {
-                            approve: true,
-                            matchCommandLine: true
-                        },
-                        scope: "session"
+            if (!options?.skipSessionScoped) {
+                actions.push({
+                    label: ( localize(17039, "Allow Exact Command Line in this Session")),
+                    data: {
+                        type: "newRule",
+                        rule: {
+                            key: `/^${escapeRegExpCharacters(commandLine)}$/`,
+                            value: {
+                                approve: true,
+                                matchCommandLine: true
+                            },
+                            scope: "session"
+                        }
                     }
-                }
-            });
+                });
+            }
             actions.push({
-                label: ( localize(15275, "Allow Exact Command Line in this Workspace")),
+                label: ( localize(17040, "Allow Exact Command Line in this Workspace")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -181,7 +185,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
                 }
             });
             actions.push({
-                label: ( localize(15276, "Always Allow Exact Command Line")),
+                label: ( localize(17041, "Always Allow Exact Command Line")),
                 data: {
                     type: "newRule",
                     rule: {
@@ -199,16 +203,18 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
     if (actions.length > 0) {
         actions.push(( new Separator()));
     }
+    if (!options?.skipSessionScoped) {
+        actions.push({
+            label: ( localize(17042, "Allow All Commands in this Session")),
+            tooltip: ( localize(17043, "Allow this tool to run in this session without confirmation.")),
+            data: {
+                type: "sessionApproval"
+            }
+        });
+        actions.push(( new Separator()));
+    }
     actions.push({
-        label: ( localize(15277, "Allow All Commands in this Session")),
-        tooltip: ( localize(15278, "Allow this tool to run in this session without confirmation.")),
-        data: {
-            type: "sessionApproval"
-        }
-    });
-    actions.push(( new Separator()));
-    actions.push({
-        label: ( localize(15279, "Configure Auto Approve...")),
+        label: ( localize(17044, "Configure Auto Approve...")),
         data: {
             type: "configure"
         }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.d.ts

@@ -1,6 +1,7 @@
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import type { Report } from "./tools/consoleCompactor/consoleCompactor.js";
 import { ShellIntegrationQuality } from "./toolTerminalCreator.js";
 export declare class RunInTerminalToolTelemetry {
     private readonly _telemetryService;
@@ -41,4 +42,11 @@ export declare class RunInTerminalToolTelemetry {
         inputToolFreeFormInputShownCount: number | undefined;
         inputToolFreeFormInputCount: number | undefined;
     }): void;
+    /**
+     * Reports the measurements produced by the terminal output compaction
+     * {@link Report}, so the effectiveness of compaction (how much output was
+     * removed and whether it was lossless) can be evaluated across sessions.
+     */
+    logCompaction(report: Report): void;
+    logCompactionFailed(): void;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.js

@@ -83,6 +83,16 @@ let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
             compressOutputEnabled: this._configurationService.getValue(ChatConfiguration.CompressOutputEnabled) === true
         });
     }
+    logCompaction(report) {
+        this._telemetryService.publicLog2("toolUse.runInTerminal.compaction", {
+            commandKinds: ( new TelemetryTrustedValue(JSON.stringify(report.commandKinds))),
+            originalChars: report.original.chars,
+            compactedChars: report.compacted.chars
+        });
+    }
+    logCompactionFailed() {
+        this._telemetryService.publicLog2("toolUse.runInTerminal.compactionFailed", {});
+    }
 };
 RunInTerminalToolTelemetry = ( __decorate([( __param(0, ITelemetryService)), ( __param(1, IConfigurationService))], RunInTerminalToolTelemetry));
 const commandAllowList = ( new Set([