@ashx-j/lunr 0.2.19 → 0.2.21

package/dist/builtin-extensions/pi-subagents/src/extension/index.js

@@ -2,32 +2,33 @@
 /**
  * Subagent Tool
  *
- * Full-featured subagent with sync and async modes.
- * - Sync (default): Streams output, renders markdown, tracks usage
- * - Async: Background execution, emits events when done
+ * Full-featured subagent with foreground and async modes.
+ * - Async (default): Background execution, emits events when done
+ * - Foreground (async:false or clarify:true): Streams output, renders markdown, tracks usage
  *
  * Modes: single (agent + task), parallel (tasks[]), chain (chain[] with {previous})
- * Toggle: async parameter (default: false, configurable via config.json)
  *
  * Config file: ~/.lunr/agent/extensions/subagent/config.json
- *   { "asyncByDefault": true, "forceTopLevelAsync": true, "maxSubagentDepth": 1, "intercomBridge": { "mode": "always", "instructionFile": "./intercom-bridge.md" }, "worktreeSetupHook": "./scripts/setup-worktree.mjs" }
+ *   { "maxSubagentDepth": 1, "intercomBridge": { "mode": "always", "instructionFile": "./intercom-bridge.md" }, "worktreeSetupHook": "./scripts/setup-worktree.mjs" }
  */
 import { randomUUID } from "node:crypto";
+import { createSubagentCancellation, registerSubagentCancellation } from "../../../../core/subagent-cancellation.js";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { keyText } from "../../../../modes/interactive/components/keybinding-hints.js";
 import { awaitWithAbort } from "../../../../utils/await-with-abort.js";
 import { Box, Container, Spacer, Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@ashx-j/lunr-tui";
 import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.js";
 import { resolveCurrentSessionId } from "../shared/session-identity.js";
 import { cleanupOldChainDirs } from "../shared/settings.js";
-import { clearLegacyResultAnimationTimer, renderSubagentResult, subagentAnimSink } from "../tui/render.js";
+import { clearLegacyResultAnimationTimer, disposeSubagentWidget, renderSubagentResult, SUBAGENT_PAINT_INTERVAL_MS, subagentAnimSink, } from "../tui/render.js";
 import { SubagentParams } from "./schemas.js";
 import { validateChainInput } from "./chain-validation.js";
+import { resolveSubagentRequestParams } from "../runs/foreground/request-params.js";
 import { createAsyncJobTracker } from "../runs/background/async-job-tracker.js";
 import { createResultWatcher } from "../runs/background/result-watcher.js";
 import { createScheduledRunManager } from "../runs/background/scheduled-runs.js";
+import { isAsyncSubagentExecution, normalizeAsyncLaunchConfig, subagentLaunchRunsAsync } from "../runs/background/top-level-async.js";
 import { registerSlashCommands } from "../slash/slash-commands.js";
 import { registerPromptTemplateDelegationBridge } from "../slash/prompt-template-bridge.js";
 import { registerMainWatchdog } from "../watchdog/register-main.js";
@@ -41,10 +42,9 @@ import { drainOutstandingWork } from "../runs/background/auto-drain.js";
 import registerSubagentNotify, { parseSubagentNotifyContent } from "../runs/background/notify.js";
 import { formatSteeringNotice, handleSubagentSteeringNotice, SUBAGENT_STEERING_MESSAGE_TYPE } from "./steering-notices.js";
 import { SUBAGENT_CHILD_ENV, SUBAGENT_PARENT_SESSION_ENV } from "../runs/shared/pi-args.js";
-import { formatDuration, shortenPath } from "../shared/formatters.js";
 import { loadConfig } from "./config.js";
 import { buildSubagentToolDescription } from "./tool-description.js";
-import { ASYNC_DIR, DEFAULT_ARTIFACT_CONFIG, RESULTS_DIR, SLASH_RESULT_TYPE, SLASH_TEXT_RESULT_TYPE, SUBAGENT_ASYNC_COMPLETE_EVENT, SUBAGENT_ASYNC_STARTED_EVENT, SUBAGENT_CONTROL_EVENT, SUBAGENT_STEERING_NOTICE_EVENT, WIDGET_KEY, } from "../shared/types.js";
+import { ASYNC_DIR, childRowLabel, DEFAULT_ARTIFACT_CONFIG, RESULTS_DIR, SLASH_RESULT_TYPE, SLASH_TEXT_RESULT_TYPE, SUBAGENT_ASYNC_COMPLETE_EVENT, SUBAGENT_ASYNC_STARTED_EVENT, SUBAGENT_CONTROL_EVENT, SUBAGENT_STEERING_NOTICE_EVENT, WIDGET_KEY, } from "../shared/types.js";
 import { clearPendingForegroundControlNotices, formatSubagentControlNotice, handleSubagentControlNotice, SUBAGENT_CONTROL_MESSAGE_TYPE, } from "./control-notices.js";
 export { loadConfig } from "./config.js";
 /**
@@ -114,23 +114,72 @@ function effectiveParallelTaskCount(tasks) {
         return total + count;
     }, 0);
 }
-export function renderSubagentCall(args, theme, context) {
+function matchingActionJobs(state, requestedId) {
+    const jobs = new Map();
+    for (const job of state.asyncJobs.values())
+        jobs.set(job.asyncId, job);
+    for (const job of state.fleetJobs?.values() ?? [])
+        jobs.set(job.asyncId, job);
+    const exact = jobs.get(requestedId);
+    if (exact)
+        return [exact];
+    return [...jobs.values()].filter((job) => job.asyncId.startsWith(requestedId));
+}
+export function resolveSubagentActionDisplayTitle(args, state) {
+    const requestedId = (args.id || args.runId || "").trim();
+    if (!requestedId)
+        return undefined;
+    const matches = matchingActionJobs(state, requestedId);
+    if (matches.length !== 1)
+        return undefined;
+    const job = matches[0];
+    const steps = job.steps ?? [];
+    if (Number.isInteger(args.index)) {
+        const step = steps.find((candidate) => candidate.index === args.index) ?? steps[args.index];
+        return step ? childRowLabel(step) : undefined;
+    }
+    if (steps.length === 1)
+        return childRowLabel(steps[0]);
+    if (steps.length > 1)
+        return `${job.mode ?? "subagent"} run`;
+    if (job.agents?.length === 1)
+        return job.agents[0];
+    if (job.agents?.length)
+        return `${job.mode ?? "subagent"} run`;
+    return undefined;
+}
+export function renderSubagentCall(rawArgs, theme, context, options) {
+    const args = resolveSubagentRequestParams(rawArgs);
     if (args.action) {
-        const target = args.id || args.runId || "";
+        const resultTitle = context?.result?.details?.displayTitle;
+        const resolvedTitle = resultTitle || options?.resolveActionTitle?.(args);
+        const target = resolvedTitle || args.id || args.runId || "";
         return new Text(`${theme.fg("toolTitle", theme.bold("subagent "))}${args.action}${target ? ` ${theme.fg("accent", target)}` : ""}`, 0, 0);
     }
     const isParallel = (args.tasks?.length ?? 0) > 0;
     const parallelCount = effectiveParallelTaskCount(args.tasks);
-    const asyncLabel = args.async === true && args.clarify !== true ? theme.fg("warning", " [async]") : "";
+    const asyncMark = subagentLaunchRunsAsync(args) ? `${theme.fg("warning", "async")} ` : "";
     if (args.chain?.length) {
-        return new Text(`${theme.fg("toolTitle", theme.bold("subagent "))}chain (${args.chain.length})${asyncLabel}`, 0, 0);
+        return new Text(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}chain (${args.chain.length})`, 0, 0);
     }
     if (isParallel) {
-        return new Text(`${theme.fg("toolTitle", theme.bold("subagent "))}parallel (${parallelCount})${asyncLabel}`, 0, 0);
+        return new Text(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}parallel (${parallelCount})`, 0, 0);
     }
-    const showDescription = !context?.isPartial && !context?.expanded && !context?.isError;
+    const showDescription = !context?.result && !context?.isPartial && !context?.expanded && !context?.isError;
     const description = showDescription ? theme.fg("accent", args.description || args.task || "?") : "";
-    return new Text(`${theme.fg("toolTitle", theme.bold(description ? "subagent " : "subagent"))}${description}${asyncLabel}`, 0, 0);
+    const title = theme.fg("toolTitle", theme.bold("subagent"));
+    const rest = [asyncMark.trim() ? theme.fg("warning", "async") : "", description].filter(Boolean).join(" ");
+    return new Text(rest ? `${title} ${rest}` : title, 0, 0);
+}
+export function renderSubagentNotify(details, theme) {
+    const status = typeof details?.status === "string" ? details.status : "";
+    const icon = status === "completed"
+        ? theme.fg("success", "✓")
+        : status === "failed"
+            ? theme.fg("error", "✗")
+            : theme.fg("warning", "■");
+    const title = details?.agent || "child";
+    return new Text(`${icon} ${theme.bold(title)} ${theme.fg("dim", status)}`, 0, 0);
 }
 function ensureSubagentResultAnimation(context) {
     const state = context.state;
@@ -141,7 +190,7 @@ function ensureSubagentResultAnimation(context) {
     if (state.frame === undefined)
         state.frame = 0;
     state.subagentResultAnimationTimer = setInterval(() => {
-        state.frame = ((state.frame ?? 0) + 1) % 10;
+        state.frame = (state.frame ?? 0) + 1;
         try {
             const entries = state.animEntries;
             if (entries?.length && typeof context.requestRender === "function") {
@@ -155,7 +204,7 @@ function ensureSubagentResultAnimation(context) {
             }
         }
         catch { }
-    }, 80);
+    }, SUBAGENT_PAINT_INTERVAL_MS);
 }
 function isSlashResultError(result) {
     return result.details?.results.some((entry) => entry.exitCode !== 0 && entry.progress?.status !== "running") || false;
@@ -229,14 +278,14 @@ export default function registerSubagentExtension(pi) {
     ensureAccessibleDir(RESULTS_DIR);
     ensureAccessibleDir(ASYNC_DIR);
     cleanupOldChainDirs();
-    const config = loadConfig();
+    const config = normalizeAsyncLaunchConfig(loadConfig());
     const waitToolConfig = resolveWaitToolConfig(config.waitTool);
-    const asyncByDefault = config.asyncByDefault === true;
     const tempArtifactsDir = getArtifactsDir(null);
     cleanupAllArtifactDirs(DEFAULT_ARTIFACT_CONFIG.cleanupDays);
     const state = {
         baseCwd: "",
         currentSessionId: null,
+        sessionGeneration: 0,
         foregroundSubagentInFlight: 0,
         subagentSpawns: { sessionId: null, count: 0 },
         asyncJobs: new Map(),
@@ -264,24 +313,40 @@ export default function registerSubagentExtension(pi) {
     let generation = 0;
     let executorPromise;
     const pendingLaunches = new Set();
+    const pendingAsyncLaunches = new Set();
+    let unregisterCancellation;
     const runtimeCleanup = () => {
         generation++;
+        supervisorChannel.cancelOwnedQuestions("parent runtime replaced");
+        state.sessionGeneration = (state.sessionGeneration ?? 0) + 1;
         executorPromise = undefined;
         pendingLaunches.clear();
+        pendingAsyncLaunches.clear();
+        unregisterCancellation?.();
         mainWatchdog.dispose();
         stopResultWatcher();
         scheduledRunManager.stop();
         supervisorChannel.dispose();
         clearPendingForegroundControlNotices(state);
+        disposeSubagentWidget();
         if (state.poller) {
             clearInterval(state.poller);
             state.poller = null;
         }
     };
     globalStore[runtimeCleanupStoreKey] = runtimeCleanup;
-    const { ensurePoller, refreshWidget, handleStarted, handleComplete, resetJobs, restoreActiveJobs } = createAsyncJobTracker(pi, state, ASYNC_DIR, {
+    const { ensurePoller, refreshWidget, handleStarted, handleComplete: trackComplete, resetJobs, restoreActiveJobs } = createAsyncJobTracker(pi, state, ASYNC_DIR, {
         widgetEnabled: config.asyncWidget !== false,
     });
+    const handleComplete = (data) => {
+        trackComplete(data);
+        const result = data;
+        if (typeof state.currentSessionId === "string" && result.sessionId !== state.currentSessionId)
+            return;
+        if (typeof result.id === "string" && result.id.trim()) {
+            supervisorChannel.settleRunQuestions(result.id, "async run settled");
+        }
+    };
     let executorExecute;
     const scheduledRunManager = createScheduledRunManager({
         config,
@@ -308,9 +373,12 @@ export default function registerSubagentExtension(pi) {
                     return;
                 launchReady = true;
                 pendingLaunches.delete(launchReadyPromise);
+                pendingAsyncLaunches.delete(launchReadyPromise);
                 resolveLaunchReady();
             };
             pendingLaunches.add(launchReadyPromise);
+            if (isAsyncSubagentExecution(resolveSubagentRequestParams(params)))
+                pendingAsyncLaunches.add(launchReadyPromise);
             try {
                 const currentGeneration = generation;
                 signal?.throwIfAborted();
@@ -319,7 +387,7 @@ export default function registerSubagentExtension(pi) {
                         if (generation !== currentGeneration)
                             throw new Error("Subagent session changed before initialization");
                         return createSubagentExecutor({
-                            pi, state, config, asyncByDefault,
+                            pi, state, config,
                             waitToolEnabled: waitToolConfig.enabled,
                             handleScheduledRunAction: (params, ctx) => scheduledRunManager.handleToolCall(params, ctx),
                             watchdog: mainWatchdog, tempArtifactsDir, getSubagentSessionRoot, expandTilde,
@@ -360,40 +428,12 @@ export default function registerSubagentExtension(pi) {
                 .join("\n");
         return new Text(content, 0, 0);
     });
-    pi.registerMessageRenderer("subagent-notify", (message, options, theme) => {
+    pi.registerMessageRenderer("subagent-notify", (message, _options, theme) => {
         const content = typeof message.content === "string" ? message.content : "";
         const details = message.details ?? parseSubagentNotifyContent(content);
         if (!details)
             return new Text(content, 0, 0);
-        const icon = details.status === "completed"
-            ? theme.fg("success", "✓")
-            : details.status === "paused"
-                ? theme.fg("warning", "■")
-                : theme.fg("error", "✗");
-        const parts = [];
-        if (details.taskInfo)
-            parts.push(details.taskInfo);
-        if (details.durationMs !== undefined)
-            parts.push(formatDuration(details.durationMs));
-        const notifyLabel = details.taskInfo || details.agent || "child";
-        let text = `${icon} ${theme.bold(notifyLabel)} ${theme.fg("dim", details.status)}`;
-        if (parts.length > 0)
-            text += ` ${theme.fg("dim", "·")} ${parts.map((part) => theme.fg("dim", part)).join(` ${theme.fg("dim", "·")} `)}`;
-        const trimmedPreview = details.resultPreview.trim();
-        const previewLines = options.expanded
-            ? trimmedPreview.split("\n").filter((line) => line.trim())
-            : [trimmedPreview.split("\n", 1)[0] ?? ""].filter((line) => line.trim());
-        for (const line of previewLines.length > 0 ? previewLines : ["(no output)"]) {
-            text += `\n  ${theme.fg("dim", `⎿  ${line}`)}`;
-        }
-        if (!options.expanded && trimmedPreview.includes("\n")) {
-            const expandKey = keyText("app.tools.expand");
-            text += `\n  ${theme.fg("dim", `${expandKey} full notification`)}`;
-        }
-        if (details.sessionLabel && details.sessionValue) {
-            text += `\n  ${theme.fg("muted", `${details.sessionLabel}: ${shortenPath(details.sessionValue)}`)}`;
-        }
-        return new Text(text, 0, 0);
+        return renderSubagentNotify(details, theme);
     });
     pi.registerMessageRenderer(SUBAGENT_STEERING_MESSAGE_TYPE, (message, _options, theme) => {
         const details = message.details;
@@ -402,10 +442,16 @@ export default function registerSubagentExtension(pi) {
         return new Text(theme.fg(details.state === "recovered" ? "warning" : "error", formatSteeringNotice(details)), 0, 0);
     });
     pi.registerMessageRenderer(SUBAGENT_CONTROL_MESSAGE_TYPE, () => undefined);
-    const executeSubagentCollapsed = (id, params, signal, onUpdate, ctx) => {
+    const executeSubagentCollapsed = async (id, params, signal, onUpdate, ctx) => {
         if (ctx.hasUI)
             ctx.ui.setToolsExpanded(false);
-        return executor.execute(id, params, signal, onUpdate, ctx);
+        const displayTitle = params.action === "steer"
+            ? resolveSubagentActionDisplayTitle(params, state)
+            : undefined;
+        const result = await executor.execute(id, params, signal, onUpdate, ctx);
+        if (displayTitle && result.details)
+            result.details.displayTitle = displayTitle;
+        return result;
     };
     const slashBridge = registerSlashSubagentBridge({
         events: pi.events,
@@ -439,7 +485,9 @@ export default function registerSubagentExtension(pi) {
         execute(id, params, signal, onUpdate, ctx) {
             return executeSubagentCollapsed(id, params, signal, onUpdate, ctx);
         },
-        renderCall: renderSubagentCall,
+        renderCall: (args, theme, context) => renderSubagentCall(args, theme, context, {
+            resolveActionTitle: (params) => resolveSubagentActionDisplayTitle(params, state),
+        }),
         renderResult(result, options, theme, context) {
             if (subagentResultIsRunning(result)) {
                 ensureSubagentResultAnimation(context);
@@ -462,8 +510,8 @@ export default function registerSubagentExtension(pi) {
         },
     };
     pi.registerTool(tool);
-    // lunr: register a callback so toggling model tiers mid-session rebuilds the subagent
-    // tool description (adds/removes MODEL TIERS guidance) and refreshes the tool registry.
+    // lunr: register a callback so model-tier settings changes rebuild the subagent
+    // tool description and refresh the live registry.
     const modelTierBridge = globalThis[Symbol.for("@lunr/model-tiers")];
     modelTierBridge?.registerToolDescriptionRefresher?.(() => {
         tool.description = buildSubagentToolDescription(config);
@@ -544,8 +592,12 @@ export default function registerSubagentExtension(pi) {
     };
     const resetSessionState = (ctx) => {
         generation++;
+        supervisorChannel.cancelOwnedQuestions("parent session replaced");
+        state.sessionGeneration = (state.sessionGeneration ?? 0) + 1;
         executorPromise = undefined;
         pendingLaunches.clear();
+        pendingAsyncLaunches.clear();
+        unregisterCancellation?.();
         state.baseCwd = ctx.cwd;
         state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
         state.subagentSpawns = { sessionId: state.currentSessionId, count: 0 };
@@ -565,6 +617,20 @@ export default function registerSubagentExtension(pi) {
         clearPendingForegroundControlNotices(state);
         resetJobs(ctx);
         restoreActiveJobs(ctx);
+        const sessionId = state.currentSessionId;
+        const sessionGeneration = generation;
+        if (sessionId)
+            unregisterCancellation = registerSubagentCancellation(sessionId, createSubagentCancellation({
+                pendingLaunches: pendingAsyncLaunches,
+                isCurrent: () => generation === sessionGeneration && state.currentSessionId === sessionId,
+                getActiveRunIds: () => [...state.asyncJobs.values()]
+                    .filter((job) => job.sessionId === sessionId && (job.status === "queued" || job.status === "running"))
+                    .map((job) => job.asyncId),
+                async stopRun(id) {
+                    const result = await executor.execute(randomUUID(), { action: "stop", id }, new AbortController().signal, undefined, ctx);
+                    return !result.isError;
+                },
+            }));
         scheduledRunManager.bindSession(ctx);
         restoreSlashFinalSnapshots(ctx.sessionManager.getEntries());
         primeExistingResults();
@@ -576,8 +642,12 @@ export default function registerSubagentExtension(pi) {
     });
     pi.on("session_shutdown", () => {
         generation++;
+        supervisorChannel.cancelOwnedQuestions("parent session shutdown");
+        state.sessionGeneration = (state.sessionGeneration ?? 0) + 1;
         executorPromise = undefined;
         pendingLaunches.clear();
+        pendingAsyncLaunches.clear();
+        unregisterCancellation?.();
         delete process.env[SUBAGENT_PARENT_SESSION_ENV];
         for (const unsubscribe of eventUnsubscribes) {
             try {
@@ -610,6 +680,7 @@ export default function registerSubagentExtension(pi) {
         if (globalStore[runtimeCleanupStoreKey] === runtimeCleanup) {
             delete globalStore[runtimeCleanupStoreKey];
         }
+        disposeSubagentWidget();
         try {
             if (state.lastUiContext?.hasUI) {
                 state.lastUiContext.ui.setWidget(WIDGET_KEY, undefined);