@ashx-j/lunr 0.2.19 → 0.2.21

package/dist/modes/interactive/interactive-mode.js

@@ -38,6 +38,7 @@ import { getSearchCuratorSetting, setSearchCuratorSetting } from "../../core/sea
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
+import { getSubagentCancellation, SubagentEscapeSequence } from "../../core/subagent-cancellation.js";
 import { time } from "../../core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
@@ -87,6 +88,7 @@ import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { renderUsageBox } from "./components/usage-view.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { orderedExtensionWidgets, replaceExtensionWidget, widgetSeparatorNeedsSpacer, } from "./extension-widget-order.js";
 import { getModelSearchText } from "./model-search.js";
 import { wrapSkillTagAutocomplete } from "./skill-tag-autocomplete.js";
 import { computeSmoothRevealStep, countGraphemesBeforeToolCall, countMessageGraphemes, sliceMessageContent, } from "./smooth-streaming.js";
@@ -239,6 +241,7 @@ export class InteractiveMode {
     hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
     lastSigintTime = 0;
     lastEscapeTime = 0;
+    subagentEscape = new SubagentEscapeSequence();
     anthropicSubscriptionWarningShown = false;
     // Status line tracking (for mutating immediately-sequential status updates)
     lastStatusSpacer = undefined;
@@ -1614,21 +1617,8 @@ export class InteractiveMode {
      */
     setExtensionWidget(key, content, options) {
         const placement = options?.placement ?? "aboveEditor";
-        const removeExisting = (map) => {
-            const existing = map.get(key);
-            if (existing?.dispose)
-                existing.dispose();
-            map.delete(key);
-        };
-        removeExisting(this.extensionWidgetsAbove);
-        removeExisting(this.extensionWidgetsBelow);
-        if (content === undefined) {
-            this.renderWidgets();
-            return;
-        }
         let component;
         if (Array.isArray(content)) {
-            // Wrap string array in a Container with Text components
             const container = new Container();
             for (const line of content.slice(0, InteractiveMode.MAX_WIDGET_LINES)) {
                 container.addChild(new Text(line, 1, 0));
@@ -1638,12 +1628,10 @@ export class InteractiveMode {
             }
             component = container;
         }
-        else {
-            // Factory function - create component
+        else if (content) {
             component = content(this.ui, theme);
         }
-        const targetMap = placement === "belowEditor" ? this.extensionWidgetsBelow : this.extensionWidgetsAbove;
-        targetMap.set(key, component);
+        replaceExtensionWidget(this.extensionWidgetsAbove, this.extensionWidgetsBelow, key, component, placement);
         this.renderWidgets();
     }
     clearExtensionWidgets() {
@@ -1710,13 +1698,14 @@ export class InteractiveMode {
         if (leadingSpacer) {
             container.addChild(new Spacer(1));
         }
-        let first = true;
-        for (const component of widgets.values()) {
-            if (!first) {
-                container.addChild(new Spacer(1));
+        let previousKey;
+        for (const [key, component] of orderedExtensionWidgets(widgets)) {
+            if (previousKey !== undefined) {
+                if (widgetSeparatorNeedsSpacer(previousKey, key))
+                    container.addChild(new Spacer(1));
                 container.addChild(new DynamicBorder((s) => theme.fg("dim", s)));
             }
-            first = false;
+            previousKey = key;
             container.addChild(component);
         }
     }
@@ -2171,6 +2160,33 @@ export class InteractiveMode {
         // Set up handlers on defaultEditor - they use this.editor for text access
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
+            const sessionId = this.session.sessionId;
+            const cancellation = getSubagentCancellation(sessionId);
+            const escapeAction = this.subagentEscape.press(sessionId, cancellation?.hasActiveRuns() ?? false);
+            if (escapeAction) {
+                this.lastEscapeTime = 0;
+                if (this.session.isStreaming)
+                    this.restoreQueuedMessagesToEditor({ abort: true });
+                else if (this.session.isBashRunning)
+                    this.session.abortBash();
+                if (escapeAction === "children" && cancellation) {
+                    void cancellation
+                        .stop()
+                        .then(({ requested, failed }) => {
+                        if (this.session.sessionId !== sessionId)
+                            return;
+                        if (failed)
+                            this.showError(`Could not request stop for ${failed} async runs. Inspect subagent status.`);
+                        else if (requested)
+                            this.showStatus(`Stopping ${requested} async ${requested === 1 ? "run" : "runs"}`);
+                    })
+                        .catch((error) => {
+                        if (this.session.sessionId === sessionId)
+                            this.showError(error instanceof Error ? error.message : String(error));
+                    });
+                }
+                return;
+            }
             if (this.session.isStreaming) {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             }
@@ -3990,6 +4006,7 @@ export class InteractiveMode {
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
                 smoothStreaming: this.settingsManager.getSmoothStreaming(),
+                subagentSpinner: this.settingsManager.getSubagentSpinner(),
                 sessionRetentionDays: this.settingsManager.getSessionRetentionDays(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
@@ -4116,6 +4133,10 @@ export class InteractiveMode {
                 onSmoothStreamingChange: (enabled) => {
                     this.applySmoothStreamingSettingChange(enabled);
                 },
+                onSubagentSpinnerChange: (spinner) => {
+                    this.settingsManager.setSubagentSpinner(spinner);
+                    this.ui.requestRender();
+                },
                 onSessionRetentionDaysChange: (days) => {
                     this.settingsManager.setSessionRetentionDays(days);
                 },
@@ -4276,6 +4297,7 @@ export class InteractiveMode {
                     autoManage: () => this.settingsManager.getAutoManageSubscriptions(),
                     requestRender: () => this.ui.requestRender(),
                 },
+                requestRender: () => this.ui.requestRender(),
                 createModelTierPicker: (_tier, currentModelRef, done) => {
                     const selector = new ModelSelectorComponent(this.ui, this.resolveModelReference(currentModelRef), this.settingsManager, this.session.modelRuntime, this.session.scopedModels, (model) => {
                         done(`${model.provider}/${model.id}`);