oira666_pi-subagent 0.3.0 → 0.3.2

package/README.md

@@ -128,12 +128,9 @@ pi --no-subagent-prevent-cycles   # allow cycles (not recommended)
 Subagent tool calls and live activity lines render a dim `hh:mm:ss` timestamp
 (call start, per-subagent run start, and each live log entry).
 
-In the interactive TUI the extension also replaces the footer with a wrapped
-version of Pi's builtin footer so that the combined `total` usage line (parent
-+ all subagents, recursively) renders directly below the normal stats line
-(prefixed `parent`), with other extensions' statuses (e.g. SSH) on their own
-line below. If the builtin footer component cannot be wrapped (e.g. pi
-internals changed), the extension falls back to the plain single-line status.
+In the interactive TUI the extension publishes the combined `total` usage line
+(parent + all subagents, recursively) via Pi's normal `ctx.ui.setStatus()`
+status line. Pi renders all extension statuses on the same footer status line.
 
 ## Steering Running Subagents
 

package/index.ts

@@ -31,7 +31,6 @@ import {
   updateNameRecord,
   SUBAGENT_NAMES_CUSTOM_TYPE,
 } from "./names.js";
-import { installSubagentFooter, type SubagentFooterController } from "./footer.js";
 import {
   recordToolCallStart,
   renderCall,
@@ -820,7 +819,6 @@ export default function (pi: ExtensionAPI) {
   let currentNamesFile = "";
   /** Stable ownership/fork key for this session's delegation tree position. */
   let currentOwnerId = "ephemeral";
-  let footerController: SubagentFooterController | null = null;
   let pendingResumePlans: ResumableSubagentCall[] = [];
   let modelToRestoreAfterResume: any | undefined;
   const approvedProjectAgentDirsForSession = new Set<string>();
@@ -1225,21 +1223,10 @@ export default function (pi: ExtensionAPI) {
         targetCtx,
         Array.from(activeSubagentUsageSummaries.values()),
       );
-      if (footerController) {
-        // Custom footer renders the total directly below the builtin stats
-        // line; keep the single-line status slot empty so other extensions'
-        // statuses (e.g. SSH) get their own clean line below.
-        footerController.updateContext(targetCtx);
-        footerController.setTotalLine(line);
-        if (typeof targetCtx.ui.setStatus === "function") {
-          targetCtx.ui.setStatus("subagent-usage", undefined);
-        }
-        return;
-      }
       if (typeof targetCtx.ui.setStatus !== "function") return;
       targetCtx.ui.setStatus(
         "subagent-usage",
-        line ? formatFooterStatusText(targetCtx, `total ${line}`) : undefined,
+        line ? formatFooterStatusText(targetCtx, line) : undefined,
       );
     } catch (err) {
       console.error("[pi-subagent] Failed to update combined subagent status line:", err);
@@ -1249,14 +1236,6 @@ export default function (pi: ExtensionAPI) {
   // Auto-discover agents on session start
   pi.on("session_start", async (event, ctx) => {
     latestSessionCtx = ctx;
-    if (!footerController && ctx.hasUI && !isRpcMode(process.argv)) {
-      try {
-        footerController = await installSubagentFooter(ctx, "subagent-usage");
-      } catch (err) {
-        console.error("[pi-subagent] Failed to install custom footer (falling back to status line):", err);
-        footerController = null;
-      }
-    }
     updateCombinedUsageStatus(ctx);
     try {
       // Always repair sessions left on the synthetic resume model, even in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",
@@ -10,7 +10,6 @@
     "runner.ts",
     "resume.ts",
     "names.ts",
-    "footer.ts",
     "shared.ts",
     "render.ts",
     "tree.ts",

package/tree.ts

@@ -92,7 +92,7 @@ export function formatCombinedUsageStatusLine(
 	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"}`;
+	return `with subagents (${subagentCount}) Σ $${cost.toFixed(4)} • ↑${formatTokens(input)} ↓${formatTokens(output)}${cache} T${formatTokens(total)} • ${turns} turn${turns === 1 ? "" : "s"}`;
 }
 
 export function formatUsage(usage: Partial<UsageStats>, model?: string): string {

package/footer.ts

@@ -1,256 +0,0 @@
-/**
- * Custom footer that places the combined subagent "total" usage line directly
- * below pi's normal stats line, with other extensions' statuses (e.g. SSH) on
- * their own line below.
- *
- * Layout:
- *   <pwd (git branch) line>          — from the builtin footer
- *   parent <stats line>              — builtin stats, prefixed when a total exists
- *   total Σ ...                      — combined parent + subagent usage
- *   <blank>
- *   <other extension statuses>       — joined on one separate line
- *
- * Implementation: pi joins all `ctx.ui.setStatus()` texts onto a single
- * footer line, so multi-line layouts require `ctx.ui.setFooter()`. To avoid
- * re-implementing (and drifting from) the builtin stats line, the builtin
- * FooterComponent is loaded from the running pi installation and wrapped. If
- * that ever fails (pi internals moved), installation reports failure and the
- * caller falls back to the plain single-line setStatus behavior.
- */
-
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { pathToFileURL } from "node:url";
-import { truncateToWidth } from "@mariozechner/pi-tui";
-import { getPiCliScriptPath } from "./runner.js";
-
-export interface SubagentFooterController {
-  /** Update the rendered total line (undefined hides it). */
-  setTotalLine(text: string | undefined): void;
-  /** Track the most recent extension context (model/session may change). */
-  updateContext(ctx: any): void;
-  /** Restore the builtin footer. */
-  dispose(): void;
-}
-
-function sanitizeStatusText(text: string): string {
-  return text
-    .replace(/[\r\n\t]/g, " ")
-    .replace(/ +/g, " ")
-    .trim();
-}
-
-async function loadBuiltinFooterComponent(): Promise<any | null> {
-  try {
-    const cliScript = getPiCliScriptPath();
-    if (!cliScript) return null;
-    const distDir = path.dirname(fs.realpathSync(cliScript));
-    const footerPath = path.join(distDir, "modes", "interactive", "components", "footer.js");
-    if (!fs.existsSync(footerPath)) return null;
-    const mod = await import(pathToFileURL(footerPath).href);
-    return typeof mod?.FooterComponent === "function" ? mod.FooterComponent : null;
-  } catch {
-    return null;
-  }
-}
-
-function getThinkingLevel(ctx: any): string {
-  try {
-    const entries = ctx?.sessionManager?.getEntries?.() ?? [];
-    for (let i = entries.length - 1; i >= 0; i--) {
-      const entry = entries[i];
-      if (entry?.type === "thinking_level_change" && typeof entry.thinkingLevel === "string") {
-        return entry.thinkingLevel;
-      }
-    }
-  } catch {
-    /* fall through */
-  }
-  return "off";
-}
-
-/**
- * Install the custom subagent footer. Returns a controller on success or null
- * when the builtin footer component cannot be wrapped (caller should fall back
- * to ctx.ui.setStatus).
- */
-export async function installSubagentFooter(
-  initialCtx: any,
-  ownStatusKey: string,
-): Promise<SubagentFooterController | null> {
-  const FooterComponent = await loadBuiltinFooterComponent();
-  if (!FooterComponent) return null;
-  if (typeof initialCtx?.ui?.setFooter !== "function") return null;
-
-  let ctx = initialCtx;
-  let totalLine: string | undefined;
-  let requestRender: (() => void) | undefined;
-  let installed = false;
-
-  const shimSession = {
-    get state() {
-      return {
-        model: ctx?.model,
-        thinkingLevel: getThinkingLevel(ctx),
-      };
-    },
-    get sessionManager() {
-      return ctx?.sessionManager;
-    },
-    get modelRegistry() {
-      return ctx?.modelRegistry ?? { isUsingOAuth: () => false };
-    },
-    getContextUsage() {
-      try {
-        return ctx?.getContextUsage?.();
-      } catch {
-        return undefined;
-      }
-    },
-  };
-
-  // Smoke-test the wrapped component once before replacing the real footer.
-  // If pi's internal constructor or render contract changed, fail installation
-  // so the caller falls back to the plain status line instead of risking a
-  // broken footer.
-  try {
-    const probe = new FooterComponent(shimSession, {
-      getGitBranch: () => undefined,
-      getExtensionStatuses: () => new Map(),
-    });
-    const probeLines = probe.render(80);
-    if (!Array.isArray(probeLines)) return null;
-    probe.dispose?.();
-  } catch {
-    return null;
-  }
-
-  try {
-    initialCtx.ui.setFooter((tui: any, theme: any, footerData: any) => {
-      let builtin: any = null;
-      try {
-        builtin = new FooterComponent(shimSession, footerData);
-      } catch (err) {
-        console.error("[pi-subagent] Failed to construct builtin footer wrapper:", err);
-      }
-      requestRender = () => {
-        try {
-          tui.requestRender();
-        } catch {
-          /* TUI gone */
-        }
-      };
-      const unsubscribe = (() => {
-        try {
-          return typeof footerData?.onBranchChange === "function"
-            ? footerData.onBranchChange(() => requestRender?.())
-            : undefined;
-        } catch {
-          return undefined;
-        }
-      })();
-
-      const fallbackRender = (width: number): string[] => {
-        const lines: string[] = [];
-        if (totalLine) lines.push(truncateToWidth(theme.fg("dim", totalLine), width, theme.fg("dim", "...")));
-        try {
-          const extensionStatuses = footerData?.getExtensionStatuses?.();
-          if (extensionStatuses && extensionStatuses.size > 0) {
-            const statusLine = Array.from(extensionStatuses.entries() as Iterable<[string, string]>)
-              .sort(([a], [b]) => a.localeCompare(b))
-              .filter(([key]) => key !== ownStatusKey)
-              .map(([, text]) => sanitizeStatusText(text))
-              .join(" ");
-            if (statusLine) lines.push(truncateToWidth(statusLine, width, theme.fg("dim", "...")));
-          }
-        } catch {
-          /* statuses unavailable */
-        }
-        return lines.length > 0 ? lines : [""];
-      };
-
-      return {
-        dispose() {
-          try {
-            unsubscribe?.();
-          } catch {
-            /* ignore */
-          }
-          try {
-            builtin?.dispose?.();
-          } catch {
-            /* ignore */
-          }
-        },
-        invalidate() {
-          try {
-            builtin?.invalidate?.();
-          } catch {
-            /* ignore */
-          }
-        },
-        render(width: number): string[] {
-          try {
-            if (!builtin) return fallbackRender(width);
-            const parentPrefix = totalLine ? theme.fg("dim", "parent ") : "";
-            const prefixWidth = totalLine ? "parent ".length : 0;
-            const builtinLines: string[] = builtin.render(Math.max(20, width - prefixWidth));
-            // Builtin layout: [pwdLine, statsLine, joinedExtensionStatuses?].
-            // We re-render the status section ourselves on a separate line.
-            const lines: string[] = [];
-            if (builtinLines.length >= 2) {
-              const pwdLine = prefixWidth > 0 ? builtin.render(width)[0] : builtinLines[0];
-              lines.push(pwdLine ?? builtinLines[0]);
-              lines.push(parentPrefix + builtinLines[1]);
-            } else {
-              lines.push(...builtinLines.slice(0, 2));
-            }
-            if (totalLine) lines.push(truncateToWidth(theme.fg("dim", totalLine), width, theme.fg("dim", "...")));
-
-            const statuses: string[] = [];
-            const extensionStatuses = footerData?.getExtensionStatuses?.();
-            if (extensionStatuses && extensionStatuses.size > 0) {
-              for (const [key, text] of Array.from(extensionStatuses.entries() as Iterable<[string, string]>).sort(
-                ([a], [b]) => a.localeCompare(b),
-              )) {
-                if (key === ownStatusKey) continue;
-                statuses.push(sanitizeStatusText(text));
-              }
-            }
-            if (statuses.length > 0) {
-              lines.push("");
-              lines.push(truncateToWidth(statuses.join(" "), width, theme.fg("dim", "...")));
-            }
-            return lines;
-          } catch (err) {
-            console.error("[pi-subagent] Custom footer render failed:", err);
-            return fallbackRender(width);
-          }
-        },
-      };
-    });
-    installed = true;
-  } catch {
-    return null;
-  }
-  if (!installed) return null;
-
-  return {
-    setTotalLine(text: string | undefined) {
-      const next = text ? `total ${text}` : undefined;
-      if (next === totalLine) return;
-      totalLine = next;
-      requestRender?.();
-    },
-    updateContext(nextCtx: any) {
-      if (nextCtx) ctx = nextCtx;
-    },
-    dispose() {
-      try {
-        ctx?.ui?.setFooter?.(undefined);
-      } catch {
-        /* ignore */
-      }
-    },
-  };
-}