@ashx-j/lunr-dev 0.2.13-dev.8.1 → 0.2.19-dev.10.1

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

@@ -2,7 +2,8 @@
 /**
  * Rendering functions for subagent results
  */
-import { getMarkdownTheme, keyText } from "@ashx-j/lunr-dev";
+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";
@@ -406,9 +407,12 @@ function widgetJobsRunningSeed(jobs) {
         seed = runningSeed(seed, widgetJobRunningSeed(job));
     return seed;
 }
-function widgetStatusGlyph(job, theme) {
+function widgetAnimFrame(now = Date.now()) {
+    return Math.floor(now / 80) % RUNNING_FRAMES.length;
+}
+function widgetStatusGlyph(job, theme, now = Date.now()) {
     if (job.status === "running")
-        return theme.fg("accent", runningGlyph(widgetJobRunningSeed(job)));
+        return theme.fg("accent", runningGlyph((widgetJobRunningSeed(job) ?? 0) + widgetAnimFrame(now)));
     if (job.status === "queued")
         return theme.fg("muted", "◦");
     if (job.status === "complete")
@@ -949,37 +953,50 @@ function foregroundStyleWidgetDetails(job, theme, expanded, width) {
     }
     return lines;
 }
-function buildSingleWidgetLines(job, theme, width, expanded) {
-    const stats = widgetStats(job, theme);
-    const count = job.mode === "chain" ? job.chainStepCount : job.stepsTotal ?? job.agents?.length ?? job.steps?.length;
-    const mode = widgetJobName(job);
-    const title = `async subagent ${mode}${count && count > 1 ? ` (${count})` : ""}`;
+function compactJobProgress(job, step, now = Date.now()) {
+    const running = (step?.status ?? job.status) === "running";
+    const startedAt = step?.startedAt ?? job.startedAt;
+    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,
+    };
+}
+function compactJobLead(job, step) {
+    return compactRowLead({
+        description: step?.description ?? step?.agent ?? job.agents?.[0],
+        task: step?.description ?? step?.agent,
+    }) || widgetJobName(job);
+}
+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 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 [
-        `${theme.fg("toolTitle", themeBold(theme, title))} ${theme.fg("dim", "· background")}`,
-        `${widgetStatusGlyph(job, theme)} ${themeBold(theme, mode)}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`,
-        ...foregroundStyleWidgetDetails(job, theme, expanded, width),
-    ].map((line) => truncLine(line, width));
+        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 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) {
-    const fullLines = buildSingleWidgetLines(job, theme, width, false);
-    if (fullLines.length <= 10 || !job.steps?.length || (job.mode !== "parallel" && !job.activeParallelGroup))
-        return fullLines;
-    const total = job.stepsTotal ?? job.steps.length;
-    const itemTitle = job.mode === "parallel" || job.activeParallelGroup ? "Agent" : "Step";
-    const lines = fullLines.slice(0, 2);
-    for (const [index, step] of job.steps.entries()) {
-        const status = widgetStepStatus(step.status, theme);
-        const activity = widgetStepActivityLine(step, width, false, job.updatedAt);
-        const stepStats = widgetStepStats(theme, step);
-        const activitySuffix = activity ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", activity)}` : "";
-        const modelDisplay = modelThinkingBadge(theme, step.model, step.thinking, step.modelSelection);
-        lines.push(`  ${widgetStepGlyph(step.status, theme, widgetStepRunningSeed(step, index))} ${itemTitle} ${index + 1}/${total}: ${themeBold(theme, step.agent)} ${theme.fg("dim", "·")} ${status}${modelDisplay}${activitySuffix}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}`);
-        for (const nestedLine of formatNestedWidgetLines(step.children, theme, width, false, job.updatedAt))
-            lines.push(`    ${nestedLine}`);
-    }
-    if (job.steps.some((step) => step.status === "running"))
-        lines.push(theme.fg("accent", `  ${liveDetailHintText()}`));
-    return lines.map((line) => truncLine(line, width));
+    return buildSingleWidgetLines(job, theme, width, false);
 }
 const RESERVED_NON_WIDGET_ROWS = 19;
 let widgetLayoutSession;
@@ -1288,18 +1305,42 @@ export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded =
     }
     return lines;
 }
+let widgetPaintTimer;
+let widgetPaintCtx;
+export function clearWidgetPaintTimer() {
+    if (widgetPaintTimer) {
+        clearInterval(widgetPaintTimer);
+        widgetPaintTimer = undefined;
+    }
+    widgetPaintCtx = undefined;
+}
+function ensureWidgetPaintTimer(ctx, running) {
+    widgetPaintCtx = ctx;
+    if (!running || !ctx.hasUI) {
+        clearWidgetPaintTimer();
+        return;
+    }
+    if (widgetPaintTimer)
+        return;
+    widgetPaintTimer = setInterval(() => {
+        widgetPaintCtx?.ui.requestRender?.();
+    }, 80);
+    widgetPaintTimer.unref?.();
+}
 /**
  * Render the async jobs widget
  */
 export function renderWidget(ctx, jobs) {
     if (jobs.length === 0) {
         resetWidgetLayoutSession();
+        clearWidgetPaintTimer();
         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));
 }
 function renderSingleCompact(d, r, theme, frame) {