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

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

@@ -14,19 +14,17 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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 { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatMode } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { InlineChatWidget } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
-import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
+import { InlineChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+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-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 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';
 
@@ -55,16 +53,15 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     get lastResponseContent() {
         return this._lastResponseContent;
     }
-    constructor(_terminalElement, _instance, _xterm, contextKeyService, _chatService, _storageService, _viewsService, instantiationService, _chatAgentService, _layoutService) {
+    constructor(_terminalElement, _instance, _xterm, contextKeyService, _chatService, _storageService, instantiationService, _chatAgentService, _chatWidgetService) {
         super();
         this._terminalElement = _terminalElement;
         this._instance = _instance;
         this._xterm = _xterm;
         this._chatService = _chatService;
         this._storageService = _storageService;
-        this._viewsService = _viewsService;
         this._chatAgentService = _chatAgentService;
-        this._layoutService = _layoutService;
+        this._chatWidgetService = _chatWidgetService;
         this._onDidHide = this._register(( new Emitter()));
         this.onDidHide = this._onDidHide.event;
         this._messages = this._store.add(( new Emitter()));
@@ -167,10 +164,10 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11848, 'Ask about commands'));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11987, 'Ask about commands'));
     }
-    async reveal(viewState) {
-        await this._createSession(viewState);
+    async reveal() {
+        await this._createSession();
         this._doLayout();
         this._container.classList.remove('hide');
         this._visibleContextKey.set(true);
@@ -255,37 +252,23 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     get focusTracker() {
         return this._focusTracker;
     }
-    async _createSession(viewState) {
+    async _createSession() {
         this._sessionCtor = createCancelablePromise(async (token) => {
             if (!this._model.value) {
-                this._model.value = this._chatService.startSession(ChatAgentLocation.Terminal, token);
-                const model = this._model.value;
-                if (model) {
-                    this._inlineChatWidget.setChatModel(model, this._loadViewState());
-                    this._resetPlaceholder();
-                }
-                if (!this._model.value) {
-                    throw ( new Error('Failed to start chat session'));
-                }
+                const modelRef = this._chatService.startSession(ChatAgentLocation.Terminal);
+                this._model.value = modelRef;
+                const model = modelRef.object;
+                this._inlineChatWidget.setChatModel(model);
+                this._resetPlaceholder();
             }
         });
         this._register(toDisposable(() => this._sessionCtor?.cancel()));
     }
-    _loadViewState() {
-        const rawViewState = this._storageService.get(this._viewStateStorageKey, StorageScope.PROFILE, undefined);
-        let viewState;
-        if (rawViewState) {
-            try {
-                viewState = JSON.parse(rawViewState);
-            }
-            catch {
-                viewState = undefined;
-            }
-        }
-        return viewState;
-    }
     _saveViewState() {
-        this._storageService.store(this._viewStateStorageKey, JSON.stringify(this._inlineChatWidget.chatWidget.getViewState()), StorageScope.PROFILE, StorageTarget.USER);
+        const viewState = this._inlineChatWidget.chatWidget.getViewState();
+        if (viewState) {
+            this._storageService.store(this._viewStateStorageKey, JSON.stringify(viewState), StorageScope.PROFILE, StorageTarget.USER);
+        }
     }
     clear() {
         this.cancel();
@@ -356,7 +339,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._chatService.cancelCurrentRequestForSession(model?.sessionResource);
     }
     async viewInChat() {
-        const widget = await showChatView(this._viewsService, this._layoutService);
+        const widget = await this._chatWidgetService.revealWidget();
         const currentRequest = this._inlineChatWidget.chatWidget.viewModel?.model.getRequests().find(r => r.id === this._currentRequestId);
         if (!widget || !currentRequest?.response) {
             return;
@@ -407,10 +390,9 @@ TerminalChatWidget = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IChatService)),
     ( __param(5, IStorageService)),
-    ( __param(6, IViewsService)),
-    ( __param(7, IInstantiationService)),
-    ( __param(8, IChatAgentService)),
-    ( __param(9, IWorkbenchLayoutService))
+    ( __param(6, IInstantiationService)),
+    ( __param(7, IChatAgentService)),
+    ( __param(8, IChatWidgetService))
 ], TerminalChatWidget));
 
 export { TerminalChatWidget };

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

@@ -6,7 +6,7 @@ import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { isPowerShell } from './runInTerminalHelpers.js';
 
 const neverMatchRegex = /(?!.*)/;
@@ -127,11 +127,11 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
         for (const [key, value] of Object.entries(config)) {
             const defaultValue = configInspectValue?.default?.value;
             const isDefaultRule = !!(isObject(defaultValue) &&
-                key in defaultValue &&
+                Object.prototype.hasOwnProperty.call(defaultValue, key) &&
                 structuralEquals(defaultValue[key], value));
             function checkTarget(inspectValue) {
                 return (isObject(inspectValue) &&
-                    key in inspectValue &&
+                    Object.prototype.hasOwnProperty.call(inspectValue, key) &&
                     structuralEquals(inspectValue[key], value));
             }
             const sourceTarget = (checkTarget(configInspectValue.workspaceFolder) ? ConfigurationTarget.WORKSPACE_FOLDER

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.d.ts

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 import { type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from "./executeStrategy.js";
 import type { IMarker as IXtermMarker } from "@xterm/xterm";

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

@@ -58,6 +58,9 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
                 await this._instance.sendText('\x03', false);
                 await waitForIdle(this._instance.onData, 100);
             }
+            if (commandId) {
+                this._log(`In basic execute strategy: skipping pre-bound command id ${commandId} because basic shell integration executes via sendText`);
+            }
             this._log(`Executing command line \`${commandLine}\``);
             this._instance.sendText(commandLine, true);
             this._log('Waiting for done event');
@@ -66,6 +69,12 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
                 throw ( new Error('The terminal was closed'));
             }
             const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
+            if (finishedCommand) {
+                this._log(`Finished command id=${finishedCommand.id ?? 'none'} for requested=${commandId ?? 'none'}`);
+            }
+            else if (commandId) {
+                this._log(`No finished command surfaced for requested=${commandId}`);
+            }
             this._log('Waiting for idle');
             await waitForIdle(this._instance.onData, 1000);
             if (token.isCancellationRequested) {

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

@@ -36,7 +36,6 @@ export interface IPromptDetectionResult {
  * Detects if the given text content appears to end with a common prompt pattern.
  */
 export declare function detectsCommonPromptPattern(cursorLine: string): IPromptDetectionResult;
-export declare function detectsInputRequiredPattern(cursorLine: string): boolean;
 /**
  * Enhanced version of {@link waitForIdle} that uses prompt detection heuristics. After the terminal
  * idles for the specified period, checks if the terminal's cursor line looks like a common prompt.

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

@@ -37,15 +37,6 @@ function detectsCommonPromptPattern(cursorLine) {
     }
     return { detected: false, reason: `No common prompt pattern found in last line: "${cursorLine}"` };
 }
-const PS_CONFIRM_RE = /\s*(?:\[[^\]]\]\s+[^\[]+\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/;
-const YN_PAIRED_RE = /(?:\(|\[)\s*(?:y(?:es)?\s*\/\s*n(?:o)?|n(?:o)?\s*\/\s*y(?:es)?)\s*(?:\]|\))\s+$/i;
-const YN_AFTER_PUNCT_RE = /[?:]\s*(?:\(|\[)?\s*y(?:es)?\s*\/\s*n(?:o)?\s*(?:\]|\))?\s+$/i;
-const CONFIRM_Y_RE = /\(y\)\s*$/i;
-const LINE_ENDS_WITH_COLON_RE = /:\s*$/;
-const END = /\(END\)$/;
-function detectsInputRequiredPattern(cursorLine) {
-    return PS_CONFIRM_RE.test(cursorLine) || YN_PAIRED_RE.test(cursorLine) || YN_AFTER_PUNCT_RE.test(cursorLine) || CONFIRM_Y_RE.test(cursorLine) || LINE_ENDS_WITH_COLON_RE.test(cursorLine.trim()) || END.test(cursorLine);
-}
 async function waitForIdleWithPromptHeuristics(onData, instance, idlePollIntervalMs, extendedTimeoutMs) {
     await waitForIdle(onData, idlePollIntervalMs);
     const xterm = await instance.xtermReadyPromise;
@@ -89,6 +80,15 @@ async function trackIdleOnPrompt(instance, idleDurationMs, store) {
     const scheduler = store.add(( new RunOnceScheduler(() => {
         idleOnPrompt.complete();
     }, idleDurationMs)));
+    let state = 0 ;
+    const promptFallbackScheduler = store.add(( new RunOnceScheduler(() => {
+        if (state === 2  || state === 3 ) {
+            promptFallbackScheduler.cancel();
+            return;
+        }
+        state = 3 ;
+        scheduler.schedule();
+    }, 1000)));
     let TerminalState;
     (function (TerminalState) {
         TerminalState[TerminalState["Initial"] = 0] = "Initial";
@@ -96,30 +96,36 @@ async function trackIdleOnPrompt(instance, idleDurationMs, store) {
         TerminalState[TerminalState["Executing"] = 2] = "Executing";
         TerminalState[TerminalState["PromptAfterExecuting"] = 3] = "PromptAfterExecuting";
     })(TerminalState || (TerminalState = {}));
-    let state = TerminalState.Initial;
     store.add(onData(e => {
         const matches = e.matchAll(/(?:\x1b\]|\x9d)[16]33;(?<type>[ACD])(?:;.*)?(?:\x1b\\|\x07|\x9c)/g);
         for (const match of matches) {
             if (match.groups?.type === 'A') {
-                if (state === TerminalState.Initial) {
-                    state = TerminalState.Prompt;
+                if (state === 0 ) {
+                    state = 1 ;
                 }
-                else if (state === TerminalState.Executing) {
-                    state = TerminalState.PromptAfterExecuting;
+                else if (state === 2 ) {
+                    state = 3 ;
                 }
             }
             else if (match.groups?.type === 'C' || match.groups?.type === 'D') {
-                state = TerminalState.Executing;
+                state = 2 ;
             }
         }
-        if (state === TerminalState.PromptAfterExecuting) {
+        if (state === 3 ) {
+            promptFallbackScheduler.cancel();
             scheduler.schedule();
         }
         else {
             scheduler.cancel();
+            if (state === 0  || state === 1 ) {
+                promptFallbackScheduler.schedule();
+            }
+            else {
+                promptFallbackScheduler.cancel();
+            }
         }
     }));
     return idleOnPrompt.p;
 }
 
-export { detectsCommonPromptPattern, detectsInputRequiredPattern, trackIdleOnPrompt, waitForIdle, waitForIdleWithPromptHeuristics };
+export { detectsCommonPromptPattern, trackIdleOnPrompt, waitForIdle, waitForIdleWithPromptHeuristics };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.d.ts

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from "./executeStrategy.js";

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

@@ -1,5 +1,7 @@
 
+import { truncateOutputKeepingTail } from './runInTerminalHelpers.js';
 
+const MAX_OUTPUT_LENGTH = 16000;
 function getOutput(instance, startMarker) {
     if (!instance.xterm || !instance.xterm.raw) {
         return '';
@@ -13,8 +15,8 @@ function getOutput(instance, startMarker) {
         lines[y - startLine] = line ? line.translateToString(true) : '';
     }
     let output = lines.join('\n');
-    if (output.length > 16000) {
-        output = output.slice(-16e3);
+    if (output.length > MAX_OUTPUT_LENGTH) {
+        output = truncateOutputKeepingTail(output, MAX_OUTPUT_LENGTH);
     }
     return output;
 }

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

@@ -5,6 +5,8 @@ export declare function isPowerShell(envShell: string, os: OperatingSystem): boo
 export declare function isWindowsPowerShell(envShell: string): boolean;
 export declare function isZsh(envShell: string, os: OperatingSystem): boolean;
 export declare function isFish(envShell: string, os: OperatingSystem): boolean;
+export declare const TRUNCATION_MESSAGE = "\n\n[... PREVIOUS OUTPUT TRUNCATED ...]\n\n";
+export declare function truncateOutputKeepingTail(output: string, maxLength: number): string;
 export declare function sanitizeTerminalOutput(output: string): string;
 export declare function generateAutoApproveActions(commandLine: string, subCommands: string[], autoApproveResult: {
     subCommandResults: ICommandApprovalResultWithReason[];

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

@@ -27,6 +27,19 @@ function isFish(envShell, os) {
     }
     return /^fish$/.test(posix.basename(envShell));
 }
+const TRUNCATION_MESSAGE = '\n\n[... PREVIOUS OUTPUT TRUNCATED ...]\n\n';
+function truncateOutputKeepingTail(output, maxLength) {
+    if (output.length <= maxLength) {
+        return output;
+    }
+    const truncationMessageLength = TRUNCATION_MESSAGE.length;
+    if (truncationMessageLength >= maxLength) {
+        return TRUNCATION_MESSAGE.slice(TRUNCATION_MESSAGE.length - maxLength);
+    }
+    const availableLength = maxLength - truncationMessageLength;
+    const endPortion = output.slice(-availableLength);
+    return TRUNCATION_MESSAGE + endPortion;
+}
 function generateAutoApproveActions(commandLine, subCommands, autoApproveResult) {
     const actions = [];
     const canCreateAutoApproval = (autoApproveResult.subCommandResults.every(e => e.result !== 'denied') &&
@@ -72,11 +85,11 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         if (subCommandsToSuggest.length > 0) {
             let subCommandLabel;
             if (subCommandsToSuggest.length === 1) {
-                subCommandLabel = ( localize(11850, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
+                subCommandLabel = ( localize(11989, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
             }
             else {
                 const commandSeparated = subCommandsToSuggest.join(', ');
-                subCommandLabel = ( localize(11851, 'Always Allow Commands: {0}', commandSeparated));
+                subCommandLabel = ( localize(11990, 'Always Allow Commands: {0}', commandSeparated));
             }
             actions.push({
                 label: subCommandLabel,
@@ -94,7 +107,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
             !( commandsWithSubcommands.has(commandLine)) &&
             !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(11852, 'Always Allow Exact Command Line')),
+                label: ( localize(11991, 'Always Allow Exact Command Line')),
                 data: {
                     type: 'newRule',
                     rule: {
@@ -112,7 +125,15 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(11853, 'Configure Auto Approve...')),
+        label: ( localize(11992, 'Allow All Commands in this Session')),
+        tooltip: ( localize(11993, 'Allow this tool to run in this session without confirmation.')),
+        data: {
+            type: 'sessionApproval'
+        }
+    });
+    actions.push(( new Separator()));
+    actions.push({
+        label: ( localize(11994, 'Configure Auto Approve...')),
         data: {
             type: 'configure'
         }
@@ -125,4 +146,4 @@ function dedupeRules(rules) {
     });
 }
 
-export { dedupeRules, generateAutoApproveActions, isFish, isPowerShell, isWindowsPowerShell, isZsh };
+export { TRUNCATION_MESSAGE, dedupeRules, generateAutoApproveActions, isFish, isPowerShell, isWindowsPowerShell, isZsh, truncateOutputKeepingTail };

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

@@ -14,6 +14,8 @@ export declare function getTaskDefinition(id: string): {
     taskType: string;
 };
 export declare function getTaskRepresentation(task: IConfiguredTask | Task): string;
+export declare function getTaskKey(task: Task): string;
+export declare function tasksMatch(a: Task, b: Task): boolean;
 export declare function getTaskForTool(id: string | undefined, taskDefinition: {
     taskLabel?: string;
     taskType?: string;
@@ -45,7 +47,7 @@ export declare function resolveDependencyTasks(parentTask: Task, workspaceFolder
 /**
  * Collects output, polling duration, and idle status for all terminals.
  */
-export declare function collectTerminalResults(terminals: ITerminalInstance[], task: Task, instantiationService: IInstantiationService, invocationContext: IToolInvocationContext, progress: ToolProgress, token: CancellationToken, disposableStore: DisposableStore, isActive?: (task: Task) => Promise<boolean>, dependencyTasks?: Task[]): Promise<Array<{
+export declare function collectTerminalResults(terminals: ITerminalInstance[], task: Task, instantiationService: IInstantiationService, invocationContext: IToolInvocationContext, progress: ToolProgress, token: CancellationToken, disposableStore: DisposableStore, isActive?: (task: Task) => Promise<boolean>, dependencyTasks?: Task[], taskService?: ITaskService): Promise<Array<{
     name: string;
     output: string;
     resources?: ILinkLocation[];

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

@@ -1,4 +1,5 @@
 
+import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -6,6 +7,7 @@ import { getOutput } from './outputHelpers.js';
 import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
 import { OutputMonitorState } from './tools/monitoring/types.js';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 function getTaskDefinition(id) {
     const idx = id.indexOf(': ');
@@ -24,10 +26,25 @@ function getTaskRepresentation(task) {
         return task.script;
     }
     else if ('command' in task && task.command) {
-        return typeof task.command === 'string' ? task.command : task.command.name?.toString() || '';
+        return isString(task.command) ? task.command : task.command.name?.toString() || '';
     }
     return '';
 }
+function getTaskKey(task) {
+    return task.getKey() ?? task.getMapKey();
+}
+function tasksMatch(a, b) {
+    if (!a || !b) {
+        return false;
+    }
+    if (getTaskKey(a) === getTaskKey(b)) {
+        return true;
+    }
+    if (a.getCommonTaskId?.() === b.getCommonTaskId?.()) {
+        return true;
+    }
+    return a._id === b._id;
+}
 async function getTaskForTool(id, taskDefinition, workspaceFolder, configurationService, taskService, allowParentTask) {
     let index = 0;
     let task;
@@ -87,7 +104,7 @@ async function resolveDependencyTasks(parentTask, workspaceFolder, configuration
         return undefined;
     }
     const dependencyTasks = await Promise.all(( parentTask.configurationProperties.dependsOn.map(async (dep) => {
-        const depId = typeof dep.task === 'string' ? dep.task : dep.task?._key;
+        const depId = isString(dep.task) ? dep.task : dep.task?._key;
         if (!depId) {
             return undefined;
         }
@@ -95,7 +112,7 @@ async function resolveDependencyTasks(parentTask, workspaceFolder, configuration
     })));
     return dependencyTasks.filter((t) => t !== undefined);
 }
-async function collectTerminalResults(terminals, task, instantiationService, invocationContext, progress, token, disposableStore, isActive, dependencyTasks) {
+async function collectTerminalResults(terminals, task, instantiationService, invocationContext, progress, token, disposableStore, isActive, dependencyTasks, taskService) {
     const results = [];
     if (token.isCancellationRequested) {
         return results;
@@ -138,6 +155,17 @@ async function collectTerminalResults(terminals, task, instantiationService, inv
             dependencyTasks,
             sessionId: invocationContext.sessionId
         };
+        if (terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0 && taskService) {
+            const maxWaitTime = 1000;
+            const startTime = Date.now();
+            while (!token.isCancellationRequested && Date.now() - startTime < maxWaitTime) {
+                const busyTasks = await taskService.getBusyTasks();
+                if (( busyTasks.some(t => tasksMatch(t, terminalTask)))) {
+                    break;
+                }
+                await timeout(100);
+            }
+        }
         const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, taskProblemPollFn, invocationContext, token, task._label));
         await Event.toPromise(outputMonitor.onDidFinishCommand);
         const pollingResult = outputMonitor.pollingResult;
@@ -204,4 +232,4 @@ async function taskProblemPollFn(execution, token, taskService) {
     throw ( new Error('Polling failed'));
 }
 
-export { collectTerminalResults, getTaskDefinition, getTaskForTool, getTaskRepresentation, resolveDependencyTasks, taskProblemPollFn };
+export { collectTerminalResults, getTaskDefinition, getTaskForTool, getTaskKey, getTaskRepresentation, resolveDependencyTasks, taskProblemPollFn, tasksMatch };

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

@@ -2,7 +2,6 @@
 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 { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -11,18 +10,14 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { TerminalSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ToolDataSource, VSCodeToolReference } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { registerActiveInstanceAction, sharedWhenClause } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
-import { TerminalContextKeys } from '@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
+import { 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';
 import { TerminalChatAgentToolsCommandId } from '../common/terminal.chatAgentTools.js';
-import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { GetTerminalLastCommandTool, GetTerminalLastCommandToolData } from './tools/getTerminalLastCommandTool.js';
 import { GetTerminalOutputTool, GetTerminalOutputToolData } from './tools/getTerminalOutputTool.js';
 import { GetTerminalSelectionTool, GetTerminalSelectionToolData } from './tools/getTerminalSelectionTool.js';
@@ -58,34 +53,27 @@ let ChatAgentToolsContribution = class ChatAgentToolsContribution extends Dispos
         this._register(toolsService.registerTool(ConfirmTerminalCommandToolData, confirmTerminalCommandTool));
         const getTerminalOutputTool = instantiationService.createInstance(GetTerminalOutputTool);
         this._register(toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool));
-        const runCommandsToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runCommands', VSCodeToolReference.runCommands, {
-            icon: ThemeIcon.fromId(Codicon.terminal.id),
-            description: ( localize(11854, 'Runs commands in the terminal'))
-        }));
-        runCommandsToolSet.addTool(GetTerminalOutputToolData);
+        this._register(toolsService.executeToolSet.addTool(GetTerminalOutputToolData));
         instantiationService.invokeFunction(createRunInTerminalToolData).then(runInTerminalToolData => {
             const runInTerminalTool = instantiationService.createInstance(RunInTerminalTool);
             this._register(toolsService.registerTool(runInTerminalToolData, runInTerminalTool));
-            runCommandsToolSet.addTool(runInTerminalToolData);
+            this._register(toolsService.executeToolSet.addTool(runInTerminalToolData));
         });
         const getTerminalSelectionTool = instantiationService.createInstance(GetTerminalSelectionTool);
         this._register(toolsService.registerTool(GetTerminalSelectionToolData, getTerminalSelectionTool));
         const getTerminalLastCommandTool = instantiationService.createInstance(GetTerminalLastCommandTool);
         this._register(toolsService.registerTool(GetTerminalLastCommandToolData, getTerminalLastCommandTool));
-        runCommandsToolSet.addTool(GetTerminalSelectionToolData);
-        runCommandsToolSet.addTool(GetTerminalLastCommandToolData);
+        this._register(toolsService.readToolSet.addTool(GetTerminalSelectionToolData));
+        this._register(toolsService.readToolSet.addTool(GetTerminalLastCommandToolData));
         const runTaskTool = instantiationService.createInstance(RunTaskTool);
         this._register(toolsService.registerTool(RunTaskToolData, runTaskTool));
         const getTaskOutputTool = instantiationService.createInstance(GetTaskOutputTool);
         this._register(toolsService.registerTool(GetTaskOutputToolData, getTaskOutputTool));
         const createAndRunTaskTool = instantiationService.createInstance(CreateAndRunTaskTool);
         this._register(toolsService.registerTool(CreateAndRunTaskToolData, createAndRunTaskTool));
-        const runTasksToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runTasks', 'runTasks', {
-            description: ( localize(11855, 'Runs tasks and gets their output for your workspace')),
-        }));
-        runTasksToolSet.addTool(RunTaskToolData);
-        runTasksToolSet.addTool(GetTaskOutputToolData);
-        runTasksToolSet.addTool(CreateAndRunTaskToolData);
+        this._register(toolsService.executeToolSet.addTool(RunTaskToolData));
+        this._register(toolsService.executeToolSet.addTool(GetTaskOutputToolData));
+        this._register(toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
     }
 };
 ChatAgentToolsContribution = ( __decorate([
@@ -95,7 +83,7 @@ ChatAgentToolsContribution = ( __decorate([
 registerWorkbenchContribution2(ChatAgentToolsContribution.ID, ChatAgentToolsContribution, WorkbenchPhase.AfterRestored);
 registerActiveInstanceAction({
     id: TerminalChatAgentToolsCommandId.ChatAddTerminalSelection,
-    title: ( localize(11856, 'Add Terminal Selection to Chat')),
+    title: ( localize(11995, 'Add Terminal Selection to Chat')),
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, sharedWhenClause.terminalAvailable)),
     menu: [
         {
@@ -106,22 +94,20 @@ registerActiveInstanceAction({
         },
     ],
     run: async (activeInstance, _c, accessor) => {
-        const viewsService = accessor.get(IViewsService);
         const chatWidgetService = accessor.get(IChatWidgetService);
-        const layoutService = accessor.get(IWorkbenchLayoutService);
         const selection = activeInstance.selection;
         if (!selection) {
             return;
         }
-        const chatView = chatWidgetService.lastFocusedWidget || (await showChatView(viewsService, layoutService));
+        const chatView = chatWidgetService.lastFocusedWidget ?? (await chatWidgetService.revealWidget());
         if (!chatView) {
             return;
         }
         chatView.attachmentModel.addContext({
             id: `terminal-selection-${Date.now()}`,
             kind: 'generic',
-            name: ( localize(11857, 'Terminal Selection')),
-            fullName: ( localize(11857, 'Terminal Selection')),
+            name: ( localize(11996, 'Terminal Selection')),
+            fullName: ( localize(11996, 'Terminal Selection')),
             value: selection,
             icon: Codicon.terminal
         });