pi-subagents-lite 1.0.2 → 1.2.0

package/src/format.ts

@@ -0,0 +1,173 @@
+/**
+ * format.ts — Consolidated display formatting helpers.
+ *
+ * Single source of truth for all display-formatting functions used across
+ * the UI layer. Previously scattered across agent-widget.ts, output-file.ts,
+ * and agent-types.ts by historical accident.
+ *
+ * Pure functions — no module-level state, no side effects.
+ */
+
+import { getConfig } from "./agent-types.js";
+import type { SubagentType, Theme } from "./types.js";
+import { formatTokens, formatCost } 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;
+
+// ---- Internal helpers (used by buildStatsParts) ----
+
+/**
+ * Token count with optional context-fill % and compaction-count annotations.
+ * Thresholds for percent: <70% dim, 70–85% warning, ≥85% error.
+ * Compaction count rendered as `↻ N` in dim.
+ *
+ *   "12.3k"                     — no annotations
+ *   "12.3k(45%)"                — percent only
+ *   "12.3k(↻ 2)"                 — compactions only (e.g. right after compact)
+ *   "12.3k(45%·↻ 2)"             — both
+ */
+function formatSessionTokens(
+  tokens: number,
+  percent: number | null,
+  theme: Theme,
+  compactions = 0,
+): string {
+  const tokenStr = formatTokens(tokens);
+  const annot: string[] = [];
+  if (percent !== null) {
+    const color = percent >= 85 ? "error" : percent >= 70 ? "warning" : "dim";
+    annot.push(theme.fg(color, `${Math.round(percent)}%`));
+  }
+  if (compactions > 0) {
+    annot.push(theme.fg("dim", `↻ ${compactions}`));
+  }
+  if (annot.length === 0) return tokenStr;
+  // Include closing paren in the last annotation's color span to prevent
+  // ANSI reset from leaving `)` in default color when wrapped in outer dim.
+  const lastIdx = annot.length - 1;
+  annot[lastIdx] += ")";
+  return `${tokenStr}(${annot.join("·")}`;
+}
+
+/** Format turn count with optional max limit: "5≤30⟳" or "5⟳". */
+function formatTurns(turnCount: number, maxTurns?: number | null): string {
+  return maxTurns != null ? `${turnCount}≤${maxTurns}⟳ ` : `${turnCount}⟳ `;
+}
+
+// ---- Exported formatting functions ----
+
+/** Format milliseconds as a compact human-readable duration: "1h 1m 1s", "5m 37s", "10s", "<1s". */
+export function formatMs(ms: number): string {
+  if (!Number.isFinite(ms) || ms < 1000) return "<1s";
+
+  const totalSeconds = Math.floor(ms / 1000);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+
+  const parts: string[] = [];
+  if (hours > 0) parts.push(`${hours}h`);
+  if (minutes > 0) parts.push(`${minutes}m`);
+  if (seconds > 0 || parts.length === 0) parts.push(`${seconds}s`);
+
+  return parts.join(" ");
+}
+
+/**
+ * Build common stats parts: toolUses · turns · tokens with context % · cost.
+ * Shared by AgentWidget and index.ts for consistent stats display.
+ */
+export function buildStatsParts(
+  args: {
+    toolUses: number;
+    turnCount?: number;
+    maxTurns?: number;
+    tokens: number;
+    contextPercent: number | null;
+    compactions: number;
+    cost?: number;
+  },
+  theme: Theme,
+): string[] {
+  const parts: string[] = [];
+  if (args.toolUses > 0) parts.push(`${args.toolUses}🛠 `);
+  if (args.turnCount != null) parts.push(formatTurns(args.turnCount, args.maxTurns));
+  if (args.tokens > 0) {
+    parts.push(formatSessionTokens(
+      args.tokens, args.contextPercent, theme, args.compactions,
+    ));
+  }
+  if (args.cost != null && args.cost > 0) parts.push(formatCost(args.cost));
+  return parts;
+}
+
+/** Get display name for any agent type (built-in or custom). */
+export function getDisplayName(type: SubagentType): string {
+  return getConfig(type).displayName;
+}
+
+/**
+ * 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)}`;
+    }
+  }
+}

package/src/index.ts

@@ -23,7 +23,6 @@
  *   - session_shutdown: Abort all, dispose manager
  */
 
-import { Box, Container, Spacer, Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import * as path from "node:path";
 import type {
@@ -31,38 +30,44 @@ import type {
   ExtensionCommandContext,
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
-import type { SessionModelOverrides, SubagentsConfig } from "./model-precedence.js";
 import { DEFAULT_AGENTS } from "./default-agents.js";
 import { registerAgents, getAvailableTypes, setAgentScanDirs } from "./agent-types.js";
 import { scanAgentFilesInDir, mergeAgents } from "./agent-discovery.js";
 import { AgentManager } from "./agent-manager.js";
-import { AgentWidget, buildStatsParts, formatMs, getDisplayName, type AgentActivity, type Theme, type UICtx } from "./ui/agent-widget.js";
+import { AgentWidget, type UICtx } from "./ui/agent-widget.js";
 import { showAgentsMainMenu } from "./menus.js";
-import { loadConfig, DEFAULT_CONFIG } from "./config-io.js";
-import { executeAgentTool, toolCallListener, backgroundAgentIds, scheduleNudge } from "./tool-execution.js";
-import { executeStopAgentTool } from "./stop-agent-tool.js";
-
-// ============================================================================
-// Module-level state
-// ============================================================================
-
-/** Session-only model overrides — not persisted, cleared on session_start. */
-export let sessionOverrides: SessionModelOverrides = { default: null };
-
-/** Config cache — loaded at session_start, updated by /agents menu mutations. */
-export let __config: SubagentsConfig = { ...DEFAULT_CONFIG, agent: { ...DEFAULT_CONFIG.agent }, concurrency: { ...DEFAULT_CONFIG.concurrency } };
-
-/** Agent manager singleton — module-level, no globalThis access. */
-export let manager: AgentManager;
-
-/** Live activity state per agent, keyed by agent ID. Read by AgentWidget and tool-execution. */
-export const agentActivity = new Map<string, AgentActivity>();
-
-/** Live TUI widget showing running/completed agents above the editor. Used by tool-execution. */
-export let widget: AgentWidget | undefined;
-
-/** ExtensionAPI reference — stored at init for execute callbacks. */
-export let piInstance: ExtensionAPI;
+import { loadConfig } from "./config-io.js";
+import { executeAgentTool, executeStopAgentTool, toolCallListener, backgroundAgentIds, scheduleNudge } from "./tool-execution.js";
+import { renderAgentToolCall, renderAgentToolResult, renderSubagentResult } from "./renderer.js";
+import {
+  __config,
+  sessionOverrides,
+  agentActivity,
+  piInstance,
+  setConfig,
+  setManager,
+  clearManager,
+  setWidget,
+  setPiInstance,
+  setSessionCtx,
+  resetSessionOverrides,
+  resetLastToolsExpanded,
+  syncWidgetSettings,
+  syncCompactFromToolsExpanded,
+  getManager,
+  getWidget,
+} from "./state.js";
+
+// Re-exports for backward compatibility
+export {
+  __config,
+  sessionOverrides,
+  agentActivity,
+  piInstance,
+  setShowCostEnabled,
+  syncWidgetSettings,
+  syncCompactFromToolsExpanded,
+} from "./state.js";
 
 
 
@@ -75,30 +80,37 @@ export let piInstance: ExtensionAPI;
  * Idempotent — safe to call on every session_start.
  */
 function ensureManagerAndWidget(): void {
-  if (manager) return;
-
-  manager = new AgentManager(
-    (record) => {
-      // Only nudge for background (async) agents — sync agents already returned via tool result
-      if (backgroundAgentIds.has(record.id)) {
-        scheduleNudge(record.id);
-        backgroundAgentIds.delete(record.id);
-      }
-
-      // Mark finished and update widget BEFORE deleting activity —
-      // renderFinishedLine reads activity for turn count, tokens, etc.
-      widget?.markFinished(record.id);
-      widget?.update();
+  const currentManager = getManager();
+  const currentWidget = getWidget();
+  // Create manager if missing
+  if (!currentManager) {
+    const newManager = new AgentManager(
+      (record) => {
+        // Only nudge for background (async) agents — sync agents already returned via tool result
+        if (backgroundAgentIds.has(record.id)) {
+          scheduleNudge(record.id);
+          backgroundAgentIds.delete(record.id);
+        }
 
-      // Remove from live activity tracking
-      agentActivity.delete(record.id);
-    },
-    __config.concurrency,
-  );
+        // Mark finished and update widget BEFORE deleting activity —
+        // renderFinishedLine reads activity for turn count, tokens, etc.
+        getWidget()?.markFinished(record.id);
+        getWidget()?.update();
+
+        // Remove from live activity tracking
+        agentActivity.delete(record.id);
+      },
+      __config.concurrency,
+    );
+    setManager(newManager);
+  }
 
-  // Create/replace widget tied to this manager instance
-  if (!widget) {
-    widget = new AgentWidget(manager, agentActivity);
+  // Create widget if missing (uses existing or newly created manager)
+  if (!currentWidget) {
+    const newWidget = new AgentWidget(getManager(), agentActivity);
+    newWidget.setShowCost(__config.agent.showCost === true);
+    setWidget(newWidget);
+    syncWidgetSettings();
   }
 }
 
@@ -127,35 +139,12 @@ async function scanAndRegisterAgents(ctx: ExtensionContext): Promise<void> {
 }
 
 async function loadConfigAndRegisterAgents(ctx: ExtensionContext): Promise<void> {
-  __config = loadConfig();
+  setConfig(loadConfig());
   ensureManagerAndWidget();
   await scanAndRegisterAgents(ctx);
 }
 
-// ============================================================================
-// UI helpers — stats card rendering (shared by renderResult and message renderer)
-// ============================================================================
-
-/** Format agent display name with optional model: "Agent (mimo-v2.5-pro)" or "Agent". */
-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. Used by both renderers. */
-function buildStatsLine(d: Record<string, unknown>, theme: Theme): string {
-  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,
-  }, theme);
-  parts.push(formatMs(d.durationMs as number));
-  return parts.join("·");
-}
 
 // ============================================================================
 // Agent tool registration helper — dynamic enum for agent types
@@ -182,55 +171,17 @@ function registerAgentTool(pi: ExtensionAPI): void {
       description: Type.String(),
       agent: agentParam,
       run_in_background: Type.Optional(Type.Boolean()),
-
+      worktree_path: Type.Optional(Type.String()),
     }),
     execute: executeAgentTool,
 
-    renderCall(args, theme) {
-      const typeName = getDisplayName((args.agent as string) || "");
-      const label = typeName || "Agent";
-      let text = `▸ ${theme.fg("accent", theme.bold(label))}`;
-
-      // Show model in parens when it differs from the parent model
-      // _modelOverride is injected by toolCallListener when the resolved
-      // model differs from the session's parent model
-      const a = args as Record<string, unknown>;
-      const modelOverride = a._modelOverride as string | undefined;
-      if (modelOverride) {
-        text += ` (${modelOverride})`;
-      }
-
-      return new Text(text, 0, 0);
-    },
-
-    renderResult(result, options, theme) {
-      const { expanded } = options as { expanded?: boolean };
-      const text = result.content[0]?.type === "text" ? result.content[0].text : "";
-      const d = result.details as Record<string, unknown> | undefined;
-      const isError = !!(result as any).isError;
-      const icon = 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 — type name already shown by renderCall
-      // For background spawns (no stats), use space placeholder — agent isn't done yet
-      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);
-      }
+    renderCall: (args, theme) => renderAgentToolCall(args as Record<string, unknown>, theme),
 
-      return new Text(`${prefix}${theme.fg("dim", text)}`, 0, 0);
-    },
+    renderResult: (result, options, theme) => renderAgentToolResult(
+      result as { content: Array<{ type: string; text?: string }>; details?: Record<string, unknown>; isError?: boolean },
+      options as { expanded?: boolean },
+      theme,
+    ),
   });
 }
 
@@ -240,7 +191,7 @@ function registerAgentTool(pi: ExtensionAPI): void {
 
 export default function (pi: ExtensionAPI) {
   // Store pi for execute callbacks
-  piInstance = pi;
+  setPiInstance(pi);
 
   // ========================================================================
   // Tool registration (stealth schemas — at init time)
@@ -261,55 +212,13 @@ export default function (pi: ExtensionAPI) {
   });
 
   // Message renderer — subagent-result (background agent completion)
-  pi.registerMessageRenderer("subagent-result", (message, options, theme) => {
-    const { expanded } = options as { expanded?: boolean };
-    const d = message.details as Record<string, unknown> | undefined;
-    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 desc = (d.description as string) || "";
-
-      const namePart = agentNameLabel(d, theme);
-      const statsLine = buildStatsLine(d, theme);
-      let headerLine = `${icon} ${namePart}·${statsLine}\n  ${theme.fg("text", desc)}`;
-      if ((d.outputFile as string)) {
-        headerLine += `\n  ${theme.fg("dim", `tail -f ${d.outputFile}`)}`;
-      }
-      inner.addChild(new Text(headerLine, 0, 0));
-
-      if (expanded && text) {
-        inner.addChild(new Spacer(1));
-        const resultLines = text.split("\n").map(l => `  ${l}`).join("\n");
-        inner.addChild(new Text(resultLines, 0, 0));
-      }
-    } else {
-      const desc = (d?.description as string) || "";
-      let line = `${theme.fg("success", "✓")}`;
-      if (d?.type) {
-        line += ` ${agentNameLabel(d, theme)}`;
-      }
-      if (desc) line += `\n  ${theme.fg("text", desc)}`;
-      if (d?.outputFile) {
-        line += `\n  ${theme.fg("dim", `tail -f ${d.outputFile}`)}`;
-      }
-      inner.addChild(new Text(line, 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;
-  });
+  pi.registerMessageRenderer("subagent-result", (message, options, theme) =>
+    renderSubagentResult(
+      message as { content?: string; details?: Record<string, unknown> },
+      options as { expanded?: boolean },
+      theme,
+    ),
+  );
 
   // Command registration
   pi.registerCommand("agents", {
@@ -324,25 +233,66 @@ export default function (pi: ExtensionAPI) {
   pi.on("tool_call", toolCallListener);
 
   pi.on("tool_execution_start", async (_event, ctx) => {
-    widget?.setUICtx(ctx.ui as unknown as UICtx);
-    widget?.onTurnStart();
+    // Set UI context on first tool execution
+    if (!getWidget()) {
+      ensureManagerAndWidget();
+    }
+    getWidget()?.setUICtx(ctx.ui as unknown as UICtx);
+    getWidget()?.onTurnStart();
   });
 
+
+
   // session_start — load config, scan agents, register into registry,
   // then re-register Agent tool with dynamic agent type enum
+  // Listen for ctrl+o keypress to sync compact mode (push-based, no polling)
+  let unregisterTerminalInput: (() => void) | undefined;
+
   pi.on("session_start", async (_event: unknown, ctx: ExtensionContext) => {
-    sessionOverrides = { default: null };
+    setSessionCtx(ctx);
+    resetSessionOverrides();
     agentActivity.clear();
+    resetLastToolsExpanded();
     await loadConfigAndRegisterAgents(ctx);
     // Re-register with updated agent type list (now includes user/project agents)
     registerAgentTool(pi);
+    // Register ctrl+o listener
+    if (ctx.hasUI && !unregisterTerminalInput) {
+      unregisterTerminalInput = ctx.ui.onTerminalInput((data: string) => {
+        // ctrl+o = 0x0F (15) — toggles tool expansion
+        if (data === "\u000f") {
+          // Read state after a tick to let the built-in handler process it first
+          setTimeout(() => {
+            const ui = ctx.ui as unknown as { getToolsExpanded?: () => boolean };
+            const expanded = ui.getToolsExpanded?.();
+            if (expanded !== undefined) {
+              getWidget()?.notifyToolsExpansionChanged(expanded);
+            }
+          }, 0);
+        }
+        return undefined; // Don't consume the input
+      });
+    }
+    // Sync compact mode with initial tool expansion state
+    syncCompactFromToolsExpanded(false);
   });
 
-  pi.on("session_shutdown", async (_event: unknown) => {
-    widget?.dispose();
-    widget = undefined;
-    if (manager) {
-      await manager.dispose();
+  pi.on("session_shutdown", async (_event: unknown, ctx: ExtensionContext) => {
+    // Warn if agents were killed
+    const currentManager = getManager();
+    if (currentManager) {
+      const records = currentManager.listAgents();
+      const active = records.filter(r => r.lifecycle.status === "running" || r.lifecycle.status === "queued");
+      if (active.length > 0 && ctx.hasUI) {
+        ctx.ui.notify(`${active.length} agent(s) killed by reload`, "warning");
+      }
+    }
+    getWidget()?.dispose();
+    setWidget(undefined);
+    const mgr = getManager();
+    if (mgr) {
+      await mgr.dispose();
+      clearManager();
     }
   });
 }