pi-subagents 0.70.0 → 0.71.0

package/src/tui/render.js

@@ -43,21 +43,22 @@ function capCompactMainWindowResult(component, layout, theme, enabled) {
             return lines;
         const visibleRows = maxLines === 1 ? 1 : maxLines - 1;
         const hiddenCount = lines.length - visibleRows;
-        const hint = theme.fg("accent", `… ${hiddenCount} rows hidden · ${liveDetailKeyText()} expands`);
+        const hint = theme.fg("accent", `… ${hiddenCount} rows hidden · ${expandKeyHint("to expand", "to view them")}`);
         if (maxLines === 1)
             return [truncLine(`${lines[0] ?? ""} ${hint}`, width)];
         return [...lines.slice(0, visibleRows), truncLine(hint, width)];
     };
     return capped;
 }
-function liveDetailKeyText() {
-    return keyText("app.tools.expand");
+function expandKeyHint(action, unconfiguredAction = action) {
+    const shortcut = keyText("app.tools.expand");
+    return shortcut ? `Press ${shortcut} ${action}` : `Configure the expand key ${unconfiguredAction}`;
 }
 export function liveDetailHintText() {
-    return `Press ${liveDetailKeyText()} for live detail`;
+    return expandKeyHint("for live detail");
 }
 function workflowDetailHintText() {
-    return `Press ${liveDetailKeyText()} for details`;
+    return expandKeyHint("for details");
 }
 function foregroundSingleHintText(shortcut) {
     if (!shortcut)
@@ -1976,8 +1977,12 @@ function widgetStats(job, theme, projection = buildWorkflowWidgetProjection(job)
         parts.push(formatDuration(Math.max(0, end - job.startedAt)));
     return statJoin(theme, parts);
 }
-function widgetStepStats(theme, step) {
+function widgetStepStats(theme, step, snapshotNow = Date.now()) {
+    const externalElapsed = step.runner?.type === "external-cli" && step.externalProcess
+        ? step.externalProcess.durationMs ?? Math.max(0, (step.externalProcess.endedAt ?? snapshotNow) - step.externalProcess.startedAt)
+        : undefined;
     return statJoin(theme, [
+        step.runner?.type === "external-cli" ? "external-cli" : "",
         step.turnCount !== undefined ? `${step.turnCount} turns` : "",
         step.toolCount !== undefined ? formatToolUseStat(step.toolCount) : "",
         step.tokens
@@ -1985,7 +1990,7 @@ function widgetStepStats(theme, step) {
                 ? formatContextUsage(step.tokens, step.contextLimit) ?? formatTokenUsage(step.tokens, "token")
                 : step.tokens.total ? formatTokenUsage(step.tokens, "token") : ""
             : "",
-        step.durationMs !== undefined ? formatDuration(step.durationMs) : "",
+        externalElapsed !== undefined ? formatDuration(externalElapsed) : step.durationMs !== undefined ? formatDuration(step.durationMs) : "",
     ]);
 }
 function modelThinkingBadge(theme, model, thinking) {
@@ -2191,7 +2196,7 @@ function foregroundStyleWidgetStepLines(job, theme, step, itemTitle, index, tota
     const rowIndent = options?.rowIndent ?? "  ";
     const detailIndent = options?.detailIndent ?? "    ";
     const status = widgetStepStatus(step.status, theme);
-    const stats = widgetStepStats(theme, step);
+    const stats = widgetStepStats(theme, step, job.updatedAt);
     const modelDisplay = modelThinkingBadge(theme, step.model, step.thinking);
     const collapseDetails = shouldCollapseSingleChildDetails(job, step);
     const displayName = collapseDetails ? singleChildAgentName(job, step) : childDisplayName(step);
@@ -2355,7 +2360,7 @@ function compactSingleWidgetLines(job, theme, width, frame, projection = buildWo
         const step = row.step;
         const status = widgetStepStatus(step.status, theme);
         const activity = widgetStepActivityLine(step, width, false, job.updatedAt);
-        const stepStats = widgetStepStats(theme, step);
+        const stepStats = widgetStepStats(theme, step, job.updatedAt);
         const activitySuffix = activity ? ` ${theme.fg("dim", "·")} ${theme.fg("dim", activity)}` : "";
         const modelDisplay = modelThinkingBadge(theme, step.model, step.thinking);
         const task = compactTaskText(step.description, step.label);
@@ -2588,7 +2593,7 @@ function fitWidgetLineBudget(lines, theme, width, expanded) {
     const hiddenCount = lines.length - visibleLines;
     const hint = expanded
         ? `… ${hiddenCount} live-detail lines hidden`
-        : `… ${hiddenCount} lines hidden · ${liveDetailKeyText()} expands`;
+        : `… ${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) {
@@ -3307,7 +3312,7 @@ export function renderSubagentResult(result, options, theme, frame, rendererConf
             const c = new Container();
             const detailIndent = mainWindowIndent(layout, 1);
             c.addChild(new Text(truncLine(`${contextPrefix}${compactLine} · ${lines.length} lines`, width), 0, 0));
-            c.addChild(new Text(truncLine(theme.fg("accent", `${detailIndent}Press ${liveDetailKeyText()} for full output`), width), 0, 0));
+            c.addChild(new Text(truncLine(theme.fg("accent", `${detailIndent}${expandKeyHint("for full output")}`), width), 0, 0));
             return compact(c);
         }
         const c = new Container();