oira666_pi-subagent 0.2.27 → 0.2.29

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 to parts and implement: arhitecture, 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,13 +42,22 @@ import {
   type DelegationMode,
   type SingleResult,
   type SubagentDetails,
+  type SubagentUsageSummary,
   DEFAULT_DELEGATION_MODE,
+  buildLiveSubagentDetails,
   buildSubagentDetails,
   getFinalOutput,
   getNestedSubagentResults,
   isResultError,
   isSubagentDetails,
+  emptyUsage,
+  addUsage,
+  emptyUsageSummary,
+  addUsageSummary,
+  usageSummaryToUsageStats,
+  usageSummaryFromUsage,
 } from "./types.js";
+import { formatCombinedUsageStatusLine } from "./tree.js";
 
 // ---------------------------------------------------------------------------
 // Limits
@@ -294,15 +303,106 @@ function makeDetailsFactory(
   projectAgentsDir: string | null,
   delegationMode: DelegationMode,
 ) {
-  return (mode: "single" | "parallel") =>
-    (results: SingleResult[]): SubagentDetails =>
+  return (mode: "single" | "parallel") => {
+    const makeDetails = (results: SingleResult[]): SubagentDetails =>
       buildSubagentDetails(mode, delegationMode, projectAgentsDir, results);
+    makeDetails.live = (results: SingleResult[]): SubagentDetails =>
+      buildLiveSubagentDetails(mode, delegationMode, projectAgentsDir, results);
+    return makeDetails;
+  };
 }
 
 function formatAgentNames(agents: AgentConfig[]): string {
   return agents.map((a) => `${a.name} (${a.source})`).join(", ") || "none";
 }
 
+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 && liveSummaries.length === 0) return undefined;
+
+  const parentUsage = emptyUsage();
+  const subagents = emptyUsageSummary();
+  for (const entry of entries as any[]) {
+    if (entry?.type !== "message") continue;
+    const msg = entry.message;
+    if (!msg) continue;
+    if (msg.role === "assistant" && msg.provider !== RESUME_PROVIDER) {
+      const usage = msg.usage;
+      if (usage) {
+        parentUsage.input += usage.input || 0;
+        parentUsage.output += usage.output || 0;
+        parentUsage.cacheRead += usage.cacheRead || 0;
+        parentUsage.cacheWrite += usage.cacheWrite || 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 ?? 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);
+}
+
 function getCycleViolations(
   requestedNames: Set<string>,
   ancestorAgentStack: string[],
@@ -644,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[],
@@ -815,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;
@@ -1006,9 +1108,36 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
+  // 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);
+    }
+  }
+
   // 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
@@ -1118,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;
@@ -1251,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);
@@ -1466,7 +1613,7 @@ This guard prevents self-recursion and cyclic handoffs (for example A -> B -> A)
       const errorMsg =
         result.errorMessage ||
         result.stderr ||
-        getFinalOutput(result.messages) ||
+        getFinalOutput(result.messages, result.finalOutput) ||
         "(no output)";
       return {
         content: [
@@ -1483,7 +1630,7 @@ This guard prevents self-recursion and cyclic handoffs (for example A -> B -> A)
       content: [
         {
           type: "text" as const,
-          text: getFinalOutput(result.messages) || "(no output)",
+          text: getFinalOutput(result.messages, result.finalOutput) || "(no output)",
         },
       ],
       details: makeDetails("single")([result]),

package/package.json

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