@henryqw/pi-subagent 4.0.0 → 4.0.1

package/dist/index.js

@@ -1,10 +1,9 @@
 import { createHash } from "node:crypto";
 import { readFileSync, readdirSync } from "node:fs";
-import { setTimeout as delay } from "node:timers/promises";
 import { isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
-import { createHerdrClient, herdrCommandFailure, hasHerdrErrorCode } from "@henryqw/pi-herdr";
+import { createHerdrClient, herdrCommandFailure, hasHerdrErrorCode, startPiAgent } from "@henryqw/pi-herdr";
 import { modelReference, orderedProfileRoutes, readTaskModelsConfig, resolveConfiguredTaskRoute, resolveTaskModelRoute, } from "@henryqw/pi-task-models";
 export { addUsage, capEphemeralSubagentOutput, createEphemeralSubagentExecutor, EphemeralSubagentError, formatDuration, } from "./ephemeral.js";
 export { createChildWorktree, finalizeChildWorktree, worktreeContextNote, } from "./worktree.js";
@@ -310,27 +309,27 @@ export async function startManagedSubagent(host, agent, pane, launch, options, h
         return "existing";
     }
     await hooks.beforeStart?.();
-    const arguments_ = ["agent", "start", name, "--kind", "pi", "--pane", paneId, "--", ...launch.args];
     const herdr = createHerdrClient(options.execute);
-    for (let attempt = 1; attempt <= 5; attempt += 1) {
-        const result = await herdr.exec(arguments_, { cwd: host.cwd });
-        if (result.code === 0 && !result.killed) {
-            await hooks.onStarted?.();
-            return "started";
-        }
-        if (hasHerdrErrorCode(result, "agent_name_taken")) {
-            const raced = await getManagedSubagent(host, name, options);
-            if (!raced)
-                throw new Error(`Herdr agent ${name} reported agent_name_taken but could not be found; refusing to start a duplicate`);
-            assertAgentPane(name, paneId, raced);
-            return "existing";
-        }
-        if (!hasHerdrErrorCode(result, "agent_pane_busy") || attempt === 5) {
-            throw new Error(herdrCommandFailure(arguments_, result));
-        }
-        await (options.delay ?? delay)(250);
+    const startArgs = ["agent", "start", name, "--kind", "pi", "--pane", paneId, "--", ...launch.args];
+    const result = await startPiAgent(herdr, {
+        name,
+        pane: paneId,
+        args: launch.args,
+        options: { cwd: host.cwd },
+        delay: options.delay,
+    });
+    if (result.code === 0 && !result.killed) {
+        await hooks.onStarted?.();
+        return "started";
+    }
+    if (hasHerdrErrorCode(result, "agent_name_taken")) {
+        const raced = await getManagedSubagent(host, name, options);
+        if (!raced)
+            throw new Error(`Herdr agent ${name} reported agent_name_taken but could not be found; refusing to start a duplicate`);
+        assertAgentPane(name, paneId, raced);
+        return "existing";
     }
-    throw new Error(`Herdr agent ${name} could not be started`);
+    throw new Error(herdrCommandFailure(startArgs, result));
 }
 export async function promptManagedSubagent(host, agent, prompt, options) {
     assertAgentName(agent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-subagent",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Delegate bounded single, parallel, or chained tasks to isolated Pi roles.",
   "keywords": [
     "pi-package",
@@ -60,7 +60,7 @@
     ]
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.1.1",
+    "@henryqw/pi-herdr": "^0.4.0",
     "@henryqw/pi-multi-codex": "^0.3.8",
     "@henryqw/pi-task-models": "^1.0.0"
   }