oira666_pi-subagent 0.2.28 → 0.2.30

package/agents/team-lead.md

@@ -1,6 +1,6 @@
 ---
 name: team-lead
-description: Focused on tasks managment, delegates work to its subagents. For more compex tasks. 
+description: "A team of agents with different specializations that can take any complex task, split it into parts, and implement architecture, generation, review, or any other kind of task."
 ---
 
 You are an experienced team lead, focused on tasks management. You don't do any work yourself. You delegate.

package/index.ts

@@ -42,6 +42,7 @@ import {
   type DelegationMode,
   type SingleResult,
   type SubagentDetails,
+  type SubagentUsageSummary,
   DEFAULT_DELEGATION_MODE,
   buildLiveSubagentDetails,
   buildSubagentDetails,
@@ -54,6 +55,7 @@ import {
   emptyUsageSummary,
   addUsageSummary,
   usageSummaryToUsageStats,
+  usageSummaryFromUsage,
 } from "./types.js";
 import { formatCombinedUsageStatusLine } from "./tree.js";
 
@@ -314,11 +316,60 @@ function formatAgentNames(agents: AgentConfig[]): string {
   return agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
 }
 
-function collectCombinedUsageStatusLine(ctx: any): string | undefined {
+function liveDetailsSignature(details: SubagentDetails): string {
+  return JSON.stringify(details.results.map((result) => ({
+    agent: result.agent,
+    task: result.task ?? "",
+  })));
+}
+
+function collectLiveUsageSummary(details: SubagentDetails): SubagentUsageSummary {
+  const summary = emptyUsageSummary();
+  for (const result of details.results) {
+    addUsageSummary(summary, usageSummaryFromUsage(result.usage));
+
+    const completedNested = getNestedSubagentResults(result.messages ?? []);
+    const completedNestedIds = new Set<string>();
+    const completedNestedSignatureCounts = new Map<string, number>();
+    for (const nested of completedNested) {
+      if (nested.toolCallId) completedNestedIds.add(nested.toolCallId);
+      const signature = liveDetailsSignature(nested.details);
+      completedNestedSignatureCounts.set(
+        signature,
+        (completedNestedSignatureCounts.get(signature) ?? 0) + 1,
+      );
+      addUsageSummary(
+        summary,
+        nested.details.usageSummary ?? collectLiveUsageSummary(nested.details),
+      );
+    }
+
+    for (const [liveToolCallId, liveNested] of Object.entries(result.liveNestedSubagents ?? {})) {
+      if (!isSubagentDetails(liveNested)) continue;
+      // Prefer durable completed toolResult messages over matching live progress.
+      // Some Pi versions key live progress differently than final tool results,
+      // so also de-dupe by requested child agent/task signature as a multiset.
+      if (completedNestedIds.has(liveToolCallId)) continue;
+      const signature = liveDetailsSignature(liveNested);
+      const completedSignatureCount = completedNestedSignatureCounts.get(signature) ?? 0;
+      if (completedSignatureCount > 0) {
+        completedNestedSignatureCounts.set(signature, completedSignatureCount - 1);
+        continue;
+      }
+      addUsageSummary(summary, collectLiveUsageSummary(liveNested));
+    }
+  }
+  return summary;
+}
+
+function collectCombinedUsageStatusLine(
+  ctx: any,
+  liveSummaries: SubagentUsageSummary[] = [],
+): string | undefined {
   const entries = typeof ctx?.sessionManager?.getEntries === "function" || typeof ctx?.sessionManager?.getBranch === "function"
     ? branchEntries(ctx)
     : [];
-  if (entries.length === 0) return undefined;
+  if (entries.length === 0 && liveSummaries.length === 0) return undefined;
 
   const parentUsage = emptyUsage();
   const subagents = emptyUsageSummary();
@@ -333,14 +384,20 @@ function collectCombinedUsageStatusLine(ctx: any): string | undefined {
         parentUsage.output += usage.output || 0;
         parentUsage.cacheRead += usage.cacheRead || 0;
         parentUsage.cacheWrite += usage.cacheWrite || 0;
-        parentUsage.cost += usage.cost?.total || 0;
+        parentUsage.cost += typeof usage.cost === "number" ? usage.cost : usage.cost?.total || 0;
         parentUsage.turns += 1;
       }
     }
     if (msg.role === "toolResult" && msg.toolName === "subagent" && isSubagentDetails(msg.details)) {
-      addUsageSummary(subagents, msg.details.usageSummary ?? emptyUsageSummary());
+      addUsageSummary(
+        subagents,
+        msg.details.usageSummary ?? usageSummaryFromUsage(msg.details.aggregatedUsage),
+      );
     }
   }
+  for (const liveSummary of liveSummaries) {
+    addUsageSummary(subagents, liveSummary);
+  }
   const subagentUsage = usageSummaryToUsageStats(subagents) ?? emptyUsage();
   addUsage(parentUsage, subagentUsage);
   return formatCombinedUsageStatusLine(parentUsage, subagents.subagentCount);
@@ -687,6 +744,7 @@ export default function (pi: ExtensionAPI) {
   let modelToRestoreAfterResume: any | undefined;
   const approvedProjectAgentDirsForSession = new Set<string>();
   const activeSubagents = new Map<number, { agent: string; task: string; handle: RunningSubagentHandle }>();
+  const activeSubagentUsageSummaries = new Map<string, SubagentUsageSummary>();
   const latestBroadcastTargets = {
     all: [] as BroadcastTarget[],
     youngest: [] as BroadcastTarget[],
@@ -858,9 +916,10 @@ export default function (pi: ExtensionAPI) {
   }
 
   function extractPendingSubagentTaskCounts(result: SingleResult): number[] {
-    const completedToolCallIds = new Set(getNestedSubagentResults(result.messages).map((nested) => nested.toolCallId));
+    const messages = Array.isArray((result as any).messages) ? (result as any).messages : [];
+    const completedToolCallIds = new Set(getNestedSubagentResults(messages).map((nested) => nested.toolCallId));
     const counts: number[] = [];
-    for (const message of result.messages as any[]) {
+    for (const message of messages) {
       if (message?.role !== "assistant" || !Array.isArray(message.content)) continue;
       for (const part of message.content) {
         if (part?.type !== "toolCall" || part?.name !== "subagent") continue;
@@ -1049,23 +1108,36 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
-  // If the host exposes a status-line extension point, add a second line under
-  // the normal session stats with parent + active-branch subagent totals. Older
-  // Pi versions simply won't have this API, so keep this best-effort.
-  try {
-    const statusProvider = (ctx: any) => collectCombinedUsageStatusLine(ctx ?? latestSessionCtx);
-    if (typeof pi.registerStatusLine === "function") {
-      pi.registerStatusLine({ id: "subagent-combined-usage", placement: "after-session-stats", render: statusProvider });
-    } else if (typeof pi.addStatusLine === "function") {
-      pi.addStatusLine(statusProvider, { id: "subagent-combined-usage", placement: "after-session-stats" });
+  // Pi exposes footer/status-line extension text through ctx.ui.setStatus().
+  // Keep a dedicated line updated with parent + active-branch subagent totals.
+  // This is shown by the normal footer underneath Pi's built-in session stats.
+  function formatFooterStatusText(ctx: any, text: string): string {
+    return typeof ctx?.ui?.theme?.fg === "function"
+      ? ctx.ui.theme.fg("dim", text)
+      : text;
+  }
+
+  function updateCombinedUsageStatus(ctx?: any): void {
+    const targetCtx = ctx ?? latestSessionCtx;
+    if (!targetCtx?.ui || typeof targetCtx.ui.setStatus !== "function") return;
+    try {
+      const line = collectCombinedUsageStatusLine(
+        targetCtx,
+        Array.from(activeSubagentUsageSummaries.values()),
+      );
+      targetCtx.ui.setStatus(
+        "subagent-usage",
+        line ? formatFooterStatusText(targetCtx, `total ${line}`) : undefined,
+      );
+    } catch (err) {
+      console.error("[pi-subagent] Failed to update combined subagent status line:", err);
     }
-  } catch (err) {
-    console.error("[pi-subagent] Failed to register combined subagent status line:", err);
   }
 
   // Auto-discover agents on session start
   pi.on("session_start", async (event, ctx) => {
     latestSessionCtx = ctx;
+    updateCombinedUsageStatus(ctx);
     try {
       // Always repair sessions left on the synthetic resume model, even in
       // nested subagents that can no longer delegate. Those leaf processes
@@ -1175,10 +1247,26 @@ export default function (pi: ExtensionAPI) {
     }
   });
 
-  pi.on("agent_end", async () => {
+  pi.on("agent_end", async (_event, ctx) => {
+    updateCombinedUsageStatus(ctx);
     await restoreModelAfterResumeFailure();
   });
 
+  pi.on("message_end", (_event, ctx) => {
+    latestSessionCtx = ctx;
+    updateCombinedUsageStatus(ctx);
+    setTimeout(() => updateCombinedUsageStatus(ctx), 0);
+  });
+
+  pi.on("tool_execution_end", (event, ctx) => {
+    latestSessionCtx = ctx;
+    if (event.toolName === "subagent") {
+      activeSubagentUsageSummaries.delete(event.toolCallId);
+      updateCombinedUsageStatus(ctx);
+      setTimeout(() => updateCombinedUsageStatus(ctx), 0);
+    }
+  });
+
   pi.on("resources_discover", (_event, ctx) => {
     const prompt = pendingInteractiveResumePrompt;
     if (!prompt) return;
@@ -1308,7 +1396,9 @@ calls one after another. Do NOT put dependent tasks in the same array.
           nextActiveSubagentId += tasks.length;
           const trackedOnUpdate = (partial: any) => {
             if (isSubagentDetails(partial?.details)) {
+              activeSubagentUsageSummaries.set(toolCallId, collectLiveUsageSummary(partial.details));
               updateLatestBroadcastTargets(partial.details, topLevelBaseId);
+              updateCombinedUsageStatus(ctx);
               emitNestedProgressToParent(toolCallId, partial.details);
             }
             onUpdate?.(partial);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",

package/tree.ts

@@ -76,8 +76,14 @@ export function formatCombinedUsageStatusLine(
 	const input = usage.input ?? 0;
 	const output = usage.output ?? 0;
 	const cacheRead = usage.cacheRead ?? 0;
+	const cacheWrite = usage.cacheWrite ?? 0;
+	const turns = usage.turns ?? 0;
 	const cost = usage.cost ?? 0;
-	return `↑${formatTokens(input)} ↓${formatTokens(output)} R${formatTokens(cacheRead)} $${cost.toFixed(3)} (with ${subagentCount} subagents)`;
+	const total = input + output + cacheRead + cacheWrite;
+	const cache = cacheRead || cacheWrite
+		? ` R${formatTokens(cacheRead)} W${formatTokens(cacheWrite)}`
+		: "";
+	return `Σ ↑${formatTokens(input)} ↓${formatTokens(output)}${cache} T${formatTokens(total)} • ${turns} turn${turns === 1 ? "" : "s"} • $${cost.toFixed(4)} • ${subagentCount} subagent${subagentCount === 1 ? "" : "s"}`;
 }
 
 export function formatUsage(usage: Partial<UsageStats>, model?: string): string {

package/types.ts

@@ -173,12 +173,16 @@ export function mergeToolCalls(target: ToolCallCounts, source: ToolCallCounts):
   }
 }
 
+function asMessageArray(messages: unknown): Message[] {
+  return Array.isArray(messages) ? (messages as Message[]) : [];
+}
+
 /** Extract all tool calls made by assistant turns in a message list */
-export function extractToolCalls(messages: Message[]): ToolCallCounts {
+export function extractToolCalls(messages: unknown): ToolCallCounts {
   const counts: ToolCallCounts = {};
-  for (const msg of messages) {
+  for (const msg of asMessageArray(messages)) {
     if (msg.role !== "assistant") continue;
-    for (const part of (msg.content as any[]) ?? []) {
+    for (const part of (Array.isArray((msg as any).content) ? (msg as any).content : [])) {
       if ((part as any)?.type !== "toolCall") continue;
       const name: string = typeof (part as any).name === "string" ? (part as any).name : "unknown";
       counts[name] = (counts[name] ?? 0) + 1;
@@ -393,13 +397,14 @@ export function isSubagentDetails(value: unknown): value is SubagentDetails {
 }
 
 /** Extract the last assistant text from a message history. */
-export function getFinalOutput(messages: Message[], fallback?: string): string {
-	for (let i = messages.length - 1; i >= 0; i--) {
-		const msg = messages[i];
-		if (msg.role === "assistant") {
-			for (let j = msg.content.length - 1; j >= 0; j--) {
-				const part = msg.content[j];
-				if (part.type === "text") return part.text;
+export function getFinalOutput(messages: unknown, fallback?: string): string {
+	const history = asMessageArray(messages);
+	for (let i = history.length - 1; i >= 0; i--) {
+		const msg = history[i];
+		if (msg.role === "assistant" && Array.isArray((msg as any).content)) {
+			for (let j = (msg as any).content.length - 1; j >= 0; j--) {
+				const part = (msg as any).content[j];
+				if (part?.type === "text") return part.text;
 			}
 		}
 	}
@@ -407,14 +412,14 @@ export function getFinalOutput(messages: Message[], fallback?: string): string {
 }
 
 /** Extract all display-worthy items from a message history. */
-export function getDisplayItems(messages: Message[]): DisplayItem[] {
+export function getDisplayItems(messages: unknown): DisplayItem[] {
 	const items: DisplayItem[] = [];
-	for (const msg of messages) {
-		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text") {
+	for (const msg of asMessageArray(messages)) {
+		if (msg.role === "assistant" && Array.isArray((msg as any).content)) {
+			for (const part of (msg as any).content) {
+				if (part?.type === "text") {
 					items.push({ type: "text", text: part.text });
-				} else if (part.type === "toolCall") {
+				} else if (part?.type === "toolCall") {
 					items.push({ type: "toolCall", name: part.name, args: part.arguments });
 				}
 			}
@@ -424,16 +429,16 @@ export function getDisplayItems(messages: Message[]): DisplayItem[] {
 }
 
 /** Extract nested subagent tool results from a message history. */
-export function getNestedSubagentResults(messages: Message[]): NestedSubagentResult[] {
+export function getNestedSubagentResults(messages: unknown): NestedSubagentResult[] {
 	const results: NestedSubagentResult[] = [];
-	for (const msg of messages) {
-		if (msg.role !== "toolResult") continue;
-		if (msg.toolName !== "subagent") continue;
-		if (!isSubagentDetails(msg.details)) continue;
+	for (const msg of asMessageArray(messages)) {
+		if ((msg as any)?.role !== "toolResult") continue;
+		if ((msg as any).toolName !== "subagent") continue;
+		if (!isSubagentDetails((msg as any).details)) continue;
 		results.push({
-			details: msg.details,
-			isError: msg.isError,
-			toolCallId: msg.toolCallId,
+			details: (msg as any).details,
+			isError: Boolean((msg as any).isError),
+			toolCallId: typeof (msg as any).toolCallId === "string" ? (msg as any).toolCallId : "",
 		});
 	}
 	return results;