@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -32,8 +32,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(13976, "Open Inline Chat")),
-    category: ( localize2(13977, "Terminal")),
+    title: ( localize2(14265, "Open Inline Chat")),
+    category: ( localize2(14266, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -77,7 +77,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(13978, "Close")),
+    title: ( localize2(14267, "Close")),
     category: AbstractInlineChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -102,8 +102,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(13979, "Run Chat Command")),
-    shortTitle: ( localize2(13980, "Run")),
+    title: ( localize2(14268, "Run Chat Command")),
+    shortTitle: ( localize2(14269, "Run")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -131,8 +131,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(13981, "Run First Chat Command")),
-    shortTitle: ( localize2(13982, "Run First")),
+    title: ( localize2(14270, "Run First Chat Command")),
+    shortTitle: ( localize2(14271, "Run First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -160,8 +160,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(13983, "Insert Chat Command")),
-    shortTitle: ( localize2(13984, "Insert")),
+    title: ( localize2(14272, "Insert Chat Command")),
+    shortTitle: ( localize2(14273, "Insert")),
     category: AbstractInlineChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -190,8 +190,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(13985, "Insert First Chat Command")),
-    shortTitle: ( localize2(13986, "Insert First")),
+    title: ( localize2(14274, "Insert First Chat Command")),
+    shortTitle: ( localize2(14275, "Insert First")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -219,7 +219,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(13987, "Rerun Request")),
+    title: ( localize2(14276, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInlineChatAction.category,
@@ -260,7 +260,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(13988, "View in Chat")),
+    title: ( localize2(14277, "View in Chat")),
     category: AbstractInlineChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -286,8 +286,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(13989, "View Hidden Chat Terminals")),
-            category: ( localize2(13990, "Terminal")),
+            title: ( localize2(14278, "View Hidden Chat Terminals")),
+            category: ( localize2(14279, "Terminal")),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -329,7 +329,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             return;
         }
         const items = [];
-        const lastCommandLocalized = command => ( localize2(13991, "Last: {0}", command)).value;
+        const lastCommandLocalized = command => ( localize2(14280, "Last: {0}", command)).value;
         const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
@@ -381,10 +381,10 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(13992, "Select a chat terminal to show and focus")).value;
+        qp.placeholder = ( localize2(14281, "Select a chat terminal to show and focus")).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(13993, "Chat Terminals")).value;
+        qp.title = ( localize2(14282, "Chat Terminals")).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -442,14 +442,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(13994, "Chat: Focus Most Recent Terminal"))
+        title: ( localize(14283, "Chat: Focus Most Recent Terminal"))
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(13995, "Chat: Focus Most Recent Terminal Output"))
+        title: ( localize(14284, "Chat: Focus Most Recent Terminal Output"))
     },
     when: ChatContextKeys.inChatSession
 });

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

@@ -9,10 +9,21 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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/participants/chatAgents.service";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatModel, IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
-import { InlineChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
+import { IInlineChatWidgetConstructionOptions, 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";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { IAccessibleViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { IChatWidgetLocationOptions } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
 export declare class TerminalChatWidget extends Disposable {
     private readonly _terminalElement;
     private readonly _instance;
@@ -25,7 +36,7 @@ export declare class TerminalChatWidget extends Disposable {
     private readonly _onDidHide;
     readonly onDidHide: Event<void>;
     private readonly _inlineChatWidget;
-    get inlineChatWidget(): InlineChatWidget;
+    get inlineChatWidget(): TerminalInlineChatWidget;
     private readonly _focusTracker;
     private readonly _focusedContextKey;
     private readonly _visibleContextKey;
@@ -69,3 +80,18 @@ export declare class TerminalChatWidget extends Disposable {
     cancel(): void;
     viewInChat(): Promise<void>;
 }
+declare class TerminalInlineChatWidget extends InlineChatWidget {
+    private _modelService;
+    constructor(location: IChatWidgetLocationOptions, options: IInlineChatWidgetConstructionOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, accessibilityService: IAccessibilityService, configurationService: IConfigurationService, accessibleViewService: IAccessibleViewService, textModelResolverService: ITextModelService, chatService: IChatService, hoverService: IHoverService, chatEntitlementService: IChatEntitlementService, markdownRendererService: IMarkdownRendererService, _modelService: IModelService);
+    get value(): string;
+    set value(value: string);
+    selectAll(): void;
+    set placeholder(value: string);
+    toggleStatus(show: boolean): void;
+    updateToolbar(show: boolean): void;
+    get responseContent(): string | undefined;
+    getChatModel(): IChatModel | undefined;
+    setChatModel(chatModel: IChatModel): void;
+    getCodeBlockInfo(codeBlockIndex: number): Promise<ITextModel | undefined>;
+}
+export {};

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

@@ -25,6 +25,17 @@ import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-kate
 import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
 import * as terminalChatWidget from './media/terminalChatWidget.css';
 import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { IAccessibleViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -91,7 +102,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._container = createElement("div");
         this._container.classList.add("terminal-inline-chat");
         this._terminalElement.appendChild(this._container);
-        this._inlineChatWidget = instantiationService.createInstance(InlineChatWidget, {
+        this._inlineChatWidget = instantiationService.createInstance(TerminalInlineChatWidget, {
             location: ChatAgentLocation.Terminal,
             resolveData: () => {
                 return undefined;
@@ -127,7 +138,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
             Event.fromObservableLight(this._inlineChatWidget.chatWidget.input.selectedLanguageModel),
             Event.debounce(this._xterm.raw.onCursorMove, () => void 0, MicrotaskDelay)
         )(() => this._relayout()));
-        const observer = this._register(( new DisposableResizeObserver(() => this._relayout())));
+        const observer = this._register(( new DisposableResizeObserver("TerminalChatWidget.terminalElementResize", () => this._relayout())));
         observer.observe(this._terminalElement);
         this._resetPlaceholder();
         this._container.appendChild(this._inlineChatWidget.domNode);
@@ -187,7 +198,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(13996, "Ask about commands"));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(14285, "Ask about commands"));
     }
     async reveal() {
         await this._createSession();
@@ -420,5 +431,120 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
 };
 TerminalChatWidget = ( __decorate([( __param(3, IContextKeyService)), ( __param(4, IChatService)), ( __param(5, IStorageService)), ( __param(6, IInstantiationService)), ( __param(7, IChatAgentService)), ( __param(8, IChatWidgetService))], TerminalChatWidget));
+let TerminalInlineChatWidget = class TerminalInlineChatWidget extends InlineChatWidget {
+    constructor(
+        location,
+        options,
+        instantiationService,
+        contextKeyService,
+        keybindingService,
+        accessibilityService,
+        configurationService,
+        accessibleViewService,
+        textModelResolverService,
+        chatService,
+        hoverService,
+        chatEntitlementService,
+        markdownRendererService,
+        _modelService
+    ) {
+        super(
+            location,
+            options,
+            instantiationService,
+            contextKeyService,
+            keybindingService,
+            accessibilityService,
+            configurationService,
+            accessibleViewService,
+            textModelResolverService,
+            chatService,
+            hoverService,
+            chatEntitlementService,
+            markdownRendererService
+        );
+        this._modelService = _modelService;
+    }
+    get value() {
+        return this.chatWidget.getInput();
+    }
+    set value(value) {
+        this.chatWidget.setInput(value);
+    }
+    selectAll() {
+        this.chatWidget.inputEditor.setSelection(( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
+    }
+    set placeholder(value) {
+        this.chatWidget.setInputPlaceholder(value);
+    }
+    toggleStatus(show) {
+        this._elements.toolbar1.classList.toggle("hidden", !show);
+        this._elements.toolbar2.classList.toggle("hidden", !show);
+        this._elements.status.classList.toggle("hidden", !show);
+        this._elements.infoLabel.classList.toggle("hidden", !show);
+        this._onDidChangeHeight.fire();
+    }
+    updateToolbar(show) {
+        this._elements.root.classList.toggle("toolbar", show);
+        this._elements.toolbar1.classList.toggle("hidden", !show);
+        this._elements.toolbar2.classList.toggle("hidden", !show);
+        this._elements.status.classList.toggle("actions", show);
+        this._elements.infoLabel.classList.toggle("hidden", show);
+        this._onDidChangeHeight.fire();
+    }
+    get responseContent() {
+        const requests = this.chatWidget.viewModel?.model.getRequests();
+        return requests?.at(-1)?.response?.response.toString();
+    }
+    getChatModel() {
+        return this.chatWidget.viewModel?.model;
+    }
+    setChatModel(chatModel) {
+        chatModel.inputModel.setState({
+            inputText: "",
+            selections: []
+        });
+        this.chatWidget.setModel(chatModel);
+    }
+    async getCodeBlockInfo(codeBlockIndex) {
+        const {
+            viewModel
+        } = this.chatWidget;
+        if (!viewModel) {
+            return undefined;
+        }
+        const items = viewModel.getItems().filter(i => isResponseVM(i));
+        const item = items.at(-1);
+        if (!item) {
+            return;
+        }
+        const codeBlocks = this.chatWidget.getCodeBlockInfosForResponse(item);
+        const info = codeBlocks[codeBlockIndex];
+        if (info?.uri) {
+            return this._modelService.getModel(info.uri) ?? undefined;
+        }
+        const markdown = item.response.getMarkdown();
+        let currentCodeBlockIndex = 0;
+        let foundText;
+        for (const line of markdown.split("\n")) {
+            if (line.startsWith("```") && foundText === undefined) {
+                foundText = "";
+            } else if (line.startsWith("```") && foundText !== undefined) {
+                if (currentCodeBlockIndex === codeBlockIndex) {
+                    break;
+                }
+                currentCodeBlockIndex++;
+                foundText = undefined;
+            } else if (foundText !== undefined) {
+                foundText += (foundText ? "\n" : "") + line;
+            }
+        }
+        if (foundText !== undefined && currentCodeBlockIndex === codeBlockIndex) {
+            return this._modelService.createModel(foundText, null, undefined, true);
+        }
+        return undefined;
+    }
+};
+TerminalInlineChatWidget = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService)), ( __param(5, IAccessibilityService)), ( __param(6, IConfigurationService)), ( __param(7, IAccessibleViewService)), ( __param(8, ITextModelService)), ( __param(9, IChatService)), ( __param(10, IHoverService)), ( __param(11, IChatEntitlementService)), ( __param(12, IMarkdownRendererService)), ( __param(13, IModelService))], TerminalInlineChatWidget));
 
 export { TerminalChatWidget };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.js

@@ -84,9 +84,10 @@ async function getTaskForTool(
         return;
     }
     let tasksForWorkspace;
-    const workspaceFolderPath = URI.file(workspaceFolder).path;
+    const getPathForCompare = uri => uri.path.replace(/\/$/, "").toLowerCase();
+    const workspaceFolderPath = getPathForCompare(URI.file(workspaceFolder));
     for (const [folder, tasks] of workspaceFolderToTaskMap) {
-        if (( URI.parse(folder)).path === workspaceFolderPath) {
+        if (getPathForCompare(( URI.parse(folder))) === workspaceFolderPath) {
             tasksForWorkspace = tasks;
             break;
         }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.d.ts

@@ -3,6 +3,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { type IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { IToolResultCompressor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service";
 export declare class ChatAgentToolsContribution extends Disposable implements IWorkbenchContribution {
     private readonly _instantiationService;
     private readonly _toolsService;
@@ -10,7 +11,7 @@ export declare class ChatAgentToolsContribution extends Disposable implements IW
     static readonly ID = "terminal.chatAgentTools";
     private readonly _runInTerminalToolRegistration;
     private _runInTerminalToolRegistrationVersion;
-    constructor(_instantiationService: IInstantiationService, _toolsService: ILanguageModelToolsService, _configurationService: IConfigurationService);
+    constructor(_instantiationService: IInstantiationService, _toolsService: ILanguageModelToolsService, _configurationService: IConfigurationService, toolResultCompressor: IToolResultCompressor);
     private _runInTerminalTool;
     private _registerRunInTerminalTool;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js

@@ -14,6 +14,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 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/actions/chatContextKeys';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { IToolResultCompressor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service';
 import { registerActiveInstanceAction, sharedWhenClause } 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';
@@ -30,6 +31,7 @@ import { createRunInTerminalToolData, RunInTerminalTool } from '@codingame/monac
 import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/createAndRunTaskTool.js';
 import { GetTaskOutputTool, GetTaskOutputToolData } from './tools/task/getTaskOutputTool.js';
 import { RunTaskTool, RunTaskToolData } from './tools/task/runTaskTool.js';
+import { registerTerminalCompressors } from './tools/terminalOutputCompressor.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -86,13 +88,19 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
     static {
         this.ID = "terminal.chatAgentTools";
     }
-    constructor(_instantiationService, _toolsService, _configurationService) {
+    constructor(
+        _instantiationService,
+        _toolsService,
+        _configurationService,
+        toolResultCompressor
+    ) {
         super();
         this._instantiationService = _instantiationService;
         this._toolsService = _toolsService;
         this._configurationService = _configurationService;
         this._runInTerminalToolRegistration = this._register(( new MutableDisposable()));
         this._runInTerminalToolRegistrationVersion = 0;
+        registerTerminalCompressors(toolResultCompressor);
         const confirmTerminalCommandTool = _instantiationService.createInstance(ConfirmTerminalCommandTool);
         this._register(
             _toolsService.registerTool(ConfirmTerminalCommandToolData, confirmTerminalCommandTool)
@@ -129,7 +137,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         this._register(_toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
         this._register(_toolsService.readToolSet.addTool(GetTaskOutputToolData));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) || e.affectsConfiguration(AgentNetworkDomainSettingId.AllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem)) {
+            if (e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.DeprecatedAgentSandboxEnabled) || e.affectsConfiguration(AgentSandboxSettingId.AgentSandboxAllowUnsandboxedCommands) || e.affectsConfiguration(AgentNetworkDomainSettingId.AllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedOldDeniedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxAllowedNetworkDomains) || e.affectsConfiguration(AgentNetworkDomainSettingId.DeprecatedSandboxDeniedNetworkDomains) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem) || e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem)) {
                 this._registerRunInTerminalTool();
             }
         }));
@@ -154,7 +162,7 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         });
     }
 };
-ChatAgentToolsContribution = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILanguageModelToolsService)), ( __param(2, IConfigurationService))], ChatAgentToolsContribution));
+ChatAgentToolsContribution = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ILanguageModelToolsService)), ( __param(2, IConfigurationService)), ( __param(3, IToolResultCompressor))], ChatAgentToolsContribution));
 registerWorkbenchContribution2(
     ChatAgentToolsContribution.ID,
     ChatAgentToolsContribution,
@@ -162,7 +170,7 @@ registerWorkbenchContribution2(
 );
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(14003, "Add Terminal Selection to Chat")),
+    title: ( localize(14292, "Add Terminal Selection to Chat")),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [{
         id: MenuId.TerminalInstanceContext,
@@ -183,8 +191,8 @@ registerActiveInstanceAction({
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: "generic",
-            name: ( localize(14004, "Terminal Selection")),
-            fullName: ( localize(14004, "Terminal Selection")),
+            name: ( localize(14293, "Terminal Selection")),
+            fullName: ( localize(14293, "Terminal Selection")),
             value: selection,
             icon: Codicon.terminal
         });

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.js

@@ -12,7 +12,7 @@ const GetTerminalLastCommandToolData = {
     id: TerminalToolId.TerminalLastCommand,
     toolReferenceName: "terminalLastCommand",
     legacyToolReferenceFullNames: ["runCommands/terminalLastCommand"],
-    displayName: ( localize(14019, "Get Terminal Last Command")),
+    displayName: ( localize(14308, "Get Terminal Last Command")),
     modelDescription: "Get the last command run in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -24,8 +24,8 @@ let GetTerminalLastCommandTool = class GetTerminalLastCommandTool extends Dispos
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14020, "Getting last terminal command")),
-            pastTenseMessage: ( localize(14021, "Got last terminal command"))
+            invocationMessage: ( localize(14309, "Getting last terminal command")),
+            pastTenseMessage: ( localize(14310, "Got last terminal command"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.d.ts

@@ -1,15 +1,12 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 export declare const GetTerminalOutputToolData: IToolData;
 export interface IGetTerminalOutputInputParams {
     id?: string;
-    terminalId?: number;
 }
 export declare class GetTerminalOutputTool extends Disposable implements IToolImpl {
-    private readonly _terminalService;
-    constructor(_terminalService: ITerminalService);
+    constructor();
     prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.js

@@ -1,11 +1,8 @@
 
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
-import { getOutput } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers';
 import { RunInTerminalTool } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool';
 import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
 
@@ -13,8 +10,8 @@ const GetTerminalOutputToolData = {
     id: TerminalToolId.GetTerminalOutput,
     toolReferenceName: "getTerminalOutput",
     legacyToolReferenceFullNames: ["runCommands/getTerminalOutput"],
-    displayName: ( localize(14022, "Get Terminal Output")),
-    modelDescription: `Get output from a terminal session. This can target either a persistent terminal started with ${TerminalToolId.RunInTerminal} in async mode (using 'id') or any foreground terminal visible in the terminal panel (using 'terminalId'). For the 'id' parameter, this must be the exact opaque UUID returned by ${TerminalToolId.RunInTerminal}; terminal names, labels, and integers are not valid for 'id'.`,
+    displayName: ( localize(14311, "Get Terminal Output")),
+    modelDescription: `Get output from an active terminal execution (identified by the \`id\` returned from ${TerminalToolId.RunInTerminal}).`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
     inputSchema: {
@@ -22,52 +19,30 @@ const GetTerminalOutputToolData = {
         properties: {
             id: {
                 type: "string",
-                description: `The ID of a persistent terminal session to check (returned by ${TerminalToolId.RunInTerminal} in async mode). This must be the exact opaque ID returned by that tool; terminal names, labels, or integers are invalid. Provide either 'id' or 'terminalId', not both.`,
+                description: `The ID of an active terminal execution to check (returned by ${TerminalToolId.RunInTerminal} for async executions, or for sync executions that timed out and were moved to the background). This must be the exact opaque UUID returned by that tool; terminal names, labels, or integers are invalid.`,
                 pattern: "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
-            },
-            terminalId: {
-                type: "number",
-                description: "The numeric instanceId of a terminal. Use this to get output from terminals not started by the agent (e.g., user-created terminals or foreground terminals). Provide either 'id' or 'terminalId', not both."
             }
-        }
+        },
+        required: ["id"]
     }
 };
-let GetTerminalOutputTool = class GetTerminalOutputTool extends Disposable {
-    constructor(_terminalService) {
+class GetTerminalOutputTool extends Disposable {
+    constructor() {
         super();
-        this._terminalService = _terminalService;
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14023, "Checking terminal output")),
-            pastTenseMessage: ( localize(14024, "Checked terminal output"))
+            invocationMessage: ( localize(14312, "Checking terminal output")),
+            pastTenseMessage: ( localize(14313, "Checked terminal output"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
         const args = invocation.parameters;
-        if (!args.id && args.terminalId === undefined) {
+        if (!args.id) {
             return {
                 content: [{
                     kind: "text",
-                    value: "Error: Either 'id' (persistent terminal UUID) or 'terminalId' (foreground terminal instanceId) must be provided."
-                }]
-            };
-        }
-        if (args.terminalId !== undefined && !args.id) {
-            const instance = this._terminalService.getInstanceFromId(args.terminalId);
-            if (!instance) {
-                return {
-                    content: [{
-                        kind: "text",
-                        value: `Error: No terminal found with instanceId ${args.terminalId}. The terminal may have been closed.`
-                    }]
-                };
-            }
-            const output = getOutput(instance);
-            return {
-                content: [{
-                    kind: "text",
-                    value: `Output of terminal ${args.terminalId}:\n${output}`
+                    value: `Error: 'id' (the persistent terminal UUID returned by ${TerminalToolId.RunInTerminal} in async mode) must be provided.`
                 }]
             };
         }
@@ -87,7 +62,6 @@ let GetTerminalOutputTool = class GetTerminalOutputTool extends Disposable {
             }]
         };
     }
-};
-GetTerminalOutputTool = ( __decorate([( __param(0, ITerminalService))], GetTerminalOutputTool));
+}
 
 export { GetTerminalOutputTool, GetTerminalOutputToolData };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.js

@@ -11,7 +11,7 @@ const GetTerminalSelectionToolData = {
     id: TerminalToolId.TerminalSelection,
     toolReferenceName: "terminalSelection",
     legacyToolReferenceFullNames: ["runCommands/terminalSelection"],
-    displayName: ( localize(14025, "Get Terminal Selection")),
+    displayName: ( localize(14314, "Get Terminal Selection")),
     modelDescription: "Get the current selection in the active terminal.",
     source: ToolDataSource.Internal,
     icon: Codicon.terminal
@@ -23,8 +23,8 @@ let GetTerminalSelectionTool = class GetTerminalSelectionTool extends Disposable
     }
     async prepareToolInvocation(context, token) {
         return {
-            invocationMessage: ( localize(14026, "Reading terminal selection")),
-            pastTenseMessage: ( localize(14027, "Read terminal selection"))
+            invocationMessage: ( localize(14315, "Reading terminal selection")),
+            pastTenseMessage: ( localize(14316, "Read terminal selection"))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.js

@@ -9,7 +9,7 @@ import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 const KillTerminalToolData = {
     id: TerminalToolId.KillTerminal,
     toolReferenceName: "killTerminal",
-    displayName: ( localize(14028, "Kill Terminal")),
+    displayName: ( localize(14317, "Kill Terminal")),
     modelDescription: `Kill a terminal by its ID. Use this to clean up terminals that are no longer needed (e.g., after stopping a server or when a long-running task completes). The terminal ID is returned by ${TerminalToolId.RunInTerminal} in async mode (legacy: isBackground=true).`,
     icon: Codicon.terminal,
     source: ToolDataSource.Internal,
@@ -28,8 +28,8 @@ const KillTerminalToolData = {
 class KillTerminalTool extends Disposable {
     async prepareToolInvocation(_context, _token) {
         return {
-            invocationMessage: ( localize(14029, "Killing terminal")),
-            pastTenseMessage: ( localize(14030, "Killed terminal"))
+            invocationMessage: ( localize(14318, "Killing terminal")),
+            pastTenseMessage: ( localize(14319, "Killed terminal"))
         };
     }
     async invoke(invocation, _countTokens, _progress, _token) {
@@ -44,8 +44,8 @@ class KillTerminalTool extends Disposable {
             };
         }
         const finalOutput = execution.getOutput();
+        RunInTerminalTool.markKilledByTool(args.id);
         execution.instance.dispose();
-        RunInTerminalTool.removeExecution(args.id);
         const outputSummary = finalOutput ? `Final output before termination:\n${finalOutput}` : "No output was captured.";
         return {
             content: [{