@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.0

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

@@ -1,34 +1,40 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId, registerAction2, Action2, MenuRegistry } 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 { KeybindingWeight, KeybindingsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ChatViewId } from '@codingame/monaco-vscode-api/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 { 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-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 { registerActiveXtermAction } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
+import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
+import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
+import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-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 { getIconId } from '@codingame/monaco-vscode-api/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 { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+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 { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11830, 'Open Inline Chat')),
-    category: ( localize2(11831, "Terminal")),
+    title: ( localize2(11967, 'Open Inline Chat')),
+    category: ( localize2(11968, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -50,21 +56,27 @@ registerActiveXtermAction({
             return;
         }
         const contr = activeChatController || TerminalChatController.get(activeInstance);
+        if (!contr) {
+            return;
+        }
         if (opts) {
-            opts = typeof opts === 'string' ? { query: opts } : opts;
-            if (typeof opts === 'object' && opts !== null && 'query' in opts && typeof opts.query === 'string') {
-                contr?.updateInput(opts.query, false);
-                if (!('isPartialQuery' in opts && opts.isPartialQuery)) {
-                    contr?.terminalChatWidget?.acceptInput();
+            function isValidOptionsObject(obj) {
+                return typeof obj === 'object' && obj !== null && 'query' in obj && isString(obj.query);
+            }
+            opts = isString(opts) ? { query: opts } : opts;
+            if (isValidOptionsObject(opts)) {
+                contr.updateInput(opts.query, false);
+                if (!opts.isPartialQuery) {
+                    contr.terminalChatWidget?.acceptInput();
                 }
             }
         }
-        contr?.terminalChatWidget?.reveal();
+        contr.terminalChatWidget?.reveal();
     }
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11832, 'Close')),
+    title: ( localize2(11969, 'Close')),
     category: AbstractInline1ChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -89,8 +101,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11833, 'Run Chat Command')),
-    shortTitle: ( localize2(11834, 'Run')),
+    title: ( localize2(11970, 'Run Chat Command')),
+    shortTitle: ( localize2(11971, 'Run')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -118,8 +130,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11835, 'Run First Chat Command')),
-    shortTitle: ( localize2(11836, 'Run First')),
+    title: ( localize2(11972, 'Run First Chat Command')),
+    shortTitle: ( localize2(11973, 'Run First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -147,8 +159,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(11837, 'Insert Chat Command')),
-    shortTitle: ( localize2(11838, 'Insert')),
+    title: ( localize2(11974, 'Insert Chat Command')),
+    shortTitle: ( localize2(11975, 'Insert')),
     category: AbstractInline1ChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -177,8 +189,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(11839, 'Insert First Chat Command')),
-    shortTitle: ( localize2(11840, 'Insert First')),
+    title: ( localize2(11976, 'Insert First Chat Command')),
+    shortTitle: ( localize2(11977, 'Insert First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -206,7 +218,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(11841, "Rerun Request")),
+    title: ( localize2(11978, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInline1ChatAction.category,
@@ -247,7 +259,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(11842, 'View in Chat')),
+    title: ( localize2(11979, 'View in Chat')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -273,8 +285,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(11843, 'View Hidden Chat Terminals')),
-            category: ( localize2(11844, 'Terminal')),
+            title: ( localize2(11980, 'View Hidden Chat Terminals')),
+            category: ( localize2(11981, 'Terminal')),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -306,7 +318,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             }
         }
         const items = [];
-        const lastCommandLocalized = (command) => ( localize2(11845, 'Last: {0}', command)).value;
+        const lastCommandLocalized = (command) => ( localize2(11982, 'Last: {0}', command)).value;
         const metas = [];
         for (const instance of ( all.values())) {
             const iconId = instantiationService.invokeFunction(getIconId, instance);
@@ -338,13 +350,15 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(11846, 'Select a chat terminal to show and focus')).value;
+        qp.placeholder = ( localize2(11983, 'Select a chat terminal to show and focus')).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(11847, 'Chat Terminals')).value;
+        qp.title = ( localize2(11984, 'Chat Terminals')).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
-        qp.onDidAccept(async () => {
+        const qpDisposables = ( new DisposableStore());
+        qpDisposables.add(qp);
+        qpDisposables.add(qp.onDidAccept(async () => {
             const sel = qp.selectedItems[0];
             if (sel) {
                 const instance = all.get(Number(sel.id));
@@ -361,8 +375,98 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             else {
                 qp.hide();
             }
-        });
-        qp.onDidHide(() => qp.dispose());
+        }));
+        qpDisposables.add(qp.onDidHide(() => {
+            qpDisposables.dispose();
+            qp.dispose();
+        }));
         qp.show();
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: TerminalChatCommandId.FocusMostRecentChatTerminal,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ChatContextKeys.inChatSession,
+    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyT,
+    handler: async (accessor) => {
+        const terminalChatService = accessor.get(ITerminalChatService);
+        const part = terminalChatService.getMostRecentProgressPart();
+        if (!part) {
+            return;
+        }
+        await part.focusTerminal();
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ChatContextKeys.inChatSession,
+    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyO,
+    handler: async (accessor) => {
+        const terminalChatService = accessor.get(ITerminalChatService);
+        const part = terminalChatService.getMostRecentProgressPart();
+        if (!part) {
+            return;
+        }
+        await part.toggleOutputFromKeyboard();
+    }
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+    command: {
+        id: TerminalChatCommandId.FocusMostRecentChatTerminal,
+        title: ( localize(11985, 'Chat: Focus Most Recent Terminal')),
+    },
+    when: ChatContextKeys.inChatSession
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+    command: {
+        id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
+        title: ( localize(11986, '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) {
+            case ConfigurationTarget.APPLICATION:
+                preferencesService.openApplicationSettings(options);
+                break;
+            case ConfigurationTarget.USER:
+            case ConfigurationTarget.USER_LOCAL:
+                preferencesService.openUserSettings(options);
+                break;
+            case ConfigurationTarget.USER_REMOTE:
+                preferencesService.openRemoteSettings(options);
+                break;
+            case ConfigurationTarget.WORKSPACE:
+            case ConfigurationTarget.WORKSPACE_FOLDER:
+                preferencesService.openWorkspaceSettings(options);
+                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);
+});

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

@@ -6,7 +6,7 @@ import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-a
 import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { TerminalChatWidget } from "./terminalChatWidget.js";
-import type { ITerminalContributionContext } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/terminal/browser/terminalExtensions";
+import type { ITerminalContributionContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalExtensions";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 export declare class TerminalChatController extends Disposable implements ITerminalContribution {
     private readonly _ctx;

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

@@ -4,15 +4,12 @@ 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-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 { IChatCodeBlockContextProviderService, IChatWidgetService } 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';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 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;
@@ -123,10 +120,9 @@ TerminalChatController = TerminalChatController_1 = ( __decorate([
     ( __param(5, ITerminalService))
 ], TerminalChatController));
 async function moveToPanelChat(accessor, model) {
-    const viewsService = accessor.get(IViewsService);
     const chatService = accessor.get(IChatService);
-    const layoutService = accessor.get(IWorkbenchLayoutService);
-    const widget = await showChatView(viewsService, layoutService);
+    const chatWidgetService = accessor.get(IChatWidgetService);
+    const widget = await chatWidgetService.revealWidget();
     if (widget && widget.viewModel && model) {
         for (const request of model.getRequests().slice()) {
             await chatService.adoptRequest(widget.viewModel.model.sessionResource, request);

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

@@ -5,7 +5,7 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { TerminalChatContextKeys } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+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'; }

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

@@ -1,7 +1,7 @@
 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 { Disposable, IDisposable } 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 { 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";
 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";
@@ -24,6 +24,9 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _chatSessionListenersByTerminalInstance;
     private readonly _onDidRegisterTerminalInstanceForToolSession;
     readonly onDidRegisterTerminalInstanceWithToolSession: Event<ITerminalInstance>;
+    private readonly _activeProgressParts;
+    private _focusedProgressPart;
+    private _mostRecentProgressPart;
     /**
      * 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).
@@ -32,6 +35,11 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _pendingRestoredMappings;
     private readonly _hasToolTerminalContext;
     private readonly _hasHiddenToolTerminalContext;
+    /**
+     * Tracks chat session IDs 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;
     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>;
@@ -40,8 +48,17 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     registerTerminalInstanceWithChatSession(chatSessionId: string, instance: ITerminalInstance): void;
     getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined;
     isBackgroundTerminal(terminalToolSessionId?: string): boolean;
+    registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable;
+    setFocusedProgressPart(part: IChatTerminalToolProgressPart): void;
+    clearFocusedProgressPart(part: IChatTerminalToolProgressPart): void;
+    getFocusedProgressPart(): IChatTerminalToolProgressPart | undefined;
+    getMostRecentProgressPart(): IChatTerminalToolProgressPart | undefined;
+    private _getLastActiveProgressPart;
+    private _isAfter;
     private _restoreFromStorage;
     private _tryAdoptRestoredMapping;
     private _persistToStorage;
     private _updateHasToolTerminalContextKeys;
+    setChatSessionAutoApproval(chatSessionId: string, enabled: boolean): void;
+    hasChatSessionAutoApproval(chatSessionId: string): boolean;
 }

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

@@ -1,15 +1,16 @@
 
 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 { Disposable, DisposableMap, toDisposable } 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 { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 var StorageKeys;
 (function (StorageKeys) {
@@ -31,7 +32,9 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._chatSessionListenersByTerminalInstance = this._register(( new DisposableMap()));
         this._onDidRegisterTerminalInstanceForToolSession = ( new Emitter());
         this.onDidRegisterTerminalInstanceWithToolSession = this._onDidRegisterTerminalInstanceForToolSession.event;
+        this._activeProgressParts = ( new Set());
         this._pendingRestoredMappings = ( new Map());
+        this._sessionAutoApprovalEnabled = ( new Set());
         this._hasToolTerminalContext = TerminalChatContextKeys.hasChatTerminals.bindTo(this._contextKeyService);
         this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);
         this._restoreFromStorage();
@@ -56,12 +59,16 @@ let TerminalChatService = class TerminalChatService extends Disposable {
                 this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
                 this._toolSessionIdByTerminalInstance.delete(instance);
                 this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
+                const sessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
+                if (sessionId) {
+                    this._sessionAutoApprovalEnabled.delete(sessionId);
+                }
                 this._persistToStorage();
                 this._updateHasToolTerminalContextKeys();
             }
         }));
         this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));
-        if (typeof instance.shellLaunchConfig?.attachPersistentProcess?.id === 'number' || typeof instance.persistentProcessId === 'number') {
+        if (isNumber(instance.shellLaunchConfig?.attachPersistentProcess?.id) || isNumber(instance.persistentProcessId)) {
             this._persistToStorage();
         }
         this._updateHasToolTerminalContextKeys();
@@ -116,6 +123,56 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         }
         return this._terminalService.instances.includes(instance) && !this._terminalService.foregroundInstances.includes(instance);
     }
+    registerProgressPart(part) {
+        this._activeProgressParts.add(part);
+        if (this._isAfter(part, this._mostRecentProgressPart)) {
+            this._mostRecentProgressPart = part;
+        }
+        return toDisposable(() => {
+            this._activeProgressParts.delete(part);
+            if (this._focusedProgressPart === part) {
+                this._focusedProgressPart = undefined;
+            }
+            if (this._mostRecentProgressPart === part) {
+                this._mostRecentProgressPart = this._getLastActiveProgressPart();
+            }
+        });
+    }
+    setFocusedProgressPart(part) {
+        this._focusedProgressPart = part;
+    }
+    clearFocusedProgressPart(part) {
+        if (this._focusedProgressPart === part) {
+            this._focusedProgressPart = undefined;
+        }
+    }
+    getFocusedProgressPart() {
+        return this._focusedProgressPart;
+    }
+    getMostRecentProgressPart() {
+        if (!this._mostRecentProgressPart || !( this._activeProgressParts.has(this._mostRecentProgressPart))) {
+            this._mostRecentProgressPart = this._getLastActiveProgressPart();
+        }
+        return this._mostRecentProgressPart;
+    }
+    _getLastActiveProgressPart() {
+        let latest;
+        for (const part of this._activeProgressParts) {
+            if (this._isAfter(part, latest)) {
+                latest = part;
+            }
+        }
+        return latest;
+    }
+    _isAfter(candidate, current) {
+        if (!current) {
+            return true;
+        }
+        if (candidate.elementIndex === current.elementIndex) {
+            return candidate.contentIndex >= current.contentIndex;
+        }
+        return candidate.elementIndex > current.elementIndex;
+    }
     _restoreFromStorage() {
         try {
             const raw = this._storageService.get(StorageKeys.ToolSessionMappings, StorageScope.WORKSPACE);
@@ -124,7 +181,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
             }
             const parsed = JSON.parse(raw);
             for (const [toolSessionId, persistentProcessId] of parsed) {
-                if (typeof toolSessionId === 'string' && typeof persistentProcessId === 'number') {
+                if (isString(toolSessionId) && isNumber(persistentProcessId)) {
                     this._pendingRestoredMappings.set(toolSessionId, persistentProcessId);
                 }
             }
@@ -159,8 +216,12 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         try {
             const entries = [];
             for (const [toolSessionId, instance] of this._terminalInstancesByToolSessionId.entries()) {
-                if (typeof instance.persistentProcessId === 'number' && instance.shouldPersist) {
-                    entries.push([toolSessionId, instance.persistentProcessId]);
+                const persistentId = isNumber(instance.persistentProcessId)
+                    ? instance.persistentProcessId
+                    : instance.shellLaunchConfig.attachPersistentProcess?.id;
+                const shouldPersist = instance.shouldPersist || instance.shellLaunchConfig.forcePersist;
+                if (isNumber(persistentId) && shouldPersist) {
+                    entries.push([toolSessionId, persistentId]);
                 }
             }
             if (entries.length > 0) {
@@ -180,6 +241,17 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         const hiddenTerminalCount = this.getToolSessionTerminalInstances(true).length;
         this._hasHiddenToolTerminalContext.set(hiddenTerminalCount > 0);
     }
+    setChatSessionAutoApproval(chatSessionId, enabled) {
+        if (enabled) {
+            this._sessionAutoApprovalEnabled.add(chatSessionId);
+        }
+        else {
+            this._sessionAutoApprovalEnabled.delete(chatSessionId);
+        }
+    }
+    hasChatSessionAutoApproval(chatSessionId) {
+        return ( this._sessionAutoApprovalEnabled.has(chatSessionId));
+    }
 };
 TerminalChatService = ( __decorate([
     ( __param(0, ILogService)),

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

@@ -6,14 +6,12 @@ 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-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 { IChatAcceptInputOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatResponseModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/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-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
+import { 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";
 export declare class TerminalChatWidget extends Disposable {
     private readonly _terminalElement;
@@ -21,9 +19,8 @@ export declare class TerminalChatWidget extends Disposable {
     private readonly _xterm;
     private readonly _chatService;
     private readonly _storageService;
-    private readonly _viewsService;
     private readonly _chatAgentService;
-    private readonly _layoutService;
+    private readonly _chatWidgetService;
     private readonly _container;
     private readonly _onDidHide;
     readonly onDidHide: Event<void>;
@@ -48,12 +45,12 @@ 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, _layoutService: IWorkbenchLayoutService);
+    }, contextKeyService: IContextKeyService, _chatService: IChatService, _storageService: IStorageService, instantiationService: IInstantiationService, _chatAgentService: IChatAgentService, _chatWidgetService: IChatWidgetService);
     private _dimension?;
     private _relayout;
     private _doLayout;
     private _resetPlaceholder;
-    reveal(viewState?: IChatViewState): Promise<void>;
+    reveal(): Promise<void>;
     private _getTerminalCursorTop;
     private _updateXtermViewportPosition;
     private _getTerminalViewportHeight;
@@ -65,7 +62,6 @@ export declare class TerminalChatWidget extends Disposable {
     acceptCommand(shouldExecute: boolean): Promise<void>;
     get focusTracker(): IFocusTracker;
     private _createSession;
-    private _loadViewState;
     private _saveViewState;
     clear(): void;
     acceptInput(query?: string, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined>;