@henryqw/pi-subagent 26.4.0 → 26.5.1

package/README.md

@@ -6,7 +6,7 @@ Delegate work to configured Pi Roles with [Herdr](https://herdr.dev/). Authorize
 
 ## Install
 
-Requires Pi 1.1.0 or later in the 1.x series. Development and automated checks use Pi 1.1.0. Older Pi releases are no longer supported.
+Requires Pi 1.1.0 or later in the 1.x series. Development and automated checks use Pi 1.1.0. Older Pi releases are no longer supported. Isolated work requires Herdr 0.9.3 or later, with a running Herdr server on API protocol 22 or later; Pi Subagent checks both before it starts.
 
 ```bash
 pi install npm:@henryqw/pi-task-models

package/dist/direct-herdr.d.ts

@@ -26,7 +26,6 @@ export declare function directSessionUsage(jsonl: string, prompt: string): {
     tokens?: number;
     activity?: DirectToolActivity;
 };
-export declare function directSessionTokens(jsonl: string, prompt: string): number | undefined;
 export type DirectTab = Pick<DirectHandle, "name" | "tabId" | "paneId" | "sessionFile"> & {
     leasePath: string;
 };

package/dist/direct-herdr.js

@@ -160,9 +160,6 @@ export function directSessionUsage(jsonl, prompt) {
     return { tokens: observed ? total : undefined,
         activity: pending.size || latest ? { pending: [...pending.values()], latest } : undefined };
 }
-export function directSessionTokens(jsonl, prompt) {
-    return directSessionUsage(jsonl, prompt).tokens;
-}
 export class DirectAllocationError extends Error {
     allocation;
     constructor(allocation, cause) {

package/dist/ephemeral.js

@@ -110,13 +110,7 @@ function validateRunInput(value) {
     if (input.onActivity !== undefined && typeof input.onActivity !== "function") {
         throw new TypeError("run.onActivity must be a function.");
     }
-    return {
-        signal: input.signal,
-        prepare: input.prepare,
-        onUpdate: input.onUpdate,
-        onTokens: input.onTokens,
-        onActivity: input.onActivity,
-    };
+    return value;
 }
 function record(value, field) {
     if (!value || typeof value !== "object" || Array.isArray(value))
@@ -217,8 +211,6 @@ export function createEphemeralSubagentExecutor(options) {
                         throw abortError(input.signal, cause);
                     throw new EphemeralSubagentError("prepare", cause instanceof Error ? cause.message : String(cause), cause);
                 }
-                if (input.signal?.aborted)
-                    throw abortError(input.signal);
                 return await runPi(prepared, input, validated, invocation);
             }
             finally {

package/dist/herdr-runtime.d.ts

@@ -126,7 +126,6 @@ export declare class HerdrHostRuntime implements HostRuntime {
     private workerTurnFinished;
     private removeWorkerSessionFile;
     private assertLeasePath;
-    private assertPrivateLease;
     private scanLease;
     private signalExactHolders;
     private listTabs;

package/dist/herdr-runtime.js

@@ -11,7 +11,7 @@ import { runProcess as defaultRunProcess } from "./process.js";
 import { EXECUTION_BUDGET_ENV } from "./ephemeral.js";
 import { assertPrivateLease, scanProcessLease } from "./process-lease.js";
 import { exactDirectTerminalTurn } from "./direct-herdr.js";
-const MIN_HERDR_VERSION = [0, 9, 0];
+const MIN_HERDR_VERSION = [0, 9, 3];
 const MIN_HERDR_PROTOCOL = 22;
 const HERDR_OPERATION_CAP_MS = 30_000;
 const LSOF_OPERATION_CAP_MS = 3_000;
@@ -276,7 +276,7 @@ export class HerdrHostRuntime {
         const versionOutput = await this.herdr.run(["--version"], this.processOptions(root, context, HERDR_OPERATION_CAP_MS));
         const versionMatch = /^herdr (\S+)\s*$/.exec(versionOutput);
         if (!versionMatch || !compareVersion(versionMatch[1], MIN_HERDR_VERSION)) {
-            throw new Error("Herdr client version must be at least 0.9.0.");
+            throw new Error("Herdr client version must be at least 0.9.3.");
         }
         const status = statusFields(await this.herdr.run(["status", "server"], this.processOptions(root, context, HERDR_OPERATION_CAP_MS)));
         if (status.get("status") !== "running"
@@ -285,7 +285,7 @@ export class HerdrHostRuntime {
             || status.get("private_protocol_compatible") !== "yes"
             || !/^\d+$/.test(status.get("private_protocol") ?? "")
             || Number(status.get("private_protocol")) < MIN_HERDR_PROTOCOL) {
-            throw new Error("Herdr server must be compatible version >=0.9.0 with private protocol >=22.");
+            throw new Error("Herdr server must be compatible version >=0.9.3 with private protocol >=22.");
         }
         const schema = await this.herdr.json(["api", "schema", "--json"], this.processOptions(root, context, HERDR_OPERATION_CAP_MS));
         requireSchemaCapabilities(schema);
@@ -438,7 +438,7 @@ export class HerdrHostRuntime {
         assertAgentIntent(allocation, input.attempt);
         this.assertLeasePath(allocation.leasePath, input.intent.token);
         try {
-            await this.assertPrivateLease(allocation.leasePath, false);
+            await assertPrivateLease(allocation.leasePath, false);
             const agents = (await this.listAgents(allocation.worktreeCwd, context)).map((agent) => {
                 const name = agent.name;
                 if (name !== undefined && name !== null && typeof name !== "string")
@@ -547,7 +547,7 @@ export class HerdrHostRuntime {
             if (input.workerId !== allocation.agentName)
                 throw new Error("Worker termination identity does not match the exact saved agent.");
             this.assertLeasePath(allocation.leasePath, allocation.token);
-            await this.assertPrivateLease(allocation.leasePath, false);
+            await assertPrivateLease(allocation.leasePath, false);
             const agents = (await this.listAgents(allocation.worktreeCwd, context)).map((agent) => ({
                 name: typeof agent.name === "string" ? agent.name : undefined,
                 paneId: exactString(agent.pane_id, "Herdr listed agent pane ID"),
@@ -604,7 +604,7 @@ export class HerdrHostRuntime {
             if (input.workerId !== allocation.agentName)
                 throw new Error("Saved termination worker does not match the exact owned agent.");
             this.assertLeasePath(allocation.leasePath, allocation.token);
-            await this.assertPrivateLease(allocation.leasePath, false);
+            await assertPrivateLease(allocation.leasePath, false);
             const agents = (await this.listAgents(allocation.worktreeCwd, context)).map((agent) => ({
                 name: typeof agent.name === "string" ? agent.name : undefined,
                 paneId: exactString(agent.pane_id, "Herdr listed agent pane ID"),
@@ -649,7 +649,7 @@ export class HerdrHostRuntime {
         assertAgentIntent(allocation, attempt);
         this.assertLeasePath(allocation.leasePath, attempt.correlationToken);
         await this.assertPrivateLeaseDirectories(allocation.leasePath, true);
-        await this.assertPrivateLease(allocation.leasePath, true);
+        await assertPrivateLease(allocation.leasePath, true);
         const agents = (await this.listAgents(allocation.worktreeCwd, context)).map((agent) => ({
             name: typeof agent.name === "string" ? agent.name : undefined,
             paneId: exactString(agent.pane_id, "Herdr listed agent pane ID"),
@@ -826,7 +826,7 @@ export class HerdrHostRuntime {
         if (!acquireLaunch)
             throw new Error("Agent start requires immediate Role launch acquisition.");
         this.assertLeasePath(allocation.leasePath, allocation.token);
-        await this.assertPrivateLease(allocation.leasePath, false);
+        await assertPrivateLease(allocation.leasePath, false);
         if ((await this.scanLease(allocation.leasePath, allocation.worktreeCwd, context)).length) {
             throw new Error("Agent start requires an empty exact process lease.");
         }
@@ -1057,12 +1057,12 @@ export class HerdrHostRuntime {
         finally {
             await file?.close();
         }
-        await this.assertPrivateLease(path, false);
+        await assertPrivateLease(path, false);
     }
     async removeLeaseArtifacts(allocation, token, paneId, tabId, context) {
         this.assertLeasePath(allocation.leasePath, token);
         await this.assertPrivateLeaseDirectories(allocation.leasePath, true);
-        const leaseWasPresent = await this.assertPrivateLease(allocation.leasePath, true);
+        const leaseWasPresent = await assertPrivateLease(allocation.leasePath, true);
         if ((await this.scanLease(allocation.leasePath, allocation.worktreeCwd, context, undefined, true)).length) {
             throw new Error("Exact process lease still has a holder during cleanup.");
         }
@@ -1080,10 +1080,10 @@ export class HerdrHostRuntime {
         if (leaseWasPresent) {
             if (!directoryPresent)
                 throw new Error("Exact process lease directory disappeared during cleanup.");
-            await this.assertPrivateLease(allocation.leasePath, false);
+            await assertPrivateLease(allocation.leasePath, false);
             await unlink(allocation.leasePath);
         }
-        else if (await this.assertPrivateLease(allocation.leasePath, true)) {
+        else if (await assertPrivateLease(allocation.leasePath, true)) {
             throw new Error("Exact process lease appeared during cleanup.");
         }
         if (!directoryPresent)
@@ -1193,9 +1193,6 @@ export class HerdrHostRuntime {
             throw new Error("Process lease path is not the exact random path owned by this task token.");
         }
     }
-    async assertPrivateLease(path, allowMissing) {
-        return assertPrivateLease(path, allowMissing);
-    }
     async scanLease(path, cwd, context, pid, allowMissing = false) {
         return scanProcessLease(path, (args) => this.execute(this.lsofCommand, args, this.processOptions(cwd, context, LSOF_OPERATION_CAP_MS)), pid, allowMissing);
     }

package/dist/launch-runtime.js

@@ -14,9 +14,6 @@ export const ISOLATED_MODEL_TASK = {
     purpose: "Resolve one task-scoped isolated Role launch.",
     defaultProfile: "balanced",
 };
-function abortIfNeeded(signal) {
-    signal?.throwIfAborted();
-}
 function isMissing(error) {
     return Boolean(error && typeof error === "object" && error.code === "ENOENT");
 }
@@ -46,7 +43,7 @@ async function removeTransientLaunch(directory, promptPath, promptRequired) {
         throw new AggregateError(failures, "Transient Role launch cleanup was incomplete.");
 }
 export async function materializeTransientLaunch(prepared, signal) {
-    abortIfNeeded(signal);
+    signal?.throwIfAborted();
     const promptBytes = Buffer.from(prepared.prompt, "utf8");
     const created = await mkdtemp(join(tmpdir(), "pi-subagent-role-"));
     let directory = normalize(created);
@@ -66,7 +63,7 @@ export async function materializeTransientLaunch(prepared, signal) {
         file = await open(promptPath, constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY | constants.O_NOFOLLOW, PROMPT_MODE);
         promptCreated = true;
         await file.chmod(PROMPT_MODE);
-        abortIfNeeded(signal);
+        signal?.throwIfAborted();
         await file.writeFile(promptBytes, { signal });
         await file.sync();
         await file.close();
@@ -124,7 +121,7 @@ export class RoleLaunchRuntime {
         return this.options.randomToken?.() ?? randomBytes(12).toString("hex");
     }
     async prepareLaunch(role, modelClass, context) {
-        abortIfNeeded(context.signal);
+        context.signal?.throwIfAborted();
         const prepared = await resolveConfiguredRoleLaunch(this.options.pi, this.options.context(), { role, modelClass });
         return Object.freeze({
             launch: Object.freeze({
@@ -141,7 +138,7 @@ export class RoleLaunchRuntime {
         });
     }
     async preflight(input, context) {
-        abortIfNeeded(context.signal);
+        context.signal?.throwIfAborted();
         const resolvedRoot = await this.options.resolveRoot(input.cwd, context);
         if (typeof resolvedRoot !== "string" || !isAbsolute(resolvedRoot) || resolvedRoot.includes("\0")) {
             throw new Error("Pi Subagent root resolver must return an absolute canonical path.");
@@ -152,7 +149,7 @@ export class RoleLaunchRuntime {
         const rootInfo = await lstat(root);
         if (!rootInfo.isDirectory())
             throw new Error("Pi Subagent root must be an existing local directory.");
-        abortIfNeeded(context.signal);
+        context.signal?.throwIfAborted();
         if (input.request.tasks.some((task) => task.kind === "changeset")) {
             await this.options.preflightHost?.({ request: input.request, cwd: input.cwd, root }, context);
         }

package/dist/schema.js

@@ -492,22 +492,19 @@ function normalizeText(value, field) {
         throw new Error(`${field} must be non-empty text without NUL bytes.`);
     return normalized;
 }
-function normalizeRole(value, field) {
-    return parseRoleName(value, field);
-}
 function normalizeJudgment(judgment, field) {
     if (!judgment)
         return;
     return {
         ...judgment,
-        role: normalizeRole(judgment.role, `${field}.role`),
+        role: parseRoleName(judgment.role, `${field}.role`),
         criterion: normalizeText(judgment.criterion, `${field}.criterion`),
     };
 }
 function normalizeTask(task, index) {
     const fields = {
         id: task.id,
-        role: normalizeRole(task.role, `tasks[${index}].role`),
+        role: parseRoleName(task.role, `tasks[${index}].role`),
         modelClass: task.modelClass,
         requirements: normalizeText(task.requirements, `tasks[${index}].requirements`),
         deliverable: normalizeText(task.deliverable, `tasks[${index}].deliverable`),

package/extensions/admission.ts

@@ -12,10 +12,6 @@ export function roleCanWrite(role: Role): boolean {
 	return role.tools.some((tool) => !READ_ONLY_TOOLS.has(tool)) || role.extensions.length > 0 || Boolean(role.mcps?.length);
 }
 
-export function roleIsReadOnlyScout(role: Role): boolean {
-	return !roleCanWrite(role) && role.extensions.length === 0 && !role.mcps?.length;
-}
-
 async function checkoutKey(pi: ExtensionAPI, ctx: ExtensionContext): Promise<string> {
 	const cwd = await realpath(ctx.cwd);
 	const result = await pi.exec("git", ["rev-parse", "--show-toplevel"], { cwd, timeout: 5_000 });

package/extensions/isolated.ts

@@ -2,7 +2,6 @@ import type { JsonValue } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { EphemeralSubagentExecutor } from "../dist/ephemeral.js";
-import { ROLE_TOOL_POLICY_FLAG } from "../dist/index.js";
 import type { EffectiveExecutionPolicy } from "./config.ts";
 import {
 	createCanonicalGitRootResolver,
@@ -430,10 +429,6 @@ export interface RegisterIsolatedOptions {
 
 /** Register lifecycle surfaces; delegate_task remains the only start tool. */
 export function registerIsolatedExtension(pi: ExtensionAPI, options: RegisterIsolatedOptions): IsolatedSurface {
-	if (process.argv.includes(`--${ROLE_TOOL_POLICY_FLAG}`)) {
-		const denied = (): never => { throw new Error("Child Roles cannot access isolated delegation."); };
-		return { execute: async () => denied(), inventory: async () => denied(), recover: async () => denied(), inspect: async () => denied(), canFollowup: denied, enqueue: denied, drain: denied };
-	}
 	const componentsFactory = options.componentsFactory ?? createIsolatedComponents;
 	let latestCtx: ExtensionContext | undefined;
 	let components: IsolatedExtensionComponents | undefined;

package/extensions/subagent.ts

@@ -4,7 +4,7 @@ import { type Component, Text, type TUI, truncateToWidth, visibleWidth } from "@
 import { availableTaskModels, loadTaskModelsConfig, modelReference, registerModelTask, resolveAvailableModel, type ResolvedTaskRoute, taskThinkingLevels } from "@henryqw/pi-task-models";
 import { capEphemeralSubagentOutput as capOutput, createEphemeralSubagentExecutor, DELEGATE_TASK, formatDuration, loadRoles, prepareRoleLaunch, resolveRolePackageResources, ROLE_TOOL_POLICY_FLAG, type Role } from "@henryqw/pi-subagent";
 import { readSubagentConfig, resolveExecutionPolicy, type EffectiveExecutionPolicy } from "./config.ts";
-import { registerCheckoutAdmission, roleCanWrite, roleIsReadOnlyScout } from "./admission.ts";
+import { registerCheckoutAdmission, roleCanWrite } from "./admission.ts";
 import { registerIsolatedExtension } from "./isolated.ts";
 import { directRef, registerSubagentCommand, type DirectDisplay, type DirectTask } from "./subagent-command.ts";
 import { MODEL_CLASS_GUIDANCE } from "./model-class-policy.ts";
@@ -278,7 +278,7 @@ export default function subagentExtension(pi: ExtensionAPI): void {
 			const snapshot = notices.join("\n");
 			if (Buffer.byteLength(snapshot, "utf8") > 32_000) throw new Error("Status exceeds the 32 KiB inspection limit; use subagent_status for exact evidence.");
 			const role = loadRoles().find((candidate) => candidate.name === "scout");
-			if (!role || !roleIsReadOnlyScout(role)) throw new Error("Status inspection requires a configured read-only scout Role without extensions or MCP servers.");
+			if (!role || roleCanWrite(role)) throw new Error("Status inspection requires a configured read-only scout Role without extensions or MCP servers.");
 			const prepared = prepareRoleLaunch(pi, ctx, { role, task: DELEGATE_TASK, modelClass: "fast" });
 			const herdr = createDirectHerdr(pi, ctx.cwd, currentPolicy().childIdleMs);
 			const controller = new AbortController();
@@ -712,12 +712,7 @@ export default function subagentExtension(pi: ExtensionAPI): void {
 							throw error;
 						} finally { release(); }
 					}, controller.signal);
-				} catch (error) {
-					if (!controller.signal.aborted) {
-						const state = [...states.values()].find(({ status }) => status === "running" || status === "pending");
-						if (state) states.set(state.id, { id: state.id, index: state.index, name: state.name, role: state.role, status: "rejected", failure: capOutput(String(error)) });
-					}
-				} finally {
+				} catch { /* aborted */ } finally {
 					for (const [id, state] of states) {
 						if (state.status === "pending" || state.status === "running") states.set(id, {
 							id: state.id, index: state.index, name: state.name, role: state.role,
@@ -733,7 +728,7 @@ export default function subagentExtension(pi: ExtensionAPI): void {
 				}
 			})();
 			return {
-				content: [{ type: "text" as const, text: capOutput(`Direct delegation started · ${ref} · ${taskId}\nHerdr tab: ${first.tabId} · pane: ${first.paneId} · agent: ${first.name}\nExact session: ${first.sessionFile}\nAll launched tabs: /subagent (on this session branch).\n${entries.length} task(s); result will arrive in one follow-up message. Direct work shares this checkout; completion is an exact answer, not checked integration. ${writes ? "Potential writers run serially; competing Pi writes stay blocked until owned workers are proved stopped. If termination is uncertain, use /subagent ${ref} Close/cancel-and-release (stops ALL its owned workers); changes are not rolled back." : "Concurrent changes may make reads stale."}`) }],
+				content: [{ type: "text" as const, text: capOutput(`Direct delegation started · ${ref} · ${taskId}\nHerdr tab: ${first.tabId} · pane: ${first.paneId} · agent: ${first.name}\nExact session: ${first.sessionFile}\nAll launched tabs: /subagent (on this session branch).\n${entries.length} task(s); result will arrive in one follow-up message. Direct work shares this checkout; completion is an exact answer, not checked integration. ${writes ? `Potential writers run serially; competing Pi writes stay blocked until owned workers are proved stopped. If termination is uncertain, use /subagent ${ref} Close/cancel-and-release (stops ALL its owned workers); changes are not rolled back.` : "Concurrent changes may make reads stale."}`) }],
 				details: { taskId, mode: workflow.mode, tabId: first.tabId, sessionFile: first.sessionFile,
 					entries: entries.map(({ id, index, delegation }) => ({ id, index, name: delegation.name, role: delegation.role })) },
 			};

package/extensions/workflow.ts

@@ -148,12 +148,7 @@ export async function runForegroundWorkflow(
 	signal?: AbortSignal,
 ): Promise<void> {
 	signal?.throwIfAborted();
-	if (mode === "single") {
-		await runEntry(entries[0]!, run);
-		signal?.throwIfAborted();
-		return;
-	}
-	if (mode === "parallel") {
+	if (mode === "single" || mode === "parallel") {
 		await Promise.all(entries.map((entry) => runEntry(entry, run)));
 		signal?.throwIfAborted();
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-subagent",
-  "version": "26.4.0",
+  "version": "26.5.1",
   "description": "Delegate bounded direct work or durable checked isolated task graphs to Pi roles.",
   "keywords": [
     "pi-package",
@@ -67,7 +67,7 @@
   },
   "dependencies": {
     "@henryqw/pi-config-store": "^3.0.0",
-    "@henryqw/pi-herdr": "^0.4.9",
+    "@henryqw/pi-herdr": "^0.5.0",
     "@henryqw/pi-multi-codex": "^3.0.0",
     "@henryqw/pi-process": "^0.2.0",
     "@henryqw/pi-task-models": "^8.0.0",