@ashx-j/lunr 0.2.18 → 0.2.20

package/dist/builtin-extensions/pi-subagents/src/tui/render.js

@@ -6,7 +6,7 @@ import { getMarkdownTheme } from "../../../../modes/interactive/theme/theme.js";
 import { keyText } from "../../../../modes/interactive/components/keybinding-hints.js";
 import { Container, Markdown, Spacer, Text, visibleWidth } from "@ashx-j/lunr-tui";
 import { MAX_WIDGET_JOBS, WIDGET_KEY, } from "../shared/types.js";
-import { formatTokens, formatUsage, formatDuration, formatModelSelection, formatToolCall, shortenPath } from "../shared/formatters.js";
+import { formatTokens, formatUsage, formatDuration, formatModelSelection, formatCompactModelBadge, formatToolCall, shortenPath } from "../shared/formatters.js";
 import { sanitizeChildDescription } from "../shared/child-spec.js";
 import { getDisplayItems, getSingleResultOutput } from "../shared/utils.js";
 import { flatToLogicalStepIndex } from "../runs/background/parallel-groups.js";
@@ -202,6 +202,20 @@ function statJoin(theme, parts) {
 function formatTokenStat(tokens) {
     return `${formatTokens(tokens)} token`;
 }
+function usageTokenTotal(usage) {
+    if (!usage)
+        return 0;
+    return (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
+}
+function compactResultTokens(result) {
+    const progress = result.progress || result.progressSummary;
+    if (progress && progress.tokens > 0)
+        return progress.tokens;
+    const fromUsage = usageTokenTotal(result.usage);
+    if (fromUsage > 0)
+        return fromUsage;
+    return progress?.tokens ?? 0;
+}
 function formatToolUseStat(count) {
     return `${count} tool use${count === 1 ? "" : "s"}`;
 }
@@ -220,9 +234,10 @@ function formatTotalCostStat(totalCost) {
 function liveDurationMs(progress, running, now) {
     if (!progress)
         return 0;
+    const durationMs = progress.durationMs ?? 0;
     if (!running || progress.lastActivityAt === undefined)
-        return progress.durationMs;
-    return progress.durationMs + Math.max(0, now - progress.lastActivityAt);
+        return durationMs;
+    return durationMs + Math.max(0, now - progress.lastActivityAt);
 }
 function formatProgressStats(theme, progress, includeDuration = true, options = {}) {
     if (!progress)
@@ -299,17 +314,18 @@ function resultGlyph(result, output, theme, running = result.progress?.status ==
         return theme.fg("warning", "✓");
     return theme.fg("success", "✓");
 }
-/** Compact hang row: tool count, tokens, elapsed time. */
-export function formatCompactStatsHangLine(progress, width, paint = (s) => s, prefix = "  ⎿  ", now = Date.now(), running = false) {
-    const toolCount = progress?.toolCount ?? 0;
-    const tokens = progress?.tokens ?? 0;
-    const durationMs = liveDurationMs(progress, running, now);
+function formatCompactRowStats(tokens, durationMs) {
+    return `${formatTokenStat(tokens)} · ${durationMs > 0 ? formatDuration(durationMs) : "0ms"}`;
+}
+/** Unified compact row: glyph description · tier|model · tokens · time. */
+export function formatCompactSubagentRow(theme, width, parts) {
+    const stats = formatCompactRowStats(parts.tokens, parts.durationMs);
     const body = [
-        formatToolUseStat(toolCount),
-        formatTokenStat(tokens),
-        durationMs > 0 ? formatDuration(durationMs) : "0ms",
-    ].join(" · ");
-    return truncLine(paint(`${prefix}${body}`), width);
+        `${parts.prefix ?? ""}${parts.glyph} ${themeBold(theme, parts.description)}`,
+        parts.modelBadge ? theme.fg("dim", parts.modelBadge) : "",
+        theme.fg("dim", stats),
+    ].filter(Boolean).join(` ${theme.fg("dim", "·")} `);
+    return truncLine(body, width);
 }
 export function widgetRenderKey(job) {
     return JSON.stringify({
@@ -955,18 +971,18 @@ function foregroundStyleWidgetDetails(job, theme, expanded, width) {
 }
 function compactJobProgress(job, step, now = Date.now()) {
     const running = (step?.status ?? job.status) === "running";
+    const tokens = step?.tokens?.total ?? job.totalTokens?.total ?? 0;
+    if (step?.durationMs !== undefined) {
+        return {
+            tokens,
+            durationMs: liveDurationMs({ durationMs: step.durationMs, lastActivityAt: step.lastActivityAt }, running, now),
+        };
+    }
     const startedAt = step?.startedAt ?? job.startedAt;
+    if (startedAt === undefined)
+        return { tokens, durationMs: 0 };
     const endedAt = running ? now : step?.endedAt ?? step?.lastActivityAt ?? job.updatedAt ?? now;
-    const durationMs = step?.durationMs !== undefined
-        ? step.durationMs
-        : startedAt !== undefined
-            ? Math.max(0, endedAt - startedAt)
-            : 0;
-    return {
-        toolCount: step?.toolCount ?? job.toolCount ?? 0,
-        tokens: step?.tokens?.total ?? job.totalTokens?.total ?? 0,
-        durationMs,
-    };
+    return { tokens, durationMs: Math.max(0, endedAt - startedAt) };
 }
 function compactJobLead(job, step) {
     return compactRowLead({
@@ -974,29 +990,42 @@ function compactJobLead(job, step) {
         task: step?.description ?? step?.agent,
     }) || widgetJobName(job);
 }
+function activeJobStep(job) {
+    const steps = job.steps ?? [];
+    return steps.find((step) => step.status === "running")
+        ?? steps.find((step) => step.status === "pending" || step.status === "queued")
+        ?? steps[steps.length - 1];
+}
+function compactJobChildRows(job, theme, width, now = Date.now()) {
+    const steps = job.steps ?? [];
+    if (steps.length <= 1)
+        return compactJobLines(job, steps[0], theme, width, now);
+    return steps.flatMap((step) => compactJobLines(job, step, theme, width, now));
+}
 function compactJobLines(job, step, theme, width, now = Date.now()) {
     const running = (step?.status ?? job.status) === "running";
     const lead = compactJobLead(job, step);
-    const modelBadge = formatModelSelection(step?.modelSelection, step?.model, step?.thinking);
-    const permissionBadge = step?.permissions ? theme.fg("dim", step.permissions) : "";
+    const modelBadge = formatCompactModelBadge(step?.modelSelection, step?.model);
     const glyph = step
         ? widgetStepGlyph(step.status, theme, running ? (widgetStepRunningSeed(step, step.index) ?? 0) + widgetAnimFrame(now) : widgetStepRunningSeed(step, step.index))
         : widgetStatusGlyph(job, theme, now);
-    const hang = formatCompactStatsHangLine(compactJobProgress(job, step, now), width, (s) => theme.fg("dim", s), "  ⎿  ", now, running);
-    return [
-        truncLine(`${glyph} ${themeBold(theme, lead)}${modelBadge ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", modelBadge)}` : ""}${permissionBadge ? ` ${theme.fg("dim", "·")} ${permissionBadge}` : ""}`, width),
-        hang,
-    ];
-}
-function buildSingleWidgetLines(job, theme, width, _expanded) {
-    const now = Date.now();
+    const progress = compactJobProgress(job, step, now);
+    return [formatCompactSubagentRow(theme, width, {
+            glyph,
+            description: lead,
+            modelBadge,
+            tokens: progress.tokens,
+            durationMs: progress.durationMs,
+        })];
+}
+function buildSingleWidgetLines(job, theme, width, _expanded, now = Date.now()) {
     const steps = job.steps ?? [];
     if (steps.length <= 1)
         return compactJobLines(job, steps[0], theme, width, now);
     return steps.flatMap((step) => compactJobLines(job, step, theme, width, now));
 }
-function compactSingleWidgetLines(job, theme, width) {
-    return buildSingleWidgetLines(job, theme, width, false);
+function compactSingleWidgetLines(job, theme, width, now = Date.now()) {
+    return buildSingleWidgetLines(job, theme, width, false, now);
 }
 const RESERVED_NON_WIDGET_ROWS = 19;
 let widgetLayoutSession;
@@ -1031,7 +1060,9 @@ function widgetHeaderCounts(jobs) {
 function buildSingleLineWidgetLines(jobs, theme, width) {
     const counts = widgetHeaderCounts(jobs);
     const hasActive = counts.running.length > 0 || counts.queued.length > 0;
-    const glyph = counts.running.length > 0 ? runningGlyph(widgetJobsRunningSeed(counts.running)) : hasActive ? "●" : "○";
+    const glyph = counts.running.length > 0
+        ? runningGlyph((widgetJobsRunningSeed(counts.running) ?? 0) + widgetAnimFrame())
+        : hasActive ? "●" : "○";
     const parts = [];
     if (counts.running.length > 0)
         parts.push(`${counts.running.length}/${jobs.length} running`);
@@ -1105,7 +1136,9 @@ function selectProgressiveJobKeys(jobs, previousKeys, bodyRows) {
 function progressiveHeaderLine(jobs, theme, width) {
     const counts = widgetHeaderCounts(jobs);
     const hasActive = counts.running.length > 0 || counts.queued.length > 0;
-    const glyph = counts.running.length > 0 ? runningGlyph(widgetJobsRunningSeed(counts.running)) : hasActive ? "●" : "○";
+    const glyph = counts.running.length > 0
+        ? runningGlyph((widgetJobsRunningSeed(counts.running) ?? 0) + widgetAnimFrame())
+        : hasActive ? "●" : "○";
     const parts = [];
     if (counts.running.length > 0)
         parts.push(formatAgentRunningLabel(counts.running.length));
@@ -1123,17 +1156,9 @@ function progressiveHeaderLine(jobs, theme, width) {
     }
     return truncLine(`${theme.fg(hasActive ? "accent" : "dim", glyph)} ${theme.fg(hasActive ? "accent" : "dim", "Async agents")} ${theme.fg("dim", "·")} ${theme.fg("dim", parts.join(", ") || `${jobs.length} total`)}`, width);
 }
-function progressiveJobLine(job, theme, width) {
-    const stats = widgetStats(job, theme);
-    const activity = widgetActivity(job);
-    const status = job.status === "complete" ? "done" : job.status;
-    const parts = [
-        themeBold(theme, widgetJobName(job)),
-        theme.fg("dim", status),
-        stats,
-        activity && activity.toLowerCase() !== status ? theme.fg("dim", activity) : "",
-    ].filter(Boolean);
-    return truncLine(`  ${widgetStatusGlyph(job, theme)} ${parts.join(` ${theme.fg("dim", "·")} `)}`, width);
+function progressiveJobLine(job, theme, width, now = Date.now()) {
+    const row = compactJobLines(job, activeJobStep(job), theme, Math.max(1, width - 2), now)[0] ?? "";
+    return row ? `  ${row}` : "";
 }
 function progressiveHiddenLine(hiddenJobs, theme, width) {
     const counts = widgetHeaderCounts(hiddenJobs);
@@ -1219,31 +1244,19 @@ function fitAdaptiveWidgetLines(jobs, lines, theme, width, expanded) {
     widgetLayoutSession = { expanded, rows, columns, tier: "progressive", lockedRows, visibleJobKeys: rendered.visibleJobKeys };
     return rendered.lines;
 }
-function buildWidgetComponent(jobs, expanded) {
-    return (_tui, theme) => {
-        const width = getTermWidth();
-        const lines = expanded
-            ? buildWidgetLines(jobs, theme, width, true)
-            : jobs.length === 1
-                ? compactSingleWidgetLines(jobs[0], theme, width)
-                : buildWidgetLines(jobs, theme, width, false);
-        const container = new Container();
-        for (const line of fitAdaptiveWidgetLines(jobs, lines, theme, width, expanded))
-            container.addChild(new Text(line, 1, 0));
-        return container;
-    };
-}
-export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded = false) {
+export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded = false, now = Date.now()) {
     if (jobs.length === 0)
         return [];
     if (jobs.length === 1)
-        return buildSingleWidgetLines(jobs[0], theme, width, expanded);
+        return buildSingleWidgetLines(jobs[0], theme, width, expanded, now);
     const running = jobs.filter((job) => job.status === "running");
     const queued = jobs.filter((job) => job.status === "queued");
     const finished = jobs.filter((job) => job.status !== "running" && job.status !== "queued");
     const lines = [];
     const hasActive = running.length > 0 || queued.length > 0;
-    const headerGlyph = running.length > 0 ? runningGlyph(widgetJobsRunningSeed(running)) : hasActive ? "●" : "○";
+    const headerGlyph = running.length > 0
+        ? runningGlyph((widgetJobsRunningSeed(running) ?? 0) + widgetAnimFrame(now))
+        : hasActive ? "●" : "○";
     lines.push(truncLine(`${theme.fg(hasActive ? "accent" : "dim", headerGlyph)} ${theme.fg(hasActive ? "accent" : "dim", "Async agents")} ${theme.fg("dim", "· background")}`, width));
     const items = [];
     let hiddenRunning = 0;
@@ -1255,12 +1268,8 @@ export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded =
             hiddenRunning++;
             continue;
         }
-        const stats = widgetStats(job, theme);
-        items.push([
-            `${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
-            `  ${theme.fg("dim", `⎿  ${widgetActivity(job)}`)}`,
-            ...widgetParallelAgentDetails(job, theme, expanded, width),
-        ]);
+        const row = compactJobChildRows(job, theme, Math.max(1, width - 3), now);
+        items.push(expanded ? [...row, ...widgetParallelAgentDetails(job, theme, true, width)] : row);
         slots--;
     }
     if (queued.length > 0 && slots > 0) {
@@ -1273,12 +1282,8 @@ export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded =
             hiddenFinished++;
             continue;
         }
-        const stats = widgetStats(job, theme);
-        items.push([
-            `${widgetStatusGlyph(job, theme)} ${themeBold(theme, widgetJobName(job))}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
-            `  ${theme.fg("dim", `⎿  ${widgetActivity(job)}`)}`,
-            ...widgetParallelAgentDetails(job, theme, expanded, width),
-        ]);
+        const row = compactJobChildRows(job, theme, Math.max(1, width - 3), now);
+        items.push(expanded ? [...row, ...widgetParallelAgentDetails(job, theme, true, width)] : row);
         slots--;
     }
     const hiddenQueued = queued.length > 0 && !queuedSummaryShown ? queued.length : 0;
@@ -1305,27 +1310,114 @@ export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded =
     }
     return lines;
 }
-let widgetPaintTimer;
-let widgetPaintCtx;
-export function clearWidgetPaintTimer() {
-    if (widgetPaintTimer) {
-        clearInterval(widgetPaintTimer);
-        widgetPaintTimer = undefined;
+let activeWidget;
+export class SubagentAsyncWidget {
+    jobs;
+    expanded;
+    theme;
+    requestRender;
+    nowFn;
+    timer;
+    disposed = false;
+    cachedWidth;
+    cachedLines;
+    constructor(jobs, theme, options) {
+        this.jobs = jobs;
+        this.theme = theme;
+        this.expanded = options?.expanded ?? false;
+        this.requestRender = options?.requestRender;
+        this.nowFn = options?.now ?? Date.now;
+        this.syncTimer();
     }
-    widgetPaintCtx = undefined;
-}
-function ensureWidgetPaintTimer(ctx, running) {
-    widgetPaintCtx = ctx;
-    if (!running || !ctx.hasUI) {
-        clearWidgetPaintTimer();
-        return;
+    setTheme(theme) {
+        this.theme = theme;
+        this.invalidate();
     }
-    if (widgetPaintTimer)
-        return;
-    widgetPaintTimer = setInterval(() => {
-        widgetPaintCtx?.ui.requestRender?.();
-    }, 80);
-    widgetPaintTimer.unref?.();
+    setJobs(jobs) {
+        this.jobs = jobs;
+        this.invalidate();
+        this.syncTimer();
+    }
+    setExpanded(expanded) {
+        if (this.expanded === expanded)
+            return;
+        this.expanded = expanded;
+        this.invalidate();
+    }
+    setRequestRender(requestRender) {
+        this.requestRender = requestRender;
+    }
+    hasRunning() {
+        return this.jobs.some((job) => job.status === "running");
+    }
+    syncTimer() {
+        if (this.disposed)
+            return;
+        if (this.hasRunning())
+            this.startTimer();
+        else
+            this.stopTimer();
+    }
+    startTimer() {
+        if (this.timer)
+            return;
+        this.timer = setInterval(() => {
+            if (this.disposed)
+                return;
+            this.invalidate();
+            this.requestRender?.();
+        }, 80);
+        this.timer.unref?.();
+    }
+    stopTimer() {
+        if (!this.timer)
+            return;
+        clearInterval(this.timer);
+        this.timer = undefined;
+    }
+    invalidate() {
+        this.cachedWidth = undefined;
+        this.cachedLines = undefined;
+    }
+    dispose() {
+        this.disposed = true;
+        this.stopTimer();
+        if (activeWidget === this)
+            activeWidget = undefined;
+    }
+    render(width) {
+        const theme = this.theme;
+        if (!theme)
+            return [];
+        if (this.cachedLines && this.cachedWidth === width && !this.hasRunning())
+            return this.cachedLines;
+        const now = this.nowFn();
+        const innerWidth = Math.max(1, width - 2);
+        const lines = this.expanded
+            ? buildWidgetLines(this.jobs, theme, innerWidth, true, now)
+            : this.jobs.length === 1
+                ? compactSingleWidgetLines(this.jobs[0], theme, innerWidth, now)
+                : buildWidgetLines(this.jobs, theme, innerWidth, false, now);
+        const fitted = fitAdaptiveWidgetLines(this.jobs, lines, theme, innerWidth, this.expanded);
+        const padded = fitted.map((line) => {
+            const withPad = ` ${line}`;
+            const vis = visibleWidth(withPad);
+            return withPad + " ".repeat(Math.max(0, width - vis));
+        });
+        this.cachedWidth = width;
+        this.cachedLines = padded;
+        return padded;
+    }
+}
+export function createSubagentWidgetComponent(jobs, theme, options) {
+    return new SubagentAsyncWidget(jobs, theme, options);
+}
+export function disposeSubagentWidget() {
+    activeWidget?.dispose();
+    activeWidget = undefined;
+}
+export function clearWidgetPaintTimer() {
+    disposeSubagentWidget();
 }
 /**
  * Render the async jobs widget
@@ -1333,43 +1425,47 @@ function ensureWidgetPaintTimer(ctx, running) {
 export function renderWidget(ctx, jobs) {
     if (jobs.length === 0) {
         resetWidgetLayoutSession();
-        clearWidgetPaintTimer();
+        disposeSubagentWidget();
         if (ctx.hasUI)
             ctx.ui.setWidget(WIDGET_KEY, undefined);
         return;
     }
     if (!ctx.hasUI)
         return;
-    ensureWidgetPaintTimer(ctx, jobs.some((job) => job.status === "running"));
-    ctx.ui.setWidget(WIDGET_KEY, buildWidgetComponent(jobs, ctx.ui.getToolsExpanded?.() ?? false));
+    const expanded = ctx.ui.getToolsExpanded?.() ?? false;
+    const requestRender = () => ctx.ui.requestRender?.();
+    if (activeWidget) {
+        activeWidget.setJobs(jobs);
+        activeWidget.setExpanded(expanded);
+        activeWidget.setRequestRender(requestRender);
+        ctx.ui.requestRender?.();
+        return;
+    }
+    const widget = new SubagentAsyncWidget(jobs, undefined, { expanded, requestRender });
+    activeWidget = widget;
+    ctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => {
+        widget.setTheme(theme);
+        return widget;
+    });
 }
 function renderSingleCompact(d, r, theme, frame) {
     const output = r.truncation?.text || getSingleResultOutput(r);
     const progress = r.progress || r.progressSummary;
     const isRunning = r.progress?.status === "running";
-    const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
-    // lunr: simplified collapsed row — glyph · task summary · agent type · runtime/tools/tokens stats.
     const c = new Container();
     const width = getTermWidth() - 4;
-    // lunr: row line is a per-frame template so the running glyph animates in place (see subagentAnimSink).
     const lead = compactRowLead({ description: r.description ?? r.agent, task: r.task });
-    const modelBadge = formatModelSelection(r.modelSelection ?? progress?.modelSelection, r.model ?? progress?.model, r.thinking ?? progress?.thinking);
-    const permissionBadge = r.permissions ? theme.fg("dim", r.permissions) : "";
-    c.addChild(animatedLine((f, now) => {
-        const stats = formatProgressStats(theme, progress, true, { running: isRunning, terminal: !isRunning, now });
-        return truncLine(`${resultGlyph(r, output, theme, isRunning, undefined, f)} ${themeBold(theme, lead)}${modelBadge ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", modelBadge)}` : ""}${permissionBadge ? ` ${theme.fg("dim", "·")} ${permissionBadge}` : ""}${contextBadge}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`, width);
-    }, frame, isRunning));
-    if (isRunning && r.progress) {
-        c.addChild(animatedLine((_f, now) => formatCompactStatsHangLine(r.progress, width, (s) => theme.fg("dim", s), "  ⎿  ", now, true), frame, true));
-        return c;
+    const modelBadge = formatCompactModelBadge(r.modelSelection ?? progress?.modelSelection, r.model ?? progress?.model);
+    c.addChild(animatedLine((f, now) => formatCompactSubagentRow(theme, width, {
+        glyph: resultGlyph(r, output, theme, isRunning, undefined, f),
+        description: lead,
+        modelBadge,
+        tokens: compactResultTokens(r),
+        durationMs: liveDurationMs(progress, isRunning, now),
+    }), frame, isRunning));
+    if (!isRunning && (r.exitCode !== 0 || r.interrupted || r.detached || r.stopped)) {
+        c.addChild(new Text(truncLine(theme.fg(r.exitCode !== 0 ? "error" : "dim", `  ⎿  ${resultStatusLine(r, output)}`), width), 0, 0));
     }
-    c.addChild(new Text(truncLine(theme.fg("dim", `  ⎿  ${resultStatusLine(r, output)}`), width), 0, 0));
-    const preview = firstOutputLine(output);
-    if (preview && r.exitCode === 0 && !hasEmptyTextOutputWithoutOutputTarget(r.task, output)) {
-        c.addChild(new Text(truncLine(theme.fg("dim", `     ${preview}`), width), 0, 0));
-    }
-    if (r.sessionFile)
-        c.addChild(new Text(truncLine(theme.fg("dim", `  session: ${shortenPath(r.sessionFile)}`), width), 0, 0));
     return c;
 }
 function renderMultiCompact(d, theme, frame) {
@@ -1415,9 +1511,8 @@ function renderMultiCompact(d, theme, frame) {
     const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
     const c = new Container();
     const width = getTermWidth() - 4;
-    // lunr: header line is a per-frame template so the running glyph animates in place (see subagentAnimSink).
-    c.addChild(animatedLine((f, now) => {
-        const stats = statJoin(theme, [multiLabel.headerLabel, formatProgressStats(theme, totalSummary, true, { running: hasRunning, terminal: !hasRunning, now }), formatTotalCostStat(d.totalCost)]);
+    c.addChild(animatedLine((f) => {
+        const stats = statJoin(theme, [multiLabel.headerLabel, formatTotalCostStat(d.totalCost)]);
         return truncLine(`${glyph(f)} ${theme.fg("toolTitle", theme.bold(d.mode))}${contextBadge}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`, width);
     }, frame, hasRunning));
     const useResultsDirectly = multiLabel.hasParallelInChain || !d.chainAgents?.length;
@@ -1454,21 +1549,20 @@ function renderMultiCompact(d, theme, frame) {
         const rProg = r.progress || progressFromArray || r.progressSummary;
         const rRunning = rProg && "status" in rProg && rProg.status === "running";
         const rPending = rProg && "status" in rProg && rProg.status === "pending";
-        const pendingLabel = rPending ? ` ${theme.fg("dim", "· pending")}` : "";
-        // lunr: simplified collapsed row — glyph · task summary · agent type · runtime/tools/tokens stats.
-        // lunr: row line is a per-frame template so the running glyph animates in place (see subagentAnimSink).
         const lead = compactRowLead({ description: r.description ?? agentName, task: r.task });
-        const permissionBadge = r.permissions ? theme.fg("dim", r.permissions) : "";
-        const modelBadge = formatModelSelection(r.modelSelection ?? (rProg && "modelSelection" in rProg ? rProg.modelSelection : undefined), r.model ?? (rProg && "model" in rProg ? rProg.model : undefined), r.thinking ?? (rProg && "thinking" in rProg ? rProg.thinking : undefined));
+        const modelBadge = formatCompactModelBadge(r.modelSelection ?? (rProg && "modelSelection" in rProg ? rProg.modelSelection : undefined), r.model ?? (rProg && "model" in rProg ? rProg.model : undefined));
         c.addChild(animatedLine((f, now) => {
-            const glyph = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, progressRunningSeed(rProg), f);
-            const stepStats = formatProgressStats(theme, rProg, true, { running: !!rRunning, terminal: !rRunning && !rPending, now });
-            return truncLine(`  ${glyph} ${themeBold(theme, lead)}${modelBadge ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", modelBadge)}` : ""}${permissionBadge ? ` ${theme.fg("dim", "·")} ${permissionBadge}` : ""}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`, width);
+            const rowGlyph = rPending ? theme.fg("dim", "◦") : resultGlyph(r, output, theme, rRunning, progressRunningSeed(rProg), f);
+            return formatCompactSubagentRow(theme, width, {
+                glyph: rowGlyph,
+                description: lead,
+                modelBadge,
+                tokens: compactResultTokens(r),
+                durationMs: liveDurationMs(rProg, !!rRunning, now),
+                prefix: "  ",
+            });
         }, frame, !!rRunning));
-        if (rRunning && rProg && "status" in rProg) {
-            c.addChild(animatedLine((_f, now) => formatCompactStatsHangLine(rProg, width, (s) => theme.fg("dim", s), "    ⎿  ", now, true), frame, true));
-        }
-        else if (!rPending && (r.exitCode !== 0 || r.interrupted || r.detached || hasEmptyTextOutputWithoutOutputTarget(r.task, output))) {
+        if (!rPending && !rRunning && (r.exitCode !== 0 || r.interrupted || r.detached || r.stopped)) {
             c.addChild(new Text(truncLine(theme.fg(r.exitCode !== 0 ? "error" : "dim", `    ⎿  ${resultStatusLine(r, output)}`), width), 0, 0));
         }
     }