@d3ara1n/pi-subagent 0.5.0 → 0.6.0

package/README.md

@@ -64,7 +64,7 @@ Edit `~/.pi/agent/settings.json`:
 ```json
 {
   "subagent": {
-    "timeout": 600,
+    "timeout": 1500,
     "maxConcurrency": 4,
     "maxDepth": 3,
     "maxTurns": 0,
@@ -80,7 +80,7 @@ Edit `~/.pi/agent/settings.json`:
 }
 ```
 
-All fields are optional. Defaults: `timeout: 600` (seconds; 10 min; roles that can `delegate` get 2× automatically when no per-role timeout is set), `maxConcurrency: 4`, `maxDepth: 3`, `maxTurns: 0` (unlimited), `maxCost: 0` (unlimited), `history.enabled: true`, `summary.role: "utility"`, `summary.enabled: true`.
+All fields are optional. Defaults: `timeout: 1500` (seconds; 25 min; roles that can `delegate` get 2× automatically when no per-role timeout is set), `maxConcurrency: 4`, `maxDepth: 3`, `maxTurns: 0` (unlimited), `maxCost: 0` (unlimited), `history.enabled: true`, `summary.role: "utility"`, `summary.enabled: true`.
 
 ### Agent Overrides
 
@@ -92,7 +92,7 @@ Override, disable, or add subagent roles via `agentOverrides`. Built-in and cust
     "agentOverrides": {
       "worker": {
         "role": "heavy",
-        "timeout": 600,
+        "timeout": 1500,
         "maxTurns": 50,
         "maxCost": 1.0
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-subagent",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "Role-based subagent orchestration for pi — delegates tasks to specialized pi child processes with configurable model roles",
   "main": "src/index.ts",

package/src/index.ts

@@ -686,27 +686,32 @@ export default function subagentExtension(pi: ExtensionAPI) {
 			const stats = formatUsageStats(r.usage, r.model);
 			const usageLine = [secs != null ? `${secs}s` : null, stats].filter(Boolean).join(" \u00b7 ");
 
-			// Result line content (shared between collapsed and expanded).
-			let resultContent: string | undefined;
-			let resultCol: ThemeColor | undefined;
+			// resultline: fixed line on terminal frames — `<icon> <content>` colored by outcome.
+			// success → AI summary, else first line of output (truncated), else a placeholder — never blank.
+			// error/timeout/budget → errorMessage (or a default label).
+			let resultline: string | undefined;
 			if (!isRunning) {
 				if (isFailedState) {
-					resultContent = r.errorMessage || (isTimeout ? "Timed out" : isBudget ? "Budget exceeded" : "failed");
-					resultCol = isTimeout || isBudget ? "warning" : "error";
+					const content = r.errorMessage || (isTimeout ? "Timed out" : isBudget ? "Budget exceeded" : "failed");
+					const col: ThemeColor = isTimeout || isBudget ? "warning" : "error";
+					resultline = `${icon} ${theme.fg(col, content)}`;
 				} else {
-					resultContent = r.summary || undefined;
-					resultCol = "text";
+					// success fallback chain: summary → output first line → placeholder.
+					const firstLine = r.output.trim().split("\n")[0] ?? "";
+					const preview = firstLine.length > 70 ? `${firstLine.slice(0, 70)}...` : firstLine;
+					const content = r.summary || preview;
+					const col: ThemeColor = content ? "text" : "muted";
+					resultline = `${icon} ${theme.fg(col, content || "(no output)")}`;
 				}
 			}
 
 			if (expanded) {
 				const container = new Container();
 
-				// Header: taskline (+ error line on failure; success has no summary line here
-				// — full output below makes it redundant).
+				// Header: taskline + resultline (summary on success, error message on failure).
 				container.addChild(new Text(taskline, 0, 0));
-				if (resultContent) {
-					container.addChild(new Text(`${icon} ${theme.fg(resultCol!, resultContent)}`, 0, 0));
+				if (resultline) {
+					container.addChild(new Text(resultline, 0, 0));
 				}
 
 				// Input block: reference files + context char count + task full text,
@@ -745,14 +750,19 @@ export default function subagentExtension(pi: ExtensionAPI) {
 					}
 				}
 
-				// Full output (terminal runs only).
-				if (!isRunning && r.output.trim()) {
+				// Full output (terminal runs only). Always render the slot — show a
+				// placeholder when empty so the user never thinks output was lost.
+				if (!isRunning) {
 					container.addChild(new Spacer(1));
-					container.addChild(new Markdown(r.output.trim(), 0, 0, mdTheme));
-					if (r.outputMethod === "compressed") {
-						container.addChild(new Text(theme.fg("muted", "(output compressed by summary model \u2014 full text in history)"), 0, 0));
-					} else if (r.outputMethod === "truncated") {
-						container.addChild(new Text(theme.fg("muted", "(output truncated \u2014 full text in history)"), 0, 0));
+					if (r.output.trim()) {
+						container.addChild(new Markdown(r.output.trim(), 0, 0, mdTheme));
+						if (r.outputMethod === "compressed") {
+							container.addChild(new Text(theme.fg("muted", "(output compressed by summary model \u2014 full text in history)"), 0, 0));
+						} else if (r.outputMethod === "truncated") {
+							container.addChild(new Text(theme.fg("muted", "(output truncated \u2014 full text in history)"), 0, 0));
+						}
+					} else {
+						container.addChild(new Text(theme.fg("muted", "(no output \u2014 the run produced no text)"), 0, 0));
 					}
 				}
 
@@ -768,8 +778,8 @@ export default function subagentExtension(pi: ExtensionAPI) {
 			// Collapsed view.
 			let text = taskline;
 			if (!isRunning) {
-				// Result line (shared computation above).
-				if (resultContent) text += `\n${icon} ${theme.fg(resultCol!, resultContent)}`;
+				// resultline (shared computation above).
+				if (resultline) text += `\n${resultline}`;
 			} else if (!r.queued) {
 				// Running (not queued): show recent activity only.
 				const activity = displayItems.filter((item) => item.type === "toolCall" || item.type === "thinking");

package/src/types.ts

@@ -35,7 +35,7 @@ export interface SubagentSummaryConfig {
 }
 
 export const DEFAULT_CONFIG: SubagentConfig = {
-  timeout: 600,
+  timeout: 1500,
   maxConcurrency: 4,
   maxDepth: 3,
   maxTurns: 0,
@@ -151,14 +151,14 @@ export interface SubagentResult {
   /** Real-time activity log: thinking blocks and tool calls in arrival order. */
   activityLog: ActivityEntry[];
 
-  // ── TUI 渲染辅助字段（非子进程产出，由 execute 层填入）──────────
-  /** 运行开始墙钟时间；仅 queued/running 帧存在，供 TUI 实时算耗时。终态帧无此字段。 */
+  // ── TUI rendering helpers (not produced by the child; filled in by the execute layer) ──
+  /** Wall-clock start time; present only on queued/running frames so the TUI can compute live elapsed time. Absent on terminal frames. */
   startTime?: number;
-  /** 终态总耗时(ms)，由 execute 在结束时写入；覆盖整个 delegate 区间（含 fallback 重试）。 */
+  /** Total elapsed time (ms) for terminal frames, written by execute when the run ends; spans the whole delegate interval (incl. fallback retries). */
   elapsedMs?: number;
-  /** delegate 传入的引用文件路径（params.files），展开视图渲染用。 */
+  /** Reference file paths passed to delegate (params.files); used by the expanded view. */
   files?: string[];
-  /** delegate 传入的额外上下文（params.context），展开视图渲染用。 */
+  /** Extra context passed to delegate (params.context); used by the expanded view. */
   context?: string;
 }
 

package/src/utils.ts

@@ -32,12 +32,13 @@ export function formatUsageStats(usage: SubagentResult["usage"], model?: string)
 }
 
 /**
- * 计算用于展示的运行耗时（秒）。
- * - 运行中（exitCode === -1 且有 startTime）：基于墙钟实时计算；
- * - 终态（exitCode !== -1 且有 elapsedMs）：冻结值；
- * - queued 或字段缺失：undefined（调用方应跳过耗时展示）。
+ * Display elapsed time in seconds.
+ * - Running (exitCode === -1 with startTime): live wall-clock value.
+ * - Terminal (exitCode !== -1 with elapsedMs): frozen value.
+ * - Queued or fields missing: undefined (caller should skip the elapsed display).
  *
- * 用结构子集而非 SubagentResult，便于在无需引入完整类型的纯工具上下文中复用与测试。
+ * Takes a structural subset rather than the full SubagentResult so it can be reused
+ * and tested in pure-helper contexts without importing the full type.
  */
 export function elapsedSeconds(r: {
 	exitCode: number;
@@ -193,7 +194,10 @@ export function isProviderError(result: SubagentResult): boolean {
 	return /429|quota|rate.?limit|auth|timeout|exhausted|unavailable|503|server error|temporary|declined|overloaded|econnreset|socket hang up|epipe|network|connection/i.test(haystack);
 }
 
-/** Shape-based preview for tools we don't have a dedicated formatter for. */
+/**
+ * Shape-based preview for tools we don't have a dedicated formatter for.
+ * @internal — exported for testing; used internally by {@link formatToolCall}.
+ */
 export function previewArgs(args: Record<string, unknown>): string {
 	const command = args.command as string | undefined;
 	if (command) return `$ ${command.length > 60 ? command.slice(0, 60) + "..." : command}`;