pi-open-agents 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-agents",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Unified agent and subagent management for pi coding agent, with OpenCode-compatible agent definitions.",
   "keywords": [
     "pi-package",

package/src/subagent/executor.ts

@@ -339,6 +339,45 @@ function buildTaskArgument(task: string, taskFilePath: string | undefined): stri
   return taskFilePath ? `Task: @${taskFilePath}` : `Task: ${task}`;
 }
 
+// ─── Model Registry (best-effort) ───────────────────────────────────────────
+
+interface AuthFactory {
+  create(authPath?: string): unknown;
+}
+interface RegistryFactory {
+  create(authStore: unknown, modelsPath: string | undefined): ContextWindowLookup;
+}
+
+/**
+ * Build a model registry for cost/context-window enrichment — best-effort and
+ * resilient.
+ *
+ * AuthStorage/ModelRegistry availability and signatures vary across
+ * pi-coding-agent host versions (AuthStorage was removed in newer releases;
+ * ModelRegistry's create() signature also changed). The registry is purely
+ * cosmetic — downstream usage enrichment tolerates a missing registry (see the
+ * contextWindowFromMessage / usageFromMessage guards). This must never throw, or
+ * subagent delegation breaks entirely. Factories are injectable for testing;
+ * pass `{ auth: undefined, model: undefined }` to simulate a host that lacks
+ * these symbols.
+ */
+export function buildModelRegistry(
+  agentDir: string | undefined,
+  factories: { auth?: AuthFactory; model?: RegistryFactory } = {},
+): ContextWindowLookup | undefined {
+  const auth = ("auth" in factories ? factories.auth : AuthStorage) as AuthFactory | undefined;
+  const model = ("model" in factories ? factories.model : ModelRegistry) as RegistryFactory | undefined;
+  try {
+    if (!auth || typeof auth.create !== "function") return undefined;
+    if (!model || typeof model.create !== "function") return undefined;
+    const authPath = agentDir ? path.join(agentDir, "auth.json") : undefined;
+    const modelsPath = agentDir ? path.join(agentDir, "models.json") : undefined;
+    return model.create(auth.create(authPath), modelsPath);
+  } catch {
+    return undefined;
+  }
+}
+
 // ─── Main Executor ───────────────────────────────────────────────────────────
 
 /**
@@ -413,13 +452,8 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
     // ── Resolve pi CLI entry point ──
     const pi = await resolvePi();
 
-    // ── Build model registry for cost lookups ──
-    const modelRegistry = ModelRegistry.create(
-      AuthStorage.create(
-        options.agentDir ? path.join(options.agentDir, "auth.json") : undefined,
-      ),
-      options.agentDir ? path.join(options.agentDir, "models.json") : undefined,
-    );
+    // ── Build model registry for cost lookups (best-effort) ──
+    const modelRegistry = buildModelRegistry(options.agentDir);
 
     // ── Build CLI args ──
     const args = [
@@ -522,10 +556,16 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
       }
 
       if (event.type === "message_end" && event.message) {
-        const text = textFromMessage(event.message);
-        if (text !== undefined) output = text;
-        updateUsage(usage, usageFromMessage(event.message, modelRegistry));
-        model = modelFromMessage(event.message) ?? model;
+        // pi 0.83.0+ emits message_end for EVERY role (user, assistant, toolResult),
+        // not just assistant. Only capture text/usage/model from assistant messages —
+        // otherwise the echoed user task ("Task: ...") and raw tool results leak into
+        // the subagent output when the final assistant turn has no text part.
+        if ((event.message as { role?: unknown }).role === "assistant") {
+          const text = textFromMessage(event.message);
+          if (text !== undefined) output = text;
+          updateUsage(usage, usageFromMessage(event.message, modelRegistry));
+          model = modelFromMessage(event.message) ?? model;
+        }
         emit();
         return;
       }