@johnnywu/pi-subagents 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.2.2](https://github.com/jwu/pi-subagents/compare/v2.2.1...v2.2.2) (2026-09-04)
+
+
+### Bug Fixes
+
+* surface subagent assistant-turn failures ([b9a3013](https://github.com/jwu/pi-subagents/commit/b9a3013ef9577fea1f634d9fda7b82c4ad09074d))
+
+## [2.2.1](https://github.com/jwu/pi-subagents/compare/v2.2.0...v2.2.1) (2026-08-24)
+
+
+### Bug Fixes
+
+* support bundled pi CLI invocation ([0651956](https://github.com/jwu/pi-subagents/commit/065195604d1d3b54ea2810f10d20049c4023daf9))
+
 # [2.2.0](https://github.com/jwu/pi-subagents/compare/v2.1.1...v2.2.0) (2026-08-06)
 
 

package/extensions/subagent-executor.ts

@@ -6,8 +6,8 @@ import {
 import { spawn } from 'node:child_process';
 import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
+import { existsSync } from 'node:fs';
 import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import type { AgentConfig } from './agent-loader.ts';
 import { AUTO_RUNTIME_TOOLS_MARKER } from './subagent-prompt.ts';
 import { resolveSkills } from './skill-resolver.ts';
@@ -59,7 +59,13 @@ export interface AgentResult extends AgentProgress {
 
 export interface PiResolution {
   command: string;
-  entryPoint: string;
+  entryPoint: string | null;
+}
+
+export interface PiRuntime {
+  currentScript?: string;
+  execPath: string;
+  fileExists(filePath: string): boolean;
 }
 
 export interface ProcessInvocation {
@@ -171,14 +177,25 @@ export function subagentSessionDir(
   return path.join(agentDir, 'sessions', safeProject, 'subagents');
 }
 
-export function resolvePiEntryPoint(): PiResolution {
-  const packageEntryPoint = fileURLToPath(import.meta.resolve('@earendil-works/pi-coding-agent'));
-  const packageRoot = path.dirname(path.dirname(packageEntryPoint));
+export function resolvePiEntryPoint(
+  runtime: PiRuntime = {
+    currentScript: process.argv[1],
+    execPath: process.execPath,
+    fileExists: existsSync,
+  },
+): PiResolution {
+  const currentScript = runtime.currentScript;
+  const isBunVirtualScript = currentScript?.startsWith('/$bunfs/root/');
 
-  return {
-    command: process.execPath,
-    entryPoint: path.join(packageRoot, 'dist', 'cli.js'),
-  };
+  if (currentScript && !isBunVirtualScript && runtime.fileExists(currentScript)) {
+    return { command: runtime.execPath, entryPoint: currentScript };
+  }
+
+  const execName = path.basename(runtime.execPath).toLowerCase();
+  const isGenericRuntime = /^(node|bun)(\.exe)?$/.test(execName);
+  if (!isGenericRuntime) return { command: runtime.execPath, entryPoint: null };
+
+  return { command: 'pi', entryPoint: null };
 }
 
 export const defaultRunner: ProcessRunner = (invocation, handlers, signal) =>
@@ -206,14 +223,27 @@ function textFromMessage(message: unknown): string | undefined {
   const content = (message as { content?: unknown }).content;
   if (!Array.isArray(content)) return undefined;
 
+  const texts: string[] = [];
   for (const part of content) {
     if (part && typeof part === 'object' && (part as { type?: unknown }).type === 'text') {
       const text = (part as { text?: unknown }).text;
-      if (typeof text === 'string') return text;
+      if (typeof text === 'string') texts.push(text);
     }
   }
 
-  return undefined;
+  return texts.length > 0 ? texts.join('\n') : undefined;
+}
+
+function isAssistantMessage(message: unknown): boolean {
+  return (
+    !!message && typeof message === 'object' && (message as { role?: unknown }).role === 'assistant'
+  );
+}
+
+function stringMessageProperty(message: unknown, property: 'stopReason' | 'errorMessage') {
+  if (!message || typeof message !== 'object') return undefined;
+  const value = (message as Record<string, unknown>)[property];
+  return typeof value === 'string' ? value : undefined;
 }
 
 type ContextWindowLookup = {
@@ -305,18 +335,18 @@ function usageFromMessages(
   return sawUsage ? aggregate : undefined;
 }
 
-function lastAssistantModel(messages: unknown): string | undefined {
+function lastAssistantMessage(messages: unknown): unknown | undefined {
   if (!Array.isArray(messages)) return undefined;
   for (let index = messages.length - 1; index >= 0; index--) {
-    const message = messages[index];
-    if (!message || typeof message !== 'object') continue;
-    if ((message as { role?: unknown }).role !== 'assistant') continue;
-    const model = modelFromMessage(message);
-    if (model) return model;
+    if (isAssistantMessage(messages[index])) return messages[index];
   }
   return undefined;
 }
 
+function lastAssistantModel(messages: unknown): string | undefined {
+  return modelFromMessage(lastAssistantMessage(messages));
+}
+
 function buildTaskArgument(task: string, taskFilePath: string | undefined): string {
   return taskFilePath ? `Task: @${taskFilePath}` : `Task: ${task}`;
 }
@@ -436,6 +466,8 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
   let stderr = '';
   let model = options.agent.model;
   let stdoutBuffer = '';
+  let finalAssistantStopReason: string | undefined;
+  let finalAssistantErrorMessage: string | undefined;
 
   const progress = (status: AgentProgress['status']): AgentProgress => ({
     agent: options.agent.name,
@@ -452,6 +484,13 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
   const emit = (status: AgentProgress['status'] = 'running') =>
     options.onProgress?.(progress(status));
 
+  const setFinalAssistantOutput = (message: unknown) => {
+    // 最后一条 assistant 消息才是权威的最终输出，不能让工具结果占位符或旧文本伪装为结果。
+    output = textFromMessage(message) ?? '';
+    finalAssistantStopReason = stringMessageProperty(message, 'stopReason');
+    finalAssistantErrorMessage = stringMessageProperty(message, 'errorMessage');
+  };
+
   try {
     const promptFilePath = path.join(tempDir, 'system-prompt.md');
 
@@ -483,7 +522,14 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
       modelsPath: options.agentDir ? path.join(options.agentDir, 'models.json') : undefined,
     });
     const modelRegistry = new ModelRegistry(runtime);
-    const args = [pi.entryPoint, '--mode', 'json', '-p', '--no-skills', '--no-prompt-templates'];
+    const args = [
+      ...(pi.entryPoint ? [pi.entryPoint] : []),
+      '--mode',
+      'json',
+      '-p',
+      '--no-skills',
+      '--no-prompt-templates',
+    ];
 
     if (options.agent.systemPromptMode === 'replace-all') args.push('--no-context-files');
     if (options.agent.model) args.push('--model', options.agent.model);
@@ -554,8 +600,9 @@ 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;
+        if (!isAssistantMessage(event.message)) return;
+
+        setFinalAssistantOutput(event.message);
         updateUsage(usage, usageFromMessage(event.message, modelRegistry));
         model = modelFromMessage(event.message) ?? model;
         emit();
@@ -565,6 +612,8 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
       if (event.type === 'agent_end') {
         const aggregate = usageFromMessages(event.messages, modelRegistry);
         if (aggregate) replaceUsage(usage, aggregate);
+        const finalAssistantMessage = lastAssistantMessage(event.messages);
+        if (finalAssistantMessage) setFinalAssistantOutput(finalAssistantMessage);
         model = lastAssistantModel(event.messages) ?? model;
         emit();
       }
@@ -592,8 +641,22 @@ export async function runSubagent(options: RunSubagentOptions): Promise<AgentRes
     );
 
     if (stdoutBuffer.trim()) processLine(stdoutBuffer);
-    const isError = exit.exitCode !== 0;
-    if (isError && !output) output = stderr || `Subagent exited with code ${exit.exitCode}`;
+    const failedStopReason =
+      finalAssistantStopReason === 'error' || finalAssistantStopReason === 'aborted';
+    const hasFinalOutput = output.trim().length > 0;
+    const isError = exit.exitCode !== 0 || failedStopReason || !hasFinalOutput;
+
+    if (failedStopReason && finalAssistantErrorMessage) {
+      output = finalAssistantErrorMessage;
+    } else if (isError && !hasFinalOutput) {
+      output =
+        stderr ||
+        (failedStopReason
+          ? `Subagent stopped with reason: ${finalAssistantStopReason}`
+          : exit.exitCode !== 0
+            ? `Subagent exited with code ${exit.exitCode}`
+            : 'Subagent produced no final text output.');
+    }
 
     const truncated = truncateHeadContent(output, OUTPUT_MAX_BYTES, OUTPUT_MAX_LINES);
     if (truncated !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnnywu/pi-subagents",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Sub-agents extension for pi coding agent.",
   "homepage": "https://github.com/jwu/pi-subagents#readme",
   "repository": {
@@ -88,8 +88,8 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^20.5.3",
-    "@earendil-works/pi-coding-agent": "^0.83.0",
     "@commitlint/config-conventional": "^20.5.3",
+    "@earendil-works/pi-coding-agent": "0.84.3",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^13.0.1",
     "@semantic-release/git": "^10.0.1",