@zhushanwen/pi-subagent-workflow 7.3.2 → 7.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-subagent-workflow",
-  "version": "7.3.2",
+  "version": "7.3.3",
   "type": "module",
   "main": "index.ts",
   "description": "Unified subagent execution and multi-agent workflow orchestration for Pi — spawned-process agent runtime with sync/background modes, stateful workflow management with persistence, state machine, and execution tracing.",

package/src/execution/session-runner.ts

@@ -764,6 +764,26 @@ export async function runSpawn(
     // abortRunningControllers 跳过它，靠本 Set 兜底）。close/error 后移除（已退出无需再 kill）。
     spawnedChildren.add(child);
 
+    // [worktree-reaper-fix] 同步补全注册表 pid：spawn 返回后 child.pid 立即可得（Node.js
+    // 同步属性），无需等任何 stdout 事件。原补全点挂在 header 分支（下方 stdout handler 内），
+    // 而 RPC mode（buildSpawnArgs 固定 --mode rpc）不输出 header 行——pid 恒为 0，超
+    // SPAWN_GRACE_MS 后被 reaper 当孤儿误删活 worktree（2026-08-11 cw 递归编排整树失活事故）。
+    // header 分支调用保留：json mode 回切时仍能补全，updatePid 同 branch 覆盖写幂等，无副作用。
+    // [S1] 防御：必须放在 spawnedChildren.add 之后（onWorktreePid 抛错时子进程已被跟踪，
+    // dispose 兜底 kill 不会泄漏），且包 try/catch（补全失败不阻断 spawn 主流程——
+    // 注册表写失败最坏后果是条目停留 pid=0，由 reaper 宽限回收兜底）。
+    if (opts.worktree && child.pid) {
+      try {
+        ctx.onWorktreePid?.(opts.worktree.branch, child.pid);
+      } catch (err) {
+        logger.warn("[worktree] worktree pid registration failed (defensive)", {
+          branch: opts.worktree.branch,
+          pid: child.pid,
+          err: err instanceof Error ? err.message : String(err),
+        });
+      }
+    }
+
     // stdout/stderr 用 utf8 编码：stream 自动按字符边界切分，避免多字节
     // UTF-8（CJK/emoji）跨 chunk 时 toString() 产生 U+FFFD 替换符导致 JSON.parse 失败。
     // [m2] 先 setEncoding 再注册 signal listener/watchdog：若 setEncoding 抛错，try/finally
@@ -997,9 +1017,12 @@ export async function runSpawn(
         // [worktree-reaper-fix] 拼 spawnCwd 进错误消息：ENOENT 的 err.message 只含 command 名，
         // 无 cwd 线索（worktree 被 reaper 误删后 cwd 指向虚空）会导致误诊——2026-08-11 事故
         // AI 误判"node 被卸载"的直接原因。
+        // [S3] code 读取带运行时 guard：非 ErrnoException（普通 Error）时 code 为 undefined，
+        // 不加 cwd hint（行为与修复前一致）；仅 ENOENT 才拼 cwd。
         spawnedChildren.delete(child);
         const errno = err as NodeJS.ErrnoException;
-        const cwdHint = errno.code === "ENOENT" ? ` (cwd: ${spawnCwd})` : "";
+        const errCode = "code" in err ? errno.code : undefined;
+        const cwdHint = errCode === "ENOENT" ? ` (cwd: ${spawnCwd})` : "";
         record.lastError = `${err.message}${cwdHint}`;
         resolve(SIGNAL_EXIT_CODE_THRESHOLD); // 非零退出
       });

package/src/index.ts

@@ -14,7 +14,6 @@
  */
 
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 
 import type { ExtensionAPI, ExtensionContext, SessionShutdownEvent, SessionStartEvent, SessionTreeEvent } from "@earendil-works/pi-coding-agent";
@@ -166,9 +165,10 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
   }
 
   function resolveSessionDir(): string {
-    const defaultDir = path.join(os.homedir(), ".pi", "agent");
+    const defaultDir = getAgentDir();
     const sessionSlug = `--${process.cwd().replace(/^\//, "").replace(/\//g, "-")}--`;
-    const sessionScopedDir = path.join(os.homedir(), ".pi", "agent", "sessions", sessionSlug);
+    // F2：根改 getAgentDir() 派生（实例隔离）；保留 sessionScopedDir 存在则用之的探测语义
+    const sessionScopedDir = path.join(getAgentDir(), "sessions", sessionSlug);
     return fs.existsSync(sessionScopedDir) ? sessionScopedDir : defaultDir;
   }
 

package/src/interface/format.ts

@@ -310,6 +310,7 @@ export function formatToolCall(
   theme: ThemeLike,
 ): string {
   const shortenPath = (p: string): string => {
+    // 仅用于显示层路径缩写（~ 替换 home 前缀），不读取 pi 目录（TC9 合法命中）
     const home = os.homedir();
     return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
   };

package/src/interface/views/WorkflowsView.ts

@@ -23,10 +23,10 @@
  */
 
 import { promises as fsPromises } from "node:fs";
-import { homedir } from "node:os";
 import { join as pathJoin } from "node:path";
 
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey } from "@earendil-works/pi-tui";
 
 import {
@@ -858,11 +858,11 @@ const TRACE_ACTIVITY_WIDTH = 80;
 
 /**
  * 导出完整 workflow trace 到 Markdown 文件。
- * 路径：~/.pi/agent/workflow-traces/{runId}.md
+ * 路径：<agentDir>/workflow-traces/{runId}.md（agentDir = getAgentDir()，实例隔离）
  * 对齐 main 的 saveTraceToFile（WorkflowsView.ts:365-396）。
  */
 function saveTraceToFile(run: WorkflowRun, ctx: ExtensionContext): void {
-  const dir = pathJoin(homedir(), ".pi", "agent", "workflow-traces");
+  const dir = pathJoin(getAgentDir(), "workflow-traces");
   const filePath = pathJoin(dir, `${run.runId}.md`);
   const lines: string[] = [];
   lines.push(`# Workflow Trace: ${run.spec.scriptName} (${run.runId})`, "");

package/src/orchestration/skill-discovery.ts

@@ -6,9 +6,10 @@
  */
 
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+
 // ── Skill path resolution (with npm dir cache) ─────────────────────
 
 const skillCandidatesCache = new Map<string, string[]>();
@@ -32,8 +33,9 @@ function getNpmSkillCandidates(npmSkillsDir: string): string[] {
  * Resolve a skill name to its directory or SKILL.md path.
  * Search order:
  * 1. Project-level: .agents/skills/<name>/
- * 2. Global: ~/.pi/agent/skills/<name>/
- * 3. npm packages: ~/.pi/agent/npm/node_modules/<pkg>/skills/<name>/
+ * 2. Global: <agentDir>/skills/<name>/（agentDir = getAgentDir()，实例隔离：
+ *    PI_CODING_AGENT_DIR 场景读隔离目录，不碰 ~/.pi/agent）
+ * 3. npm packages: <agentDir>/npm/node_modules/<pkg>/skills/<name>/
  * Returns the directory path if found, undefined otherwise.
  */
 export function resolveSkillPath(skillName: string): string | undefined {
@@ -41,11 +43,11 @@ export function resolveSkillPath(skillName: string): string | undefined {
  // Project-level
     path.resolve(process.cwd(), ".agents/skills", skillName),
  // Global user skills
-    path.join(os.homedir(), ".pi/agent/skills", skillName),
+    path.join(getAgentDir(), "skills", skillName),
   ];
 
  // npm package skills (cached)
-  const npmSkillsDir = path.join(os.homedir(), ".pi/agent/npm/node_modules");
+  const npmSkillsDir = path.join(getAgentDir(), "npm/node_modules");
   for (const pkgSkillsBase of getNpmSkillCandidates(npmSkillsDir)) {
     candidates.push(path.join(pkgSkillsBase, skillName));
   }