@tintinweb/pi-subagents 0.4.9 → 0.4.11

package/src/index.ts

@@ -10,32 +10,33 @@
  *   /agents                 — Interactive agent management menu
  */
 
-import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
-import { registerRpcHandlers } from "./cross-extension-rpc.js";
-import { existsSync, mkdirSync, unlinkSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
+import { join } from "node:path";
+import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { Text } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { AgentManager } from "./agent-manager.js";
-import { steerAgent, getAgentConversation, getDefaultMaxTurns, setDefaultMaxTurns, getGraceTurns, setGraceTurns } from "./agent-runner.js";
-import { DEFAULT_AGENT_NAMES, type SubagentType, type ThinkingLevel, type AgentConfig, type JoinMode, type AgentRecord, type NotificationDetails } from "./types.js";
-import { GroupJoinManager } from "./group-join.js";
-import { getAvailableTypes, getAllTypes, getDefaultAgentNames, getUserAgentNames, getAgentConfig, resolveType, registerAgents, BUILTIN_TOOL_NAMES } from "./agent-types.js";
+import { getAgentConversation, getDefaultMaxTurns, getGraceTurns, setDefaultMaxTurns, setGraceTurns, steerAgent } from "./agent-runner.js";
+import { BUILTIN_TOOL_NAMES, getAgentConfig, getAllTypes, getAvailableTypes, getDefaultAgentNames, getUserAgentNames, registerAgents, resolveType } from "./agent-types.js";
+import { registerRpcHandlers } from "./cross-extension-rpc.js";
 import { loadCustomAgents } from "./custom-agents.js";
-import { resolveModel, type ModelRegistry } from "./model-resolver.js";
-import { createOutputFilePath, writeInitialEntry, streamToOutputFile } from "./output-file.js";
+import { GroupJoinManager } from "./group-join.js";
+import { type ModelRegistry, resolveModel } from "./model-resolver.js";
+import { createOutputFilePath, streamToOutputFile, writeInitialEntry } from "./output-file.js";
+import { type AgentConfig, type AgentRecord, type JoinMode, type NotificationDetails, type SubagentType, type ThinkingLevel } from "./types.js";
 import {
+  type AgentActivity,
+  type AgentDetails,
   AgentWidget,
-  SPINNER,
-  formatTokens,
-  formatMs,
+  describeActivity,
   formatDuration,
+  formatMs,
+  formatTokens,
+  formatTurns,
   getDisplayName,
   getPromptModeLabel,
-  describeActivity,
-  type AgentDetails,
-  type AgentActivity,
+  SPINNER,
   type UICtx,
 } from "./ui/agent-widget.js";
 
@@ -56,8 +57,8 @@ function safeFormatTokens(session: { getSessionStats(): { tokens: { total: numbe
  * Create an AgentActivity state and spawn callbacks for tracking tool usage.
  * Used by both foreground and background paths to avoid duplication.
  */
-function createActivityTracker(onStreamUpdate?: () => void) {
-  const state: AgentActivity = { activeTools: new Map(), toolUses: 0, tokens: "", responseText: "", session: undefined };
+function createActivityTracker(maxTurns?: number, onStreamUpdate?: () => void) {
+  const state: AgentActivity = { activeTools: new Map(), toolUses: 0, turnCount: 1, maxTurns, tokens: "", responseText: "", session: undefined };
 
   const callbacks = {
     onToolActivity: (activity: { type: "start" | "end"; toolName: string }) => {
@@ -76,6 +77,10 @@ function createActivityTracker(onStreamUpdate?: () => void) {
       state.responseText = fullText;
       onStreamUpdate?.();
     },
+    onTurnEnd: (turnCount: number) => {
+      state.turnCount = turnCount;
+      onStreamUpdate?.();
+    },
     onSessionCreated: (session: any) => {
       state.session = session;
     },
@@ -145,12 +150,15 @@ function formatTaskNotification(record: AgentRecord, resultMaxLen: number): stri
 function buildDetails(
   base: Pick<AgentDetails, "displayName" | "description" | "subagentType" | "modelName" | "tags">,
   record: { toolUses: number; startedAt: number; completedAt?: number; status: string; error?: string; id?: string; session?: any },
+  activity?: AgentActivity,
   overrides?: Partial<AgentDetails>,
 ): AgentDetails {
   return {
     ...base,
     toolUses: record.toolUses,
     tokens: safeFormatTokens(record.session),
+    turnCount: activity?.turnCount,
+    maxTurns: activity?.maxTurns,
     durationMs: (record.completedAt ?? Date.now()) - record.startedAt,
     status: record.status as AgentDetails["status"],
     agentId: record.id,
@@ -160,7 +168,7 @@ function buildDetails(
 }
 
 /** Build notification details for the custom message renderer. */
-function buildNotificationDetails(record: AgentRecord, resultMaxLen: number): NotificationDetails {
+function buildNotificationDetails(record: AgentRecord, resultMaxLen: number, activity?: AgentActivity): NotificationDetails {
   let totalTokens = 0;
   try {
     if (record.session) totalTokens = record.session.getSessionStats().tokens?.total ?? 0;
@@ -171,6 +179,8 @@ function buildNotificationDetails(record: AgentRecord, resultMaxLen: number): No
     description: record.description,
     status: record.status,
     toolUses: record.toolUses,
+    turnCount: activity?.turnCount ?? 0,
+    maxTurns: activity?.maxTurns,
     totalTokens,
     durationMs: record.completedAt ? record.completedAt - record.startedAt : 0,
     outputFile: record.outputFile,
@@ -203,6 +213,7 @@ export default function (pi: ExtensionAPI) {
 
         // Line 2: stats
         const parts: string[] = [];
+        if (d.turnCount > 0) parts.push(formatTurns(d.turnCount, d.maxTurns));
         if (d.toolUses > 0) parts.push(`${d.toolUses} tool use${d.toolUses === 1 ? "" : "s"}`);
         if (d.totalTokens > 0) parts.push(formatTokens(d.totalTokens));
         if (d.durationMs > 0) parts.push(formatMs(d.durationMs));
@@ -277,7 +288,7 @@ export default function (pi: ExtensionAPI) {
       customType: "subagent-notification",
       content: notification + footer,
       display: true,
-      details: buildNotificationDetails(record, 500),
+      details: buildNotificationDetails(record, 500, agentActivity.get(record.id)),
     }, { deliverAs: "followUp" });
   }
 
@@ -305,9 +316,9 @@ export default function (pi: ExtensionAPI) {
           : `${unconsumed.length} agent(s) finished`;
 
         const [first, ...rest] = unconsumed;
-        const details = buildNotificationDetails(first, 300);
+        const details = buildNotificationDetails(first, 300, agentActivity.get(first.id));
         if (rest.length > 0) {
-          details.others = rest.map(r => buildNotificationDetails(r, 300));
+          details.others = rest.map(r => buildNotificationDetails(r, 300, agentActivity.get(r.id)));
         }
 
         pi.sendMessage<NotificationDetails>({
@@ -585,7 +596,7 @@ Guidelines:
       ),
       max_turns: Type.Optional(
         Type.Number({
-          description: "Maximum number of agentic turns before stopping.",
+          description: "Maximum number of agentic turns before stopping. Omit for unlimited (default).",
           minimum: 1,
         }),
       ),
@@ -637,11 +648,14 @@ Guidelines:
         return new Text(text, 0, 0);
       }
 
-      // Helper: build "haiku · thinking: high · 3 tool uses · 33.8k tokens" stats string
+      // Helper: build "haiku · thinking: high · ⟳5≤30 · 3 tool uses · 33.8k tokens" stats string
       const stats = (d: AgentDetails) => {
         const parts: string[] = [];
         if (d.modelName) parts.push(d.modelName);
         if (d.tags) parts.push(...d.tags);
+        if (d.turnCount != null && d.turnCount > 0) {
+          parts.push(formatTurns(d.turnCount, d.maxTurns));
+        }
         if (d.toolUses > 0) parts.push(`${d.toolUses} tool use${d.toolUses === 1 ? "" : "s"}`);
         if (d.tokens) parts.push(d.tokens);
         return parts.map(p => theme.fg("dim", p)).join(" " + theme.fg("dim", "·") + " ");
@@ -762,6 +776,7 @@ Guidelines:
       if (thinking) agentTags.push(`thinking: ${thinking}`);
       if (isolated) agentTags.push("isolated");
       if (isolation === "worktree") agentTags.push("worktree");
+      const effectiveMaxTurns = params.max_turns ?? customConfig?.maxTurns ?? getDefaultMaxTurns();
       // Shared base fields for all AgentDetails in this call
       const detailBase = {
         displayName,
@@ -792,7 +807,7 @@ Guidelines:
 
       // Background execution
       if (runInBackground) {
-        const { state: bgState, callbacks: bgCallbacks } = createActivityTracker();
+        const { state: bgState, callbacks: bgCallbacks } = createActivityTracker(effectiveMaxTurns);
 
         // Wrap onSessionCreated to wire output file streaming.
         // The callback lazily reads record.outputFile (set right after spawn)
@@ -878,6 +893,8 @@ Guidelines:
           ...detailBase,
           toolUses: fgState.toolUses,
           tokens: fgState.tokens,
+          turnCount: fgState.turnCount,
+          maxTurns: fgState.maxTurns,
           durationMs: Date.now() - startedAt,
           status: "running",
           activity: describeActivity(fgState.activeTools, fgState.responseText),
@@ -889,7 +906,7 @@ Guidelines:
         });
       };
 
-      const { state: fgState, callbacks: fgCallbacks } = createActivityTracker(streamUpdate);
+      const { state: fgState, callbacks: fgCallbacks } = createActivityTracker(effectiveMaxTurns, streamUpdate);
 
       // Wire session creation to register in widget
       const origOnSession = fgCallbacks.onSessionCreated;
@@ -935,7 +952,7 @@ Guidelines:
       // Get final token count
       const tokenText = safeFormatTokens(fgState.session);
 
-      const details = buildDetails(detailBase, record, { tokens: tokenText });
+      const details = buildDetails(detailBase, record, fgState, { tokens: tokenText });
 
       const fallbackNote = fellBack
         ? `Note: Unknown agent type "${rawType}" — using general-purpose.\n\n`
@@ -1056,7 +1073,8 @@ Guidelines:
       }
       if (!record.session) {
         // Session not ready yet — queue the steer for delivery once initialized
-        (record.pendingSteers ??= []).push(params.message);
+        if (!record.pendingSteers) record.pendingSteers = [];
+        record.pendingSteers.push(params.message);
         pi.events.emit("subagents:steered", { id: record.id, message: params.message });
         return textResult(`Steering message queued for agent ${record.id}. It will be delivered once the session initializes.`);
       }
@@ -1461,7 +1479,7 @@ description: <one-line description shown in UI>
 tools: <comma-separated built-in tools: read, bash, edit, write, grep, find, ls. Use "none" for no tools. Omit for all tools>
 model: <optional model as "provider/modelId", e.g. "anthropic/claude-haiku-4-5-20251001". Omit to inherit parent model>
 thinking: <optional thinking level: off, minimal, low, medium, high, xhigh. Omit to inherit>
-max_turns: <optional max agentic turns, default 50. Omit for default>
+max_turns: <optional max agentic turns. 0 or omit for unlimited (default)>
 prompt_mode: <"replace" (body IS the full system prompt) or "append" (body is appended to default prompt). Default: replace>
 extensions: <true (inherit all MCP/extension tools), false (none), or comma-separated names. Default: true>
 skills: <true (inherit all), false (none), or comma-separated skill names to preload into prompt. Default: true>
@@ -1597,7 +1615,7 @@ ${systemPrompt}
   async function showSettings(ctx: ExtensionCommandContext) {
     const choice = await ctx.ui.select("Settings", [
       `Max concurrency (current: ${manager.getMaxConcurrent()})`,
-      `Default max turns (current: ${getDefaultMaxTurns()})`,
+      `Default max turns (current: ${getDefaultMaxTurns() ?? "unlimited"})`,
       `Grace turns (current: ${getGraceTurns()})`,
       `Join mode (current: ${getDefaultJoinMode()})`,
     ]);
@@ -1615,14 +1633,17 @@ ${systemPrompt}
         }
       }
     } else if (choice.startsWith("Default max turns")) {
-      const val = await ctx.ui.input("Default max turns before wrap-up", String(getDefaultMaxTurns()));
+      const val = await ctx.ui.input("Default max turns before wrap-up (0 = unlimited)", String(getDefaultMaxTurns() ?? 0));
       if (val) {
         const n = parseInt(val, 10);
-        if (n >= 1) {
+        if (n === 0) {
+          setDefaultMaxTurns(undefined);
+          ctx.ui.notify("Default max turns set to unlimited", "info");
+        } else if (n >= 1) {
           setDefaultMaxTurns(n);
           ctx.ui.notify(`Default max turns set to ${n}`, "info");
         } else {
-          ctx.ui.notify("Must be a positive integer.", "warning");
+          ctx.ui.notify("Must be 0 (unlimited) or a positive integer.", "warning");
         }
       }
     } else if (choice.startsWith("Grace turns")) {

package/src/memory.ts

@@ -7,9 +7,9 @@
  *   - "local"   → .pi/agent-memory-local/{agent-name}/
  */
 
-import { existsSync, readFileSync, mkdirSync, lstatSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { existsSync, lstatSync, mkdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
+import { join, } from "node:path";
 import type { MemoryScope } from "./types.js";
 
 /** Maximum lines to read from MEMORY.md */

package/src/output-file.ts

@@ -5,9 +5,9 @@
  * matching Claude Code's task output file format.
  */
 
+import { appendFileSync, chmodSync, mkdirSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { mkdirSync, chmodSync, appendFileSync, writeFileSync } from "node:fs";
 import type { AgentSession, AgentSessionEvent } from "@mariozechner/pi-coding-agent";
 
 /** Create the output file path, ensuring the directory exists.

package/src/skill-loader.ts

@@ -5,8 +5,8 @@
  * and returns their content for injection into the agent's system prompt.
  */
 
-import { join } from "node:path";
 import { homedir } from "node:os";
+import { join } from "node:path";
 import { isUnsafeName, safeReadFile } from "./memory.js";
 
 export interface PreloadedSkill {

package/src/types.ts

@@ -2,8 +2,8 @@
  * types.ts — Type definitions for the subagent system.
  */
 
-import type { AgentSession } from "@mariozechner/pi-coding-agent";
 import type { ThinkingLevel } from "@mariozechner/pi-agent-core";
+import type { AgentSession } from "@mariozechner/pi-coding-agent";
 
 export type { ThinkingLevel };
 
@@ -93,6 +93,8 @@ export interface NotificationDetails {
   description: string;
   status: string;
   toolUses: number;
+  turnCount: number;
+  maxTurns?: number;
   totalTokens: number;
   durationMs: number;
   outputFile?: string;

package/src/ui/agent-widget.ts

@@ -7,8 +7,8 @@
 
 import { truncateToWidth } from "@mariozechner/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
-import type { SubagentType } from "../types.js";
 import { getConfig } from "../agent-types.js";
+import type { SubagentType } from "../types.js";
 
 // ---- Constants ----
 
@@ -55,6 +55,10 @@ export interface AgentActivity {
   tokens: string;
   responseText: string;
   session?: { getSessionStats(): { tokens: { total: number } } };
+  /** Current turn count. */
+  turnCount: number;
+  /** Effective max turns for this agent (undefined = unlimited). */
+  maxTurns?: number;
 }
 
 /** Metadata attached to Agent tool results for custom rendering. */
@@ -74,6 +78,10 @@ export interface AgentDetails {
   modelName?: string;
   /** Notable config tags (e.g. ["thinking: high", "isolated"]). */
   tags?: string[];
+  /** Current turn count. */
+  turnCount?: number;
+  /** Effective max turns (undefined = unlimited). */
+  maxTurns?: number;
   agentId?: string;
   error?: string;
 }
@@ -87,6 +95,11 @@ export function formatTokens(count: number): string {
   return `${count} token`;
 }
 
+/** Format turn count with optional max limit: "⟳5≤30" or "⟳5". */
+export function formatTurns(turnCount: number, maxTurns?: number | null): string {
+  return maxTurns != null ? `⟳${turnCount}≤${maxTurns}` : `⟳${turnCount}`;
+}
+
 /** Format milliseconds as human-readable duration. */
 export function formatMs(ms: number): string {
   return `${(ms / 1000).toFixed(1)}s`;
@@ -214,7 +227,7 @@ export class AgentWidget {
   }
 
   /** Render a finished agent line. */
-  private renderFinishedLine(a: { type: SubagentType; status: string; description: string; toolUses: number; startedAt: number; completedAt?: number; error?: string }, theme: Theme): string {
+  private renderFinishedLine(a: { id: string; type: SubagentType; status: string; description: string; toolUses: number; startedAt: number; completedAt?: number; error?: string }, theme: Theme): string {
     const name = getDisplayName(a.type);
     const modeLabel = getPromptModeLabel(a.type);
     const duration = formatMs((a.completedAt ?? Date.now()) - a.startedAt);
@@ -241,6 +254,8 @@ export class AgentWidget {
     }
 
     const parts: string[] = [];
+    const activity = this.agentActivity.get(a.id);
+    if (activity) parts.push(formatTurns(activity.turnCount, activity.maxTurns));
     if (a.toolUses > 0) parts.push(`${a.toolUses} tool use${a.toolUses === 1 ? "" : "s"}`);
     parts.push(duration);
 
@@ -296,6 +311,7 @@ export class AgentWidget {
       }
 
       const parts: string[] = [];
+      if (bg) parts.push(formatTurns(bg.turnCount, bg.maxTurns));
       if (toolUses > 0) parts.push(`${toolUses} tool use${toolUses === 1 ? "" : "s"}`);
       if (tokenText) parts.push(tokenText);
       parts.push(elapsed);

package/src/ui/conversation-viewer.ts

@@ -5,12 +5,12 @@
  * Subscribes to session events for real-time streaming updates.
  */
 
-import { matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component, type TUI } from "@mariozechner/pi-tui";
 import type { AgentSession } from "@mariozechner/pi-coding-agent";
-import type { Theme } from "./agent-widget.js";
-import { formatTokens, formatDuration, getDisplayName, getPromptModeLabel, describeActivity, type AgentActivity } from "./agent-widget.js";
-import type { AgentRecord } from "../types.js";
+import { type Component, matchesKey, type TUI, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
 import { extractText } from "../context.js";
+import type { AgentRecord } from "../types.js";
+import type { Theme } from "./agent-widget.js";
+import { type AgentActivity, describeActivity, formatDuration, formatTokens, getDisplayName, getPromptModeLabel } from "./agent-widget.js";
 
 /** Lines consumed by chrome: top border + header + header sep + footer sep + footer + bottom border. */
 const CHROME_LINES = 6;

package/src/worktree.ts

@@ -7,10 +7,10 @@
  */
 
 import { execFileSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
-import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { randomUUID } from "node:crypto";
+import { join } from "node:path";
 
 export interface WorktreeInfo {
   /** Absolute path to the worktree directory. */