pi-subagents-lite 0.2.0 → 0.3.1

package/src/model-precedence.ts

@@ -4,17 +4,20 @@
  * Pure function — no side effects, no file I/O, no pi SDK imports.
  *
  * Precedence chain (highest to lowest):
- *   1. config.agent[subagentType]  (per-type override)
- *   2. config.agent["default"]     (global default)
- *   3. agentConfig?.model          (agent config / frontmatter)
- *   4. parentModelId               (inherit from parent)
+ *   1. sessionOverrides[subagentType]  (session per-type override)
+ *   2. sessionOverrides["default"]     (session global default)
+ *   3. config.agent[subagentType]      (config per-type override)
+ *   4. config.agent["default"]         (config global default)
+ *   5. agentConfig?.model              (agent config / frontmatter)
+ *   6. parentModelId                   (inherit from parent)
  */
 
 /** Shape of the subagents-lite.json config file. */
 export interface SubagentsConfig {
   agent: {
     default: string | null;
-    [agentType: string]: string | null | undefined;
+    forceBackground: boolean;
+    [agentType: string]: string | null | undefined | boolean;
   };
   concurrency: {
     default: number;
@@ -23,49 +26,56 @@ export interface SubagentsConfig {
   };
 }
 
+/**
+ * Shape of session-only model overrides.
+ * Same as config.agent but without the forceBackground flag.
+ * Not persisted — cleared on session_start.
+ */
+export interface SessionModelOverrides {
+  default: string | null;
+  [agentType: string]: string | null | undefined;
+}
+
+/**
+/** Options for resolveModel. */
+export interface ResolveModelOptions {
+  /** The type of subagent being spawned. */
+  subagentType: string;
+  /** The agent's config (from .md frontmatter or defaults). */
+  agentConfig?: { model?: string };
+  /** The global subagents-lite.json config (model overrides). */
+  config: SubagentsConfig;
+  /** The parent agent's model ID (final fallback). */
+  parentModelId: string;
+  /** Session-only overrides (checked first). */
+  sessionOverrides?: SessionModelOverrides;
+}
+
 /**
  * Resolve the model for a subagent invocation.
  *
  * Returns the first non-null, non-undefined, non-empty-string value
  * from the precedence chain. If all are empty/null, returns parentModelId.
- *
- * @param subagentType - The type of subagent being spawned
- * @param agentConfig - The agent's config (from .md frontmatter or defaults)
- * @param config - The global subagents-lite.json config (model overrides)
- * @param parentModelId - The parent agent's model ID (final fallback)
- * @returns The resolved model ID string
  */
-export function resolveModel(
-  subagentType: string,
-  agentConfig: { model?: string } | undefined,
-  config: SubagentsConfig,
-  parentModelId: string,
-): string {
-  // Level 1: per-type override
-  const perTypeOverride = config.agent[subagentType];
-  if (isValidValue(perTypeOverride)) {
-    return perTypeOverride;
-  }
-
-  // Level 2: global default override
-  const globalDefault = config.agent["default"];
-  if (isValidValue(globalDefault)) {
-    return globalDefault;
-  }
-
-  // Level 3: agent config/frontmatter model
-  if (agentConfig && isValidValue(agentConfig.model)) {
-    return agentConfig.model;
-  }
+export function resolveModel(options: ResolveModelOptions): string {
+  const { subagentType, agentConfig, config, parentModelId, sessionOverrides } = options;
 
-  // Level 4: parent model (final fallback)
-  return parentModelId;
+  // Precedence chain: session > config > frontmatter > parent
+  const candidates: Array<string | boolean | null | undefined> = [
+    sessionOverrides?.[subagentType],
+    sessionOverrides?.["default"],
+    config.agent[subagentType],
+    config.agent["default"],
+    agentConfig?.model,
+    parentModelId, // final fallback (always a valid string)
+  ];
+  return candidates.find(isValidValue) ?? parentModelId;
 }
 
 /**
  * Check if a value is a valid non-empty model string.
  * Returns true for non-null, non-undefined, non-empty strings.
  */
-function isValidValue(value: string | null | undefined): value is string {
+function isValidValue(value: string | boolean | null | undefined): value is string {
   return typeof value === "string" && value.length > 0;
 }

package/src/model-selector.ts

@@ -10,7 +10,6 @@
 
 import {
   Container,
-  type Component,
   type Focusable,
   fuzzyFilter,
   getKeybindings,
@@ -37,7 +36,7 @@ export interface ModelOption {
   provider: string;
 }
 
-export interface ModelSelectorCallbacks {
+interface ModelSelectorCallbacks {
   onSelect: (value: string) => void;
   onCancel: () => void;
 }
@@ -126,9 +125,20 @@ export class ModelSelectorDialog extends Container implements Focusable {
   handleInput(keyData: string): void {
     const kb = getKeybindings();
 
+    // Navigation keys — no-op when list is empty
+    if (this.filteredItems.length === 0) {
+      if (
+        kb.matches(keyData, "tui.select.up") ||
+        kb.matches(keyData, "tui.select.down") ||
+        kb.matches(keyData, "tui.select.pageUp") ||
+        kb.matches(keyData, "tui.select.pageDown")
+      ) {
+        return;
+      }
+    }
+
     // Up — wrap to bottom
     if (kb.matches(keyData, "tui.select.up")) {
-      if (this.filteredItems.length === 0) return;
       this.selectedIndex =
         this.selectedIndex === 0
           ? this.filteredItems.length - 1
@@ -139,7 +149,6 @@ export class ModelSelectorDialog extends Container implements Focusable {
 
     // Down — wrap to top
     if (kb.matches(keyData, "tui.select.down")) {
-      if (this.filteredItems.length === 0) return;
       this.selectedIndex =
         this.selectedIndex === this.filteredItems.length - 1
           ? 0
@@ -150,7 +159,6 @@ export class ModelSelectorDialog extends Container implements Focusable {
 
     // PageUp — jump up one page
     if (kb.matches(keyData, "tui.select.pageUp")) {
-      if (this.filteredItems.length === 0) return;
       this.selectedIndex = Math.max(0, this.selectedIndex - MAX_VISIBLE);
       this.updateList();
       return;
@@ -158,7 +166,6 @@ export class ModelSelectorDialog extends Container implements Focusable {
 
     // PageDown — jump down one page
     if (kb.matches(keyData, "tui.select.pageDown")) {
-      if (this.filteredItems.length === 0) return;
       this.selectedIndex = Math.min(
         this.filteredItems.length - 1,
         this.selectedIndex + MAX_VISIBLE,
@@ -242,19 +249,12 @@ export class ModelSelectorDialog extends Container implements Focusable {
       const isSelected = i === this.selectedIndex;
       const isCurrent = item.value === this.currentModel;
 
-      let line: string;
-      if (isSelected) {
-        const prefix = this.theme.fg("accent", "→ ");
-        const modelText = this.theme.fg("accent", item.label);
-        const providerBadge = this.theme.fg("muted", `[${item.provider}]`);
-        const checkmark = isCurrent ? this.theme.fg("success", " ✓") : "";
-        line = `${prefix}${modelText} ${providerBadge}${checkmark}`;
-      } else {
-        const modelText = `  ${item.label}`;
-        const providerBadge = this.theme.fg("muted", `[${item.provider}]`);
-        const checkmark = isCurrent ? this.theme.fg("success", " ✓") : "";
-        line = `${modelText} ${providerBadge}${checkmark}`;
-      }
+      const modelText = isSelected
+        ? this.theme.fg("accent", "→ ") + this.theme.fg("accent", item.label)
+        : `  ${item.label}`;
+      const providerBadge = this.theme.fg("muted", `[${item.provider}]`);
+      const checkmark = isCurrent ? this.theme.fg("success", " ✓") : "";
+      const line = `${modelText} ${providerBadge}${checkmark}`;
 
       this.listContainer.addChild(new Text(line, 0, 0));
     }

package/src/output-file.ts

@@ -13,6 +13,15 @@ import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import type { AgentSession, AgentSessionEvent } from "@earendil-works/pi-coding-agent";
 
+/** 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;
+
+/** Max content length for full tool result display — longer results get a summary line. */
+const MAX_TOOL_RESULT_DISPLAY_LENGTH = 500;
+
 /** Get an ISO 8601 timestamp string suitable for log output. */
 function timestamp(): string {
   return new Date().toISOString();
@@ -20,11 +29,14 @@ function timestamp(): string {
 
 /**
  * Create the output file path for an agent.
- * Path: /tmp/pi-agent-outputs/<agentId>.log
+ * Default path: /tmp/pi-agent-outputs/<agentId>.log
  * Ensures the parent directory exists with 0o700 permissions.
+ *
+ * @param baseDir - Optional base directory (defaults to /tmp/pi-agent-outputs).
+ *                    Provided for testability; production callers omit it.
  */
-export function createOutputFilePath(agentId: string): string {
-  const dir = "/tmp/pi-agent-outputs";
+export function createOutputFilePath(agentId: string, baseDir?: string): string {
+  const dir = baseDir ?? "/tmp/pi-agent-outputs";
   mkdirSync(dir, { recursive: true, mode: 0o700 });
   return join(dir, `${agentId}.log`);
 }
@@ -41,6 +53,14 @@ export function writeInitialEntry(
   writeFileSync(path, line, "utf-8");
 }
 
+/**
+ * Safe append — silently ignores write errors.
+ * Used for best-effort output file writes that must never throw.
+ */
+function safeAppend(path: string, content: string): void {
+  try { appendFileSync(path, content, "utf-8"); } catch { /* ignore write errors */ }
+}
+
 /** Split text into non-empty lines, prefixing each with a timestamp and role tag. */
 function splitAndPrefix(text: string, role: string): string {
   return text
@@ -50,25 +70,74 @@ 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";
+  const name = (item.name ?? item.toolName ?? "unknown") as string;
   // pi-ai ToolCall uses `arguments`, legacy/anthropic format uses `input`
   const rawArgs = (item.arguments ?? item.input) as Record<string, unknown> | undefined;
-  let argsStr = "";
-  if (rawArgs && typeof rawArgs === "object" && Object.keys(rawArgs).length > 0) {
-    const keys = Object.keys(rawArgs);
-    if (keys.length === 1) {
-      // Single-arg shorthand: read("src/file.ts")
-      const val = rawArgs[keys[0]];
-      const display = typeof val === "string" && val.length > 200
-        ? JSON.stringify(val.slice(0, 200) + "...")
-        : JSON.stringify(val);
-      argsStr = `(${display})`;
-    } else {
-      argsStr = ` ${JSON.stringify(rawArgs)}`;
-    }
-  }
+  const argsStr = summarizeToolArgs(name, rawArgs);
   return `${timestamp()} [TOOL] ${name}${argsStr}\n`;
 }
 
@@ -81,6 +150,29 @@ function extractUserText(content: string | ReadonlyArray<Record<string, unknown>
   return "";
 }
 
+/**
+ * Format a tool result message as log line(s), truncating if content is too long.
+ *
+ * - If content length ≤ MAX_TOOL_RESULT_DISPLAY_LENGTH chars: each line is prefixed with [TOOL_RESULT]
+ * - If content length > MAX_TOOL_RESULT_DISPLAY_LENGTH chars: single summary line `[TOOL_RESULT] <toolName>: <N> chars`
+ */
+function formatToolResult(toolName: string, content: ReadonlyArray<Record<string, unknown>> | undefined): string {
+  if (!content || !Array.isArray(content)) return "";
+
+  const text = content
+    .filter((c): c is { type: "text"; text: string } => c.type === "text" && typeof c.text === "string")
+    .map((c) => c.text)
+    .join("\n");
+
+  if (text.length > MAX_TOOL_RESULT_DISPLAY_LENGTH) {
+    return `${timestamp()} [TOOL_RESULT] ${toolName}: ${text.length} chars\n`;
+  }
+
+  if (!text.trim()) return "";
+
+  return splitAndPrefix(text, "TOOL_RESULT");
+}
+
 /**
  * Format a single message content item as log lines.
  * Handles text, toolUse/toolCall, and thinking content.
@@ -124,7 +216,7 @@ function formatMessageLine(
 export function streamToOutputFile(
   session: AgentSession,
   path: string,
-  stats?: { turnCount: number; toolUseCount: number; totalTokens: number },
+  stats?: { turnCount: number; toolUseCount: number; totalTokens: number; cost: number },
 ): () => void {
   let writtenCount = 1; // initial user prompt already written
 
@@ -134,17 +226,20 @@ export function streamToOutputFile(
       const msg = messages[writtenCount];
       if (msg.role === "assistant") {
         const lines = formatMessageLine("ASSISTANT", msg.content as any);
-        if (lines) {
-          try { appendFileSync(path, lines, "utf-8"); } catch { /* ignore write errors */ }
-        }
+        if (lines) safeAppend(path, lines);
       } else if (msg.role === "user") {
         const text = extractUserText(msg.content as any);
         if (text.trim()) {
-          try { appendFileSync(path, `${timestamp()} [USER] ${text}\n`, "utf-8"); } catch { /* ignore */ }
+          safeAppend(path, `${timestamp()} [USER] ${text}\n`);
         }
+      } else if (msg.role === "toolResult") {
+        const msgAny = msg as unknown as Record<string, unknown>;
+        const lines = formatToolResult(
+          (msgAny.toolName ?? "unknown") as string,
+          msgAny.content as ReadonlyArray<Record<string, unknown>> | undefined,
+        );
+        if (lines) safeAppend(path, lines);
       }
-      // NOTE: toolResult messages are enumerated as text content and already
-      // included in the assistant message content. No separate TOOL_RESULT role.
       writtenCount++;
     }
   };
@@ -158,17 +253,12 @@ export function streamToOutputFile(
     flush();
 
     // Write DONE line
-    const { turnCount = 0, toolUseCount = 0, totalTokens = 0 } = stats ?? {};
+    const { turnCount = 0, toolUseCount = 0, totalTokens = 0, cost = 0 } = stats ?? {};
     const tokensStr = totalTokens >= 1000
       ? `${(totalTokens / 1000).toFixed(1)}k tokens`
       : `${totalTokens} tokens`;
-    try {
-      appendFileSync(
-        path,
-        `${timestamp()} [DONE] ${turnCount} turns, ${toolUseCount} tool uses, ${tokensStr}\n`,
-        "utf-8",
-      );
-    } catch { /* ignore write errors */ }
+    const costStr = `$${cost.toFixed(3)}`;
+    safeAppend(path, `${timestamp()} [DONE] ${turnCount} turns, ${toolUseCount} tool uses, ${tokensStr}, ${costStr}\n`);
 
     // Unsubscribe from session events
     unsubscribe();

package/src/prompts.ts

@@ -48,14 +48,14 @@ export function buildAgentPrompt(
       extraSections.push(`\n# Preloaded Skill: ${skill.name}\n${skill.content}`);
     }
   }
-  const extrasSuffix = extraSections.length > 0 ? "\n\n" + extraSections.join("\n") : "";
+  const extrasSuffix = extraSections.length > 0 ? `\n\n${extraSections.join("\n")}` : "";
 
   const header = `You are a pi coding agent sub-agent.
 You have been invoked to handle a specific task autonomously.
 
 ${envBlock}`;
 
-  return activeAgentTag + header + "\n\n" + config.systemPrompt + extrasSuffix;
+  return `${activeAgentTag}${header}\n\n${config.systemPrompt}${extrasSuffix}`;
 }