@codingame/monaco-vscode-chat-service-override 22.1.9 → 23.0.0

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

@@ -41,68 +41,68 @@ function getAccessibilityHelpText(accessor) {
     const focusResponseKeybinding = keybindingService.lookupKeybinding('chat.action.focus')?.getAriaLabel();
     const focusInputKeybinding = keybindingService.lookupKeybinding('workbench.action.chat.focusInput')?.getAriaLabel();
     content.push(( localize(
-        11526,
+        11791,
         "Inline chat occurs within a terminal. It is useful for suggesting terminal commands. Keep in mind that AI generated code may be incorrect."
     )));
     content.push(( localize(
-        11527,
+        11792,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        11528,
+        11793,
         "The input box is where the user can type a request and can make the request ({0}). The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus.",
         makeRequestKeybinding
     )) : ( localize(
-        11529,
+        11794,
         "The input box is where the user can type a request and can make the request by tabbing to the Make Request button, which is not currently triggerable via keybindings. The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus."
     )));
     content.push(openAccessibleViewKeybinding ? ( localize(
-        11530,
+        11795,
         'The response can be inspected in the accessible view ({0}).',
         openAccessibleViewKeybinding
     )) : ( localize(
-        11531,
+        11796,
         'With the input box focused, inspect the response in the accessible view via the Open Accessible View command, which is currently not triggerable by a keybinding.'
     )));
     content.push(focusResponseKeybinding ? ( localize(
-        11532,
+        11797,
         'Reach the response from the input box ({0}).',
         focusResponseKeybinding
     )) : ( localize(
-        11533,
+        11798,
         'Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response.'
     )));
     content.push(focusInputKeybinding ? ( localize(
-        11534,
+        11799,
         'Reach the input box from the response ({0}).',
         focusInputKeybinding
     )) : ( localize(
-        11535,
+        11800,
         'Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input.'
     )));
     content.push(runCommandKeybinding ? ( localize(
-        11536,
+        11801,
         'With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.',
         runCommandKeybinding
     )) : ( localize(
-        11537,
+        11802,
         'Run a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        11538,
+        11803,
         'With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.',
         insertCommandKeybinding
     )) : ( localize(
-        11539,
+        11804,
         'Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(( localize(
-        11540,
+        11805,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        11541,
+        11806,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join('\n');

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

@@ -2,26 +2,33 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
+import { ITerminalService, ITerminalGroupService, ITerminalEditorService, ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { registerActiveXtermAction } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
 import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { getIconId } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalIcon';
 import { TerminalChatController } from './terminalChatController.js';
+import { TerminalCapability } from '@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11542, 'Open Inline Chat')),
-    category: ( localize2(11543, "Terminal")),
+    title: ( localize2(11807, 'Open Inline Chat')),
+    category: ( localize2(11808, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -57,7 +64,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11544, 'Close')),
+    title: ( localize2(11809, 'Close')),
     category: AbstractInline1ChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -82,8 +89,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11545, 'Run Chat Command')),
-    shortTitle: ( localize2(11546, 'Run')),
+    title: ( localize2(11810, 'Run Chat Command')),
+    shortTitle: ( localize2(11811, 'Run')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -111,8 +118,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11547, 'Run First Chat Command')),
-    shortTitle: ( localize2(11548, 'Run First')),
+    title: ( localize2(11812, 'Run First Chat Command')),
+    shortTitle: ( localize2(11813, 'Run First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -140,8 +147,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(11549, 'Insert Chat Command')),
-    shortTitle: ( localize2(11550, 'Insert')),
+    title: ( localize2(11814, 'Insert Chat Command')),
+    shortTitle: ( localize2(11815, 'Insert')),
     category: AbstractInline1ChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -170,8 +177,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(11551, 'Insert First Chat Command')),
-    shortTitle: ( localize2(11552, 'Insert First')),
+    title: ( localize2(11816, 'Insert First Chat Command')),
+    shortTitle: ( localize2(11817, 'Insert First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -199,7 +206,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(11553, "Rerun Request")),
+    title: ( localize2(11818, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInline1ChatAction.category,
@@ -228,7 +235,7 @@ registerActiveXtermAction({
         }
         const lastRequest = model.getRequests().at(-1);
         if (lastRequest) {
-            const widget = chatWidgetService.getWidgetBySessionId(model.sessionId);
+            const widget = chatWidgetService.getWidgetBySessionResource(model.sessionResource);
             await chatService.resendRequest(lastRequest, {
                 noCommandDetection: false,
                 attempt: lastRequest.attempt + 1,
@@ -240,7 +247,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(11554, 'View in Chat')),
+    title: ( localize2(11819, 'View in Chat')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -262,3 +269,100 @@ registerActiveXtermAction({
         contr?.viewInChat();
     }
 });
+registerAction2(class ShowChatTerminalsAction extends Action2 {
+    constructor() {
+        super({
+            id: TerminalChatCommandId.ViewHiddenChatTerminals,
+            title: ( localize2(11820, 'View Hidden Chat Terminals')),
+            category: ( localize2(11821, 'Terminal')),
+            f1: true,
+            precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    when: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ( ContextKeyExpr.equals('view', ChatViewId)))),
+                    group: 'terminal',
+                    order: 0,
+                    isHiddenByDefault: true
+                }]
+        });
+    }
+    run(accessor) {
+        const terminalService = accessor.get(ITerminalService);
+        const groupService = accessor.get(ITerminalGroupService);
+        const editorService = accessor.get(ITerminalEditorService);
+        const terminalChatService = accessor.get(ITerminalChatService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const chatService = accessor.get(IChatService);
+        const visible = ( new Set([...groupService.instances, ...editorService.instances]));
+        const toolInstances = terminalChatService.getToolSessionTerminalInstances();
+        if (toolInstances.length === 0) {
+            return;
+        }
+        const all = ( new Map());
+        for (const i of toolInstances) {
+            if (!( visible.has(i))) {
+                all.set(i.instanceId, i);
+            }
+        }
+        const items = [];
+        const lastCommandLocalized = (command) => ( localize2(11822, 'Last: {0}', command)).value;
+        const metas = [];
+        for (const instance of ( all.values())) {
+            const iconId = instantiationService.invokeFunction(getIconId, instance);
+            const label = `$(${iconId}) ${instance.title}`;
+            const lastCommand = instance.capabilities.get(TerminalCapability.CommandDetection)?.commands.at(-1)?.command;
+            const chatSessionId = terminalChatService.getChatSessionIdForInstance(instance);
+            let chatSessionTitle;
+            if (chatSessionId) {
+                const sessionUri = LocalChatSessionUri.forSession(chatSessionId);
+                chatSessionTitle = chatService.getSession(sessionUri)?.title || chatService.getPersistedSessionTitle(sessionUri);
+            }
+            let description;
+            if (chatSessionTitle) {
+                description = `${chatSessionTitle}`;
+            }
+            metas.push({
+                label,
+                description,
+                detail: lastCommand ? lastCommandLocalized(lastCommand) : undefined,
+                id: String(instance.instanceId),
+            });
+        }
+        for (const m of metas) {
+            items.push({
+                label: m.label,
+                description: m.description,
+                detail: m.detail,
+                id: m.id
+            });
+        }
+        const qp = quickInputService.createQuickPick();
+        qp.placeholder = ( localize2(11823, 'Select a chat terminal to show and focus')).value;
+        qp.items = items;
+        qp.canSelectMany = false;
+        qp.title = ( localize2(11824, 'Chat Terminals')).value;
+        qp.matchOnDescription = true;
+        qp.matchOnDetail = true;
+        qp.onDidAccept(async () => {
+            const sel = qp.selectedItems[0];
+            if (sel) {
+                const instance = all.get(Number(sel.id));
+                if (instance) {
+                    terminalService.setActiveInstance(instance);
+                    await terminalService.revealTerminal(instance);
+                    qp.hide();
+                    terminalService.focusInstance(instance);
+                }
+                else {
+                    qp.hide();
+                }
+            }
+            else {
+                qp.hide();
+            }
+        });
+        qp.onDidHide(() => qp.dispose());
+        qp.show();
+    }
+});

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

@@ -4,7 +4,7 @@ import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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 { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
@@ -12,6 +12,7 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { TerminalChatWidget } from './terminalChatWidget.js';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { setActiveChatController } from './terminalChatControllerHolder.js';
 
 var TerminalChatController_1;
@@ -50,7 +51,7 @@ let TerminalChatController = class TerminalChatController extends Disposable {
                     code: editor.getValue(),
                     codeBlockIndex: 0,
                     languageId: editor.getModel().getLanguageId(),
-                    chatSessionId: this._terminalChatWidget.value.inlineChatWidget.chatWidget.viewModel?.sessionId
+                    chatSessionResource: this._terminalChatWidget.value.inlineChatWidget.chatWidget.viewModel?.sessionResource
                 };
             }
         }, 'terminal'));
@@ -124,10 +125,11 @@ TerminalChatController = TerminalChatController_1 = ( __decorate([
 async function moveToPanelChat(accessor, model) {
     const viewsService = accessor.get(IViewsService);
     const chatService = accessor.get(IChatService);
-    const widget = await showChatView(viewsService);
+    const layoutService = accessor.get(IWorkbenchLayoutService);
+    const widget = await showChatView(viewsService, layoutService);
     if (widget && widget.viewModel && model) {
         for (const request of model.getRequests().slice()) {
-            await chatService.adoptRequest(widget.viewModel.model.sessionId, request);
+            await chatService.adoptRequest(widget.viewModel.model.sessionResource, request);
         }
         widget.focusResponseItem();
     }

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

@@ -0,0 +1,47 @@
+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 { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+/**
+ * Used to manage chat tool invocations and the underlying terminal instances they create/use.
+ */
+export declare class TerminalChatService extends Disposable implements ITerminalChatService {
+    private readonly _logService;
+    private readonly _terminalService;
+    private readonly _storageService;
+    private readonly _contextKeyService;
+    private readonly _chatService;
+    _serviceBrand: undefined;
+    private readonly _terminalInstancesByToolSessionId;
+    private readonly _toolSessionIdByTerminalInstance;
+    private readonly _chatSessionIdByTerminalInstance;
+    private readonly _terminalInstanceListenersByToolSessionId;
+    private readonly _chatSessionListenersByTerminalInstance;
+    private readonly _onDidRegisterTerminalInstanceForToolSession;
+    readonly onDidRegisterTerminalInstanceWithToolSession: Event<ITerminalInstance>;
+    /**
+     * Pending mappings restored from storage that have not yet been matched to a live terminal
+     * instance (we match by persistentProcessId when it becomes available after reconnection).
+     * toolSessionId -> persistentProcessId
+     */
+    private readonly _pendingRestoredMappings;
+    private readonly _hasToolTerminalContext;
+    private readonly _hasHiddenToolTerminalContext;
+    constructor(_logService: ILogService, _terminalService: ITerminalService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatService: IChatService);
+    registerTerminalInstanceWithToolSession(terminalToolSessionId: string | undefined, instance: ITerminalInstance): void;
+    getTerminalInstanceByToolSessionId(terminalToolSessionId: string | undefined): Promise<ITerminalInstance | undefined>;
+    getToolSessionTerminalInstances(hiddenOnly?: boolean): readonly ITerminalInstance[];
+    getToolSessionIdForInstance(instance: ITerminalInstance): string | undefined;
+    registerTerminalInstanceWithChatSession(chatSessionId: string, instance: ITerminalInstance): void;
+    getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined;
+    isBackgroundTerminal(terminalToolSessionId?: string): boolean;
+    private _restoreFromStorage;
+    private _tryAdoptRestoredMapping;
+    private _persistToStorage;
+    private _updateHasToolTerminalContextKeys;
+}

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

@@ -0,0 +1,192 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { TerminalChatContextKeys } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+
+var StorageKeys;
+(function (StorageKeys) {
+    StorageKeys["ToolSessionMappings"] = "terminalChat.toolSessionMappings";
+    StorageKeys["CommandIdMappings"] = "terminalChat.commandIdMappings";
+})(StorageKeys || (StorageKeys = {}));
+let TerminalChatService = class TerminalChatService extends Disposable {
+    constructor(_logService, _terminalService, _storageService, _contextKeyService, _chatService) {
+        super();
+        this._logService = _logService;
+        this._terminalService = _terminalService;
+        this._storageService = _storageService;
+        this._contextKeyService = _contextKeyService;
+        this._chatService = _chatService;
+        this._terminalInstancesByToolSessionId = ( new Map());
+        this._toolSessionIdByTerminalInstance = ( new Map());
+        this._chatSessionIdByTerminalInstance = ( new Map());
+        this._terminalInstanceListenersByToolSessionId = this._register(( new DisposableMap()));
+        this._chatSessionListenersByTerminalInstance = this._register(( new DisposableMap()));
+        this._onDidRegisterTerminalInstanceForToolSession = ( new Emitter());
+        this.onDidRegisterTerminalInstanceWithToolSession = this._onDidRegisterTerminalInstanceForToolSession.event;
+        this._pendingRestoredMappings = ( new Map());
+        this._hasToolTerminalContext = TerminalChatContextKeys.hasChatTerminals.bindTo(this._contextKeyService);
+        this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);
+        this._restoreFromStorage();
+    }
+    registerTerminalInstanceWithToolSession(terminalToolSessionId, instance) {
+        if (!terminalToolSessionId) {
+            this._logService.warn('Attempted to register a terminal instance with an undefined tool session ID');
+            return;
+        }
+        this._terminalInstancesByToolSessionId.set(terminalToolSessionId, instance);
+        this._toolSessionIdByTerminalInstance.set(instance, terminalToolSessionId);
+        this._onDidRegisterTerminalInstanceForToolSession.fire(instance);
+        this._terminalInstanceListenersByToolSessionId.set(terminalToolSessionId, instance.onDisposed(() => {
+            this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
+            this._toolSessionIdByTerminalInstance.delete(instance);
+            this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
+            this._persistToStorage();
+            this._updateHasToolTerminalContextKeys();
+        }));
+        this._register(this._chatService.onDidDisposeSession(e => {
+            if (LocalChatSessionUri.parseLocalSessionId(e.sessionResource) === terminalToolSessionId) {
+                this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
+                this._toolSessionIdByTerminalInstance.delete(instance);
+                this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
+                this._persistToStorage();
+                this._updateHasToolTerminalContextKeys();
+            }
+        }));
+        this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));
+        if (typeof instance.shellLaunchConfig?.attachPersistentProcess?.id === 'number' || typeof instance.persistentProcessId === 'number') {
+            this._persistToStorage();
+        }
+        this._updateHasToolTerminalContextKeys();
+    }
+    async getTerminalInstanceByToolSessionId(terminalToolSessionId) {
+        await this._terminalService.whenConnected;
+        if (!terminalToolSessionId) {
+            return undefined;
+        }
+        if (( this._pendingRestoredMappings.has(terminalToolSessionId))) {
+            const instance = this._terminalService.instances.find(i => i.shellLaunchConfig.attachPersistentProcess?.id === this._pendingRestoredMappings.get(terminalToolSessionId));
+            if (instance) {
+                this._tryAdoptRestoredMapping(instance);
+                return instance;
+            }
+        }
+        return this._terminalInstancesByToolSessionId.get(terminalToolSessionId);
+    }
+    getToolSessionTerminalInstances(hiddenOnly) {
+        if (hiddenOnly) {
+            const foregroundInstances = ( new Set(( this._terminalService.foregroundInstances.map(i => i.instanceId))));
+            const uniqueInstances = ( new Set(( this._terminalInstancesByToolSessionId.values())));
+            return Array.from(uniqueInstances).filter(i => !( foregroundInstances.has(i.instanceId)));
+        }
+        return Array.from(( new Set(( this._terminalInstancesByToolSessionId.values()))));
+    }
+    getToolSessionIdForInstance(instance) {
+        return this._toolSessionIdByTerminalInstance.get(instance);
+    }
+    registerTerminalInstanceWithChatSession(chatSessionId, instance) {
+        if (this._chatSessionIdByTerminalInstance.get(instance) === chatSessionId) {
+            return;
+        }
+        this._chatSessionListenersByTerminalInstance.deleteAndDispose(instance);
+        this._chatSessionIdByTerminalInstance.set(instance, chatSessionId);
+        const disposable = instance.onDisposed(() => {
+            this._chatSessionIdByTerminalInstance.delete(instance);
+            this._chatSessionListenersByTerminalInstance.deleteAndDispose(instance);
+        });
+        this._chatSessionListenersByTerminalInstance.set(instance, disposable);
+    }
+    getChatSessionIdForInstance(instance) {
+        return this._chatSessionIdByTerminalInstance.get(instance);
+    }
+    isBackgroundTerminal(terminalToolSessionId) {
+        if (!terminalToolSessionId) {
+            return false;
+        }
+        const instance = this._terminalInstancesByToolSessionId.get(terminalToolSessionId);
+        if (!instance) {
+            return false;
+        }
+        return this._terminalService.instances.includes(instance) && !this._terminalService.foregroundInstances.includes(instance);
+    }
+    _restoreFromStorage() {
+        try {
+            const raw = this._storageService.get(StorageKeys.ToolSessionMappings, StorageScope.WORKSPACE);
+            if (!raw) {
+                return;
+            }
+            const parsed = JSON.parse(raw);
+            for (const [toolSessionId, persistentProcessId] of parsed) {
+                if (typeof toolSessionId === 'string' && typeof persistentProcessId === 'number') {
+                    this._pendingRestoredMappings.set(toolSessionId, persistentProcessId);
+                }
+            }
+        }
+        catch (err) {
+            this._logService.warn('Failed to restore terminal chat tool session mappings', err);
+        }
+    }
+    _tryAdoptRestoredMapping(instance) {
+        if (this._pendingRestoredMappings.size === 0) {
+            return;
+        }
+        for (const [toolSessionId, persistentProcessId] of this._pendingRestoredMappings) {
+            if (persistentProcessId === instance.shellLaunchConfig.attachPersistentProcess?.id) {
+                this._terminalInstancesByToolSessionId.set(toolSessionId, instance);
+                this._toolSessionIdByTerminalInstance.set(instance, toolSessionId);
+                this._onDidRegisterTerminalInstanceForToolSession.fire(instance);
+                this._terminalInstanceListenersByToolSessionId.set(toolSessionId, instance.onDisposed(() => {
+                    this._terminalInstancesByToolSessionId.delete(toolSessionId);
+                    this._toolSessionIdByTerminalInstance.delete(instance);
+                    this._terminalInstanceListenersByToolSessionId.deleteAndDispose(toolSessionId);
+                    this._persistToStorage();
+                }));
+                this._pendingRestoredMappings.delete(toolSessionId);
+                this._persistToStorage();
+                break;
+            }
+        }
+    }
+    _persistToStorage() {
+        this._updateHasToolTerminalContextKeys();
+        try {
+            const entries = [];
+            for (const [toolSessionId, instance] of this._terminalInstancesByToolSessionId.entries()) {
+                if (typeof instance.persistentProcessId === 'number' && instance.shouldPersist) {
+                    entries.push([toolSessionId, instance.persistentProcessId]);
+                }
+            }
+            if (entries.length > 0) {
+                this._storageService.store(StorageKeys.ToolSessionMappings, JSON.stringify(entries), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            }
+            else {
+                this._storageService.remove(StorageKeys.ToolSessionMappings, StorageScope.WORKSPACE);
+            }
+        }
+        catch (err) {
+            this._logService.warn('Failed to persist terminal chat tool session mappings', err);
+        }
+    }
+    _updateHasToolTerminalContextKeys() {
+        const toolCount = this._terminalInstancesByToolSessionId.size;
+        this._hasToolTerminalContext.set(toolCount > 0);
+        const hiddenTerminalCount = this.getToolSessionTerminalInstances(true).length;
+        this._hasHiddenToolTerminalContext.set(hiddenTerminalCount > 0);
+    }
+};
+TerminalChatService = ( __decorate([
+    ( __param(0, ILogService)),
+    ( __param(1, ITerminalService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IChatService))
+], TerminalChatService));
+
+export { TerminalChatService };

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

@@ -6,13 +6,14 @@ import { type IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/co
 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 { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { IChatAcceptInputOptions } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat";
-import type { IChatViewState } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IChatAcceptInputOptions } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import type { IChatViewState } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { InlineChatWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
+import { InlineChatWidget } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
 import { ITerminalInstance, type IXtermTerminal } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 export declare class TerminalChatWidget extends Disposable {
     private readonly _terminalElement;
@@ -22,6 +23,7 @@ export declare class TerminalChatWidget extends Disposable {
     private readonly _storageService;
     private readonly _viewsService;
     private readonly _chatAgentService;
+    private readonly _layoutService;
     private readonly _container;
     private readonly _onDidHide;
     readonly onDidHide: Event<void>;
@@ -46,7 +48,7 @@ export declare class TerminalChatWidget extends Disposable {
     readonly requestInProgress: IObservable<boolean>;
     constructor(_terminalElement: HTMLElement, _instance: ITerminalInstance, _xterm: IXtermTerminal & {
         raw: RawXtermTerminal;
-    }, contextKeyService: IContextKeyService, _chatService: IChatService, _storageService: IStorageService, _viewsService: IViewsService, instantiationService: IInstantiationService, _chatAgentService: IChatAgentService);
+    }, contextKeyService: IContextKeyService, _chatService: IChatService, _storageService: IStorageService, _viewsService: IViewsService, instantiationService: IInstantiationService, _chatAgentService: IChatAgentService, _layoutService: IWorkbenchLayoutService);
     private _dimension?;
     private _relayout;
     private _doLayout;