@ashx-j/lunr 0.2.18 → 0.2.20

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,7 +88,6 @@ 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 { buildInjectedContextLines } from "./injected-context.js";
 import { getModelSearchText } from "./model-search.js";
 import { wrapSkillTagAutocomplete } from "./skill-tag-autocomplete.js";
 import { computeSmoothRevealStep, countGraphemesBeforeToolCall, countMessageGraphemes, sliceMessageContent, } from "./smooth-streaming.js";
@@ -240,6 +240,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;
@@ -2172,6 +2173,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 });
             }
@@ -3312,7 +3340,6 @@ export class InteractiveMode {
             updateFooter: true,
             populateHistory: true,
         });
-        this.renderInjectedContextIfNeeded();
         this.renderProjectTrustWarningIfNeeded();
         // Show compaction info if session was compacted
         const allEntries = this.sessionManager.getEntries();
@@ -3346,26 +3373,6 @@ export class InteractiveMode {
     rebuildChatFromMessages() {
         this.chatContainer.clear();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());
-        this.renderInjectedContextIfNeeded();
-    }
-    sessionHasConversation() {
-        return this.sessionManager.getEntries().some((entry) => entry.type === "message" && (entry.message.role === "user" || entry.message.role === "assistant"));
-    }
-    renderInjectedContextIfNeeded() {
-        if (this.sessionHasConversation())
-            return;
-        const paths = this.session.resourceLoader
-            .getAgentsFiles()
-            .agentsFiles.map((file) => this.formatContextPath(file.path));
-        const lines = buildInjectedContextLines(paths);
-        if (lines.length === 0)
-            return;
-        if (this.chatContainer.children.length > 0) {
-            this.chatContainer.addChild(new Spacer(1));
-        }
-        const [title, ...files] = lines;
-        this.chatContainer.addChild(new Text(theme.fg("customMessageLabel", title ?? "injected context") +
-            (files.length > 0 ? `\n${theme.fg("dim", files.join("\n"))}` : ""), 1, 0));
     }
     // =========================================================================
     // Key handlers