@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.1

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

@@ -12,7 +12,6 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ChatAgentLocation, ChatConfiguration } 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-xterm-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
@@ -29,16 +28,17 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { AbstractInlineChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11993, 'Open Inline Chat')),
-    category: ( localize2(11994, "Terminal")),
+    title: ( localize2(12321, "Open Inline Chat")),
+    category: ( localize2(12322, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
-        weight: KeybindingWeight.ExternalExtension + 1,
+        weight: KeybindingWeight.ExternalExtension + 1
     },
     f1: true,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -61,9 +61,11 @@ registerActiveXtermAction({
         }
         if (opts) {
             function isValidOptionsObject(obj) {
-                return typeof obj === 'object' && obj !== null && 'query' in obj && isString(obj.query);
+                return typeof obj === "object" && obj !== null && "query" in obj && isString(obj.query);
             }
-            opts = isString(opts) ? { query: opts } : opts;
+            opts = isString(opts) ? {
+                query: opts
+            } : opts;
             if (isValidOptionsObject(opts)) {
                 contr.updateInput(opts.query, false);
                 if (!opts.isPartialQuery) {
@@ -76,18 +78,18 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11995, 'Close')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12323, "Close")),
+    category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
         when: ( ContextKeyExpr.and(( ContextKeyExpr.or(TerminalContextKeys.focus, TerminalChatContextKeys.focused)), TerminalChatContextKeys.visible)),
-        weight: KeybindingWeight.WorkbenchContrib,
+        weight: KeybindingWeight.WorkbenchContrib
     },
     menu: [{
-            id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-            group: '0_main',
-            order: 2,
-        }],
+        id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
+        group: "0_main",
+        order: 2
+    }],
     icon: Codicon.close,
     f1: true,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, TerminalChatContextKeys.visible)),
@@ -101,9 +103,9 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11996, 'Run Chat Command')),
-    shortTitle: ( localize2(11997, 'Run')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12324, "Run Chat Command")),
+    shortTitle: ( localize2(12325, "Run")),
+    category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
@@ -112,11 +114,11 @@ registerActiveXtermAction({
     keybinding: {
         when: ( TerminalChatContextKeys.requestActive.negate()),
         weight: KeybindingWeight.WorkbenchContrib,
-        primary: KeyMod.CtrlCmd | KeyCode.Enter,
+        primary: KeyMod.CtrlCmd | KeyCode.Enter
     },
     menu: {
         id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-        group: '0_main',
+        group: "0_main",
         order: 0,
         when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, ( TerminalChatContextKeys.responseContainsMultipleCodeBlocks.negate()), ( TerminalChatContextKeys.requestActive.negate())))
     },
@@ -130,9 +132,9 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11998, 'Run First Chat Command')),
-    shortTitle: ( localize2(11999, 'Run First')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12326, "Run First Chat Command")),
+    shortTitle: ( localize2(12327, "Run First")),
+    category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
@@ -141,11 +143,11 @@ registerActiveXtermAction({
     keybinding: {
         when: ( TerminalChatContextKeys.requestActive.negate()),
         weight: KeybindingWeight.WorkbenchContrib,
-        primary: KeyMod.CtrlCmd | KeyCode.Enter,
+        primary: KeyMod.CtrlCmd | KeyCode.Enter
     },
     menu: {
         id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-        group: '0_main',
+        group: "0_main",
         order: 0,
         when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsMultipleCodeBlocks, ( TerminalChatContextKeys.requestActive.negate())))
     },
@@ -159,9 +161,9 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(12000, 'Insert Chat Command')),
-    shortTitle: ( localize2(12001, 'Insert')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12328, "Insert Chat Command")),
+    shortTitle: ( localize2(12329, "Insert")),
+    category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -175,7 +177,7 @@ registerActiveXtermAction({
     },
     menu: {
         id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-        group: '0_main',
+        group: "0_main",
         order: 1,
         when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, ( TerminalChatContextKeys.responseContainsMultipleCodeBlocks.negate()), ( TerminalChatContextKeys.requestActive.negate())))
     },
@@ -189,9 +191,9 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(12002, 'Insert First Chat Command')),
-    shortTitle: ( localize2(12003, 'Insert First')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12330, "Insert First Chat Command")),
+    shortTitle: ( localize2(12331, "Insert First")),
+    category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
@@ -204,7 +206,7 @@ registerActiveXtermAction({
     },
     menu: {
         id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-        group: '0_main',
+        group: "0_main",
         order: 1,
         when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsMultipleCodeBlocks, ( TerminalChatContextKeys.requestActive.negate())))
     },
@@ -218,10 +220,10 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(12004, "Rerun Request")),
+    title: ( localize2(12332, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
-    category: AbstractInline1ChatAction.category,
+    category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
@@ -233,7 +235,7 @@ registerActiveXtermAction({
     },
     menu: {
         id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-        group: '0_main',
+        group: "0_main",
         order: 5,
         when: ( ContextKeyExpr.and(( TerminalChatContextKeys.inputHasText.toNegated()), ( TerminalChatContextKeys.requestActive.negate())))
     },
@@ -259,20 +261,20 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(12005, 'View in Chat')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(12333, "View in Chat")),
+    category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
     )), ( TerminalChatContextKeys.requestActive.negate()))),
     icon: Codicon.chatSparkle,
     menu: [{
-            id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
-            group: 'zzz',
-            order: 1,
-            isHiddenByDefault: true,
-            when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, ( TerminalChatContextKeys.requestActive.negate()))),
-        }],
+        id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
+        group: "zzz",
+        order: 1,
+        isHiddenByDefault: true,
+        when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, ( TerminalChatContextKeys.requestActive.negate())))
+    }],
     run: (_xterm, _accessor, activeInstance) => {
         if (isDetachedTerminalInstance(activeInstance)) {
             return;
@@ -285,17 +287,17 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(12006, 'View Hidden Chat Terminals')),
-            category: ( localize2(12007, 'Terminal')),
+            title: ( localize2(12334, "View Hidden Chat Terminals")),
+            category: ( localize2(12335, "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
-                }]
+                id: MenuId.ViewTitle,
+                when: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ( ContextKeyExpr.equals("view", ChatViewId)))),
+                group: "terminal",
+                order: 0,
+                isHiddenByDefault: true
+            }]
         });
     }
     run(accessor) {
@@ -318,7 +320,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             }
         }
         const items = [];
-        const lastCommandLocalized = (command) => ( localize2(12008, 'Last: {0}', command)).value;
+        const lastCommandLocalized = command => ( localize2(12336, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -334,17 +336,19 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             let detail;
             let tooltip;
             if (lastCommand) {
-                const commandLines = lastCommand.split('\n');
+                const commandLines = lastCommand.split("\n");
                 const firstLine = commandLines[0];
-                const displayCommand = firstLine.length > MAX_DETAIL_LENGTH ? firstLine.substring(0, MAX_DETAIL_LENGTH) + '…' : firstLine;
+                const displayCommand = firstLine.length > MAX_DETAIL_LENGTH ? firstLine.substring(0, MAX_DETAIL_LENGTH) + "…" : firstLine;
                 detail = lastCommandLocalized(displayCommand);
                 const wasTruncated = firstLine.length > MAX_DETAIL_LENGTH;
                 const hasMultipleLines = commandLines.length > 1;
                 if (wasTruncated || hasMultipleLines) {
                     if (hasMultipleLines) {
-                        tooltip = { value: `\`\`\`\n${lastCommand}\n\`\`\``, supportThemeIcons: true };
-                    }
-                    else {
+                        tooltip = {
+                            value: `\`\`\`\n${lastCommand}\n\`\`\``,
+                            supportThemeIcons: true
+                        };
+                    } else {
                         tooltip = lastCommandLocalized(lastCommand);
                     }
                 }
@@ -354,7 +358,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                 description,
                 detail,
                 tooltip,
-                id: String(instance.instanceId),
+                id: String(instance.instanceId)
             });
         }
         for (const m of metas) {
@@ -367,10 +371,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(12009, 'Select a chat terminal to show and focus')).value;
+        qp.placeholder = ( localize2(12337, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(12010, 'Chat Terminals')).value;
+        qp.title = ( localize2(12338, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -384,12 +388,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                     await terminalService.revealTerminal(instance);
                     qp.hide();
                     await terminalService.focusInstance(instance);
-                }
-                else {
+                } else {
                     qp.hide();
                 }
-            }
-            else {
+            } else {
                 qp.hide();
             }
         }));
@@ -405,7 +407,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     weight: KeybindingWeight.WorkbenchContrib,
     when: ChatContextKeys.inChatSession,
     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyT,
-    handler: async (accessor) => {
+    handler: async accessor => {
         const terminalChatService = accessor.get(ITerminalChatService);
         const part = terminalChatService.getMostRecentProgressPart();
         if (!part) {
@@ -419,7 +421,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     weight: KeybindingWeight.WorkbenchContrib,
     when: ChatContextKeys.inChatSession,
     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyO,
-    handler: async (accessor) => {
+    handler: async accessor => {
         const terminalChatService = accessor.get(ITerminalChatService);
         const part = terminalChatService.getMostRecentProgressPart();
         if (!part) {
@@ -431,34 +433,35 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(12011, 'Chat: Focus Most Recent Terminal')),
+        title: ( localize(12339, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(12012, 'Chat: Focus Most Recent Terminal Output')),
+        title: ( localize(12340, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });
-CommandsRegistry.registerCommand(TerminalChatCommandId.OpenTerminalSettingsLink, async (accessor, scopeRaw) => {
-    const preferencesService = accessor.get(IPreferencesService);
-    if (scopeRaw === 'global') {
-        preferencesService.openSettings({
-            query: `@id:${ChatConfiguration.GlobalAutoApprove}`
-        });
-    }
-    else {
-        const scope = parseInt(scopeRaw);
-        const target = !isNaN(scope) ? scope : undefined;
-        const options = {
-            jsonEditor: true,
-            revealSetting: {
-                key: TerminalChatAgentToolsSettingId.AutoApprove,
-            }
-        };
-        switch (target) {
+CommandsRegistry.registerCommand(
+    TerminalChatCommandId.OpenTerminalSettingsLink,
+    async (accessor, scopeRaw) => {
+        const preferencesService = accessor.get(IPreferencesService);
+        if (scopeRaw === "global") {
+            preferencesService.openSettings({
+                query: `@id:${ChatConfiguration.GlobalAutoApprove}`
+            });
+        } else {
+            const scope = parseInt(scopeRaw);
+            const target = !isNaN(scope) ? scope : undefined;
+            const options = {
+                jsonEditor: true,
+                revealSetting: {
+                    key: TerminalChatAgentToolsSettingId.AutoApprove
+                }
+            };
+            switch (target) {
             case ConfigurationTarget.APPLICATION:
                 preferencesService.openApplicationSettings(options);
                 break;
@@ -473,17 +476,22 @@ CommandsRegistry.registerCommand(TerminalChatCommandId.OpenTerminalSettingsLink,
             case ConfigurationTarget.WORKSPACE_FOLDER:
                 preferencesService.openWorkspaceSettings(options);
                 break;
-            default: {
-                preferencesService.openSettings({
-                    target: ConfigurationTarget.USER,
-                    query: `@id:${TerminalChatAgentToolsSettingId.AutoApprove}`,
-                });
-                break;
+            default:
+                {
+                    preferencesService.openSettings({
+                        target: ConfigurationTarget.USER,
+                        query: `@id:${TerminalChatAgentToolsSettingId.AutoApprove}`
+                    });
+                    break;
+                }
             }
         }
     }
-});
-CommandsRegistry.registerCommand(TerminalChatCommandId.DisableSessionAutoApproval, async (accessor, chatSessionId) => {
-    const terminalChatService = accessor.get(ITerminalChatService);
-    terminalChatService.setChatSessionAutoApproval(chatSessionId, false);
-});
+);
+CommandsRegistry.registerCommand(
+    TerminalChatCommandId.DisableSessionAutoApproval,
+    async (accessor, chatSessionResource) => {
+        const terminalChatService = accessor.get(ITerminalChatService);
+        terminalChatService.setChatSessionAutoApproval(chatSessionResource, false);
+    }
+);

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

@@ -14,19 +14,32 @@ import { setActiveChatController } from './terminalChatControllerHolder.js';
 
 var TerminalChatController_1;
 let TerminalChatController = class TerminalChatController extends Disposable {
-    static { TerminalChatController_1 = this; }
-    static { this.ID = 'terminal.chat'; }
+    static {
+        TerminalChatController_1 = this;
+    }
+    static {
+        this.ID = "terminal.chat";
+    }
     static get(instance) {
         return instance.getContribution(TerminalChatController_1.ID);
     }
-    get terminalChatWidget() { return this._terminalChatWidget?.value; }
+    get terminalChatWidget() {
+        return this._terminalChatWidget?.value;
+    }
     get lastResponseContent() {
         return this._lastResponseContent;
     }
     get scopedContextKeyService() {
         return this._terminalChatWidget?.value.inlineChatWidget.scopedContextKeyService ?? this._contextKeyService;
     }
-    constructor(_ctx, chatCodeBlockContextProviderService, chatEntitlementService, _contextKeyService, _instantiationService, _terminalService) {
+    constructor(
+        _ctx,
+        chatCodeBlockContextProviderService,
+        chatEntitlementService,
+        _contextKeyService,
+        _instantiationService,
+        _terminalService
+    ) {
         super();
         this._ctx = _ctx;
         this._contextKeyService = _contextKeyService;
@@ -39,7 +52,7 @@ let TerminalChatController = class TerminalChatController extends Disposable {
             }
         }));
         this._register(chatCodeBlockContextProviderService.registerProvider({
-            getCodeBlockContext: (editor) => {
+            getCodeBlockContext: editor => {
                 if (!editor || !this._terminalChatWidget?.hasValue || !this.hasFocus()) {
                     return;
                 }
@@ -51,11 +64,16 @@ let TerminalChatController = class TerminalChatController extends Disposable {
                     chatSessionResource: this._terminalChatWidget.value.inlineChatWidget.chatWidget.viewModel?.sessionResource
                 };
             }
-        }, 'terminal'));
+        }, "terminal"));
     }
     xtermReady(xterm) {
         this._terminalChatWidget = ( new Lazy(() => {
-            const chatWidget = this._register(this._instantiationService.createInstance(TerminalChatWidget, this._ctx.instance.domElement, this._ctx.instance, xterm));
+            const chatWidget = this._register(this._instantiationService.createInstance(
+                TerminalChatWidget,
+                this._ctx.instance.domElement,
+                this._ctx.instance,
+                xterm
+            ));
             this._register(chatWidget.focusTracker.onDidFocus(() => {
                 setActiveChatController(this);
                 if (!isDetachedTerminalInstance(this._ctx.instance)) {
@@ -67,7 +85,7 @@ let TerminalChatController = class TerminalChatController extends Disposable {
                 this._ctx.instance.resetScrollbarVisibility();
             }));
             if (!this._ctx.instance.domElement) {
-                throw ( new Error('FindWidget expected terminal DOM to be initialized'));
+                throw ( new Error("FindWidget expected terminal DOM to be initialized"));
             }
             return chatWidget;
         }));
@@ -79,7 +97,7 @@ let TerminalChatController = class TerminalChatController extends Disposable {
         }
     }
     _getPlaceholderText() {
-        return this._forcedPlaceholder ?? '';
+        return this._forcedPlaceholder ?? "";
     }
     setPlaceholder(text) {
         this._forcedPlaceholder = text;
@@ -112,13 +130,7 @@ let TerminalChatController = class TerminalChatController extends Disposable {
         this._terminalChatWidget?.rawValue?.hide();
     }
 };
-TerminalChatController = TerminalChatController_1 = ( __decorate([
-    ( __param(1, IChatCodeBlockContextProviderService)),
-    ( __param(2, IChatEntitlementService)),
-    ( __param(3, IContextKeyService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, ITerminalService))
-], TerminalChatController));
+TerminalChatController = TerminalChatController_1 = ( __decorate([( __param(1, IChatCodeBlockContextProviderService)), ( __param(2, IChatEntitlementService)), ( __param(3, IContextKeyService)), ( __param(4, IInstantiationService)), ( __param(5, ITerminalService))], TerminalChatController));
 async function moveToPanelChat(accessor, model) {
     const chatService = accessor.get(IChatService);
     const chatWidgetService = accessor.get(IChatWidgetService);

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

@@ -8,7 +8,9 @@ import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 
 let TerminalChatEnabler = class TerminalChatEnabler {
-    static { this.Id = 'terminalChat.enabler'; }
+    static {
+        this.Id = "terminalChat.enabler";
+    }
     constructor(chatAgentService, contextKeyService) {
         this._store = ( new DisposableStore());
         this._ctxHasProvider = TerminalChatContextKeys.hasChatAgent.bindTo(contextKeyService);
@@ -22,9 +24,6 @@ let TerminalChatEnabler = class TerminalChatEnabler {
         this._store.dispose();
     }
 };
-TerminalChatEnabler = ( __decorate([
-    ( __param(0, IChatAgentService)),
-    ( __param(1, IContextKeyService))
-], TerminalChatEnabler));
+TerminalChatEnabler = ( __decorate([( __param(0, IChatAgentService)), ( __param(1, IContextKeyService))], TerminalChatEnabler));
 
 export { TerminalChatEnabler };

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

@@ -1,5 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IChatTerminalToolProgressPart, 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";
@@ -19,9 +20,11 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     _serviceBrand: undefined;
     private readonly _terminalInstancesByToolSessionId;
     private readonly _toolSessionIdByTerminalInstance;
-    private readonly _chatSessionIdByTerminalInstance;
+    private readonly _chatSessionResourceByTerminalInstance;
     private readonly _terminalInstanceListenersByToolSessionId;
     private readonly _chatSessionListenersByTerminalInstance;
+    private readonly _onDidContinueInBackground;
+    readonly onDidContinueInBackground: Event<string>;
     private readonly _onDidRegisterTerminalInstanceForToolSession;
     readonly onDidRegisterTerminalInstanceWithToolSession: Event<ITerminalInstance>;
     private readonly _activeProgressParts;
@@ -36,14 +39,13 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _hasToolTerminalContext;
     private readonly _hasHiddenToolTerminalContext;
     /**
-     * Tracks chat session IDs that have auto approval enabled for all commands. This is a temporary
+     * Tracks chat session resources that have auto approval enabled for all commands. This is a temporary
      * approval that lasts only for the duration of the session.
      */
     private readonly _sessionAutoApprovalEnabled;
     /**
      * Tracks session-scoped auto-approve rules per chat session. These are temporary rules that
      * last only for the duration of the chat session (not persisted to disk).
-     * Map<chatSessionId, Record<ruleKey, ruleValue>>
      */
     private readonly _sessionAutoApproveRules;
     constructor(_logService: ILogService, _terminalService: ITerminalService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatService: IChatService);
@@ -51,7 +53,8 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     getTerminalInstanceByToolSessionId(terminalToolSessionId: string | undefined): Promise<ITerminalInstance | undefined>;
     getToolSessionTerminalInstances(hiddenOnly?: boolean): readonly ITerminalInstance[];
     getToolSessionIdForInstance(instance: ITerminalInstance): string | undefined;
-    registerTerminalInstanceWithChatSession(chatSessionId: string, instance: ITerminalInstance): void;
+    registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void;
+    getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined;
     getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined;
     isBackgroundTerminal(terminalToolSessionId?: string): boolean;
     registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable;
@@ -65,14 +68,15 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private _tryAdoptRestoredMapping;
     private _persistToStorage;
     private _updateHasToolTerminalContextKeys;
-    setChatSessionAutoApproval(chatSessionId: string, enabled: boolean): void;
-    hasChatSessionAutoApproval(chatSessionId: string): boolean;
-    addSessionAutoApproveRule(chatSessionId: string, key: string, value: boolean | {
+    setChatSessionAutoApproval(chatSessionResource: URI, enabled: boolean): void;
+    hasChatSessionAutoApproval(chatSessionResource: URI): boolean;
+    addSessionAutoApproveRule(chatSessionResource: URI, key: string, value: boolean | {
         approve: boolean;
         matchCommandLine?: boolean;
     }): void;
-    getSessionAutoApproveRules(chatSessionId: string): Readonly<Record<string, boolean | {
+    getSessionAutoApproveRules(chatSessionResource: URI): Readonly<Record<string, boolean | {
         approve: boolean;
         matchCommandLine?: boolean;
     }>>;
+    continueInBackground(terminalToolSessionId: string): void;
 }