@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js

@@ -402,7 +402,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     const cellKind = cells[0].cellKind;
     const isSameKind = cells.every(cell => cell.cellKind === cellKind);
     if (!isSameKind) {
-        const message = ( localize(11216, "Cannot join cells of different kinds"));
+        const message = ( localize(11518, "Cannot join cells of different kinds"));
         return notificationService.warn(message);
     }
     const firstCell = cells[0];
@@ -431,7 +431,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     }
     if (edits.length) {
         await bulkEditService.apply(edits, {
-            quotableLabel: ( localize(11217, "Join Notebook Cells"))
+            quotableLabel: ( localize(11519, "Join Notebook Cells"))
         });
     }
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/insertCellActions.js

@@ -74,7 +74,7 @@ registerAction2(class InsertCodeCellAboveAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_CODE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(11283, "Insert Code Cell Above")),
+            title: ( localize(11585, "Insert Code Cell Above")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -92,7 +92,7 @@ registerAction2(
         constructor() {
             super({
                 id: INSERT_CODE_CELL_ABOVE_AND_FOCUS_CONTAINER_COMMAND_ID,
-                title: ( localize(11284, "Insert Code Cell Above and Focus Container"))
+                title: ( localize(11586, "Insert Code Cell Above and Focus Container"))
             }, CellKind.Code, "above", false);
         }
     }
@@ -101,7 +101,7 @@ registerAction2(class InsertCodeCellBelowAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-            title: ( localize(11285, "Insert Code Cell Below")),
+            title: ( localize(11587, "Insert Code Cell Below")),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -119,7 +119,7 @@ registerAction2(
         constructor() {
             super({
                 id: INSERT_CODE_CELL_BELOW_AND_FOCUS_CONTAINER_COMMAND_ID,
-                title: ( localize(11286, "Insert Code Cell Below and Focus Container"))
+                title: ( localize(11588, "Insert Code Cell Below and Focus Container"))
             }, CellKind.Code, "below", false);
         }
     }
@@ -128,7 +128,7 @@ registerAction2(class InsertMarkdownCellAboveAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(11287, "Insert Markdown Cell Above")),
+            title: ( localize(11589, "Insert Markdown Cell Above")),
             menu: {
                 id: MenuId.NotebookCellInsert,
                 order: 2
@@ -140,7 +140,7 @@ registerAction2(class InsertMarkdownCellBelowAction extends InsertCellCommand {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
-            title: ( localize(11288, "Insert Markdown Cell Below")),
+            title: ( localize(11590, "Insert Markdown Cell Below")),
             menu: {
                 id: MenuId.NotebookCellInsert,
                 order: 3
@@ -152,7 +152,7 @@ registerAction2(class InsertCodeCellAtTopAction extends NotebookAction {
     constructor() {
         super({
             id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-            title: ( localize(11289, "Add Code Cell At Top")),
+            title: ( localize(11591, "Add Code Cell At Top")),
             f1: false
         });
     }
@@ -184,7 +184,7 @@ registerAction2(class InsertMarkdownCellAtTopAction extends NotebookAction {
     constructor() {
         super({
             id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
-            title: ( localize(11290, "Add Markdown Cell At Top")),
+            title: ( localize(11592, "Add Markdown Cell At Top")),
             f1: false
         });
     }
@@ -215,8 +215,8 @@ registerAction2(class InsertMarkdownCellAtTopAction extends NotebookAction {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-        title: "$(add) " + ( localize(11291, "Code")),
-        tooltip: ( localize(11292, "Add Code Cell"))
+        title: "$(add) " + ( localize(11593, "Code")),
+        tooltip: ( localize(11594, "Add Code Cell"))
     },
     order: 0,
     group: "inline",
@@ -225,9 +225,9 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
-        title: ( localize(11293, "Add Code")),
+        title: ( localize(11595, "Add Code")),
         icon: Codicon.add,
-        tooltip: ( localize(11292, "Add Code Cell"))
+        tooltip: ( localize(11594, "Add Code Cell"))
     },
     order: 0,
     group: "inline",
@@ -237,8 +237,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: INSERT_CODE_CELL_BELOW_COMMAND_ID,
         icon: Codicon.add,
-        title: ( localize(11294, "Code")),
-        tooltip: ( localize(11292, "Add Code Cell"))
+        title: ( localize(11596, "Code")),
+        tooltip: ( localize(11594, "Add Code Cell"))
     },
     order: -5,
     group: "navigation/add",
@@ -247,8 +247,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-        title: "$(add) " + ( localize(11291, "Code")),
-        tooltip: ( localize(11292, "Add Code Cell"))
+        title: "$(add) " + ( localize(11593, "Code")),
+        tooltip: ( localize(11594, "Add Code Cell"))
     },
     order: 0,
     group: "inline",
@@ -257,9 +257,9 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_CODE_CELL_AT_TOP_COMMAND_ID,
-        title: ( localize(11295, "Add Code")),
+        title: ( localize(11597, "Add Code")),
         icon: Codicon.add,
-        tooltip: ( localize(11292, "Add Code Cell"))
+        tooltip: ( localize(11594, "Add Code Cell"))
     },
     order: 0,
     group: "inline",
@@ -268,8 +268,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellBetween, {
     command: {
         id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
-        title: "$(add) " + ( localize(11296, "Markdown")),
-        tooltip: ( localize(11297, "Add Markdown Cell"))
+        title: "$(add) " + ( localize(11598, "Markdown")),
+        tooltip: ( localize(11599, "Add Markdown Cell"))
     },
     order: 1,
     group: "inline",
@@ -279,8 +279,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: INSERT_MARKDOWN_CELL_BELOW_COMMAND_ID,
         icon: Codicon.add,
-        title: ( localize(11298, "Markdown")),
-        tooltip: ( localize(11297, "Add Markdown Cell"))
+        title: ( localize(11600, "Markdown")),
+        tooltip: ( localize(11599, "Add Markdown Cell"))
     },
     order: -5,
     group: "navigation/add",
@@ -289,8 +289,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
 MenuRegistry.appendMenuItem(MenuId.NotebookCellListTop, {
     command: {
         id: INSERT_MARKDOWN_CELL_AT_TOP_COMMAND_ID,
-        title: "$(add) " + ( localize(11296, "Markdown")),
-        tooltip: ( localize(11297, "Add Markdown Cell"))
+        title: "$(add) " + ( localize(11598, "Markdown")),
+        tooltip: ( localize(11599, "Add Markdown Cell"))
     },
     order: 1,
     group: "inline",

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js

@@ -61,7 +61,7 @@ class CellDiffPlaceholderElement extends Disposable {
     constructor(placeholder, templateData) {
         super();
         templateData.body.classList.remove("left", "right", "full");
-        const text = (placeholder.hiddenCells.length === 1) ? ( localize(11334, "{0} hidden cell", placeholder.hiddenCells.length)) : ( localize(11335, "{0} hidden cells", placeholder.hiddenCells.length));
+        const text = (placeholder.hiddenCells.length === 1) ? ( localize(11636, "{0} hidden cell", placeholder.hiddenCells.length)) : ( localize(11637, "{0} hidden cells", placeholder.hiddenCells.length));
         templateData.placeholder.innerText = text;
         this._register(addDisposableListener(templateData.placeholder, "dblclick", e => {
             if (e.button !== 0) {
@@ -1902,7 +1902,7 @@ class CollapsedCellOverlayWidget extends Disposable {
                 display: "flex"
             }
         }, [$("a", {
-            title: ( localize(11336, "Show Unchanged Cells")),
+            title: ( localize(11638, "Show Unchanged Cells")),
             role: "button",
             onclick: () => {
                 this._action.fire();
@@ -1935,7 +1935,7 @@ class UnchangedCellOverlayWidget extends Disposable {
                 display: "flex"
             }
         }, [$("a", {
-            title: ( localize(11337, "Hide Unchanged Cells")),
+            title: ( localize(11639, "Hide Unchanged Cells")),
             role: "button",
             onclick: () => {
                 this._action.fire();

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js

@@ -48,7 +48,7 @@ class OutputElement extends Disposable {
             mimeTypePicker.classList.add(...ThemeIcon.asClassNameArray(mimetypeIcon));
             mimeTypePicker.tabIndex = 0;
             mimeTypePicker.title = ( localize(
-                11338,
+                11640,
                 "Choose a different output mimetype, available mimetypes: {0}",
                 ( mimeTypes.map(mimeType => mimeType.mimeType)).join(", ")
             ));
@@ -105,13 +105,13 @@ class OutputElement extends Disposable {
     }
     _renderMissingRenderer(viewModel, preferredMimeType) {
         if (!viewModel.model.outputs.length) {
-            return this._renderMessage(viewModel, ( localize(11339, "Cell has no output")));
+            return this._renderMessage(viewModel, ( localize(11641, "Cell has no output")));
         }
         if (!preferredMimeType) {
             const mimeTypes = ( viewModel.model.outputs.map(op => op.mime));
             const mimeTypesMessage = mimeTypes.join(", ");
             return this._renderMessage(viewModel, ( localize(
-                11340,
+                11642,
                 "No renderer could be found for output. It has the following mimetypes: {0}",
                 mimeTypesMessage
             )));
@@ -154,16 +154,16 @@ class OutputElement extends Disposable {
             index: index,
             picked: index === currIndex,
             detail: this.generateRendererInfo(mimeType.rendererId),
-            description: index === currIndex ? ( localize(11341, "Currently Active")) : undefined
+            description: index === currIndex ? ( localize(11643, "Currently Active")) : undefined
         })));
         const disposables = ( new DisposableStore());
         const picker = disposables.add(this._quickInputService.createQuickPick());
         picker.items = items;
         picker.activeItems = items.filter(item => !!item.picked);
         picker.placeholder = items.length !== mimeTypes.length ? ( localize(
-            11342,
+            11644,
             "Select mimetype to render for current output. Rich mimetypes are available only when the notebook is trusted"
-        )) : ( localize(11343, "Select mimetype to render for current output"));
+        )) : ( localize(11645, "Select mimetype to render for current output"));
         const pick = await ( new Promise(resolve => {
             disposables.add(picker.onDidAccept(() => {
                 resolve(
@@ -195,7 +195,7 @@ class OutputElement extends Disposable {
             const displayName = renderInfo.displayName !== "" ? renderInfo.displayName : renderInfo.id;
             return `${displayName} (${renderInfo.extensionId.value})`;
         }
-        return localize(11344, "built-in");
+        return localize(11646, "built-in");
     }
     getCellOutputCurrentIndex() {
         return this._diffElementViewModel.getNestedCellViewModel(this._diffSide).outputs.indexOf(this.output.model);

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -316,7 +316,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
                         return null;
                     },
                     getWidgetAriaLabel() {
-                        return localize(11365, "Notebook Text Diff");
+                        return localize(11667, "Notebook Text Diff");
                     }
                 }
             }

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.js

@@ -14,18 +14,18 @@ const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY = "notebook.diffEditor.cell.ignor
 const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE = ( new RawContextKey(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false));
 const NOTEBOOK_DIFF_CELL_PROPERTY = ( new RawContextKey("notebook.diffEditor.cell.property.changed", false));
 const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = ( new RawContextKey("notebook.diffEditor.cell.property.expanded", false));
-const NOTEBOOK_DIFF_CELLS_COLLAPSED = ( new RawContextKey("notebook.diffEditor.allCollapsed", undefined, ( localize(11366, "Whether all cells in notebook diff editor are collapsed"))));
-const NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS = ( new RawContextKey("notebook.diffEditor.hasUnchangedCells", undefined, ( localize(11367, "Whether there are unchanged cells in the notebook diff editor"))));
+const NOTEBOOK_DIFF_CELLS_COLLAPSED = ( new RawContextKey("notebook.diffEditor.allCollapsed", undefined, ( localize(11668, "Whether all cells in notebook diff editor are collapsed"))));
+const NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS = ( new RawContextKey("notebook.diffEditor.hasUnchangedCells", undefined, ( localize(11669, "Whether there are unchanged cells in the notebook diff editor"))));
 const NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN = ( new RawContextKey("notebook.diffEditor.unchangedCellsAreHidden", undefined, ( localize(
-    11368,
+    11670,
     "Whether the unchanged cells in the notebook diff editor are hidden"
 ))));
 const NOTEBOOK_DIFF_ITEM_KIND = ( new RawContextKey("notebook.diffEditor.item.kind", undefined, ( localize(
-    11369,
+    11671,
     "The kind of item in the notebook diff editor, Cell, Metadata or Output"
 ))));
 const NOTEBOOK_DIFF_ITEM_DIFF_STATE = ( new RawContextKey("notebook.diffEditor.item.state", undefined, ( localize(
-    11370,
+    11672,
     "The diff state of item in the notebook diff editor, delete, insert, modified or unchanged"
 ))));
 

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js

@@ -82,7 +82,7 @@ let CellDiffPlaceholderRenderer = class CellDiffPlaceholderRenderer {
         const marginOverlay = ( new CollapsedCellOverlayWidget(body));
         const contents = append(body, $(".contents"));
         const placeholder = append(contents, $("span.text", {
-            title: ( localize(11371, "Double click to show"))
+            title: ( localize(11673, "Double click to show"))
         }));
         return {
             body,

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditor.js

@@ -243,7 +243,7 @@ let ReplEditor = class ReplEditor extends EditorPane {
             ...editorOptions,
             ...editorOptionsOverride,
             ...{
-                ariaLabel: ( localize(12326, "REPL Input")),
+                ariaLabel: ( localize(12631, "REPL Input")),
                 glyphMargin: true,
                 padding: {
                     top: INPUT_EDITOR_PADDING,

package/vscode/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.js

@@ -23,7 +23,7 @@ import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscod
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 
 var ReplEditorInput_1;
-const replTabIcon = registerIcon("repl-editor-label-icon", Codicon.debugLineByLine, ( localize(12340, "Icon of the REPL editor label.")));
+const replTabIcon = registerIcon("repl-editor-label-icon", Codicon.debugLineByLine, ( localize(12645, "Icon of the REPL editor label.")));
 let ReplEditorInput = class ReplEditorInput extends NotebookEditorInput {
     static {
         ReplEditorInput_1 = this;

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

@@ -39,6 +39,13 @@ export declare class BasicExecuteStrategy extends Disposable implements ITermina
     private readonly _startMarker;
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
+    /**
+     * Tracks per-execute() DisposableStores so they can be cleaned up if the
+     * strategy is disposed mid-flight, AND removed from this collection on
+     * successful completion to avoid accumulating stale references when
+     * execute() is invoked many times on the same strategy instance.
+     */
+    private readonly _executionStores;
     constructor(_instance: ITerminalInstance, _hasReceivedUserInput: () => boolean, _commandDetection: ICommandDetectionCapability, _configurationService: IConfigurationService, _logService: ITerminalLogService);
     execute(commandLine: string, token: CancellationToken, commandId?: string, _commandLineForMetadata?: string): Promise<ITerminalExecuteStrategyResult>;
     private _log;

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

@@ -10,7 +10,26 @@ import { trackIdleOnPrompt, waitForIdle } from './executeStrategy.js';
 import { createAltBufferPromise, setupRecreatingStartMarker, stripCommandEchoAndPrompt } from './strategyHelpers.js';
 import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { isMultilineCommand } from '../runInTerminalHelpers.js';
 
+function isTerminalLaunchError(value) {
+    return typeof value === "object" && value !== null && "message" in value;
+}
+function formatExitCodeOrError(exitCodeOrError) {
+    if (isTerminalLaunchError(exitCodeOrError)) {
+        return `launch error: ${exitCodeOrError.message}${exitCodeOrError.code !== undefined ? `, code=${exitCodeOrError.code}` : ""}`;
+    }
+    return `code=${exitCodeOrError}`;
+}
+function extractExitCode(exitCodeOrError) {
+    if (isNumber(exitCodeOrError)) {
+        return exitCodeOrError;
+    }
+    if (isTerminalLaunchError(exitCodeOrError)) {
+        return exitCodeOrError.code;
+    }
+    return undefined;
+}
 let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
     constructor(
         _instance,
@@ -29,37 +48,72 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
         this._startMarker = this._register(( new MutableDisposable()));
         this._onDidCreateStartMarker = this._register(( new Emitter()));
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
+        this._executionStores = this._register(( new DisposableStore()));
     }
     async execute(commandLine, token, commandId, _commandLineForMetadata) {
         const store = ( new DisposableStore());
-        this._register(store);
+        this._executionStores.add(store);
         try {
+            if (this._instance.isDisposed) {
+                this._log("Terminal already disposed at strategy entry");
+                throw ( new Error("The terminal was closed"));
+            }
+            if (this._instance.exitCode !== undefined) {
+                this._log(
+                    `Terminal pty already exited at strategy entry (code=${this._instance.exitCode})`
+                );
+                return {
+                    output: undefined,
+                    exitCode: this._instance.exitCode,
+                    additionalInformation: `Command exited with code ${this._instance.exitCode}`
+                };
+            }
             const idlePollInterval = this._configurationService.getValue(TerminalChatAgentToolsSettingId.IdlePollInterval) ?? 1000;
-            const idlePromptPromise = trackIdleOnPrompt(this._instance, idlePollInterval, store, idlePollInterval);
-            const onDone = Promise.race([
-                Event.toPromise(this._commandDetection.onCommandFinished, store).then(e => {
-                    this._log("onDone 1 of 2 via end event, waiting for short idle prompt");
-                    return idlePromptPromise.then(() => {
-                        this._log("onDone 2 of 2 via short idle prompt");
-                        return {
-                            "type": "success",
-                            command: e
-                        };
-                    });
-                }),
-                Event.toPromise(token.onCancellationRequested, store).then(() => {
-                    this._log("onDone via cancellation");
-                }),
-                Event.toPromise(this._instance.onDisposed, store).then(() => {
-                    this._log("onDone via terminal disposal");
+            const staleMarker = this._commandDetection.executingCommandObject?.marker;
+            const onCommandFinishedFiltered = staleMarker ? Event.filter(
+                this._commandDetection.onCommandFinished,
+                e => e.marker !== staleMarker,
+                store
+            ) : this._commandDetection.onCommandFinished;
+            const idlePromptPromise = trackIdleOnPrompt(
+                this._instance,
+                idlePollInterval,
+                store,
+                idlePollInterval,
+                this._logService
+            );
+            const onDone = Promise.race([Event.toPromise(onCommandFinishedFiltered, store).then(e => {
+                this._log("onDone 1 of 2 via end event, waiting for short idle prompt");
+                return idlePromptPromise.then(() => {
+                    this._log("onDone 2 of 2 via short idle prompt");
                     return {
-                        type: "disposal"
+                        "type": "success",
+                        command: e
                     };
-                }),
-                trackIdleOnPrompt(this._instance, idlePollInterval * 3, store, idlePollInterval).then(() => {
-                    this._log("onDone long idle prompt");
-                })
-            ]);
+                });
+            }), Event.toPromise(token.onCancellationRequested, store).then(() => {
+                this._log("onDone via cancellation");
+            }), Event.toPromise(this._instance.onDisposed, store).then(() => {
+                this._log("onDone via terminal disposal");
+                return {
+                    type: "disposal"
+                };
+            }), Event.toPromise(this._instance.onExit, store).then(exitCodeOrError => {
+                this._log(`onDone via process exit (${formatExitCodeOrError(exitCodeOrError)})`);
+                return {
+                    type: "processExit",
+                    exitCodeOrError
+                };
+            }),
+            trackIdleOnPrompt(
+                this._instance,
+                idlePollInterval * 3,
+                store,
+                idlePollInterval,
+                this._logService
+            ).then(() => {
+                this._log("onDone long idle prompt");
+            })]);
             this._log("Waiting for xterm");
             const xterm = await this._instance.xtermReadyPromise;
             if (!xterm) {
@@ -76,9 +130,17 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
                 this._log.bind(this)
             );
             if (this._hasReceivedUserInput()) {
-                this._log("Command timed out, sending SIGINT and retrying");
-                await this._instance.sendText("\u0003", false);
-                await waitForIdle(this._instance.onData, 100);
+                if (this._commandDetection.executingCommandObject !== undefined) {
+                    this._log(
+                        "Previous command still executing with pending input, sending SIGINT before retrying"
+                    );
+                    await this._instance.sendText("\u0003", false);
+                    await waitForIdle(this._instance.onData, 100);
+                } else {
+                    this._log("Prompt is idle; clearing pending input with Ctrl+U instead of SIGINT");
+                    await this._instance.sendText("\u0015", false);
+                    await waitForIdle(this._instance.onData, 100);
+                }
             }
             if (commandId) {
                 this._log(
@@ -87,7 +149,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
             }
             this._log(`Executing command line \`${commandLine}\``);
             markerRecreation.dispose();
-            const forceBracketedPasteMode = isMacintosh;
+            const forceBracketedPasteMode = isMacintosh || isMultilineCommand(commandLine);
             this._instance.sendText(commandLine, true, forceBracketedPasteMode);
             this._log("Waiting for done event");
             const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({
@@ -113,8 +175,10 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
             } else if (commandId) {
                 this._log(`No finished command surfaced for requested=${commandId}`);
             }
-            this._log("Waiting for idle");
-            await waitForIdle(this._instance.onData, idlePollInterval);
+            if (!(onDoneResult && onDoneResult.type === "processExit")) {
+                this._log("Waiting for idle");
+                await waitForIdle(this._instance.onData, idlePollInterval);
+            }
             if (token.isCancellationRequested) {
                 throw ( new CancellationError());
             }
@@ -143,7 +207,10 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
             if (output !== undefined && output.trim().length === 0) {
                 additionalInformationLines.push("Command produced no output");
             }
-            const exitCode = finishedCommand?.exitCode;
+            let exitCode = finishedCommand?.exitCode;
+            if (exitCode === undefined && onDoneResult && onDoneResult.type === "processExit") {
+                exitCode = extractExitCode(onDoneResult.exitCodeOrError);
+            }
             if (isNumber(exitCode) && exitCode > 0) {
                 additionalInformationLines.push(`Command exited with code ${exitCode}`);
             }
@@ -153,7 +220,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy extends Disposable {
                 exitCode
             };
         } finally {
-            store.dispose();
+            this._executionStores.delete(store);
         }
     }
     _log(message) {

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

@@ -1,6 +1,7 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import type { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { DisposableStore, type IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+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 { IMarker as IXtermMarker } from "@xterm/xterm";
 export interface ITerminalExecuteStrategy extends IDisposable {
@@ -50,4 +51,15 @@ export declare function waitForIdleWithPromptHeuristics(onData: Event<unknown>,
  * Tracks the terminal for being idle on a prompt input. This must be called before `executeCommand`
  * is called.
  */
-export declare function trackIdleOnPrompt(instance: ITerminalInstance, idleDurationMs: number, store: DisposableStore, promptFallbackMs?: number): Promise<void>;
+export interface ITrackIdleOnPromptOptions {
+    /**
+     * When true, disables all fallback schedulers: the initial prompt fallback,
+     * the data-idle executing fallback, and the hard-cap safety net. Use this
+     * for sync (foreground) commands that should block until the command truly
+     * finishes rather than being abandoned after an idle period. In sync mode
+     * the overall chat-request timeout or user-specified timeout is the safety
+     * net instead.
+     */
+    disableFallbacks?: boolean;
+}
+export declare function trackIdleOnPrompt(instance: ITerminalInstance, idleDurationMs: number, store: DisposableStore, promptFallbackMs?: number, logService?: ITerminalLogService, options?: ITrackIdleOnPromptOptions): Promise<void>;