@ashx-j/lunr 0.2.18 → 0.2.20

package/dist/node-runtime/{chunk-G4P75AIS.js → chunk-QKFMBRAL.js}

@@ -6,6 +6,10 @@ import {
   checkForUpdate,
   markUpdateNotified
 } from "./chunk-KWA4OC2J.js";
+import {
+  SubagentEscapeSequence,
+  getSubagentCancellation
+} from "./chunk-BBUVIEZB.js";
 import {
   copyToClipboard,
   readClipboardText
@@ -31,13 +35,25 @@ import {
 import {
   MissingSessionCwdError,
   SessionImportFileNotFoundError,
+  beginTurn,
+  captureTreeChanges,
+  clearRollback,
+  disableRollbackForSession,
+  enableRollbackForSession,
   formatCatalogRefreshSummary,
   formatMissingSessionCwdPrompt,
   hasGrokCliXaiAuth,
+  initRollback,
+  isRollbackEnabled,
+  isRollbackSessionForceEnabled,
+  migrateRollbackSession,
   parseSkillBlock,
+  peekRollbackTurnsConsumed,
   refreshModelCandidatesForInit,
+  rollbackLastTurn,
+  setRollbackWarningHandler,
   stripJsonComments
-} from "./chunk-ATGA2WLC.js";
+} from "./chunk-JYNNB7DU.js";
 import {
   computeFileLists,
   createFileOps,
@@ -96,21 +112,9 @@ import {
   getModelTiersBridge
 } from "./chunk-W3CVH5RX.js";
 import {
-  beginTurn,
-  captureTreeChanges,
-  clearRollback,
-  disableRollbackForSession,
-  enableRollbackForSession,
   getAllPlanUsageResults,
-  getUsageServiceBridge,
-  initRollback,
-  isRollbackEnabled,
-  isRollbackSessionForceEnabled,
-  migrateRollbackSession,
-  peekRollbackTurnsConsumed,
-  rollbackLastTurn,
-  setRollbackWarningHandler
-} from "./chunk-PNJSG3IZ.js";
+  getUsageServiceBridge
+} from "./chunk-LTYWTR3V.js";
 import {
   convertToPng,
   processImage
@@ -124,7 +128,7 @@ import {
   resetPermissions,
   restorePermissionModeAfterPlan,
   setPermissionMode
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 import {
   getGlobalInstructionsPath,
   getModelInstructionsPath
@@ -1230,8 +1234,8 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
   updateContent(message, options) {
     this.lastMessage = message, this.thinkingSource = options?.thinkingSource, this.contentContainer.clear();
     let sourceMessage = this.thinkingSource ?? message, sourceThinkingRuns = collectThinkingRuns(sourceMessage.content);
-    (message.content.some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) || !this.hideThinkingBlock && sourceThinkingRuns.some((run) => run.length > 0)) && this.contentContainer.addChild(new Spacer(1));
-    let isFirstTextBlock = !0, thinkingRunIndex = -1, renderedThinking = !1;
+    message.content.some((c) => c.type === "text" && c.text.trim() || !this.hideThinkingBlock && c.type === "thinking" && c.thinking.trim()) && this.contentContainer.addChild(new Spacer(1));
+    let isFirstTextBlock = !0, thinkingRunIndex = -1;
     for (let i = 0; i < message.content.length; i++) {
       let content = message.content[i];
       if (content.type === "text" && content.text.trim()) {
@@ -1249,18 +1253,12 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
           let thinking = thinkingContent.thinking.trim();
           thinking && displayBlocks.push(thinking);
         }
-        i--;
-        let thinkingBlocks = sourceThinkingRuns[thinkingRunIndex] ?? displayBlocks;
-        if (thinkingBlocks.length === 0 || this.hideThinkingBlock)
+        if (i--, displayBlocks.length === 0 || this.hideThinkingBlock)
           continue;
-        renderedThinking = !0, this.renderThinkingRun(thinkingRunIndex, thinkingBlocks, message, i);
+        let sourceBlocks = sourceThinkingRuns[thinkingRunIndex] ?? [], fullyRevealed = displayBlocks.length === sourceBlocks.length && displayBlocks.every((block, index) => block === sourceBlocks[index]);
+        this.renderThinkingRun(thinkingRunIndex, displayBlocks, message, i, fullyRevealed);
       }
     }
-    if (!this.hideThinkingBlock && !renderedThinking && sourceThinkingRuns.length > 0) {
-      thinkingRunIndex = 0;
-      let thinkingBlocks = sourceThinkingRuns[0] ?? [];
-      thinkingBlocks.length > 0 && this.renderThinkingRun(thinkingRunIndex, thinkingBlocks, message, -1);
-    }
     let hasToolCalls = message.content.some((c) => c.type === "toolCall");
     if (this.hasToolCalls = hasToolCalls, message.stopReason === "length")
       this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", "Error: Model stopped because it reached the maximum output token limit. The response may be incomplete."), this.outputPad, 0));
@@ -1274,8 +1272,8 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
       }
     }
   }
-  renderThinkingRun(thinkingRunIndex, thinkingBlocks, displayMessage, displayIndex) {
-    let hasVisibleContentAfter = displayIndex >= 0 ? displayMessage.content.slice(displayIndex + 1).some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) : displayMessage.content.some((c) => c.type === "text" && c.text.trim()), runComplete = isThinkingRunComplete(!1, this.thinkingTimings?.[thinkingRunIndex], this.thinkingTimings !== void 0), wrap = (inner) => {
+  renderThinkingRun(thinkingRunIndex, thinkingBlocks, displayMessage, displayIndex, fullyRevealed) {
+    let hasVisibleContentAfter = displayIndex >= 0 ? displayMessage.content.slice(displayIndex + 1).some((c) => c.type === "text" && c.text.trim() || c.type === "thinking" && c.thinking.trim()) : displayMessage.content.some((c) => c.type === "text" && c.text.trim()), runComplete = fullyRevealed && isThinkingRunComplete(!1, this.thinkingTimings?.[thinkingRunIndex], this.thinkingTimings !== void 0), wrap = (inner) => {
       this.contentContainer.addChild(new ThinkingRunBlock(this, thinkingRunIndex, inner));
     };
     if (this.thinkingCollapse && !this.isRunExpanded(thinkingRunIndex) && runComplete) {
@@ -1328,7 +1326,7 @@ function collectThinkingRuns(content) {
       let thinking = thinkingContent.thinking.trim();
       thinking && blocks.push(thinking);
     }
-    blocks.length > 0 && runs.push(blocks);
+    runs.push(blocks);
   }
   return runs;
 }
@@ -3976,7 +3974,13 @@ var ToolExecutionComponent = class extends Container14 {
     return !!this.result?.isError && this.groupFollowed && !this.expanded && !this.isPartial && this.getRenderShell() === "default" && this.toolName !== "subagent" && this.toolName !== "subagent_wait";
   }
   shouldSkipCompactResult() {
-    return this.result === void 0 || this.isPartial || this.expanded ? !1 : this.result.isError ? this.shouldHideGroupedErrorBody() : this.getRenderShell() === "default";
+    if (this.result === void 0 || this.isPartial || this.expanded)
+      return !1;
+    if (this.toolName === "subagent") {
+      let details = this.result.details;
+      return !(this.result.isError || Array.isArray(details?.results) && details.results.length > 0 || details?.mode === "management");
+    }
+    return this.result.isError ? this.shouldHideGroupedErrorBody() : this.getRenderShell() === "default";
   }
   formatHoistedGroupErrors() {
     if (this.groupFollowed || this.expanded)
@@ -4976,12 +4980,6 @@ var UserMessageList = class {
   }
 };
 
-// packages/coding-agent/dist/modes/interactive/injected-context.js
-function buildInjectedContextLines(paths) {
-  let labels = paths.map((path3) => path3.trim()).filter((path3) => path3.length > 0);
-  return labels.length === 0 ? [] : ["injected context", ...labels.map((path3) => `  ${path3}`)];
-}
-
 // packages/coding-agent/dist/modes/interactive/skill-tag-autocomplete.js
 import { fuzzyFilter as fuzzyFilter4 } from "@ashx-j/lunr-tui";
 function extractSkillTagPrefix(textBeforeCursor, character) {
@@ -5335,6 +5333,7 @@ var InteractiveMode = class _InteractiveMode {
   hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
   lastSigintTime = 0;
   lastEscapeTime = 0;
+  subagentEscape = new SubagentEscapeSequence();
   anthropicSubscriptionWarningShown = !1;
   // Status line tracking (for mutating immediately-sequential status updates)
   lastStatusSpacer = void 0;
@@ -6470,6 +6469,15 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
   // =========================================================================
   setupKeyHandlers() {
     this.defaultEditor.onEscape = () => {
+      let sessionId = this.session.sessionId, cancellation = getSubagentCancellation(sessionId), escapeAction = this.subagentEscape.press(sessionId, cancellation?.hasActiveRuns() ?? !1);
+      if (escapeAction) {
+        this.lastEscapeTime = 0, this.session.isStreaming ? this.restoreQueuedMessagesToEditor({ abort: !0 }) : this.session.isBashRunning && this.session.abortBash(), escapeAction === "children" && cancellation && cancellation.stop().then(({ requested, failed }) => {
+          this.session.sessionId === sessionId && (failed ? this.showError(`Could not request stop for ${failed} async runs. Inspect subagent status.`) : requested && this.showStatus(`Stopping ${requested} async ${requested === 1 ? "run" : "runs"}`));
+        }).catch((error) => {
+          this.session.sessionId === sessionId && this.showError(error instanceof Error ? error.message : String(error));
+        });
+        return;
+      }
       if (this.session.isStreaming)
         this.restoreQueuedMessagesToEditor({ abort: !0 });
       else if (this.session.isBashRunning)
@@ -7141,7 +7149,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
     this.renderSessionEntries(entries, {
       updateFooter: !0,
       populateHistory: !0
-    }), this.renderInjectedContextIfNeeded(), this.renderProjectTrustWarningIfNeeded();
+    }), this.renderProjectTrustWarningIfNeeded();
     let compactionCount = this.sessionManager.getEntries().filter((e) => e.type === "compaction").length;
     if (compactionCount > 0) {
       let times = compactionCount === 1 ? "1 time" : `${compactionCount} times`;
@@ -7160,22 +7168,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
     });
   }
   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;
-    let paths = this.session.resourceLoader.getAgentsFiles().agentsFiles.map((file) => this.formatContextPath(file.path)), lines = buildInjectedContextLines(paths);
-    if (lines.length === 0)
-      return;
-    this.chatContainer.children.length > 0 && this.chatContainer.addChild(new Spacer19(1));
-    let [title, ...files] = lines;
-    this.chatContainer.addChild(new Text21(theme.fg("customMessageLabel", title ?? "injected context") + (files.length > 0 ? `
-${theme.fg("dim", files.join(`
-`))}` : ""), 1, 0));
+    this.chatContainer.clear(), this.renderSessionEntries(this.sessionManager.buildContextEntries());
   }
   // =========================================================================
   // Key handlers

package/dist/node-runtime/cli-runtime.js

@@ -57,7 +57,7 @@ var args = process.argv.slice(2), startupBenchmark = process.env.PI_STARTUP_BENC
 markStartupMilestone("mode_routed");
 var startupView;
 if (preloadMode === "interactive") {
-  let { InteractiveView } = await import("./interactive-view-S6J3QHEF.js");
+  let { InteractiveView } = await import("./interactive-view-ILS6TAN5.js");
   startupView = new InteractiveView(), startupView.start(), await startupView.waitForFirstFrame(), startupView.isExitRequested && process.exit(0);
 }
 var startRuntime = async () => {

package/dist/node-runtime/{command-AAV3YRR5.js → command-RBTRL55A.js}

@@ -5,7 +5,7 @@ import "./chunk-BRJX2PRC.js";
 async function handleGatewayCommand(args) {
   if (args[0] !== "gateway")
     return !1;
-  let { runGateway } = await import("./gateway-OAC4OBBL.js"), code = await runGateway(args.slice(1));
+  let { runGateway } = await import("./gateway-L4ANRTVE.js"), code = await runGateway(args.slice(1));
   return process.exitCode = code, !0;
 }
 export {

package/dist/node-runtime/{gateway-OAC4OBBL.js → gateway-L4ANRTVE.js}

@@ -5,7 +5,7 @@ import {
   listSessions,
   splitMessage,
   startGatewayCron
-} from "./chunk-EBF6COVM.js";
+} from "./chunk-ELWEXVO5.js";
 import {
   gatewayConfigPath,
   isFeatureEnabled,
@@ -30,7 +30,7 @@ import "./chunk-AD6VXAO7.js";
 import {
   NO_HANDLER_REASON,
   registerApprovalHandler
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-QZMODZQ2.js";

package/dist/node-runtime/index.js

@@ -19,7 +19,7 @@ import {
   TreeSelectorComponent,
   UserMessageComponent,
   UserMessageSelectorComponent
-} from "./chunk-G4P75AIS.js";
+} from "./chunk-QKFMBRAL.js";
 import "./chunk-G6LRAP36.js";
 import {
   attachJsonlLineReader,
@@ -30,6 +30,7 @@ import {
   runPrintMode
 } from "./chunk-OCVIXVTZ.js";
 import "./chunk-KWA4OC2J.js";
+import "./chunk-BBUVIEZB.js";
 import {
   copyToClipboard
 } from "./chunk-Q5ZU2VRT.js";
@@ -38,14 +39,14 @@ import "./chunk-6BEIBLQ3.js";
 import "./chunk-7N3YHTYF.js";
 import {
   main
-} from "./chunk-NI6OTSBH.js";
-import "./chunk-ZBV7FAHG.js";
+} from "./chunk-AL2FMKKM.js";
+import "./chunk-K3646JTM.js";
 import "./chunk-4DJ6HEGH.js";
 import {
   ProjectTrustStore,
   hasTrustRequiringProjectResources
 } from "./chunk-AROOY4BB.js";
-import "./chunk-XATUM2HK.js";
+import "./chunk-25I2BHAA.js";
 import {
   AgentSession,
   AgentSessionRuntime,
@@ -60,7 +61,7 @@ import {
   readStoredCredential,
   wrapRegisteredTool,
   wrapRegisteredTools
-} from "./chunk-ATGA2WLC.js";
+} from "./chunk-JYNNB7DU.js";
 import {
   DEFAULT_COMPACTION_SETTINGS,
   calculateContextTokens,
@@ -150,19 +151,19 @@ import {
 import {
   convertToLlm
 } from "./chunk-FVDOXRUD.js";
-import "./chunk-3NMWLTPV.js";
+import "./chunk-AOFXZQKA.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-PL6JKXWI.js";
 import {
   convertToPng,
   formatDimensionNote,
   resizeImage
 } from "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
-import "./chunk-R5EDISSV.js";
+import "./chunk-JHYKXIMM.js";
 import {
   CustomEditor
 } from "./chunk-H2EOZYMP.js";

package/dist/node-runtime/{interactive-mode-2SZUO53H.js → interactive-mode-HPUNH7SV.js}

@@ -3,15 +3,16 @@ import {
   InteractiveMode,
   formatResumeCommand,
   startInteractiveToolInstalls
-} from "./chunk-G4P75AIS.js";
+} from "./chunk-QKFMBRAL.js";
 import "./chunk-G6LRAP36.js";
 import "./chunk-KWA4OC2J.js";
+import "./chunk-BBUVIEZB.js";
 import "./chunk-Q5ZU2VRT.js";
 import "./chunk-NUIFPZWX.js";
 import "./chunk-6BEIBLQ3.js";
 import "./chunk-7N3YHTYF.js";
 import "./chunk-AROOY4BB.js";
-import "./chunk-ATGA2WLC.js";
+import "./chunk-JYNNB7DU.js";
 import "./chunk-STERBGUB.js";
 import "./chunk-4CSFRBCN.js";
 import "./chunk-OBMWP3I5.js";
@@ -26,9 +27,9 @@ import "./chunk-CBGB57XT.js";
 import "./chunk-GKLEQ3I4.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-H2EOZYMP.js";

package/dist/node-runtime/{interactive-view-S6J3QHEF.js → interactive-view-ILS6TAN5.js}

@@ -7,7 +7,7 @@ import {
   getChatboxEditor,
   renderStatsLine,
   thinkingThemeToken
-} from "./chunk-R5EDISSV.js";
+} from "./chunk-JHYKXIMM.js";
 import "./chunk-H2EOZYMP.js";
 import {
   markStartupMilestone

package/dist/node-runtime/{lunr-cron-AUUYP4N4.js → lunr-cron-NNYTWTGF.js}

@@ -13,7 +13,7 @@ import {
   setCronDeliverValidator,
   startScheduler,
   updateJob
-} from "./chunk-EBF6COVM.js";
+} from "./chunk-ELWEXVO5.js";
 import {
   loadGatewayConfig
 } from "./chunk-4I23VTC4.js";
@@ -26,7 +26,7 @@ import {
   typebox_exports
 } from "./chunk-PL6JKXWI.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
 import "./chunk-FQMM2EZ2.js";

package/dist/node-runtime/main.js

@@ -2,12 +2,12 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   main,
   readPipedStdin
-} from "./chunk-NI6OTSBH.js";
-import "./chunk-ZBV7FAHG.js";
+} from "./chunk-AL2FMKKM.js";
+import "./chunk-K3646JTM.js";
 import "./chunk-4DJ6HEGH.js";
 import "./chunk-AROOY4BB.js";
-import "./chunk-XATUM2HK.js";
-import "./chunk-ATGA2WLC.js";
+import "./chunk-25I2BHAA.js";
+import "./chunk-JYNNB7DU.js";
 import "./chunk-STERBGUB.js";
 import "./chunk-4CSFRBCN.js";
 import "./chunk-OBMWP3I5.js";
@@ -21,15 +21,15 @@ import "./chunk-CSFI6YXL.js";
 import "./chunk-CBGB57XT.js";
 import "./chunk-GKLEQ3I4.js";
 import "./chunk-FVDOXRUD.js";
-import "./chunk-3NMWLTPV.js";
+import "./chunk-AOFXZQKA.js";
 import "./chunk-W3CVH5RX.js";
-import "./chunk-PNJSG3IZ.js";
+import "./chunk-LTYWTR3V.js";
 import "./chunk-PL6JKXWI.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-RQ2Q5IYR.js";
-import "./chunk-R5EDISSV.js";
+import "./chunk-JHYKXIMM.js";
 import "./chunk-H2EOZYMP.js";
 import "./chunk-PVCDKGR6.js";
 import "./chunk-OR4L3IB2.js";