pi-subagents-lite 1.0.2 → 1.2.0

package/src/model-precedence.ts

@@ -18,6 +18,11 @@ export interface SubagentsConfig {
     default: string | null;
     forceBackground: boolean;
     graceTurns?: number;
+    showCost?: boolean;
+    widgetMaxLines?: number;
+    widgetMaxLinesCompact?: number;
+    widgetCompact?: boolean;
+    widgetShortcut?: boolean;
     [agentType: string]: string | null | undefined | boolean | number;
   };
   concurrency: {

package/src/output-file.ts

@@ -10,12 +10,7 @@ import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import type { AgentSession, AgentSessionEvent } from "@earendil-works/pi-coding-agent";
 import { formatTokens } from "./usage.js";
-
-/** Max length for a truncated command in tool arg summaries. */
-const MAX_COMMAND_DISPLAY_LENGTH = 100;
-
-/** Max length for a truncated string value in default tool arg summaries. */
-const MAX_DEFAULT_STRING_DISPLAY_LENGTH = 200;
+import { summarizeToolArgs } from "./format.js";
 
 /** Max content length for full tool result display — longer results get a summary line. */
 const MAX_TOOL_RESULT_DISPLAY_LENGTH = 500;
@@ -68,68 +63,6 @@ function splitAndPrefix(text: string, role: string): string {
     .join("");
 }
 
-/**
- * Summarize tool arguments for log-friendly display.
- *
- * Heavy tools (read, write, edit, bash, grep, rg) get compact summaries.
- * Other tools fall back to the default JSON formatting.
- */
-export function summarizeToolArgs(name: string, rawArgs: Record<string, unknown> | undefined): string {
-  if (!rawArgs || typeof rawArgs !== "object" || Object.keys(rawArgs).length === 0) return "";
-
-  switch (name) {
-    case "read": {
-      // read("/path/to/file") — just the path
-      const path = typeof rawArgs.path === "string" ? rawArgs.path : "";
-      return `(${JSON.stringify(path)})`;
-    }
-    case "write": {
-      // write("/path/to/file", <N> chars) — path + content size
-      const path = typeof rawArgs.file_path === "string" ? rawArgs.file_path : "";
-      const content = rawArgs.content;
-      const size = typeof content === "string" ? content.length : 0;
-      return `(${JSON.stringify(path)}, ${size} chars)`;
-    }
-    case "edit": {
-      // edit("/path/to/file", <N> edits) — path + edit count
-      const path = typeof rawArgs.path === "string" ? rawArgs.path : "";
-      const edits = rawArgs.edits;
-      const editCount = Array.isArray(edits) ? edits.length : 0;
-      return `(${JSON.stringify(path)}, ${editCount} edits)`;
-    }
-    case "bash": {
-      // bash("command") — just the command, strip heredoc, truncate long
-      const cmd = typeof rawArgs.command === "string" ? rawArgs.command : "";
-      // Strip heredoc: truncate at << followed by delimiter
-      const heredocIdx = cmd.search(/<<\s*['"]?\w+['"]?/);
-      const cleanCmd = heredocIdx >= 0 ? cmd.slice(0, heredocIdx).trim() : cmd.trim();
-      // Truncate long commands
-      const display = cleanCmd.length > MAX_COMMAND_DISPLAY_LENGTH
-        ? cleanCmd.slice(0, MAX_COMMAND_DISPLAY_LENGTH) + "…" : cleanCmd;
-      return `(${JSON.stringify(display)})`;
-    }
-    case "grep":
-    case "rg": {
-      // grep("pattern", "/path") — pattern + path
-      const pattern = typeof rawArgs.pattern === "string" ? rawArgs.pattern : "";
-      const path = typeof rawArgs.path === "string" ? rawArgs.path : "";
-      return `(${JSON.stringify(pattern)}, ${JSON.stringify(path)})`;
-    }
-    default: {
-      // Default behavior for other tools: single-arg shorthand or JSON dump
-      const keys = Object.keys(rawArgs);
-      if (keys.length === 1) {
-        const val = rawArgs[keys[0]];
-        const display = typeof val === "string" && val.length > MAX_DEFAULT_STRING_DISPLAY_LENGTH
-          ? JSON.stringify(val.slice(0, MAX_DEFAULT_STRING_DISPLAY_LENGTH) + "...")
-          : JSON.stringify(val);
-        return `(${display})`;
-      }
-      return ` ${JSON.stringify(rawArgs)}`;
-    }
-  }
-}
-
 /** Format a toolUse/toolCall content item as a single log line. */
 function formatToolItem(item: Record<string, unknown>): string {
   const name = (item.name ?? item.toolName ?? "unknown") as string;

package/src/renderer.ts

@@ -0,0 +1,163 @@
+/**
+ * renderer.ts — Rendering helpers for the Agent tool and subagent-result messages.
+ *
+ * Extracted from index.ts to separate display concerns from extension wiring.
+ */
+
+import { Box, Container, Spacer, Text } from "@earendil-works/pi-tui";
+import type { Theme } from "./types.js";
+import { buildStatsParts, formatMs, getDisplayName } from "./format.js";
+import { __config } from "./state.js";
+
+// ============================================================================
+// Stats rendering helpers
+// ============================================================================
+
+/** Format agent display name with optional model: "Agent (mimo-v2.5-pro)" or "Agent". */
+export function agentNameLabel(d: Record<string, unknown>, theme: Theme): string {
+  const typeName = getDisplayName((d.type as string) || "");
+  const modelName = d.modelName as string | undefined;
+  return modelName ? `${theme.bold(typeName)} (${modelName})` : theme.bold(typeName);
+}
+
+/** Build the stats line for an agent result card. */
+export function buildStatsLine(d: Record<string, unknown>, theme: Theme): string {
+  const showCost = __config.agent.showCost === true;
+  const parts = buildStatsParts({
+    toolUses: (d.toolUses as number) ?? 0,
+    turnCount: d.turnCount as number | undefined,
+    maxTurns: d.maxTurns as number | undefined,
+    tokens: (d.tokens as number) ?? 0,
+    contextPercent: d.contextPercent as number | null,
+    compactions: (d.compactions as number) ?? 0,
+    cost: showCost ? (d.cost as number | undefined) : undefined,
+  }, theme);
+  parts.push(formatMs(d.durationMs as number));
+  return parts.join("·");
+}
+
+// ============================================================================
+// Agent tool renderers
+// ============================================================================
+
+/** Render the Agent tool call line (e.g., "▸ Agent (model)"). */
+export function renderAgentToolCall(
+  args: Record<string, unknown>,
+  theme: Theme,
+): Text {
+  const typeName = getDisplayName((args.agent as string) || "");
+  const label = typeName || "Agent";
+  let text = `▸ ${theme.fg("accent", theme.bold(label))}`;
+
+  const modelOverride = args._modelOverride as string | undefined;
+  if (modelOverride) {
+    text += ` (${modelOverride})`;
+  }
+
+  return new Text(text, 0, 0);
+}
+
+/** Render the Agent tool result — compact or expanded. */
+export function renderAgentToolResult(
+  result: { content: Array<{ type: string; text?: string }>; details?: Record<string, unknown>; isError?: boolean },
+  options: { expanded?: boolean },
+  theme: Theme,
+): Text {
+  const { expanded } = options;
+  const text = result.content[0]?.type === "text" ? result.content[0].text ?? "" : "";
+  const d = result.details;
+  const icon = result.isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+  const desc = (d?.description as string) || "";
+
+  if (d && d.turnCount != null) {
+    const namePart = agentNameLabel(d, theme);
+    const statsLine = buildStatsLine(d, theme);
+    let lines = `${icon} ${namePart}·${statsLine}\n  ${theme.fg("text", desc)}`;
+    if (expanded && text) {
+      lines += "\n" + text.split("\n").map(l => `  ${l}`).join("\n");
+    }
+    return new Text(lines, 0, 0);
+  }
+
+  // Minimal card — background spawns (no stats) use space placeholder
+  const isBackground = text.includes("running in background") || text.includes("queued");
+  const prefix = isBackground ? "  " : `${icon} `;
+  if (desc) {
+    return new Text(`${prefix}${theme.fg("text", desc)}`, 0, 0);
+  }
+
+  return new Text(`${prefix}${theme.fg("dim", text)}`, 0, 0);
+}
+
+// ============================================================================
+// Message renderer — subagent-result (background agent completion)
+// ============================================================================
+
+/** Render a subagent-result message injected after background agent completion. */
+export function renderSubagentResult(
+  message: { content?: string; details?: Record<string, unknown> },
+  options: { expanded?: boolean },
+  theme: Theme,
+): Container {
+  const { expanded } = options;
+  const d = message.details;
+  const text = (message.content as string)?.trim() || "";
+
+  const inner = new Container();
+  inner.addChild(new Text(theme.fg("customMessageLabel", "Subagent Result"), 0, 0));
+  inner.addChild(new Spacer(1));
+
+  if (d && d.turnCount != null) {
+    const isError = d.status === "error" || d.status === "aborted" || d.status === "stopped";
+    const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+
+    const namePart = agentNameLabel(d, theme);
+    const statsLine = buildStatsLine(d, theme);
+    let headerLine = `${icon} ${namePart}·${statsLine}\n  ${theme.fg("text", (d.description as string) || "")}`;
+    if (d.outputFile as string) {
+      headerLine += `\n  ${theme.fg("dim", `tail -f ${d.outputFile}`)}`;
+    }
+    if (d.worktreePath as string) {
+      headerLine += `\n  ${theme.fg("dim", `worktree: ${d.worktreePath}`)}`;
+    }
+    inner.addChild(new Text(headerLine, 0, 0));
+
+    if (expanded && text) {
+      inner.addChild(new Spacer(1));
+      inner.addChild(new Text(text.split("\n").map(l => `  ${l}`).join("\n"), 0, 0));
+    }
+  } else {
+    inner.addChild(new Text(buildFallbackResultLine(d, text, theme), 0, 0));
+  }
+
+  const box = new Box(1, 1, (t) => theme.bg("customMessageBg", t));
+  box.addChild(inner);
+
+  const outer = new Container();
+  outer.addChild(new Spacer(1));
+  outer.addChild(box);
+  outer.addChild(new Spacer(1));
+  return outer;
+}
+
+/** Build a fallback result line for subagent-result messages without stats. */
+function buildFallbackResultLine(
+  d: Record<string, unknown> | undefined,
+  text: string,
+  theme: Theme,
+): string {
+  const icon = theme.fg("success", "✓");
+  let line = icon;
+  if (d?.type) {
+    line += ` ${agentNameLabel(d, theme)}`;
+  }
+  const desc = (d?.description as string) || "";
+  if (desc) line += `\n  ${theme.fg("text", desc)}`;
+  if (d?.outputFile) {
+    line += `\n  ${theme.fg("dim", `tail -f ${d.outputFile}`)}`;
+  }
+  if (d?.worktreePath) {
+    line += `\n  ${theme.fg("dim", `worktree: ${d.worktreePath}`)}`;
+  }
+  return line;
+}

package/src/result-viewer.ts

@@ -17,7 +17,8 @@ import {
 } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { type LifetimeUsage, formatTokens } from "./usage.js";
-import { formatMs, type Theme } from "./ui/agent-widget.js";
+import type { Theme } from "./ui/agent-widget.js";
+import { formatMs } from "./format.js";
 
 /* ------------------------------------------------------------------ */
 /*  Types                                                              */

package/src/state.ts

@@ -0,0 +1,83 @@
+/**
+ * state.ts — Shared module state. Extracted from index.ts to break circular deps.
+ *
+ * manager and widget use holders because they're reassigned after import and the
+ * PI runtime doesn't propagate ESM live binding reassignments.
+ */
+
+import type { ExtensionContext, ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { SessionModelOverrides, SubagentsConfig } from "./model-precedence.js";
+import { DEFAULT_CONFIG } from "./config-io.js";
+import { AgentManager } from "./agent-manager.js";
+import { AgentWidget, type AgentActivity } from "./ui/agent-widget.js";
+
+export let sessionOverrides: SessionModelOverrides = { default: null };
+export let __config: SubagentsConfig = { ...DEFAULT_CONFIG, agent: { ...DEFAULT_CONFIG.agent }, concurrency: { ...DEFAULT_CONFIG.concurrency } };
+export const agentActivity = new Map<string, AgentActivity>();
+export let piInstance: ExtensionAPI;
+/** Stored ExtensionContext from session_start — used by menu spawn flow. */
+export let sessionCtx: ExtensionContext;
+
+// Holder objects — PI runtime doesn't propagate ESM live binding reassignments
+const managerHolder: { current?: AgentManager } = {};
+const widgetHolder: { current?: AgentWidget } = {};
+
+export function setConfig(config: SubagentsConfig): void { __config = config; }
+export function resetSessionOverrides(): void { sessionOverrides = { default: null }; }
+export function setManager(m: AgentManager): void { managerHolder.current = m; }
+export function clearManager(): void { managerHolder.current = undefined; }
+export function setWidget(w: AgentWidget | undefined): void { widgetHolder.current = w; }
+export function setPiInstance(pi: ExtensionAPI): void { piInstance = pi; }
+export function setSessionCtx(ctx: ExtensionContext): void { sessionCtx = ctx; }
+export function getManager(): AgentManager { return managerHolder.current!; }
+export function getWidget(): AgentWidget | undefined { return widgetHolder.current; }
+
+// State mutation helpers
+
+/** Update the cost display toggle in config and sync to widget. */
+export function setShowCostEnabled(enabled: boolean): void {
+  __config.agent.showCost = enabled;
+  getWidget()?.setShowCost(enabled);
+}
+
+/** Sync widget display settings from config to the widget instance. */
+export function syncWidgetSettings(): void {
+  const w = getWidget();
+  if (!w) return;
+  w.setForceCompact(__config.agent.widgetCompact === true);
+  w.setWidgetShortcut(__config.agent.widgetShortcut === true);
+  w.setMaxLines(__config.agent.widgetMaxLines ?? 12);
+  w.setMaxLinesCompact(
+    __config.agent.widgetMaxLinesCompact ?? Math.floor((__config.agent.widgetMaxLines ?? 12) / 2),
+  );
+}
+
+/** Track previous tool expansion state to detect ctrl+o toggle. */
+let lastToolsExpanded: boolean | undefined;
+
+/** Reset lastToolsExpanded (called at session_start). */
+export function resetLastToolsExpanded(): void {
+  lastToolsExpanded = undefined;
+}
+
+/** Sync compact mode with the tool expansion state (ctrl+o toggle).
+ *  Only syncs when widgetShortcut is enabled in config (opt-in behavior).
+ *  Only triggers on state change (not every tool_execution_start).
+ *  When forceCompact (widgetCompact) is ON, ignores ctrl+o state changes.
+ */
+export function syncCompactFromToolsExpanded(expanded: boolean): void {
+  if (__config.agent.widgetShortcut !== true) {
+    lastToolsExpanded = expanded;
+    return;
+  }
+  // When forceCompact is ON, ignore ctrl+o state changes
+  if (__config.agent.widgetCompact === true) {
+    lastToolsExpanded = expanded;
+    return;
+  }
+  // Tools expanded → widget full, tools collapsed → widget compact
+  if (lastToolsExpanded !== undefined && lastToolsExpanded !== expanded) {
+    getWidget()?.setCompactMode(!expanded);
+  }
+  lastToolsExpanded = expanded;
+}