pi-subagents 0.74.0 → 0.76.0

package/src/runs/shared/child-commands.d.ts

@@ -0,0 +1,28 @@
+import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
+export declare const CHILD_COMMAND_TOOL = "subagent_command";
+export type CommandOperation = "status" | "yield" | "cancel";
+export interface ChildCommandSnapshot {
+    toolCallId: string;
+    state: "running" | "yielded" | "cancel_requested" | "completed" | "failed" | "cancelled";
+    startedAt: number;
+    endedAt?: number;
+    output: string;
+    fullOutputPath?: string;
+}
+export interface ChildCommandState {
+    ownerId: string;
+    closed: boolean;
+    commands: ChildCommandSnapshot[];
+}
+export declare function readChildCommandState(channelDir: string): ChildCommandState | undefined;
+/** Owns command lifetimes, not shell execution. The supplied Pi tool still executes the command. */
+export declare function createChildCommandRuntime(channelDir: string): {
+    state: () => ChildCommandState;
+    operate: (operation: CommandOperation, toolCallId?: string) => ChildCommandState;
+    shutdown: () => Promise<void>;
+    finish(): Promise<void>;
+    wrap(tool: ToolDefinition): ToolDefinition;
+    tool(): ToolDefinition;
+};
+export declare function controlChildCommand(channelDir: string, operation: CommandOperation, toolCallId?: string, signal?: AbortSignal): Promise<ChildCommandState>;
+//# sourceMappingURL=child-commands.d.ts.map

package/src/runs/shared/child-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-commands.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-commands.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AACrD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAC7D,MAAM,WAAW,oBAAoB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;IACzF,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB;AAQD,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CACjC;AAQD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAGvF;AAMD,oGAAoG;AACpG,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM;iBAMzC,iBAAiB;yBAKP,gBAAgB,eAAe,MAAM,KAAG,iBAAiB;;;eAsDzE,cAAc,GAAG,cAAc;YAmDlC,cAAc;EAgBvB;AAiBD,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA8BhK"}

package/src/runs/shared/child-commands.js

@@ -0,0 +1,250 @@
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Type } from "typebox";
+import { createAtomicJsonWriter } from "../../shared/atomic-json.js";
+import { watchAsyncControlInbox, requestAsyncCommand } from "../background/control-channel.js";
+export const CHILD_COMMAND_TOOL = "subagent_command";
+const writeAtomicJson = createAtomicJsonWriter({ mode: 0o600 });
+const MAX_OUTPUT_BYTES = 8 * 1024;
+const RECENT_COMMANDS = 20;
+function childCommandStatePath(channelDir) {
+    return path.join(channelDir, "commands.json");
+}
+export function readChildCommandState(channelDir) {
+    try {
+        return JSON.parse(fs.readFileSync(childCommandStatePath(channelDir), "utf8"));
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return undefined;
+        throw error;
+    }
+}
+function active(job) { return job.snapshot.endedAt === undefined; }
+function text(result) {
+    return Buffer.from(result.content.filter((part) => part.type === "text").map((part) => part.text).join("\n")).subarray(-MAX_OUTPUT_BYTES).toString("utf8");
+}
+/** Owns command lifetimes, not shell execution. The supplied Pi tool still executes the command. */
+export function createChildCommandRuntime(channelDir) {
+    const ownerId = randomUUID();
+    const jobs = new Map();
+    const usedIds = new Set();
+    let closed = false;
+    let disposeInbox;
+    const state = () => ({ ownerId, closed, commands: [...jobs.values()].map((job) => ({ ...job.snapshot })) });
+    const persist = () => writeAtomicJson(childCommandStatePath(channelDir), {
+        ownerId, closed,
+        commands: [...jobs.values()].map((job) => ({ ...job.snapshot, output: job.yielded ? job.snapshot.output : "" })),
+    });
+    const operate = (operation, toolCallId) => {
+        if (operation === "status" && toolCallId === undefined)
+            return state();
+        const job = toolCallId ? jobs.get(toolCallId) : undefined;
+        if (!job)
+            throw new Error(`No retained command '${toolCallId ?? ""}' in this child session.`);
+        if (operation !== "status" && closed)
+            throw new Error("Child command controller is closed.");
+        const before = job.snapshot.state;
+        if (active(job)) {
+            if (operation === "yield" && job.snapshot.state === "running") {
+                job.yielded = true;
+                job.snapshot.state = "yielded";
+                job.yieldResult();
+            }
+            else if (operation === "cancel") {
+                job.snapshot.state = "cancel_requested";
+                job.controller.abort();
+            }
+        }
+        if (job.snapshot.state !== before)
+            persist();
+        return { ownerId, closed, commands: [{ ...job.snapshot }] };
+    };
+    const startInbox = () => {
+        if (disposeInbox)
+            return;
+        disposeInbox = watchAsyncControlInbox(channelDir, {
+            onCommand(request) {
+                const replyPath = commandReplyPath(channelDir, request.id);
+                try {
+                    if (request.ownerId !== ownerId)
+                        throw new Error("Command request belongs to another child session.");
+                    if (Date.now() > request.deadlineAt)
+                        throw new Error("Command request expired before delivery.");
+                    writeAtomicJson(replyPath, { state: operate(request.operation, request.toolCallId) });
+                }
+                catch (error) {
+                    writeAtomicJson(replyPath, { error: error instanceof Error ? error.message : String(error) });
+                }
+            },
+        });
+    };
+    const stop = async () => {
+        closed = true;
+        disposeInbox?.();
+        for (const job of jobs.values())
+            if (active(job)) {
+                job.snapshot.state = "cancel_requested";
+                job.controller.abort();
+            }
+        await Promise.all([...jobs.values()].map((job) => job.settled));
+        if (jobs.size)
+            persist();
+    };
+    return {
+        state,
+        operate,
+        shutdown: stop,
+        async finish() {
+            const pending = [...jobs.values()].filter(active);
+            if (!pending.length)
+                return;
+            await stop();
+            throw new Error(`Child finished with unfinished commands: ${pending.map((job) => job.snapshot.toolCallId).join(", ")}. Commands were cancelled; query or cancel background commands before finishing.`);
+        },
+        wrap(tool) {
+            return {
+                ...tool,
+                parameters: Type.Unsafe({ ...tool.parameters, properties: {
+                        ...tool.parameters.properties,
+                        yieldTimeMs: Type.Optional(Type.Integer({ minimum: 0, maximum: 30_000, description: "Return a managed command handle after this wait; does not terminate the command. Omit to wait for completion." })),
+                    } }),
+                description: `${tool.description}\nOptional yieldTimeMs returns a command handle without stopping execution. Use subagent_command to query or cancel it. Finish or cancel every command before completing the task.`,
+                async execute(toolCallId, params, signal, onUpdate, ctx) {
+                    if (closed)
+                        throw new Error("Child command controller is closed.");
+                    if (usedIds.has(toolCallId))
+                        throw new Error(`Command id '${toolCallId}' was already used in this child session.`);
+                    usedIds.add(toolCallId);
+                    const { yieldTimeMs, ...args } = params;
+                    const controller = new AbortController();
+                    const commandSignal = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
+                    let yieldResult;
+                    const yielded = new Promise((resolve) => { yieldResult = resolve; });
+                    const job = { snapshot: { toolCallId, state: "running", startedAt: Date.now(), output: "" }, controller, yieldResult, settled: Promise.resolve() };
+                    // Keep active commands and a bounded recent history; never retain full outputs.
+                    const completed = [...jobs].filter(([, candidate]) => !active(candidate));
+                    for (const [id] of completed.slice(0, Math.max(0, completed.length - RECENT_COMMANDS + 1)))
+                        jobs.delete(id);
+                    jobs.set(toolCallId, job);
+                    persist();
+                    startInbox();
+                    let timer;
+                    if (typeof yieldTimeMs === "number")
+                        timer = setTimeout(() => operate("yield", toolCallId), yieldTimeMs);
+                    const execution = Promise.resolve().then(() => tool.execute(toolCallId, args, commandSignal, (update) => {
+                        job.snapshot.output = text(update);
+                        if (job.snapshot.state === "running")
+                            onUpdate?.(update);
+                    }, ctx)).then((result) => {
+                        job.snapshot.output = text(result);
+                        job.snapshot.state = "completed";
+                        const fullOutputPath = result.details?.fullOutputPath;
+                        if (fullOutputPath)
+                            job.snapshot.fullOutputPath = fullOutputPath;
+                        return result;
+                    }, (error) => {
+                        job.snapshot.state = controller.signal.aborted ? "cancelled" : "failed";
+                        job.snapshot.output = String(error).slice(-MAX_OUTPUT_BYTES);
+                        throw error;
+                    }).finally(() => {
+                        if (timer)
+                            clearTimeout(timer);
+                        job.snapshot.endedAt = Date.now();
+                        persist();
+                    });
+                    job.settled = execution.then(() => { }, () => { });
+                    const result = await Promise.race([execution.then((value) => ({ value })), yielded.then(() => undefined)]);
+                    if (result)
+                        return result.value;
+                    return { content: [{ type: "text", text: `Command is still running (toolCallId: ${toolCallId}). This is not a successful exit. Use subagent_command({ action: "status", toolCallId: ${JSON.stringify(toolCallId)} }) to inspect or wait, or action: "cancel" to stop it.\n${job.snapshot.output}` }], details: { command: { ...job.snapshot } } };
+                },
+            };
+        },
+        tool() {
+            return {
+                name: CHILD_COMMAND_TOOL, label: "Child command",
+                description: "Inspect or cancel bash commands owned by this child. Cancellation stops only the selected command, not the agent. Check terminal state before finishing.",
+                parameters: Type.Object({ action: Type.String({ enum: ["status", "cancel"] }), toolCallId: Type.Optional(Type.String()), waitMs: Type.Optional(Type.Integer({ minimum: 0, maximum: 30_000 })) }),
+                async execute(_id, params, signal) {
+                    const { action, toolCallId, waitMs = 0 } = params;
+                    operate(action, toolCallId);
+                    const job = toolCallId ? jobs.get(toolCallId) : undefined;
+                    if (job && active(job) && waitMs > 0)
+                        await waitForCommand(job.settled, waitMs, signal);
+                    const snapshot = operate("status", toolCallId);
+                    return { content: [{ type: "text", text: JSON.stringify(snapshot) }], details: snapshot };
+                },
+            };
+        },
+    };
+}
+async function waitForCommand(settled, waitMs, signal) {
+    let timer;
+    let abort;
+    const wait = new Promise((resolve, reject) => {
+        timer = setTimeout(resolve, waitMs);
+        abort = () => reject(new Error("Command wait aborted; command remains managed by the child."));
+        if (signal?.aborted)
+            abort();
+        else
+            signal?.addEventListener("abort", abort, { once: true });
+    });
+    try {
+        await Promise.race([settled, wait]);
+    }
+    finally {
+        clearTimeout(timer);
+        signal?.removeEventListener("abort", abort);
+    }
+}
+function commandReplyPath(channelDir, id) {
+    return path.join(channelDir, "command-replies", `${id}.json`);
+}
+export async function controlChildCommand(channelDir, operation, toolCallId, signal) {
+    const current = readChildCommandState(channelDir);
+    if (!current)
+        throw new Error("No command controller is available for this child. Command controls require a local native Pi child with bash.");
+    if (current.closed) {
+        if (operation === "status") {
+            if (toolCallId === undefined)
+                return current;
+            const command = current.commands.find((entry) => entry.toolCallId === toolCallId);
+            if (!command)
+                throw new Error(`No retained command '${toolCallId}' in this child session.`);
+            return { ...current, commands: [command] };
+        }
+        throw new Error("Child command controller is closed.");
+    }
+    if (operation !== "status" && !toolCallId)
+        throw new Error("An exact toolCallId is required; command controls never target the next command.");
+    const id = randomUUID();
+    const deadlineAt = Date.now() + 5_000;
+    const request = { type: "command", id, ownerId: current.ownerId, operation, ...(toolCallId ? { toolCallId } : {}), deadlineAt };
+    requestAsyncCommand(channelDir, request);
+    const replyPath = commandReplyPath(channelDir, id);
+    try {
+        while (Date.now() < deadlineAt) {
+            if (signal?.aborted)
+                throw new Error("Command control wait aborted; delivery may still be pending.");
+            try {
+                const reply = JSON.parse(fs.readFileSync(replyPath, "utf8"));
+                if (reply.error)
+                    throw new Error(reply.error);
+                if (reply.state)
+                    return reply.state;
+            }
+            catch (error) {
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 20));
+        }
+        throw new Error("Command control acknowledgement timed out. Inspect command status; cancellation is not confirmed.");
+    }
+    finally {
+        fs.rmSync(replyPath, { force: true });
+    }
+}
+//# sourceMappingURL=child-commands.js.map

package/src/runs/shared/child-commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-commands.js","sourceRoot":"","sources":["../../../../src/runs/shared/child-commands.ts"],"names":[],"mappings":"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"}

package/src/runs/shared/child-session.d.ts

@@ -89,12 +89,16 @@ export interface ChildSession {
     abort(): Promise<void>;
     /** Emits `session_shutdown` to the child's extensions and disposes the session; resolves once that shutdown work is done. */
     dispose(): Promise<void>;
+    /** Final settlement check for commands owned by this child; unfinished commands are cancelled and reject completion. */
+    finishCommands?(): Promise<void>;
     /** True while Pi still has steering or follow-up input that has not started a turn. */
     hasQueuedMessages?(): boolean;
     readonly messages: readonly AgentMessage[];
     readonly sessionFile: string | undefined;
     readonly sessionId: string;
     readonly modelId: string | undefined;
+    /** Live provider/id of the selected model when Pi marks it virtual (`api === "pi-virtual"`); assistant messages then name the dispatched physical model. */
+    readonly virtualModelId?: string;
     readonly contextWindow?: number;
     readonly machineEvidence?: {
         machineId: string;

package/src/runs/shared/child-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"child-session.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-session.d.ts","sourceRoot":"","sources":["../../../../src/runs/shared/child-session.ts"],"names":[],"mappings":"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"}

package/src/runs/shared/child-session.js

@@ -18,6 +18,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { pathToFileURL } from "node:url";
+import { CHILD_COMMAND_TOOL, createChildCommandRuntime } from "./child-commands.js";
+import { supervisorChannelDir } from "./child-tool-plan.js";
 import { pinChildCacheRetention } from "../../shared/child-cache-retention.js";
 import { getAgentDir, PI_CODING_AGENT_PACKAGE_ROOT_ENV } from "../../shared/utils.js";
 import { resolvePackageSubpath } from "../background/runner-aliases.js";
@@ -86,6 +88,31 @@ function prioritizeChildPromptRuntime(result) {
     extensions.unshift(promptRuntime);
     return { ...result, extensions };
 }
+/** Ambient bash overrides keep their original backend and priority. */
+function prioritizeChildCommandRuntime(result) {
+    const index = result.extensions.findIndex(({ path }) => path === "<inline:pi-subagents:commands>");
+    if (index < 0)
+        return result;
+    if (result.extensions.some((extension, otherIndex) => otherIndex !== index && extension.tools?.has("bash"))) {
+        const extensions = result.extensions.filter((_, otherIndex) => otherIndex !== index);
+        if (!extensions.some((extension) => extension.tools?.has(CHILD_COMMAND_TOOL))) {
+            const commands = result.extensions[index];
+            const registered = commands.tools.get(CHILD_COMMAND_TOOL);
+            const reason = "Native command controls are unavailable with the active custom bash backend. Use that backend's own command controls.";
+            extensions.push({ ...commands, tools: new Map([[CHILD_COMMAND_TOOL, { ...registered, definition: {
+                                ...registered.definition, description: reason,
+                                execute: async () => { throw new Error(reason); },
+                            } }]]) });
+        }
+        return { ...result, extensions };
+    }
+    if (index === 0)
+        return result;
+    const extensions = [...result.extensions];
+    const [commands] = extensions.splice(index, 1);
+    extensions.unshift(commands);
+    return { ...result, extensions };
+}
 /** One launch at a time from env application through `session_start`, so parallel launches never observe each other's `processEnv` while their extensions load and start. */
 let loading = Promise.resolve();
 /**
@@ -116,7 +143,9 @@ function applyProcessEnv(values) {
  * default, which the child's `tools` allowlist cannot declare. Registering the selected names as
  * `direct` makes them model-declared and callable; `hidden` stays hidden. A name counts only when
  * the tool's raw identity, its `<server>/<tool>` label, matches the granting selector: Pi can give
- * the sanitized name of `srv/a.b` to `srv/a_b`. Every other tool the extension registers becomes
+ * the sanitized name of `srv/a.b` to `srv/a_b`. The selector's server part may be the configured
+ * name or its `-`→`_` form, which Pi's namespace uses: Pi refuses two servers whose names differ
+ * only in `-` and `_`, so both forms name the same server. Every other tool the extension registers becomes
  * `hidden`, so neither codemode nor `ctx.executeTool()` can call it, independent of the `tools`
  * allowlist. The `builtin` entry loads
  * through the explicit `builtin:mcp` path even with `noExtensions`, and `replaceable` lets an
@@ -128,11 +157,17 @@ function selectedBuiltinMcpExtension(pi, selections) {
     if (typeof createMcpExtension !== "function")
         throw new Error(`Selected built-in MCP tools (${selections.map(({ name }) => name).join(", ")}) need a Pi version with built-in MCP.`);
     const selectors = new Map(selections.map(({ name, selector }) => [name, selector]));
+    const split = (value) => {
+        const slash = value.indexOf("/");
+        return { server: (slash === -1 ? value : value.slice(0, slash)).replace(/-/g, "_"), tool: slash === -1 ? undefined : value.slice(slash + 1) };
+    };
     const granted = (tool) => {
         const selector = selectors.get(tool.name);
         if (selector === undefined || tool.exposure === "hidden" || tool.label === undefined)
             return false;
-        return selector.includes("/") ? tool.label === selector : tool.label.startsWith(`${selector}/`);
+        const want = split(selector);
+        const have = split(tool.label);
+        return have.tool !== undefined && have.server === want.server && (want.tool === undefined || want.tool === have.tool);
     };
     const mcp = createMcpExtension();
     const factory = (api) => mcp(new Proxy(api, {
@@ -192,6 +227,29 @@ function flushQueuedProviderRegistrations(loader, modelRuntime, onError, require
     }
     if (Array.isArray(runtime.pendingNativeProviderRegistrations))
         runtime.pendingNativeProviderRegistrations = [];
+    // Pi core flushes pendingVirtualModelRegistrations when a session binds extensions
+    // (agent-session-services), but this factory resolves the requested model before that
+    // binding, so an extension-registered virtual model never resolves for the child. The
+    // structural cast keeps compiling against SDK versions that predate virtual models;
+    // there the queue is absent and the loop is a no-op.
+    const virtualModelRuntime = modelRuntime;
+    const virtualModelQueue = runtime;
+    const pendingVirtualModelRegistrations = virtualModelQueue.pendingVirtualModelRegistrations ?? [];
+    for (const { definition, extensionPath } of pendingVirtualModelRegistrations) {
+        if (typeof virtualModelRuntime.registerVirtualModel !== "function")
+            break;
+        try {
+            virtualModelRuntime.registerVirtualModel(definition);
+            registered = true;
+        }
+        catch (error) {
+            onError?.({ extensionPath, event: "register_virtual_model", error });
+            if (requiredPaths.has(extensionPath))
+                throw new Error(`Required child extension virtual model registration failed for '${extensionPath}': ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    if (Array.isArray(virtualModelQueue.pendingVirtualModelRegistrations))
+        virtualModelQueue.pendingVirtualModelRegistrations = [];
     return { claimedProviderIds, registered };
 }
 /**
@@ -269,6 +327,11 @@ export function createDefaultChildSessionFactory(options = {}) {
                 ? await pi.ModelRuntime.create()
                 : await sharedRuntime(pi);
             const agentDir = getAgentDir();
+            const commands = launch.runtime.runId && launch.runtime.agent && launch.runtime.childIndex !== undefined
+                && launch.tools?.includes("bash") && launch.tools.includes(CHILD_COMMAND_TOOL)
+                && !launch.excludeTools?.includes("bash") && !launch.excludeTools?.includes(CHILD_COMMAND_TOOL)
+                && typeof pi.createBashTool === "function"
+                ? createChildCommandRuntime(supervisorChannelDir(launch.runtime.runId, launch.runtime.agent, launch.runtime.childIndex)) : undefined;
             const settingsManager = pi.SettingsManager.create(launch.cwd, agentDir, { projectTrusted: launch.projectTrusted });
             // Foreground children share Pi's global theme with the parent, so reinitializing it
             // would overwrite the parent's active light/dark appearance. Detached runners have
@@ -299,11 +362,32 @@ export function createDefaultChildSessionFactory(options = {}) {
                 noThemes: true,
                 noContextFiles: launch.noContextFiles,
                 additionalExtensionPaths: builtinMcp ? [...launch.extensionPaths, "builtin:mcp"] : launch.extensionPaths,
-                extensionFactories: [...launch.hooks, ...codemode, ...(builtinMcp ? [builtinMcp] : [])],
-                extensionsOverride: prioritizeChildPromptRuntime,
+                extensionFactories: [...launch.hooks, ...(commands ? [{ name: "pi-subagents:commands", factory: (api) => {
+                                api.registerTool(commands.wrap(pi.createBashTool(launch.cwd, { commandPrefix: settingsManager.getShellCommandPrefix(), shellPath: settingsManager.getShellPath() })));
+                                api.registerTool(commands.tool());
+                            } }] : []), ...codemode, ...(builtinMcp ? [builtinMcp] : [])],
+                extensionsOverride: (result) => prioritizeChildPromptRuntime(prioritizeChildCommandRuntime(result)),
                 ...(launch.systemPrompt !== undefined ? { systemPrompt: launch.systemPrompt } : {}),
                 ...(launch.appendSystemPrompt !== undefined ? { appendSystemPrompt: [launch.appendSystemPrompt] } : {}),
             });
+            // pi's own hosts emit `session_shutdown` before disposing a session so the
+            // extensions loaded into it (ambient extensions included) release their
+            // watchers, servers, and timers. Do the same, then dispose.
+            const shutdownSession = async (session) => {
+                try {
+                    await commands?.shutdown();
+                    const runner = session.extensionRunner;
+                    if (runner.hasHandlers("session_shutdown")) {
+                        await Promise.race([runner.emit({ type: "session_shutdown", reason: "quit" }), new Promise((resolve) => setTimeout(resolve, shutdownTimeoutMs).unref?.())]);
+                    }
+                }
+                catch (error) {
+                    launch.onExtensionError?.({ extensionPath: "<session>", event: "session_shutdown", error });
+                }
+                finally {
+                    session.dispose();
+                }
+            };
             const open = async () => {
                 const requiredPaths = new Set((launch.requiredExtensions ?? []).map(({ path }) => path));
                 applyProcessEnv(launch.processEnv);
@@ -353,39 +437,38 @@ export function createDefaultChildSessionFactory(options = {}) {
                     sessionStartEvent: { type: "session_start", reason: "startup" },
                 });
                 pinChildCacheRetention(session.agent);
+                // Pi reports handler failures through onError instead of throwing, so required startup failures must be collected here.
+                const requiredStartupErrors = [];
+                let binding = true;
                 try {
                     await session.bindExtensions({
                         mode: "print",
-                        onError: (error) => launch.onExtensionError?.({ extensionPath: error.extensionPath, event: error.event, error: error.error }),
+                        onError: (error) => {
+                            if (binding && requiredPaths.has(error.extensionPath))
+                                requiredStartupErrors.push(`${error.extensionPath} (${error.event}): ${error.error}`);
+                            launch.onExtensionError?.({ extensionPath: error.extensionPath, event: error.event, error: error.error });
+                        },
                     });
                 }
                 catch (error) {
                     session.dispose();
                     throw error;
                 }
+                finally {
+                    binding = false;
+                }
+                if (requiredStartupErrors.length > 0) {
+                    // Binding finished, so the other extensions' session_start handlers ran and may hold resources.
+                    await shutdownSession(session);
+                    throw new Error(`Required child extension failed during startup: ${requiredStartupErrors.join("; ")}`);
+                }
                 return session;
             };
             const opened = loading.catch(() => { }).then(open);
             loading = opened;
             const session = await opened;
             let pending;
-            // pi's own hosts emit `session_shutdown` before disposing a session so the
-            // extensions loaded into it (ambient extensions included) release their
-            // watchers, servers, and timers. Do the same, then dispose.
-            const shutdown = async () => {
-                try {
-                    const runner = session.extensionRunner;
-                    if (runner.hasHandlers("session_shutdown")) {
-                        await Promise.race([runner.emit({ type: "session_shutdown", reason: "quit" }), new Promise((resolve) => setTimeout(resolve, shutdownTimeoutMs).unref?.())]);
-                    }
-                }
-                catch (error) {
-                    launch.onExtensionError?.({ extensionPath: "<session>", event: "session_shutdown", error });
-                }
-                finally {
-                    session.dispose();
-                }
-            };
+            const shutdown = () => shutdownSession(session);
             // Outside the launch lock: MCP servers connect after `session_start` without reading the per-launch env.
             if (builtinMcpTools.length) {
                 const disposed = () => disposals !== disposalsAtStart;
@@ -408,6 +491,7 @@ export function createDefaultChildSessionFactory(options = {}) {
             const child = {
                 subscribe: (listener) => session.subscribe((event) => listener(event)),
                 prompt: (text) => session.prompt(text),
+                ...(commands ? { finishCommands: () => commands.finish() } : {}),
                 steer: (text) => session.steer(text),
                 followUp: (text) => session.followUp(text),
                 abort: () => session.abort(),
@@ -426,6 +510,7 @@ export function createDefaultChildSessionFactory(options = {}) {
                 get sessionFile() { return session.sessionFile; },
                 get sessionId() { return session.sessionId; },
                 get modelId() { return session.model ? `${session.model.provider}/${session.model.id}` : undefined; },
+                get virtualModelId() { return session.model?.api === "pi-virtual" ? `${session.model.provider}/${session.model.id}` : undefined; },
                 get contextWindow() { return session.model?.contextWindow; },
             };
             live.add(child);