@ashx-j/lunr 0.2.19 → 0.2.21

package/dist/node-runtime/{agent-session-services-35WNVGMR.js → agent-session-services-C743TYQE.js}

@@ -2,9 +2,9 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   createAgentSessionFromServices,
   createAgentSessionServices
-} from "./chunk-ATGA2WLC.js";
+} from "./chunk-XI77KVKA.js";
 import "./chunk-STERBGUB.js";
-import "./chunk-4CSFRBCN.js";
+import "./chunk-Y5KOEMBH.js";
 import "./chunk-OBMWP3I5.js";
 import "./chunk-DVGWF6A2.js";
 import "./chunk-QFWG2RVL.js";
@@ -13,12 +13,13 @@ import "./chunk-WKDK4C5P.js";
 import "./chunk-53YJI7JU.js";
 import "./chunk-KBKMCJDU.js";
 import "./chunk-CSFI6YXL.js";
-import "./chunk-CBGB57XT.js";
+import "./chunk-WLLDXJRT.js";
+import "./chunk-LISUTZS3.js";
 import "./chunk-GKLEQ3I4.js";
 import "./chunk-FVDOXRUD.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-PVCDKGR6.js";

package/dist/node-runtime/{builtin-extensions-322XDDEM.js → builtin-extensions-JCOPAAB5.js}

@@ -6,9 +6,10 @@ import {
   lightBuiltinExtensions,
   loadAllBuiltinExtensions,
   loadDeferredBuiltinExtensions
-} from "./chunk-4FX25LWP.js";
+} from "./chunk-AWVD5IEY.js";
+import "./chunk-5ZH3ZFIZ.js";
 import "./chunk-PL6JKXWI.js";
-import "./chunk-J26TSGDL.js";
+import "./chunk-6N22HULO.js";
 import "./chunk-M3LZLQW2.js";
 import "./chunk-JHYKXIMM.js";
 import "./chunk-H2EOZYMP.js";

package/dist/node-runtime/{chunk-XATUM2HK.js → chunk-25I2BHAA.js}

@@ -2,7 +2,7 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   getPermissionMode,
   resetPermissions
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 
 // packages/coding-agent/dist/core/subagent-permission-inherit.js
 var SUBAGENT_CHILD_ENV = "PI_SUBAGENT_CHILD", SUBAGENT_CHILD_PERMISSION_ENV = "PI_SUBAGENT_CHILD_PERMISSION";

package/dist/node-runtime/{chunk-TXHKBRHZ.js → chunk-2BUAYZ7K.js}

@@ -6,6 +6,11 @@ import {
   checkForUpdate,
   markUpdateNotified
 } from "./chunk-KWA4OC2J.js";
+import {
+  SubagentEscapeSequence,
+  getSubagentCancellation,
+  getSubagentSpinnerDefinition
+} from "./chunk-A3KMVBZV.js";
 import {
   copyToClipboard,
   readClipboardText
@@ -27,17 +32,29 @@ import {
   areExperimentalFeaturesEnabled,
   getProjectTrustOptions,
   hasTrustRequiringProjectResources
-} from "./chunk-AROOY4BB.js";
+} from "./chunk-YMEAYRBE.js";
 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-XI77KVKA.js";
 import {
   computeFileLists,
   createFileOps,
@@ -48,7 +65,7 @@ import {
 } from "./chunk-STERBGUB.js";
 import {
   parseGitUrl
-} from "./chunk-4CSFRBCN.js";
+} from "./chunk-Y5KOEMBH.js";
 import {
   clearRegistry,
   createAllToolDefinitions,
@@ -84,7 +101,11 @@ import {
   SKILL_TAG_CHARACTERS,
   configureHttpDispatcher,
   formatHttpIdleTimeoutMs
-} from "./chunk-CBGB57XT.js";
+} from "./chunk-WLLDXJRT.js";
+import {
+  SUBAGENT_SPINNER_LABELS,
+  SUBAGENT_SPINNER_NAMES
+} from "./chunk-LISUTZS3.js";
 import {
   SessionManager,
   sessionEntryToContextMessages
@@ -96,21 +117,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 +133,7 @@ import {
   resetPermissions,
   restorePermissionModeAfterPlan,
   setPermissionMode
-} from "./chunk-J26TSGDL.js";
+} from "./chunk-6N22HULO.js";
 import {
   getGlobalInstructionsPath,
   getModelInstructionsPath
@@ -137,7 +146,7 @@ import {
 } from "./chunk-PVCDKGR6.js";
 import {
   getCustomizeBridge
-} from "./chunk-HQCKFM2O.js";
+} from "./chunk-VGYZ3APQ.js";
 import {
   MEMORY_CHAR_CAP_DEFAULT,
   MEMORY_CHAR_CAP_MAX,
@@ -1230,8 +1239,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 +1258,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 +1277,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 +1331,7 @@ function collectThinkingRuns(content) {
       let thinking = thinkingContent.thinking.trim();
       thinking && blocks.push(thinking);
     }
-    blocks.length > 0 && runs.push(blocks);
+    runs.push(blocks);
   }
   return runs;
 }
@@ -2836,11 +2839,56 @@ var SETTINGS_SUBMENU_SELECT_LIST_LAYOUT = {
   handleInput(data) {
     this.input.handleInput(data);
   }
-}, SEARCH_CURATOR_VALUES = ["off", "on", "auto-summary"], CustomizeSubmenu = class extends Container13 {
+}, SEARCH_CURATOR_VALUES = ["off", "on", "auto-summary"];
+function subagentSpinnerItems() {
+  return SUBAGENT_SPINNER_NAMES.map((name) => ({
+    value: name,
+    label: SUBAGENT_SPINNER_LABELS[name],
+    description: getSubagentSpinnerDefinition(name).frames.slice(0, 4).join(" ")
+  }));
+}
+var SubagentSpinnerSubmenu = class extends Container13 {
+  preview;
+  selectList;
+  selected;
+  timer;
+  constructor(current, callbacks, done) {
+    super(), this.selected = current, this.addChild(new Text15(theme.bold(theme.fg("accent", "Subagent spinner")), 0, 0)), this.addChild(new Spacer14(1)), this.preview = new Text15("", 0, 0), this.addChild(this.preview), this.addChild(new Spacer14(1));
+    let options = subagentSpinnerItems();
+    this.selectList = new SelectList(options, options.length, getSelectListTheme(), SETTINGS_SUBMENU_SELECT_LIST_LAYOUT), this.selectList.setSelectedIndex(Math.max(0, SUBAGENT_SPINNER_NAMES.indexOf(current))), this.selectList.onSelectionChange = (item) => {
+      this.selected = item.value, this.updatePreview(), callbacks.requestRender();
+    }, this.selectList.onSelect = (item) => {
+      this.dispose();
+      let selected = item.value;
+      callbacks.onSubagentSpinnerChange(selected), done(SUBAGENT_SPINNER_LABELS[selected]);
+    }, this.selectList.onCancel = () => {
+      this.dispose(), done();
+    }, this.addChild(this.selectList), this.addChild(new Spacer14(1)), this.addChild(new Text15(theme.fg("dim", "  Enter to select \xB7 Esc to go back"), 0, 0)), this.updatePreview(), this.timer = setInterval(() => {
+      this.updatePreview(), callbacks.requestRender();
+    }, 80), this.timer.unref?.();
+  }
+  updatePreview() {
+    let definition = getSubagentSpinnerDefinition(this.selected), frame = definition.frames[Math.floor(Date.now() / definition.interval) % definition.frames.length];
+    this.preview.setText(`${theme.fg("muted", "Preview")}  ${theme.fg("accent", frame)}`);
+  }
+  dispose() {
+    this.timer && (clearInterval(this.timer), this.timer = void 0);
+  }
+  handleInput(data) {
+    this.selectList.handleInput(data);
+  }
+}, CustomizeSubmenu = class extends Container13 {
   settingsList;
-  constructor(_config, callbacks, done) {
+  constructor(config, callbacks, done) {
     super();
-    let bridge = getCustomizeBridge(), items = [
+    let bridge = getCustomizeBridge(), currentSpinner = bridge?.getSubagentSpinner() ?? config.subagentSpinner, items = [
+      {
+        id: "subagent-spinner",
+        label: "Subagent spinner",
+        description: "Running child indicator",
+        currentValue: SUBAGENT_SPINNER_LABELS[currentSpinner],
+        submenu: (_currentValue, submenuDone) => new SubagentSpinnerSubmenu(bridge?.getSubagentSpinner() ?? currentSpinner, callbacks, submenuDone)
+      },
       {
         id: "footer-mcp",
         label: "MCP status",
@@ -3976,7 +4024,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,6 +5030,29 @@ var UserMessageList = class {
   }
 };
 
+// packages/coding-agent/dist/modes/interactive/extension-widget-order.js
+var BUILTIN_WIDGET_ORDER = /* @__PURE__ */ new Map([
+  ["todos", 0],
+  ["subagent-async", 1]
+]);
+function replaceExtensionWidget(above, below, key, component, placement) {
+  let target = placement === "belowEditor" ? below : above, other = placement === "belowEditor" ? above : below, existingTarget = target.get(key), existingOther = other.get(key);
+  if (existingTarget && existingTarget !== component && existingTarget.dispose?.(), existingOther && existingOther !== component && existingOther.dispose?.(), other.delete(key), component === void 0) {
+    target.delete(key);
+    return;
+  }
+  target.set(key, component);
+}
+function orderedExtensionWidgets(widgets) {
+  return [...widgets.entries()].map(([key, component], insertionIndex) => ({ key, component, insertionIndex })).sort((left, right) => {
+    let leftOrder = BUILTIN_WIDGET_ORDER.get(left.key), rightOrder = BUILTIN_WIDGET_ORDER.get(right.key);
+    return leftOrder !== void 0 || rightOrder !== void 0 ? (leftOrder ?? Number.MAX_SAFE_INTEGER) - (rightOrder ?? Number.MAX_SAFE_INTEGER) : left.insertionIndex - right.insertionIndex;
+  }).map(({ key, component }) => [key, component]);
+}
+function widgetSeparatorNeedsSpacer(previousKey, key) {
+  return !(previousKey === "todos" && key === "subagent-async");
+}
+
 // packages/coding-agent/dist/modes/interactive/skill-tag-autocomplete.js
 import { fuzzyFilter as fuzzyFilter4 } from "@ashx-j/lunr-tui";
 function extractSkillTagPrefix(textBeforeCursor, character) {
@@ -5329,6 +5406,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;
@@ -6170,23 +6248,14 @@ ${warningLines}`, 0, 0)), this.loadedResourcesContainer.addChild(new Spacer19(1)
    * Set an extension widget (string array or custom component).
    */
   setExtensionWidget(key, content, options) {
-    let placement = options?.placement ?? "aboveEditor", removeExisting = (map) => {
-      let existing = map.get(key);
-      existing?.dispose && existing.dispose(), map.delete(key);
-    };
-    if (removeExisting(this.extensionWidgetsAbove), removeExisting(this.extensionWidgetsBelow), content === void 0) {
-      this.renderWidgets();
-      return;
-    }
-    let component;
+    let placement = options?.placement ?? "aboveEditor", component;
     if (Array.isArray(content)) {
       let container = new Container19();
       for (let line of content.slice(0, _InteractiveMode.MAX_WIDGET_LINES))
         container.addChild(new Text21(line, 1, 0));
       content.length > _InteractiveMode.MAX_WIDGET_LINES && container.addChild(new Text21(theme.fg("muted", "... (widget truncated)"), 1, 0)), component = container;
-    } else
-      component = content(this.ui, theme);
-    (placement === "belowEditor" ? this.extensionWidgetsBelow : this.extensionWidgetsAbove).set(key, component), this.renderWidgets();
+    } else content && (component = content(this.ui, theme));
+    replaceExtensionWidget(this.extensionWidgetsAbove, this.extensionWidgetsBelow, key, component, placement), this.renderWidgets();
   }
   clearExtensionWidgets() {
     for (let widget of this.extensionWidgetsAbove.values())
@@ -6212,9 +6281,9 @@ ${warningLines}`, 0, 0)), this.loadedResourcesContainer.addChild(new Spacer19(1)
       return;
     }
     leadingSpacer && container.addChild(new Spacer19(1));
-    let first = !0;
-    for (let component of widgets.values())
-      first || (container.addChild(new Spacer19(1)), container.addChild(new DynamicBorder((s) => theme.fg("dim", s)))), first = !1, container.addChild(component);
+    let previousKey;
+    for (let [key, component] of orderedExtensionWidgets(widgets))
+      previousKey !== void 0 && (widgetSeparatorNeedsSpacer(previousKey, key) && container.addChild(new Spacer19(1)), container.addChild(new DynamicBorder((s) => theme.fg("dim", s)))), previousKey = key, container.addChild(component);
   }
   /**
    * Set a custom footer component, or restore the built-in footer.
@@ -6464,6 +6533,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)
@@ -7555,6 +7633,7 @@ Pi will resume when the editor exits.
         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(),
@@ -7655,6 +7734,9 @@ Pi will resume when the editor exits.
         onSmoothStreamingChange: (enabled) => {
           this.applySmoothStreamingSettingChange(enabled);
         },
+        onSubagentSpinnerChange: (spinner) => {
+          this.settingsManager.setSubagentSpinner(spinner), this.ui.requestRender();
+        },
         onSessionRetentionDaysChange: (days) => {
           this.settingsManager.setSessionRetentionDays(days);
         },
@@ -7785,6 +7867,7 @@ Pi will resume when the editor exits.
           autoManage: () => this.settingsManager.getAutoManageSubscriptions(),
           requestRender: () => this.ui.requestRender()
         },
+        requestRender: () => this.ui.requestRender(),
         createModelTierPicker: (_tier, currentModelRef, done2) => new ModelSelectorComponent(this.ui, this.resolveModelReference(currentModelRef), this.settingsManager, this.session.modelRuntime, this.session.scopedModels, (model) => {
           done2(`${model.provider}/${model.id}`), this.ui.requestRender();
         }, () => {