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

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

@@ -0,0 +1,85 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+
+var TerminalChatCommandId;
+(function(TerminalChatCommandId) {
+    TerminalChatCommandId["Start"] = "workbench.action.terminal.chat.start";
+    TerminalChatCommandId["Close"] = "workbench.action.terminal.chat.close";
+    TerminalChatCommandId["MakeRequest"] = "workbench.action.terminal.chat.makeRequest";
+    TerminalChatCommandId["Cancel"] = "workbench.action.terminal.chat.cancel";
+    TerminalChatCommandId["RunCommand"] = "workbench.action.terminal.chat.runCommand";
+    TerminalChatCommandId["RunFirstCommand"] = "workbench.action.terminal.chat.runFirstCommand";
+    TerminalChatCommandId["InsertCommand"] = "workbench.action.terminal.chat.insertCommand";
+    TerminalChatCommandId["InsertFirstCommand"] = "workbench.action.terminal.chat.insertFirstCommand";
+    TerminalChatCommandId["ViewInChat"] = "workbench.action.terminal.chat.viewInChat";
+    TerminalChatCommandId["RerunRequest"] = "workbench.action.terminal.chat.rerunRequest";
+    TerminalChatCommandId["ViewHiddenChatTerminals"] = "workbench.action.terminal.chat.viewHiddenChatTerminals";
+    TerminalChatCommandId["OpenTerminalSettingsLink"] = "workbench.action.terminal.chat.openTerminalSettingsLink";
+    TerminalChatCommandId["DisableSessionAutoApproval"] = "workbench.action.terminal.chat.disableSessionAutoApproval";
+    TerminalChatCommandId["FocusMostRecentChatTerminalOutput"] = "workbench.action.terminal.chat.focusMostRecentChatTerminalOutput";
+    TerminalChatCommandId["FocusMostRecentChatTerminal"] = "workbench.action.terminal.chat.focusMostRecentChatTerminal";
+    TerminalChatCommandId["ToggleChatTerminalOutput"] = "workbench.action.terminal.chat.toggleChatTerminalOutput";
+    TerminalChatCommandId["FocusChatInstanceAction"] = "workbench.action.terminal.chat.focusChatInstance";
+    TerminalChatCommandId["ContinueInBackground"] = "workbench.action.terminal.chat.continueInBackground";
+})(TerminalChatCommandId || (TerminalChatCommandId = {}));
+const MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR = MenuId.for("terminalChatWidget");
+const MENU_TERMINAL_CHAT_WIDGET_STATUS = MenuId.for("terminalChatWidget.status");
+MenuId.for("terminalChatWidget.toolbar");
+MenuId.for("chatTerminalToolProgress");
+var TerminalChatContextKeyStrings;
+(function(TerminalChatContextKeyStrings) {
+    TerminalChatContextKeyStrings["ChatFocus"] = "terminalChatFocus";
+    TerminalChatContextKeyStrings["ChatVisible"] = "terminalChatVisible";
+    TerminalChatContextKeyStrings["ChatActiveRequest"] = "terminalChatActiveRequest";
+    TerminalChatContextKeyStrings["ChatInputHasText"] = "terminalChatInputHasText";
+    TerminalChatContextKeyStrings["ChatAgentRegistered"] = "terminalChatAgentRegistered";
+    TerminalChatContextKeyStrings["ChatResponseEditorFocused"] = "terminalChatResponseEditorFocused";
+    TerminalChatContextKeyStrings["ChatResponseContainsCodeBlock"] = "terminalChatResponseContainsCodeBlock";
+    TerminalChatContextKeyStrings["ChatResponseContainsMultipleCodeBlocks"] = "terminalChatResponseContainsMultipleCodeBlocks";
+    TerminalChatContextKeyStrings["ChatResponseSupportsIssueReporting"] = "terminalChatResponseSupportsIssueReporting";
+    TerminalChatContextKeyStrings["ChatSessionResponseVote"] = "terminalChatSessionResponseVote";
+    TerminalChatContextKeyStrings["ChatUsesAgentHost"] = "terminalChatUsesAgentHost";
+    TerminalChatContextKeyStrings["ChatHasTerminals"] = "hasChatTerminals";
+    TerminalChatContextKeyStrings["ChatHasHiddenTerminals"] = "hasHiddenChatTerminals";
+    TerminalChatContextKeyStrings["ChatToolHasInstance"] = "chatTerminalToolHasInstance";
+    TerminalChatContextKeyStrings["ChatToolCanContinueInBackground"] = "chatTerminalToolCanContinueInBackground";
+    TerminalChatContextKeyStrings["ChatToolHasOutput"] = "chatTerminalToolHasOutput";
+    TerminalChatContextKeyStrings["ChatToolUsesCollapsible"] = "chatTerminalToolUsesCollapsible";
+    TerminalChatContextKeyStrings["ChatToolIsHiddenTerminal"] = "chatTerminalToolIsHiddenTerminal";
+    TerminalChatContextKeyStrings["ChatToolOutputExpanded"] = "chatTerminalToolOutputExpanded";
+})(TerminalChatContextKeyStrings || (TerminalChatContextKeyStrings = {}));
+var TerminalChatContextKeys;
+(function(TerminalChatContextKeys) {
+    TerminalChatContextKeys.focused = ( new RawContextKey(TerminalChatContextKeyStrings.ChatFocus, false, ( localize(16992, "Whether the chat view is focused."))));
+    TerminalChatContextKeys.visible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatVisible, false, ( localize(16993, "Whether the chat view is visible."))));
+    TerminalChatContextKeys.requestActive = ( new RawContextKey(TerminalChatContextKeyStrings.ChatActiveRequest, false, ( localize(16994, "Whether there is an active chat request."))));
+    TerminalChatContextKeys.inputHasText = ( new RawContextKey(TerminalChatContextKeyStrings.ChatInputHasText, false, ( localize(16995, "Whether the chat input has text."))));
+    TerminalChatContextKeys.responseContainsCodeBlock = ( new RawContextKey(
+        TerminalChatContextKeyStrings.ChatResponseContainsCodeBlock,
+        false,
+        ( localize(16996, "Whether the chat response contains a code block."))
+    ));
+    TerminalChatContextKeys.responseContainsMultipleCodeBlocks = ( new RawContextKey(
+        TerminalChatContextKeyStrings.ChatResponseContainsMultipleCodeBlocks,
+        false,
+        ( localize(16997, "Whether the chat response contains multiple code blocks."))
+    ));
+    TerminalChatContextKeys.hasChatAgent = ( new RawContextKey(TerminalChatContextKeyStrings.ChatAgentRegistered, false, ( localize(16998, "Whether a chat agent is registered for the terminal location."))));
+    TerminalChatContextKeys.usesAgentHost = ( new RawContextKey(TerminalChatContextKeyStrings.ChatUsesAgentHost, false, ( localize(16999, "Whether the terminal chat session is backed by the Agent Host."))));
+    TerminalChatContextKeys.hasChatTerminals = ( new RawContextKey(TerminalChatContextKeyStrings.ChatHasTerminals, false, ( localize(17000, "Whether there are any chat terminals."))));
+    TerminalChatContextKeys.hasHiddenChatTerminals = ( new RawContextKey(
+        TerminalChatContextKeyStrings.ChatHasHiddenTerminals,
+        false,
+        ( localize(17001, "Whether there are any hidden chat terminals."))
+    ));
+    TerminalChatContextKeys.chatToolHasInstance = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolHasInstance, false));
+    TerminalChatContextKeys.chatToolCanContinueInBackground = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolCanContinueInBackground, false));
+    TerminalChatContextKeys.chatToolHasOutput = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolHasOutput, false));
+    TerminalChatContextKeys.chatToolUsesCollapsible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolUsesCollapsible, false));
+    TerminalChatContextKeys.chatToolIsHiddenTerminal = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolIsHiddenTerminal, false));
+    TerminalChatContextKeys.chatToolOutputExpanded = ( new RawContextKey(TerminalChatContextKeyStrings.ChatToolOutputExpanded, false));
+})(TerminalChatContextKeys || (TerminalChatContextKeys = {}));
+
+export { MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeyStrings, TerminalChatContextKeys };

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

@@ -4,7 +4,7 @@ import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { TerminalChatContextKeys, TerminalChatCommandId } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, TerminalChatCommandId } from './terminalChat.js';
 import { TerminalChatController } from './terminalChatController.js';
 
 class TerminalChatAccessibilityHelp {
@@ -37,68 +37,68 @@ function getAccessibilityHelpText(accessor) {
     const focusResponseKeybinding = keybindingService.lookupKeybinding("chat.action.focus")?.getAriaLabel();
     const focusInputKeybinding = keybindingService.lookupKeybinding("workbench.action.chat.focusInput")?.getAriaLabel();
     content.push(( localize(
-        15237,
+        17002,
         "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(
-        15238,
+        17003,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        15239,
+        17004,
         "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(
-        15240,
+        17005,
         "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(
-        15241,
+        17006,
         "The response can be inspected in the accessible view ({0}).",
         openAccessibleViewKeybinding
     )) : ( localize(
-        15242,
+        17007,
         "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(
-        15243,
+        17008,
         "Reach the response from the input box ({0}).",
         focusResponseKeybinding
     )) : ( localize(
-        15244,
+        17009,
         "Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response."
     )));
     content.push(focusInputKeybinding ? ( localize(
-        15245,
+        17010,
         "Reach the input box from the response ({0}).",
         focusInputKeybinding
     )) : ( localize(
-        15246,
+        17011,
         "Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input."
     )));
     content.push(runCommandKeybinding ? ( localize(
-        15247,
+        17012,
         "With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.",
         runCommandKeybinding
     )) : ( localize(
-        15248,
+        17013,
         "Run a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        15249,
+        17014,
         "With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.",
         insertCommandKeybinding
     )) : ( localize(
-        15250,
+        17015,
         "Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding."
     )));
     content.push(( localize(
-        15251,
+        17016,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        15252,
+        17017,
         "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/terminalChatAccessibleView.js

@@ -5,7 +5,7 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { TerminalChatController } from './terminalChatController.js';
 import { MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
-import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_STATUS } from './terminalChat.js';
 import { activeChatController } from './terminalChatControllerHolder.js';
 
 class TerminalInlineChatAccessibleView {

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

@@ -16,7 +16,7 @@ import { ITerminalService, ITerminalGroupService, ITerminalEditorService, ITermi
 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 { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from './terminalChat.js';
 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-api/vscode/vs/workbench/contrib/terminal/browser/terminalIcon';
@@ -33,8 +33,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(15253, "Open Inline Chat")),
-    category: ( localize2(15254, "Terminal")),
+    title: ( localize2(17018, "Open Inline Chat")),
+    category: ( localize2(17019, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -78,7 +78,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(15255, "Close")),
+    title: ( localize2(17020, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -103,8 +103,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(15256, "Run Chat Command")),
-    shortTitle: ( localize2(15257, "Run")),
+    title: ( localize2(17021, "Run Chat Command")),
+    shortTitle: ( localize2(17022, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -132,8 +132,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(15258, "Run First Chat Command")),
-    shortTitle: ( localize2(15259, "Run First")),
+    title: ( localize2(17023, "Run First Chat Command")),
+    shortTitle: ( localize2(17024, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -161,8 +161,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(15260, "Insert Chat Command")),
-    shortTitle: ( localize2(15261, "Insert")),
+    title: ( localize2(17025, "Insert Chat Command")),
+    shortTitle: ( localize2(17026, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -191,8 +191,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(15262, "Insert First Chat Command")),
-    shortTitle: ( localize2(15263, "Insert First")),
+    title: ( localize2(17027, "Insert First Chat Command")),
+    shortTitle: ( localize2(17028, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -220,7 +220,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(15264, "Rerun Request")),
+    title: ( localize2(17029, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -261,19 +261,19 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(15265, "View in Chat")),
+    title: ( localize2(17030, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
-    )), ( TerminalChatContextKeys.requestActive.negate()))),
+    )), ( TerminalChatContextKeys.requestActive.negate()), ( TerminalChatContextKeys.usesAgentHost.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())))
+        when: ( ContextKeyExpr.and(TerminalChatContextKeys.responseContainsCodeBlock, ( TerminalChatContextKeys.requestActive.negate()), ( TerminalChatContextKeys.usesAgentHost.negate())))
     }],
     run: (_xterm, _accessor, activeInstance) => {
         if (isDetachedTerminalInstance(activeInstance)) {
@@ -287,8 +287,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(15266, "View Hidden Chat Terminals")),
-            category: ( localize2(15267, "Terminal")),
+            title: ( localize2(17031, "View Hidden Chat Terminals")),
+            category: ( localize2(17032, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -335,7 +335,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             return;
         }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(15268, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(17033, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -387,10 +387,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(15269, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(17034, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(15270, "Chat Terminals")).value;
+        qp.title = ( localize2(17035, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -454,14 +454,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(15271, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(17036, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(15272, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(17037, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

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/participants/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys } from './terminalChat.js';
 
 let TerminalChatEnabler = class TerminalChatEnabler {
     static {

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

@@ -1,13 +1,15 @@
 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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IAhpTerminalCommandSource, IChatTerminalToolProgressPart, ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
+import { IAhpTerminalCommandSource, IChatTerminalOutputSource, 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";
 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/chatService.service";
+import type { ToolConfirmationAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 /**
  * Used to manage chat tool invocations and the underlying terminal instances they create/use.
  */
@@ -17,6 +19,7 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _storageService;
     private readonly _contextKeyService;
     private readonly _chatService;
+    private readonly _instantiationService;
     _serviceBrand: undefined;
     private readonly _terminalInstancesByToolSessionId;
     private readonly _toolSessionIdByTerminalInstance;
@@ -26,6 +29,7 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private readonly _terminalInstancesByExecutionId;
     private readonly _terminalInstanceListenersByExecutionId;
     private readonly _ahpCommandSources;
+    private readonly _outputSources;
     private readonly _onDidContinueInBackground;
     readonly onDidContinueInBackground: Event<string>;
     private readonly _onDidRegisterTerminalInstanceForToolSession;
@@ -51,7 +55,14 @@ export declare class TerminalChatService extends Disposable implements ITerminal
      * last only for the duration of the chat session (not persisted to disk).
      */
     private readonly _sessionAutoApproveRules;
-    constructor(_logService: ILogService, _terminalService: ITerminalService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatService: IChatService);
+    /**
+     * Lazily created analysis helpers backing {@link getAutoApproveActions}. These are only
+     * needed for confirmations that arrive without pre-computed actions (eg. agent host
+     * sessions), so avoid paying for tree-sitter until first use.
+     */
+    private _autoApproveCommandParser;
+    private _autoApproveEvaluator;
+    constructor(_logService: ILogService, _terminalService: ITerminalService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatService: IChatService, _instantiationService: IInstantiationService);
     registerTerminalInstanceWithToolSession(terminalToolSessionId: string | undefined, instance: ITerminalInstance): void;
     getTerminalInstanceByToolSessionId(terminalToolSessionId: string | undefined): Promise<ITerminalInstance | undefined>;
     getToolSessionTerminalInstances(hiddenOnly?: boolean): readonly ITerminalInstance[];
@@ -60,6 +71,8 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     getTerminalInstanceByExecutionId(terminalExecutionId: string): ITerminalInstance | undefined;
     registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void;
     getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined;
+    registerOutputSource(terminalToolSessionId: string, source: IChatTerminalOutputSource): IDisposable;
+    getOutputSource(terminalToolSessionId: string | undefined): IChatTerminalOutputSource | undefined;
     isBackgroundTerminal(terminalToolSessionId?: string): boolean;
     registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable;
     setFocusedProgressPart(part: IChatTerminalToolProgressPart): void;
@@ -82,7 +95,8 @@ export declare class TerminalChatService extends Disposable implements ITerminal
         approve: boolean;
         matchCommandLine?: boolean;
     }>>;
+    getAutoApproveActions(commandLine: string, language: "shellscript" | "powershell"): Promise<ToolConfirmationAction[] | undefined>;
     continueInBackground(terminalToolSessionId: string): void;
-    registerAhpCommandSource(terminalToolSessionId: string, source: IAhpTerminalCommandSource): IDisposable;
+    registerAhpCommandSource(terminalToolSessionId: string, source: IAhpTerminalCommandSource, promisedTerminal: Promise<ITerminalInstance>): IDisposable;
     getAhpCommandSource(terminalToolSessionId: string): IAhpTerminalCommandSource | undefined;
 }

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

@@ -3,13 +3,18 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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/chatService.service';
-import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { generateAutoApproveActions } from '../../chatAgentTools/browser/runInTerminalHelpers.js';
+import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../chatAgentTools/browser/treeSitterCommandParser.js';
+import { CommandLineAutoApprover } from '../../chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.js';
+import { TerminalChatContextKeys } from './terminalChat.js';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
@@ -24,7 +29,8 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         _terminalService,
         _storageService,
         _contextKeyService,
-        _chatService
+        _chatService,
+        _instantiationService
     ) {
         super();
         this._logService = _logService;
@@ -32,6 +38,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._storageService = _storageService;
         this._contextKeyService = _contextKeyService;
         this._chatService = _chatService;
+        this._instantiationService = _instantiationService;
         this._terminalInstancesByToolSessionId = ( new Map());
         this._toolSessionIdByTerminalInstance = ( new Map());
         this._chatSessionResourceByTerminalInstance = ( new Map());
@@ -40,6 +47,7 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._terminalInstancesByExecutionId = ( new Map());
         this._terminalInstanceListenersByExecutionId = this._register(( new DisposableMap()));
         this._ahpCommandSources = ( new Map());
+        this._outputSources = ( new Map());
         this._onDidContinueInBackground = this._register(( new Emitter()));
         this.onDidContinueInBackground = this._onDidContinueInBackground.event;
         this._onDidRegisterTerminalInstanceForToolSession = this._register(( new Emitter()));
@@ -110,6 +118,18 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         if (!terminalToolSessionId) {
             return undefined;
         }
+        const pendingAhp = this._ahpCommandSources.get(terminalToolSessionId);
+        if (pendingAhp) {
+            try {
+                return await pendingAhp.promisedTerminal;
+            } catch (error) {
+                this._logService.error(
+                    `Failed to resolve AHP terminal for tool session '${terminalToolSessionId}'`,
+                    error
+                );
+                return undefined;
+            }
+        }
         if (( this._pendingRestoredMappings.has(terminalToolSessionId))) {
             const instance = this._terminalService.instances.find(
                 i => i.shellLaunchConfig.attachPersistentProcess?.id === this._pendingRestoredMappings.get(terminalToolSessionId)
@@ -166,6 +186,20 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     getChatSessionResourceForInstance(instance) {
         return this._chatSessionResourceByTerminalInstance.get(instance);
     }
+    registerOutputSource(terminalToolSessionId, source) {
+        this._outputSources.set(terminalToolSessionId, source);
+        for (const part of this._activeProgressParts) {
+            part.didRegisterOutputSource(terminalToolSessionId);
+        }
+        return toDisposable(() => {
+            if (this._outputSources.get(terminalToolSessionId) === source) {
+                this._outputSources.delete(terminalToolSessionId);
+            }
+        });
+    }
+    getOutputSource(terminalToolSessionId) {
+        return terminalToolSessionId ? this._outputSources.get(terminalToolSessionId) : undefined;
+    }
     isBackgroundTerminal(terminalToolSessionId) {
         if (!terminalToolSessionId) {
             return false;
@@ -315,21 +349,61 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     getSessionAutoApproveRules(chatSessionResource) {
         return this._sessionAutoApproveRules.get(chatSessionResource) ?? {};
     }
+    async getAutoApproveActions(commandLine, language) {
+        const trimmedCommandLine = commandLine.trimStart();
+        if (trimmedCommandLine.length === 0) {
+            return undefined;
+        }
+        this._autoApproveCommandParser ??= this._register(this._instantiationService.createInstance(TreeSitterCommandParser));
+        const treeSitterLanguage = language === "powershell" ? TreeSitterCommandParserLanguage.PowerShell : TreeSitterCommandParserLanguage.Bash;
+        let subCommands;
+        try {
+            const parseResult = await this._autoApproveCommandParser.extractAutoApprovalSubCommands(treeSitterLanguage, trimmedCommandLine);
+            if (parseResult.hasUnanalyzableSyntax) {
+                return undefined;
+            }
+            subCommands = parseResult.subCommands;
+        } catch (e) {
+            this._logService.warn("Failed to parse sub-commands when generating auto approve actions", e);
+            return undefined;
+        }
+        if (subCommands.length === 0) {
+            return undefined;
+        }
+        const shell = language === "powershell" ? "pwsh" : "bash";
+        const evaluator = this._autoApproveEvaluator ??= this._register(this._instantiationService.createInstance(CommandLineAutoApprover));
+        const subCommandResults = await Promise.all(( subCommands.map(e => evaluator.isCommandAutoApproved(e, shell, OS, undefined))));
+        const commandLineResult = evaluator.isCommandLineAutoApproved(trimmedCommandLine);
+        return generateAutoApproveActions(trimmedCommandLine, subCommands, {
+            subCommandResults,
+            commandLineResult
+        }, {
+            skipSessionScoped: true
+        });
+    }
     continueInBackground(terminalToolSessionId) {
         this._onDidContinueInBackground.fire(terminalToolSessionId);
+        for (const part of this._activeProgressParts) {
+            if (part.terminalToolSessionId === terminalToolSessionId) {
+                part.markContinuedInBackground();
+            }
+        }
     }
-    registerAhpCommandSource(terminalToolSessionId, source) {
-        this._ahpCommandSources.set(terminalToolSessionId, source);
+    registerAhpCommandSource(terminalToolSessionId, source, promisedTerminal) {
+        this._ahpCommandSources.set(terminalToolSessionId, {
+            source,
+            promisedTerminal
+        });
         return toDisposable(() => {
-            if (this._ahpCommandSources.get(terminalToolSessionId) === source) {
+            if (this._ahpCommandSources.get(terminalToolSessionId)?.source === source) {
                 this._ahpCommandSources.delete(terminalToolSessionId);
             }
         });
     }
     getAhpCommandSource(terminalToolSessionId) {
-        return this._ahpCommandSources.get(terminalToolSessionId);
+        return this._ahpCommandSources.get(terminalToolSessionId)?.source;
     }
 };
-TerminalChatService = ( __decorate([( __param(0, ILogService)), ( __param(1, ITerminalService)), ( __param(2, IStorageService)), ( __param(3, IContextKeyService)), ( __param(4, IChatService))], TerminalChatService));
+TerminalChatService = ( __decorate([( __param(0, ILogService)), ( __param(1, ITerminalService)), ( __param(2, IStorageService)), ( __param(3, IContextKeyService)), ( __param(4, IChatService)), ( __param(5, IInstantiationService))], TerminalChatService));
 
 export { TerminalChatService };

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

@@ -0,0 +1,30 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IChatModelReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ResolvedChatSessionsExtensionPoint } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
+import { ITerminalChatSessionResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.service";
+/** Result of resolving the chat model used by the terminal chat surface. */
+export interface ITerminalChatSessionResolution {
+    readonly modelRef: IChatModelReference;
+    /**
+     * The chat session contribution the widget must lock to so requests carry
+     * `agentIdSilent` and reach the Agent Host agent instead of the default
+     * terminal participant. `undefined` for a local fallback session, which
+     * must stay on the legacy extension-host agent.
+     */
+    readonly lockToAgent: ResolvedChatSessionsExtensionPoint | undefined;
+}
+/** Builds the Agent Host metadata for a terminal chat session. */
+export declare function getTerminalChatSessionMeta(shellType: string | undefined, os: OperatingSystem): Record<string, unknown>;
+/** Applies terminal-specific Agent Host and local-session fallback policy. */
+export declare class TerminalChatSessionResolver implements ITerminalChatSessionResolver {
+    private readonly _chatSessionsService;
+    private readonly _chatService;
+    private readonly _configurationService;
+    readonly _serviceBrand: undefined;
+    constructor(_chatSessionsService: IChatSessionsService, _chatService: IChatService, _configurationService: IConfigurationService);
+    resolve(token: CancellationToken, shellType: string | undefined, os: OperatingSystem): Promise<ITerminalChatSessionResolution | undefined>;
+}