pi-subagents 0.76.1 → 0.77.0

package/src/tui/render.d.ts

@@ -4,7 +4,7 @@
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { type Component } from "@earendil-works/pi-tui";
-import { type AsyncJobState, type AsyncJobStep, type Details, type MainWindowRendererConfig } from "../shared/types.ts";
+import { type AsyncJobState, type AsyncJobStep, type AsyncWidgetLayout, type Details, type MainWindowRendererConfig } from "../shared/types.ts";
 type Theme = ExtensionContext["ui"]["theme"];
 export declare function liveDetailHintText(): string;
 /**
@@ -47,7 +47,7 @@ export declare function buildWidgetLines(jobs: AsyncJobState[], theme: Theme, wi
 /**
  * Render the async jobs widget
  */
-export declare function renderWidget(ctx: ExtensionContext, jobs: AsyncJobState[], initiallyCollapsed?: boolean): void;
+export declare function renderWidget(ctx: ExtensionContext, jobs: AsyncJobState[], initiallyCollapsed?: boolean, layout?: AsyncWidgetLayout): void;
 export declare function renderSubagentSummary(result: AgentToolResult<Details>, options: {
     isPartial?: boolean;
 }, theme: Theme): Component;

package/src/tui/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/tui/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/tui/render.ts"],"names":[],"mappings":"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"}

package/src/tui/render.js

@@ -2641,7 +2641,7 @@ function fitWidgetLineBudget(lines, theme, width, expanded) {
         : `… ${hiddenCount} lines hidden · ${expandKeyHint("to expand", "to view them")}`;
     return [...lines.slice(0, visibleLines), truncLine(theme.fg("dim", hint), width)];
 }
-function fitAdaptiveWidgetLines(jobs, buildLines, theme, width, expanded, frame, projectionFor) {
+function fitAdaptiveWidgetLines(jobs, buildLines, theme, width, expanded, frame, projectionFor, layout = "adaptive") {
     if (expanded) {
         resetWidgetLayoutSession();
         return fitWidgetLineBudget(buildLines(), theme, width, true);
@@ -2671,14 +2671,16 @@ function fitAdaptiveWidgetLines(jobs, buildLines, theme, width, expanded, frame,
         session.visibleJobKeys = rendered.visibleJobKeys;
         return rendered.lines.slice(0, session.lockedRows);
     }
-    const lines = buildLines();
-    if (lines.length <= availableRows) {
-        widgetLayoutSession = { expanded, rows, columns, tier: "full", visibleJobKeys: [] };
-        return fitWidgetLineBudget(lines, theme, width, false);
-    }
-    if (availableRows > 2 && jobs.length === 1 && projectionFor?.(jobs[0]).stageProgress) {
-        widgetLayoutSession = { expanded, rows, columns, tier: "full", visibleJobKeys: [] };
-        return fitWidgetLineBudget(lines, theme, width, false);
+    if (layout === "adaptive") {
+        const lines = buildLines();
+        if (lines.length <= availableRows) {
+            widgetLayoutSession = { expanded, rows, columns, tier: "full", visibleJobKeys: [] };
+            return fitWidgetLineBudget(lines, theme, width, false);
+        }
+        if (availableRows > 2 && jobs.length === 1 && projectionFor?.(jobs[0]).stageProgress) {
+            widgetLayoutSession = { expanded, rows, columns, tier: "full", visibleJobKeys: [] };
+            return fitWidgetLineBudget(lines, theme, width, false);
+        }
     }
     if (availableRows <= 2) {
         widgetLayoutSession = { expanded, rows, columns, tier: "single-line", visibleJobKeys: [] };
@@ -2781,7 +2783,7 @@ function materializedWidgetChildLines(job, theme, width, expanded, frame, projec
         lines.push(`  +${children.length - shown.length} more workflow children`);
     return lines;
 }
-function buildWidgetComponent(jobs, ui, initiallyCollapsed = false) {
+function buildWidgetComponent(jobs, ui, initiallyCollapsed = false, layout) {
     return (tui, theme) => {
         const container = new Container();
         let cachedRenderWidth;
@@ -2869,7 +2871,7 @@ function buildWidgetComponent(jobs, ui, initiallyCollapsed = false) {
             cachedExpanded = expanded;
             cachedLines = (collapsed
                 ? buildSingleLineWidgetLines(jobs, theme, width, frame)
-                : fitAdaptiveWidgetLines(roots, buildLines, theme, width, expanded, frame, projectionFor)).map((line) => paddedWidgetLine(line, renderWidth));
+                : fitAdaptiveWidgetLines(roots, buildLines, theme, width, expanded, frame, projectionFor, layout)).map((line) => paddedWidgetLine(line, renderWidth));
             return cachedLines;
         };
         return component;
@@ -2970,7 +2972,7 @@ export function buildWidgetLines(jobs, theme, width = getTermWidth(), expanded =
 /**
  * Render the async jobs widget
  */
-export function renderWidget(ctx, jobs, initiallyCollapsed = false) {
+export function renderWidget(ctx, jobs, initiallyCollapsed = false, layout = "adaptive") {
     if (jobs.length === 0) {
         resetWidgetLayoutSession();
         asyncWidgetUpdates.delete(ctx.ui);
@@ -2990,7 +2992,7 @@ export function renderWidget(ctx, jobs, initiallyCollapsed = false) {
     if (update)
         update(jobs);
     else
-        ctx.ui.setWidget(WIDGET_KEY, buildWidgetComponent(jobs, ctx.ui, initiallyCollapsed));
+        ctx.ui.setWidget(WIDGET_KEY, buildWidgetComponent(jobs, ctx.ui, initiallyCollapsed, layout));
 }
 function renderSingleCompact(d, r, theme, layout, frame, foregroundDetachShortcut) {
     const output = r.truncation?.text || getSingleResultOutput(r);
@@ -3005,7 +3007,7 @@ function renderSingleCompact(d, r, theme, layout, frame, foregroundDetachShortcu
     const width = getTermWidth() - 4;
     const detailIndent = mainWindowIndent(layout, 1);
     const continuationIndent = mainWindowIndent(layout, 2) + (layout.horizontalSpacing > 0 ? " " : "");
-    const modelDisplay = modelThinkingBadge(theme, r.model ?? r.progress?.model, r.thinking ?? r.progress?.thinking);
+    const modelDisplay = modelThinkingBadge(theme, r.progress?.model ?? r.model, r.thinking ?? r.progress?.thinking);
     c.addChild(new Text(truncLine(`${resultGlyph(r, output, theme, isRunning, undefined, frame)} ${theme.fg("toolTitle", theme.bold(foregroundSingleDisplayName(r)))}${modelDisplay}${contextBadge}${stats ? ` ${theme.fg("dim", "·")} ${stats}` : ""}`, width), 0, 0));
     if (isRunning && r.progress) {
         const task = compactTaskText(r.task);
@@ -3284,7 +3286,7 @@ function renderMultiCompact(d, theme, layout, frame) {
         const pendingLabel = rPending ? ` ${theme.fg("dim", "· pending")}` : "";
         const stepLabel = entry.rowLabel;
         const rowProgressModel = rProg && "status" in rProg ? rProg : undefined;
-        const rowModelDisplay = modelThinkingBadge(theme, r.model ?? rowProgressModel?.model, r.thinking ?? rowProgressModel?.thinking);
+        const rowModelDisplay = modelThinkingBadge(theme, rowProgressModel?.model ?? r.model, r.thinking ?? rowProgressModel?.thinking);
         const labelPrefix = stepLabel ? `${stepLabel}: ` : "";
         const line = `${glyph} ${labelPrefix}${themeBold(theme, agentName)}${contextModeBadge(theme, r.context)}${rowModelDisplay}${stepStats ? ` ${theme.fg("dim", "·")} ${stepStats}` : ""}${pendingLabel}`;
         c.addChild(new Text(truncLine(`${rowIndent}${line}`, width), 0, 0));
@@ -3469,7 +3471,7 @@ export function renderSubagentResult(result, options, theme, frame, rendererConf
         if (r.skillsWarning) {
             c.addChild(new Text(fit(theme.fg("warning", `Warning: ${r.skillsWarning}`)), 0, 0));
         }
-        c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage, r.model))), 0, 0));
+        c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage, r.progress?.model ?? r.model))), 0, 0));
         if (r.sessionFile) {
             c.addChild(new Text(fit(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`)), 0, 0));
         }
@@ -3591,7 +3593,7 @@ export function renderSubagentResult(result, options, theme, frame, rendererConf
         const resultOutput = getSingleResultOutput(r);
         const rowPresentation = styledResultPresentation(resultPresentation(r, resultOutput, rRunning, progressRunningSeed(rProg), frame), theme);
         const stats = rProg ? ` | ${rProg.toolCount} tools, ${formatDuration(rProg.durationMs)}` : "";
-        const modelDisplay = modelThinkingBadge(theme, r.model ?? rProg?.model, r.thinking ?? rProg?.thinking);
+        const modelDisplay = modelThinkingBadge(theme, rProg?.model ?? r.model, r.thinking ?? rProg?.thinking);
         const stepLabel = entry.rowLabel;
         const contextBadge = contextModeBadge(theme, r.context);
         const labelPrefix = stepLabel ? `${stepLabel}: ` : "";