@codingame/monaco-vscode-katex-common 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.js

@@ -2,7 +2,6 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { h, addDisposableListener, EventType, DisposableResizeObserver, clearNode, getActiveWindow, getComputedStyle, createTextNode, createElement, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { MarkdownString, isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -20,10 +19,11 @@ import { TerminalToolAutoExpand } from './terminalToolAutoExpand.js';
 import { ChatCollapsibleContentPart } from '../chatCollapsibleContentPart.js';
 import * as chatTerminalToolProgressPart from '../media/chatTerminalToolProgressPart.css';
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ITerminalChatService, ITerminalService, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ITerminalChatService, ITerminalService, ITerminalEditorService, ITerminalGroupService, ITerminalConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { Disposable, DisposableStore, toDisposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { getTerminalCommandDecorationTooltip, getTerminalCommandDecorationState, DecorationSelector } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
@@ -38,7 +38,6 @@ import { IAccessibleViewService } from '@codingame/monaco-vscode-api/vscode/vs/p
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
 import { TerminalLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
@@ -59,6 +58,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(chatTerminalToolProgressPart);
@@ -69,6 +69,24 @@ const MAX_OUTPUT_POLL_RETRIES = 10;
 const OUTPUT_POLL_DELAY_MS = 100;
 const MIN_DATA_EVENTS_FOR_REAL_OUTPUT = 2;
 const expandedStateByInvocation = ( new WeakMap());
+CommandsRegistry.registerCommand(
+    TerminalContribCommandId.FocusChatInstanceAction,
+    async (_accessor, progressPart) => {
+        await progressPart?.focusTerminal();
+    }
+);
+CommandsRegistry.registerCommand(
+    TerminalContribCommandId.ContinueInBackground,
+    async (_accessor, progressPart) => {
+        progressPart?.continueInBackground();
+    }
+);
+CommandsRegistry.registerCommand(
+    TerminalContribCommandId.ToggleChatTerminalOutput,
+    async (_accessor, progressPart) => {
+        await progressPart?.toggleOutputFromAction();
+    }
+);
 let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposable {
     constructor(_options, _hoverService) {
         super();
@@ -179,14 +197,15 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         editorPool,
         currentWidthDelegate,
         codeBlockStartIndex,
-        codeBlockModelCollection,
         _instantiationService,
         _terminalChatService,
         _terminalService,
         _contextKeyService,
         _chatWidgetService,
-        _keybindingService,
-        _configurationService
+        _configurationService,
+        _terminalEditorService,
+        _terminalGroupService,
+        _telemetryService
     ) {
         super(toolInvocation);
         this._instantiationService = _instantiationService;
@@ -194,12 +213,16 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._terminalService = _terminalService;
         this._contextKeyService = _contextKeyService;
         this._chatWidgetService = _chatWidgetService;
-        this._keybindingService = _keybindingService;
         this._configurationService = _configurationService;
-        this._showOutputAction = this._register(( new MutableDisposable()));
-        this._showOutputActionAdded = false;
-        this._focusAction = this._register(( new MutableDisposable()));
-        this._continueInBackgroundAction = this._register(( new MutableDisposable()));
+        this._terminalEditorService = _terminalEditorService;
+        this._terminalGroupService = _terminalGroupService;
+        this._telemetryService = _telemetryService;
+        this._toolbarHasInstance = false;
+        this._toolbarCanContinueInBackground = false;
+        this._toolbarHasOutput = false;
+        this._toolbarIsHiddenTerminal = false;
+        this._toolbarOutputExpanded = false;
+        this._actionBarActions = ( new DisposableStore());
         this._userToggledOutput = false;
         this._isInThinkingContainer = false;
         this._usesCollapsibleWrapper = false;
@@ -209,7 +232,6 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
         this._terminalData = terminalData;
         this._terminalCommandUri = terminalData.terminalCommandUri ? URI.revive(terminalData.terminalCommandUri) : undefined;
-        this._storedCommandId = this._terminalCommandUri ? ( new URLSearchParams(this._terminalCommandUri.query ?? "")).get("command") ?? undefined : undefined;
         this._isSerializedInvocation = (toolInvocation.kind === "toolInvocationSerialized");
         const elements = h(".chat-terminal-content-part@container", [h(
             ".chat-terminal-content-title@title",
@@ -254,15 +276,32 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._register(this._outputView.onDidFocus(() => this._handleOutputFocus()));
         this._register(this._outputView.onDidBlur(e => this._handleOutputBlur(e)));
         this._register(toDisposable(() => this._handleDispose()));
-        this._register(this._keybindingService.onDidUpdateKeybindings(() => {
-            this._focusAction.value?.refreshKeybindingTooltip();
-            this._showOutputAction.value?.refreshKeybindingTooltip();
-        }));
         const actionBarEl = h(".chat-terminal-action-bar@actionBar");
         elements.title.append(actionBarEl.root);
-        this._actionBar = this._register(( new ActionBar(actionBarEl.actionBar, {})));
-        this._initializeTerminalActions();
-        this._terminalService.whenConnected.then(() => this._initializeTerminalActions());
+        this._actionBar = this._register(( new ActionBar(actionBarEl.actionBar)));
+        this._register(this._actionBarActions);
+        let didInitializeTerminalActions = false;
+        const initializeTerminalActionsOnce = () => {
+            if (didInitializeTerminalActions || this._store.isDisposed) {
+                return;
+            }
+            didInitializeTerminalActions = true;
+            this._initializeTerminalActions();
+        };
+        initializeTerminalActionsOnce();
+        this._terminalService.whenConnected.then(() => {
+            initializeTerminalActionsOnce();
+        });
+        const terminalToolSessionId = this._terminalData.terminalToolSessionId;
+        if (terminalToolSessionId) {
+            this._register(this._terminalChatService.onDidContinueInBackground(sessionId => {
+                if (sessionId === terminalToolSessionId) {
+                    this._terminalData.didContinueInBackground = true;
+                    this._toolbarCanContinueInBackground = false;
+                    this._updateToolbarActions();
+                }
+            }));
+        }
         let pastTenseMessage;
         if (toolInvocation.pastTenseMessage) {
             pastTenseMessage = `${typeof toolInvocation.pastTenseMessage === "string" ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value}`;
@@ -286,7 +325,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(6944, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(7057, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -299,7 +338,6 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             renderer,
             {},
             currentWidthDelegate(),
-            codeBlockModelCollection,
             markdownOptions
         ));
         elements.message.append(this.markdownPart.domNode);
@@ -409,7 +447,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         const terminalToolSessionId = this._terminalData.terminalToolSessionId;
         if (!terminalToolSessionId) {
-            this._addActions();
+            this._updateToolbarContextKeys();
             return;
         }
         const attachInstance = async instance => {
@@ -420,7 +458,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 if (this._isSerializedInvocation) {
                     this._clearCommandAssociation();
                 }
-                this._addActions(undefined, terminalToolSessionId);
+                this._updateToolbarContextKeys(undefined, terminalToolSessionId);
                 return;
             }
             const isNewInstance = this._terminalInstance !== instance;
@@ -428,12 +466,12 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 this._terminalInstance = instance;
                 this._registerInstanceListener(instance);
             }
-            this._addActions(instance, terminalToolSessionId);
+            this._updateToolbarContextKeys(instance, terminalToolSessionId);
         };
         const initialInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(terminalToolSessionId);
         await attachInstance(initialInstance);
         if (!initialInstance) {
-            this._addActions(undefined, terminalToolSessionId);
+            this._updateToolbarContextKeys(undefined, terminalToolSessionId);
         }
         if (this._store.isDisposed) {
             return;
@@ -450,53 +488,81 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             });
             this._terminalSessionRegistration = this._store.add(listener);
         }
-        this._store.add(this._terminalChatService.onDidContinueInBackground(sessionId => {
-            if (sessionId === terminalToolSessionId) {
-                this._terminalData.didContinueInBackground = true;
-                this._removeContinueInBackgroundAction();
-            }
-        }));
     }
-    _addActions(terminalInstance, terminalToolSessionId) {
+    _updateToolbarContextKeys(terminalInstance, terminalToolSessionId) {
         if (this._store.isDisposed) {
             return;
         }
-        const actionBar = this._actionBar;
-        this._removeFocusAction();
         const resolvedCommand = this._getResolvedCommand(terminalInstance);
-        this._removeContinueInBackgroundAction();
-        if (terminalInstance) {
-            const isTerminalHidden = terminalInstance && terminalToolSessionId ? this._terminalChatService.isBackgroundTerminal(terminalToolSessionId) : false;
-            const focusAction = this._instantiationService.createInstance(
-                FocusChatInstanceAction,
-                terminalInstance,
-                resolvedCommand,
-                this._terminalCommandUri,
-                this._storedCommandId,
-                isTerminalHidden
-            );
-            this._focusAction.value = focusAction;
-            actionBar.push(focusAction, {
-                icon: true,
-                label: false,
-                index: 0
-            });
-            if (terminalToolSessionId && !this._terminalData.isBackground && !this._terminalData.didContinueInBackground) {
-                const isStillRunning = resolvedCommand?.exitCode === undefined && this._terminalData.terminalCommandState?.exitCode === undefined;
-                if (isStillRunning) {
-                    const continueAction = this._instantiationService.createInstance(ContinueInBackgroundAction, terminalToolSessionId);
-                    this._continueInBackgroundAction.value = continueAction;
-                    actionBar.push(continueAction, {
-                        icon: true,
-                        label: false,
-                        index: 0
-                    });
+        this._toolbarHasInstance = !!terminalInstance;
+        if (terminalInstance && terminalToolSessionId) {
+            this._toolbarIsHiddenTerminal = this._terminalChatService.isBackgroundTerminal(terminalToolSessionId);
+        } else {
+            this._toolbarIsHiddenTerminal = false;
+        }
+        if (terminalInstance && terminalToolSessionId && !this._terminalData.isBackground && !this._terminalData.didContinueInBackground) {
+            const isStillRunning = resolvedCommand?.exitCode === undefined && this._terminalData.terminalCommandState?.exitCode === undefined;
+            this._toolbarCanContinueInBackground = isStillRunning;
+        } else {
+            this._toolbarCanContinueInBackground = false;
+        }
+        if (!this._usesCollapsibleWrapper) {
+            const hasSnapshot = !!this._terminalData.terminalCommandOutput;
+            const hasOutput = !!resolvedCommand || hasSnapshot;
+            this._toolbarHasOutput = hasOutput;
+            if (hasOutput && !this._outputView.isExpanded) {
+                const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
+                const exitCode = resolvedCommand?.exitCode ?? this._terminalData.terminalCommandState?.exitCode;
+                if (exitCode !== undefined && exitCode !== 0 && autoExpandFailures) {
+                    this._toggleOutput(true);
                 }
             }
         }
-        this._ensureShowOutputAction(resolvedCommand);
+        this._updateToolbarActions();
         this._decoration.update(resolvedCommand);
     }
+    _updateToolbarActions() {
+        if (!this._actionBar || this._store.isDisposed) {
+            return;
+        }
+        this._actionBar.clear();
+        this._actionBarActions.clear();
+        const actions = [];
+        if (this._toolbarCanContinueInBackground) {
+            const action = ( new Action(TerminalContribCommandId.ContinueInBackground, ( localize(7058, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true, () => this.continueInBackground()));
+            this._actionBarActions.add(action);
+            actions.push(action);
+        }
+        if (this._toolbarHasInstance) {
+            const focusLabel = this._toolbarIsHiddenTerminal ? ( localize(7059, "Show and Focus Terminal")) : ( localize(7060, "Focus Terminal"));
+            const action = ( new Action(
+                TerminalContribCommandId.FocusChatInstanceAction,
+                focusLabel,
+                ThemeIcon.asClassName(Codicon.openInProduct),
+                true,
+                () => this.focusTerminal()
+            ));
+            this._actionBarActions.add(action);
+            actions.push(action);
+        }
+        if (this._toolbarHasOutput && !this._usesCollapsibleWrapper) {
+            const toggleIcon = this._toolbarOutputExpanded ? Codicon.chevronDown : Codicon.chevronRight;
+            const toggleLabel = this._toolbarOutputExpanded ? ( localize(7061, "Hide Output")) : ( localize(7062, "Show Output"));
+            const action = ( new Action(
+                TerminalContribCommandId.ToggleChatTerminalOutput,
+                toggleLabel,
+                ThemeIcon.asClassName(toggleIcon),
+                true,
+                () => this.toggleOutputFromAction()
+            ));
+            this._actionBarActions.add(action);
+            actions.push(action);
+        }
+        this._actionBar.push(actions, {
+            icon: true,
+            label: false
+        });
+    }
     _getResolvedCommand(instance) {
         const target = instance ?? this._terminalInstance;
         if (!target) {
@@ -504,51 +570,8 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         return this._resolveCommand(target);
     }
-    _ensureShowOutputAction(command) {
-        if (this._store.isDisposed) {
-            return;
-        }
-        if (this._usesCollapsibleWrapper) {
-            return;
-        }
-        const resolvedCommand = command ?? this._getResolvedCommand();
-        const hasSnapshot = !!this._terminalData.terminalCommandOutput;
-        if (!resolvedCommand && !hasSnapshot) {
-            return;
-        }
-        let showOutputAction = this._showOutputAction.value;
-        if (!showOutputAction) {
-            showOutputAction = this._instantiationService.createInstance(ToggleChatTerminalOutputAction, () => this._toggleOutputFromAction());
-            this._showOutputAction.value = showOutputAction;
-            const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
-            const exitCode = resolvedCommand?.exitCode ?? this._terminalData.terminalCommandState?.exitCode;
-            if (exitCode !== undefined && exitCode !== 0 && autoExpandFailures) {
-                this._toggleOutput(true);
-            }
-        }
-        showOutputAction.syncPresentation(this._outputView.isExpanded);
-        const actionBar = this._actionBar;
-        if (this._showOutputActionAdded) {
-            const existingIndex = actionBar.viewItems.findIndex(item => item.action === showOutputAction);
-            if (existingIndex >= 0 && existingIndex !== actionBar.length() - 1) {
-                actionBar.pull(existingIndex);
-                this._showOutputActionAdded = false;
-            } else if (existingIndex >= 0) {
-                return;
-            }
-        }
-        if (this._showOutputActionAdded) {
-            return;
-        }
-        actionBar.push([showOutputAction], {
-            icon: true,
-            label: false
-        });
-        this._showOutputActionAdded = true;
-    }
     _clearCommandAssociation(options) {
         this._terminalCommandUri = undefined;
-        this._storedCommandId = undefined;
         if (options?.clearPersistentData) {
             if (this._terminalData.terminalCommandUri) {
                 delete this._terminalData.terminalCommandUri;
@@ -566,12 +589,16 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const commandDetectionListener = this._register(( new MutableDisposable()));
         const tryResolveCommand = async () => {
             const resolvedCommand = this._resolveCommand(terminalInstance);
-            this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+            this._updateToolbarContextKeys(terminalInstance, this._terminalData.terminalToolSessionId);
             return resolvedCommand;
         };
         const attachCommandDetection = async commandDetection => {
             commandDetectionListener.clear();
             if (!commandDetection) {
+                const ahpSource = this._terminalData.terminalToolSessionId ? this._terminalChatService.getAhpCommandSource(this._terminalData.terminalToolSessionId) : undefined;
+                if (ahpSource) {
+                    this._attachAhpCommandSource(terminalInstance, ahpSource, commandDetectionListener);
+                }
                 await tryResolveCommand();
                 return;
             }
@@ -596,7 +623,8 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 return receivedDataCount > MIN_DATA_EVENTS_FOR_REAL_OUTPUT;
             };
             const autoExpand = store.add(( new TerminalToolAutoExpand({
-                commandDetection,
+                onCommandExecuted: ( Event.map(commandDetection.onCommandExecuted, () => undefined)),
+                onCommandFinished: ( Event.map(commandDetection.onCommandFinished, () => undefined)),
                 onWillData: terminalInstance.onWillData,
                 shouldAutoExpand: () => this._shouldAutoExpand(),
                 hasRealOutput
@@ -611,10 +639,10 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 receivedDataCount++;
             }));
             store.add(commandDetection.onCommandExecuted(() => {
-                this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+                this._updateToolbarContextKeys(terminalInstance, this._terminalData.terminalToolSessionId);
             }));
             store.add(commandDetection.onCommandFinished(() => {
-                this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+                this._updateToolbarContextKeys(terminalInstance, this._terminalData.terminalToolSessionId);
                 const resolvedCommand = this._getResolvedCommand(terminalInstance);
                 this._handleCommandCompletion(resolvedCommand);
                 if (resolvedCommand?.endMarker) {
@@ -641,43 +669,50 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 clearPersistentData: true
             });
             commandDetectionListener.clear();
-            if (!this._store.isDisposed) {
-                this._actionBar.clear();
-            }
-            this._removeFocusAction();
-            this._showOutputActionAdded = false;
-            this._showOutputAction.clear();
-            this._addActions(undefined, this._terminalData.terminalToolSessionId);
+            this._updateToolbarContextKeys(undefined, this._terminalData.terminalToolSessionId);
             instanceListener.dispose();
         }));
     }
-    _removeFocusAction() {
-        if (this._store.isDisposed) {
-            return;
-        }
-        const actionBar = this._actionBar;
-        const focusAction = this._focusAction.value;
-        if (actionBar && focusAction) {
-            const existingIndex = actionBar.viewItems.findIndex(item => item.action === focusAction);
-            if (existingIndex >= 0) {
-                actionBar.pull(existingIndex);
+    _attachAhpCommandSource(terminalInstance, ahpSource, commandDetectionListener) {
+        const store = ( new DisposableStore());
+        const hasRealOutput = () => {
+            const command = this._getResolvedCommand(terminalInstance);
+            if (command?.hasOutput()) {
+                return true;
             }
-        }
-        this._focusAction.clear();
-    }
-    _removeContinueInBackgroundAction() {
-        if (this._store.isDisposed) {
-            return;
-        }
-        const actionBar = this._actionBar;
-        const continueAction = this._continueInBackgroundAction.value;
-        if (actionBar && continueAction) {
-            const existingIndex = actionBar.viewItems.findIndex(item => item.action === continueAction);
-            if (existingIndex >= 0) {
-                actionBar.pull(existingIndex);
+            return !!this._terminalData.terminalCommandOutput?.text?.trim();
+        };
+        const autoExpand = store.add(( new TerminalToolAutoExpand({
+            onCommandExecuted: ( Event.map(ahpSource.onCommandExecuted, () => undefined)),
+            onCommandFinished: ( Event.map(ahpSource.onCommandFinished, () => undefined)),
+            onWillData: terminalInstance.onWillData,
+            shouldAutoExpand: () => this._shouldAutoExpand(),
+            hasRealOutput
+        })));
+        store.add(autoExpand.onDidRequestExpand(() => {
+            if (this._usesCollapsibleWrapper) {
+                this.expandCollapsibleWrapper();
+            }
+            this._toggleOutput(true);
+        }));
+        store.add(ahpSource.onCommandExecuted(cmd => {
+            if (!this._terminalData.terminalCommandId && cmd.id) {
+                this._terminalData.terminalCommandId = cmd.id;
+                this._updateToolbarContextKeys(terminalInstance, this._terminalData.terminalToolSessionId);
+            }
+        }));
+        store.add(ahpSource.onCommandFinished(cmd => {
+            if (this._terminalData.terminalCommandId === cmd.id) {
+                this._updateToolbarContextKeys(terminalInstance, this._terminalData.terminalToolSessionId);
+                const resolvedCommand = this._getResolvedCommand(terminalInstance);
+                this._handleCommandCompletion(resolvedCommand);
             }
+        }));
+        commandDetectionListener.value = store;
+        const resolvedCommand = this._resolveCommand(terminalInstance);
+        if (resolvedCommand?.endMarker) {
+            this._handleCommandCompletion(resolvedCommand);
         }
-        this._continueInBackgroundAction.clear();
     }
     _handleCommandCompletion(resolvedCommand) {
         this.markCollapsibleWrapperComplete();
@@ -693,7 +728,8 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const didChange = await this._outputView.toggle(expanded);
         const isExpanded = this._outputView.isExpanded;
         this._titleElement.classList.toggle("chat-terminal-content-title-no-bottom-radius", isExpanded);
-        this._showOutputAction.value?.syncPresentation(isExpanded);
+        this._toolbarOutputExpanded = isExpanded;
+        this._updateToolbarActions();
         if (didChange) {
             expandedStateByInvocation.set(this.toolInvocation, isExpanded);
         }
@@ -739,30 +775,63 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         widget?.focusInput();
     }
     async focusTerminal() {
-        if (this._focusAction.value) {
-            await this._focusAction.value.run();
+        const instance = this._terminalInstance;
+        let target = "none";
+        let location = "panel";
+        if (instance) {
+            target = "instance";
+            location = instance.target === TerminalLocation.Editor ? "editor" : "panel";
+        } else if (this._terminalCommandUri) {
+            target = "commandUri";
+        }
+        this._telemetryService.publicLog2("terminal/chatFocusInstance", {
+            target,
+            location
+        });
+        if (instance) {
+            this._terminalService.setActiveInstance(instance);
+            if (instance.target === TerminalLocation.Editor) {
+                this._terminalEditorService.openEditor(instance);
+            } else {
+                await this._terminalGroupService.showPanel(true);
+            }
+            this._terminalService.setActiveInstance(instance);
+            await instance.focusWhenReady(true);
+            const command = this._getResolvedCommand(instance);
+            if (command) {
+                instance.xterm?.markTracker.revealCommand(command);
+            }
             return;
         }
         if (this._terminalCommandUri) {
             this._terminalService.openResource(this._terminalCommandUri);
         }
     }
-    async toggleOutputFromKeyboard() {
+    continueInBackground() {
+        const sessionId = this._terminalData.terminalToolSessionId;
+        if (sessionId) {
+            this._terminalChatService.continueInBackground(sessionId);
+        }
+    }
+    async toggleOutputFromAction() {
         this._userToggledOutput = true;
+        this._telemetryService.publicLog2("terminal/chatToggleOutput", {
+            previousExpanded: this._outputView.isExpanded
+        });
         if (!this._outputView.isExpanded) {
             await this._toggleOutput(true);
-            this.focusOutput();
             return;
         }
-        await this._collapseOutputAndFocusInput();
+        await this._toggleOutput(false);
     }
-    async _toggleOutputFromAction() {
+    async toggleOutputFromKeyboard() {
         this._userToggledOutput = true;
         if (!this._outputView.isExpanded) {
             await this._toggleOutput(true);
+            this.focusOutput();
             return;
         }
-        await this._toggleOutput(false);
+        await this._collapseOutputAndFocusInput();
     }
     async _collapseOutputAndFocusInput() {
         if (this._outputView.isExpanded) {
@@ -774,29 +843,35 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         if (instance.isDisposed) {
             return undefined;
         }
-        const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
-        if (!commandDetection) {
-            return undefined;
-        }
         const targetId = this._terminalData.terminalCommandId;
-        if (!targetId) {
-            return undefined;
-        }
-        const commands = commandDetection.commands;
-        if (commands && commands.length > 0) {
-            const fromHistory = commands.find(c => c.id === targetId);
-            if (fromHistory) {
-                return fromHistory;
+        const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+        if (commandDetection && targetId) {
+            const commands = commandDetection.commands;
+            if (commands && commands.length > 0) {
+                const fromHistory = commands.find(c => c.id === targetId);
+                if (fromHistory) {
+                    return fromHistory;
+                }
+            }
+            const executing = commandDetection.executingCommandObject;
+            if (executing && executing.id === targetId) {
+                return executing;
             }
         }
-        const executing = commandDetection.executingCommandObject;
-        if (executing && executing.id === targetId) {
-            return executing;
+        const sessionId = this._terminalData.terminalToolSessionId;
+        if (sessionId) {
+            const ahpSource = this._terminalChatService.getAhpCommandSource(sessionId);
+            if (ahpSource) {
+                if (targetId) {
+                    return ahpSource.getCommandById(targetId);
+                }
+                return ahpSource.executingCommandObject ?? ahpSource.commands[ahpSource.commands.length - 1];
+            }
         }
         return undefined;
     }
 };
-ChatTerminalToolProgressPart = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, ITerminalChatService)), ( __param(10, ITerminalService)), ( __param(11, IContextKeyService)), ( __param(12, IChatWidgetService)), ( __param(13, IKeybindingService)), ( __param(14, IConfigurationService))], ChatTerminalToolProgressPart));
+ChatTerminalToolProgressPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, ITerminalChatService)), ( __param(9, ITerminalService)), ( __param(10, IContextKeyService)), ( __param(11, IChatWidgetService)), ( __param(12, IConfigurationService)), ( __param(13, ITerminalEditorService)), ( __param(14, ITerminalGroupService)), ( __param(15, ITelemetryService))], ChatTerminalToolProgressPart));
 let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends Disposable {
     get isExpanded() {
         return this.domNode.classList.contains("expanded");
@@ -903,7 +978,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(6945, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(7063, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -916,26 +991,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(6946, "Command: {0}", commandText));
+        const commandHeader = ( localize(7064, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(6947, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(7065, "No output was produced by the command."))}`;
             }
             const lines = rawOutput.split("\n");
             return `${commandHeader}\n${lines.join("\n").trimEnd()}`;
         }
         const snapshot = this._getTerminalCommandOutput();
         if (!snapshot) {
-            return `${commandHeader}\n${( localize(6948, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(7066, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(6947, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(7065, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(6949, "Output truncated."))}`;
+            outputText += `\n${( localize(7067, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -1047,7 +1122,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(6947, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(7065, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
@@ -1074,7 +1149,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(6947, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(7065, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -1083,9 +1158,9 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(6950, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(7068, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(6951, "Command information is not available.")));
+            this._showEmptyMessage(( localize(7069, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1141,13 +1216,10 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         const rowHeight = this._computeRowHeightPx();
         const padding = this._getOutputPadding();
-        const minHeight = rowHeight * MIN_OUTPUT_ROWS + padding;
         const maxHeight = rowHeight * MAX_OUTPUT_ROWS + padding;
         const contentHeight = this._getOutputContentHeight(lineCount, rowHeight, padding);
         const clampedHeight = Math.min(contentHeight, maxHeight);
-        const measuredBodyHeight = Math.max(this._outputBody.clientHeight, minHeight);
-        const appliedHeight = Math.min(clampedHeight, measuredBodyHeight);
-        scrollableDomNode.style.height = appliedHeight < maxHeight ? `${appliedHeight}px` : "";
+        scrollableDomNode.style.height = clampedHeight < maxHeight ? `${clampedHeight}px` : "";
         this._scrollableContainer.scanDomNode();
     }
     _computeIsAtBottom() {
@@ -1172,8 +1244,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
     }
     _getOutputContentHeight(lineCount, rowHeight, padding) {
         const contentRows = Math.max(lineCount, MIN_OUTPUT_ROWS);
-        const adjustedRows = contentRows + 1;
-        return (adjustedRows * rowHeight) + padding;
+        return (contentRows * rowHeight) + padding;
     }
     _getOutputPadding() {
         const style = getComputedStyle(this._outputBody);
@@ -1202,140 +1273,6 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
     }
 };
 ChatTerminalToolOutputSection = ( __decorate([( __param(6, IAccessibleViewService)), ( __param(7, IInstantiationService)), ( __param(8, ITerminalConfigurationService)), ( __param(9, IThemeService)), ( __param(10, IContextKeyService))], ChatTerminalToolOutputSection));
-let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extends Action {
-    constructor(_toggle, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6952, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
-        this._toggle = _toggle;
-        this._keybindingService = _keybindingService;
-        this._telemetryService = _telemetryService;
-        this._expanded = false;
-        this._updateTooltip();
-    }
-    async run() {
-        this._telemetryService.publicLog2("terminal/chatToggleOutput", {
-            previousExpanded: this._expanded
-        });
-        await this._toggle();
-    }
-    syncPresentation(expanded) {
-        this._expanded = expanded;
-        this._updatePresentation();
-        this._updateTooltip();
-    }
-    refreshKeybindingTooltip() {
-        this._updateTooltip();
-    }
-    _updatePresentation() {
-        if (this._expanded) {
-            this.label = ( localize(6953, "Hide Output"));
-            this.class = ThemeIcon.asClassName(Codicon.chevronDown);
-        } else {
-            this.label = ( localize(6952, "Show Output"));
-            this.class = ThemeIcon.asClassName(Codicon.chevronRight);
-        }
-    }
-    _updateTooltip() {
-        this.tooltip = this._keybindingService.appendKeybinding(this.label, TerminalContribCommandId.FocusMostRecentChatTerminalOutput);
-    }
-};
-ToggleChatTerminalOutputAction = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, ITelemetryService))], ToggleChatTerminalOutputAction));
-let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
-    constructor(
-        _instance,
-        _command,
-        _commandUri,
-        _commandId,
-        isTerminalHidden,
-        _terminalService,
-        _terminalEditorService,
-        _terminalGroupService,
-        _keybindingService,
-        _telemetryService
-    ) {
-        super(
-            TerminalContribCommandId.FocusChatInstanceAction,
-            isTerminalHidden ? ( localize(6954, "Show and Focus Terminal")) : ( localize(6955, "Focus Terminal")),
-            ThemeIcon.asClassName(Codicon.openInProduct),
-            true
-        );
-        this._instance = _instance;
-        this._command = _command;
-        this._commandUri = _commandUri;
-        this._commandId = _commandId;
-        this._terminalService = _terminalService;
-        this._terminalEditorService = _terminalEditorService;
-        this._terminalGroupService = _terminalGroupService;
-        this._keybindingService = _keybindingService;
-        this._telemetryService = _telemetryService;
-        this._updateTooltip();
-    }
-    async run() {
-        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6956, "Show and Focus Terminal")) : ( localize(6955, "Focus Terminal"));
-        this._updateTooltip();
-        let target = "none";
-        let location = "panel";
-        if (this._instance) {
-            target = "instance";
-            location = this._instance.target === TerminalLocation.Editor ? "editor" : "panel";
-        } else if (this._commandUri) {
-            target = "commandUri";
-        }
-        this._telemetryService.publicLog2("terminal/chatFocusInstance", {
-            target,
-            location
-        });
-        if (this._instance) {
-            this._terminalService.setActiveInstance(this._instance);
-            if (this._instance.target === TerminalLocation.Editor) {
-                this._terminalEditorService.openEditor(this._instance);
-            } else {
-                await this._terminalGroupService.showPanel(true);
-            }
-            this._terminalService.setActiveInstance(this._instance);
-            await this._instance.focusWhenReady(true);
-            const command = this._resolveCommand();
-            if (command) {
-                this._instance.xterm?.markTracker.revealCommand(command);
-            }
-            return;
-        }
-        if (this._commandUri) {
-            this._terminalService.openResource(this._commandUri);
-        }
-    }
-    refreshKeybindingTooltip() {
-        this._updateTooltip();
-    }
-    _resolveCommand() {
-        if (this._command && !this._command.endMarker?.isDisposed) {
-            return this._command;
-        }
-        if (!this._instance || !this._commandId) {
-            return this._command;
-        }
-        const commandDetection = this._instance.capabilities.get(TerminalCapability.CommandDetection);
-        const resolved = commandDetection?.commands.find(c => c.id === this._commandId);
-        if (resolved) {
-            this._command = resolved;
-        }
-        return this._command;
-    }
-    _updateTooltip() {
-        this.tooltip = this._keybindingService.appendKeybinding(this.label, TerminalContribCommandId.FocusMostRecentChatTerminal);
-    }
-};
-FocusChatInstanceAction = ( __decorate([( __param(5, ITerminalService)), ( __param(6, ITerminalEditorService)), ( __param(7, ITerminalGroupService)), ( __param(8, IKeybindingService)), ( __param(9, ITelemetryService))], FocusChatInstanceAction));
-let ContinueInBackgroundAction = class ContinueInBackgroundAction extends Action {
-    constructor(_terminalToolSessionId, _terminalChatService) {
-        super(TerminalContribCommandId.ContinueInBackground, ( localize(6957, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
-        this._terminalToolSessionId = _terminalToolSessionId;
-        this._terminalChatService = _terminalChatService;
-    }
-    async run() {
-        this._terminalChatService.continueInBackground(this._terminalToolSessionId);
-    }
-};
-ContinueInBackgroundAction = ( __decorate([( __param(1, ITerminalChatService))], ContinueInBackgroundAction));
 let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
     constructor(
         commandText,
@@ -1347,7 +1284,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         hoverService,
         configurationService
     ) {
-        const title = isComplete ? ( localize(6958, "Ran {0}", commandText)) : ( localize(6959, "Running {0}", commandText));
+        const title = isComplete ? ( localize(7070, "Ran {0}", commandText)) : ( localize(7071, "Running {0}", commandText));
         super(title, context, undefined, hoverService, configurationService);
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
@@ -1367,8 +1304,8 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
         if (this._isSandboxWrapped) {
-            const prefixText = this._isComplete ? ( localize(6960, "Ran ")) : ( localize(6961, "Running "));
-            const suffixText = ( localize(6962, " in sandbox"));
+            const prefixText = this._isComplete ? ( localize(7072, "Ran ")) : ( localize(7073, "Running "));
+            const suffixText = ( localize(7074, " in sandbox"));
             labelElement.appendChild(createTextNode(prefixText));
             const codeElement = createElement("code");
             codeElement.textContent = this._commandText;
@@ -1376,7 +1313,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             labelElement.appendChild(createTextNode(suffixText));
             return;
         }
-        const prefixText = this._isComplete ? ( localize(6963, "Ran ")) : ( localize(6964, "Running "));
+        const prefixText = this._isComplete ? ( localize(7075, "Ran ")) : ( localize(7076, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
@@ -1405,4 +1342,4 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
 };
 ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(6, IHoverService)), ( __param(7, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
-export { ChatTerminalThinkingCollapsibleWrapper, ChatTerminalToolProgressPart, ContinueInBackgroundAction, FocusChatInstanceAction, ToggleChatTerminalOutputAction };
+export { ChatTerminalThinkingCollapsibleWrapper, ChatTerminalToolProgressPart };