@selesai/code 0.12.0 → 0.13.1

package/dist/extensions/pi-subagents/test/unit/steering.test.ts

@@ -106,18 +106,15 @@ describe("steering lifecycle ledger", () => {
 		assert.equal(result?.targets[0]?.lateDeliveredAt, 5);
 	});
 
-	it("preserves only remaining deadline, turn, and tool budgets", () => {
+	it("preserves only remaining deadline and tool budgets", () => {
 		assert.deepEqual(remainingSteeringRecoveryLimits({
 			absoluteDeadlineAt: 10_000,
-			initialTurnBudget: { maxTurns: 20, graceTurns: 3 },
 			initialToolBudget: { soft: 45, hard: 65, block: ["read"] },
 		}, {
-			turnBudget: { maxTurns: 20, graceTurns: 3, turnCount: 21, outcome: "wrap-up-requested" },
 			toolBudget: { soft: 45, hard: 65, block: ["read"], toolCount: 50, outcome: "soft-reached" },
 		}, 4_000), {
 			timeoutMs: 6_000,
 			absoluteDeadlineAt: 10_000,
-			turnBudget: { maxTurns: 1, graceTurns: 1 },
 			toolBudget: { hard: 15, block: ["read"] },
 		});
 	});
@@ -130,6 +127,7 @@ describe("steering lifecycle ledger", () => {
 			fallbackModels: ["current/fallback"],
 			thinking: "high",
 			tools: ["write"],
+			allowNestedSubagents: true,
 			extensions: ["current-extension"],
 			subagentOnlyExtensions: ["current-child-extension"],
 			mcpDirectTools: ["current_mcp"],
@@ -153,6 +151,7 @@ describe("steering lifecycle ledger", () => {
 			cwd: "/original",
 			model: "original/model",
 			tools: ["read"],
+			allowNestedSubagents: false,
 			systemPrompt: "original prompt",
 			systemPromptMode: "replace",
 			inheritProjectContext: false,
@@ -164,6 +163,7 @@ describe("steering lifecycle ledger", () => {
 		});
 		assert.equal(recovered.model, "original/model");
 		assert.deepEqual(recovered.tools, ["read"]);
+		assert.equal(recovered.allowNestedSubagents, false);
 		assert.equal(recovered.systemPrompt, "original prompt");
 		assert.equal(recovered.inheritProjectContext, false);
 		assert.deepEqual(recovered.toolBudget, { hard: 7, block: ["read"] });
@@ -204,9 +204,8 @@ describe("steering lifecycle ledger", () => {
 		assert.equal(recovered.maxThinking, "low");
 	});
 
-	it("rejects recovery when any configured hard budget is exhausted", () => {
+	it("rejects recovery when a configured deadline or tool budget is exhausted", () => {
 		assert.throws(() => remainingSteeringRecoveryLimits({ absoluteDeadlineAt: 5 }, {}, 5), /deadline budget/);
-		assert.throws(() => remainingSteeringRecoveryLimits({ initialTurnBudget: { maxTurns: 2, graceTurns: 1 } }, { turnCount: 3 }), /turn budget/);
 		assert.throws(() => remainingSteeringRecoveryLimits({ initialToolBudget: { hard: 2, block: "*" } }, { toolCount: 2 }), /tool budget/);
 	});
 });

package/dist/extensions/pi-subagents/test/unit/subagent-action-recovery.test.ts

@@ -54,14 +54,6 @@ describe("subagent action recovery", () => {
 		assert.match(message, /Valid: .*status/);
 	});
 
-	it("does not list removed legacy controls", () => {
-		const message = unknownSubagentActionMessage("not-a-real-action");
-
-		assert.doesNotMatch(message, /append-step/);
-		assert.doesNotMatch(message, /approve-checkpoint/);
-		assert.doesNotMatch(message, /reject-checkpoint/);
-	});
-
 	it("does not suggest a destructive near-miss", () => {
 		const message = unknownSubagentActionMessage("del");
 

package/dist/extensions/pi-subagents/test/unit/subagent-guide.test.ts

@@ -21,4 +21,9 @@ describe("subagent guide", () => {
 	it("registers the guide action for action recovery", () => {
 		assert.ok(SUBAGENT_ACTIONS.includes("guide"));
 	});
+
+	it("documents external CLI runner limits in packaged guide topics", () => {
+		assert.match(readSubagentGuide("tool-reference"), /External CLI agent profiles[\s\S]*native Pi child options[\s\S]*model override[\s\S]*native Pi tools/);
+		assert.match(readSubagentGuide("agents"), /External CLI agents use their own runner contract[\s\S]*native Pi child options/);
+	});
 });

package/dist/extensions/pi-subagents/test/unit/subagent-prompt-runtime.test.ts

@@ -19,6 +19,7 @@ import {
 import { RUNTIME_EXTENSION_ACK_EVENT, RUNTIME_EXTENSION_ACK_PATH_ENV } from "../../src/runs/shared/runtime-acknowledged-extensions.ts";
 import { STRUCTURED_OUTPUT_CAPTURE_ENV, STRUCTURED_OUTPUT_SCHEMA_ENV } from "../../src/runs/shared/structured-output.ts";
 import { TOOL_BUDGET_ENV } from "../../src/runs/shared/tool-budget.ts";
+import { getAgentDir } from "../../src/shared/utils.ts";
 import { PERMISSION_POLICY_ENV } from "../../src/runs/shared/permissions.ts";
 import { CHILD_TOOL_DIAGNOSTIC_PATH_ENV, formatChildToolDiagnostic, MCP_DIRECT_CHILD_TOOLS_ENV, readChildToolDiagnostic, REQUIRED_CHILD_TOOLS_ENV } from "../../src/runs/shared/tool-availability.ts";
 import { CHILD_WATCHDOG_CONFIG_ENV } from "../../src/watchdog/child-status.ts";
@@ -30,6 +31,7 @@ import registerSubagentPromptRuntime, {
 	registerPermissionGate,
 	registerSteeringInbox,
 	rewriteSubagentPrompt,
+	stripGlobalContext,
 	stripInheritedSkills,
 	stripParentOnlySubagentMessages,
 	stripProjectContext,
@@ -38,6 +40,7 @@ import registerSubagentPromptRuntime, {
 
 const envSnapshot = {
 	SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT: process.env.SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT,
+	SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT: process.env.SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT,
 	SELESAI_SUBAGENT_INHERIT_SKILLS: process.env.SELESAI_SUBAGENT_INHERIT_SKILLS,
 	SELESAI_SUBAGENT_INTERCOM_SESSION_NAME: process.env.SELESAI_SUBAGENT_INTERCOM_SESSION_NAME,
 	SELESAI_SUBAGENT_FANOUT_CHILD: process.env.SELESAI_SUBAGENT_FANOUT_CHILD,
@@ -59,6 +62,7 @@ const envSnapshot = {
 	SELESAI_SUBAGENT_CHILD_AGENT: process.env.SELESAI_SUBAGENT_CHILD_AGENT,
 	SELESAI_SUBAGENT_CHILD_INDEX: process.env.SELESAI_SUBAGENT_CHILD_INDEX,
 	SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG: process.env.SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG,
+	PI_SUBAGENT_SESSION_NAME: process.env.PI_SUBAGENT_SESSION_NAME,
 };
 
 const SKILLS_SECTION = "\n\nThe following skills provide specialized instructions for specific tasks.\nUse the read tool to load a skill's file when the task matches its description.\nWhen a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.\n\n<available_skills>\n  <skill>\n    <name>safe-bash</name>\n    <description>desc</description>\n    <location>/tmp/SKILL.md</location>\n  </skill>\n  <skill>\n    <name>pi-subagents</name>\n    <description>delegate to subagents</description>\n    <location>/tmp/pi-subagents/SKILL.md</location>\n  </skill>\n</available_skills>";
@@ -83,6 +87,8 @@ const CONFIGURED_SKILLS_SECTION = "\n\nThe following configured skills are avail
 afterEach(() => {
 	if (envSnapshot.SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT === undefined) delete process.env.SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT;
 	else process.env.SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT = envSnapshot.SELESAI_SUBAGENT_INHERIT_PROJECT_CONTEXT;
+	if (envSnapshot.SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT === undefined) delete process.env.SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT;
+	else process.env.SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT = envSnapshot.SELESAI_SUBAGENT_INHERIT_GLOBAL_CONTEXT;
 	if (envSnapshot.SELESAI_SUBAGENT_INHERIT_SKILLS === undefined) delete process.env.SELESAI_SUBAGENT_INHERIT_SKILLS;
 	else process.env.SELESAI_SUBAGENT_INHERIT_SKILLS = envSnapshot.SELESAI_SUBAGENT_INHERIT_SKILLS;
 	if (envSnapshot.SELESAI_SUBAGENT_INTERCOM_SESSION_NAME === undefined) delete process.env.SELESAI_SUBAGENT_INTERCOM_SESSION_NAME;
@@ -125,6 +131,8 @@ afterEach(() => {
 	else process.env[SUBAGENT_CHILD_INDEX_ENV] = envSnapshot.SELESAI_SUBAGENT_CHILD_INDEX;
 	if (envSnapshot.SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG === undefined) delete process.env[CHILD_WATCHDOG_CONFIG_ENV];
 	else process.env[CHILD_WATCHDOG_CONFIG_ENV] = envSnapshot.SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG;
+	if (envSnapshot.PI_SUBAGENT_SESSION_NAME === undefined) delete process.env.PI_SUBAGENT_SESSION_NAME;
+	else process.env.PI_SUBAGENT_SESSION_NAME = envSnapshot.PI_SUBAGENT_SESSION_NAME;
 });
 
 function setSupervisorEnv(): void {
@@ -785,6 +793,126 @@ describe("subagent prompt runtime", () => {
 		assert.ok(rewritten.includes("Current date: 2026-04-16"));
 	});
 
+	it("strips an XML <project_context> block as full project context removal", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n",
+			`<project_instructions path="${globalDir}/AGENTS.md">\nGlobal rules\n</project_instructions>\n\n`,
+			"<project_instructions path=\"/repo/AGENTS.md\">\nRepo rules\n</project_instructions>\n\n",
+			"</project_context>\n\n",
+			"Current working directory: /repo",
+		].join("");
+		const rewritten = stripProjectContext(prompt);
+		assert.ok(!rewritten.includes("<project_context>"));
+		assert.ok(!rewritten.includes("<project_instructions"));
+		assert.ok(rewritten.includes("Current working directory: /repo"));
+	});
+
+	it("strips only global context files while preserving repository context", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n",
+			`<project_instructions path="${globalDir}/AGENTS.md">\nGlobal rules\n</project_instructions>\n\n`,
+			"<project_instructions path=\"/repo/AGENTS.md\">\nRepo rules\n</project_instructions>\n\n",
+			"</project_context>\n\n",
+			"Current working directory: /repo",
+		].join("");
+		const rewritten = stripGlobalContext(prompt);
+		assert.ok(!rewritten.includes("Global rules"));
+		assert.ok(rewritten.includes("Repo rules"));
+		assert.ok(rewritten.includes("</project_context>"));
+	});
+
+	it("strips only global context files from legacy Markdown while preserving repository context", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n# Project Context\n\nProject-specific instructions and guidelines:\n\n",
+			`## ${globalDir}/AGENTS.md\n\nGlobal rules\n\n`,
+			"## /repo/AGENTS.md\n\nRepo rules\n\n",
+			SKILLS_SECTION,
+			"\nCurrent date: 2026-04-16",
+		].join("");
+		const rewritten = rewriteSubagentPrompt(prompt, {
+			inheritProjectContext: true,
+			inheritGlobalContext: false,
+			inheritSkills: true,
+		});
+		assert.ok(!rewritten.includes("Global rules"));
+		assert.ok(rewritten.includes("## /repo/AGENTS.md"));
+		assert.ok(rewritten.includes("Repo rules"));
+	});
+
+	it("recognizes Pi context filenames case-insensitively", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n",
+			`<project_instructions path="${globalDir}/AGENTS.MD">\nGlobal rules\n</project_instructions>\n\n`,
+			"<project_instructions path=\"/repo/AGENTS.MD\">\nRepo rules\n</project_instructions>\n\n",
+			"</project_context>\n\n",
+			"Current working directory: /repo",
+		].join("");
+		const rewritten = stripGlobalContext(prompt);
+		assert.ok(!rewritten.includes("Global rules"));
+		assert.ok(rewritten.includes("Repo rules"));
+	});
+
+	for (const [label, prompt] of [
+		["CRLF context", `<project_context>\r\n<project_instructions path="${getAgentDir()}/AGENTS.md">\r\nGlobal rules\r\n</project_instructions>\r\n<project_instructions path="/repo/AGENTS.md">\r\nRepo rules\r\n</project_instructions>\r\n</project_context>`],
+		["content without a trailing newline", `<project_context><project_instructions path="${getAgentDir()}/AGENTS.md">Global rules</project_instructions><project_instructions path="/repo/AGENTS.md">Repo rules</project_instructions></project_context>`],
+		["same-line content", `<project_context><project_instructions path="${getAgentDir()}/CLAUDE.md">Global rules</project_instructions><project_instructions path="/repo/CLAUDE.md">Repo rules</project_instructions></project_context>`],
+	] as const) {
+		it(`strips global instructions from ${label}`, () => {
+			const rewritten = stripGlobalContext(prompt);
+			assert.ok(!rewritten.includes("Global rules"));
+			assert.ok(rewritten.includes("Repo rules"));
+		});
+	}
+
+	it("does not strip matching examples outside project context", () => {
+		const example = `<project_instructions path="${getAgentDir()}/AGENTS.md">Example only</project_instructions>`;
+		assert.equal(stripGlobalContext(example), example);
+	});
+
+	it("inherits global context when inheritGlobalContext is true", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n",
+			`<project_instructions path="${globalDir}/AGENTS.md">\nGlobal rules\n</project_instructions>\n\n`,
+			"</project_context>\n\n",
+			"Current working directory: /repo",
+		].join("");
+		const rewritten = rewriteSubagentPrompt(prompt, {
+			inheritProjectContext: true,
+			inheritGlobalContext: true,
+			inheritSkills: true,
+		});
+		assert.ok(rewritten.includes("Global rules"));
+	});
+
+	it("removes global context files while keeping repository context via rewriteSubagentPrompt", () => {
+		const globalDir = getAgentDir();
+		const prompt = [
+			"You are a subagent.",
+			"\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n",
+			`<project_instructions path="${globalDir}/AGENTS.md">\nGlobal rules\n</project_instructions>\n\n`,
+			"<project_instructions path=\"/repo/AGENTS.md\">\nRepo rules\n</project_instructions>\n\n",
+			"</project_context>\n\n",
+			"Current working directory: /repo",
+		].join("");
+		const rewritten = rewriteSubagentPrompt(prompt, {
+			inheritProjectContext: true,
+			inheritGlobalContext: false,
+			inheritSkills: true,
+		});
+		assert.ok(!rewritten.includes("Global rules"));
+		assert.ok(rewritten.includes("Repo rules"));
+	});
+
 	it("strips only the inherited skills block", () => {
 		const rewritten = stripInheritedSkills(BASE_PROMPT);
 		assert.ok(rewritten.includes("# Project Context"));
@@ -795,6 +923,7 @@ describe("subagent prompt runtime", () => {
 	it("can strip both inherited sections together", () => {
 		const rewritten = rewriteSubagentPrompt(BASE_PROMPT, {
 			inheritProjectContext: false,
+			inheritGlobalContext: false,
 			inheritSkills: false,
 		});
 		assert.ok(!rewritten.includes("# Project Context"));
@@ -805,6 +934,7 @@ describe("subagent prompt runtime", () => {
 	it("injects a child-only boundary that forbids proposing or running subagents", () => {
 		const rewritten = rewriteSubagentPrompt(BASE_PROMPT, {
 			inheritProjectContext: true,
+			inheritGlobalContext: true,
 			inheritSkills: true,
 		});
 
@@ -813,14 +943,15 @@ describe("subagent prompt runtime", () => {
 		assert.ok(rewritten.includes("If you need to edit files, use the available editing tools."));
 		assert.ok(!rewritten.includes("call the actual edit/write tools"));
 		assert.ok(rewritten.includes("Do not print tool-call syntax, patches, or pseudo-tool calls as text."));
-		assert.equal(rewriteSubagentPrompt(rewritten, { inheritProjectContext: true, inheritSkills: true }).indexOf(CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS), 0);
-		assert.equal(rewriteSubagentPrompt(rewritten, { inheritProjectContext: true, inheritSkills: true }).lastIndexOf(CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS), 0);
+		assert.equal(rewriteSubagentPrompt(rewritten, { inheritProjectContext: true, inheritGlobalContext: true, inheritSkills: true }).indexOf(CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS), 0);
+		assert.equal(rewriteSubagentPrompt(rewritten, { inheritProjectContext: true, inheritGlobalContext: true, inheritSkills: true }).lastIndexOf(CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS), 0);
 	});
 
 	it("replaces inherited child boundaries with the fanout boundary when authorized", () => {
 		const strictPrompt = `${CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS}\n\n${BASE_PROMPT}`;
 		const rewritten = rewriteSubagentPrompt(strictPrompt, {
 			inheritProjectContext: true,
+			inheritGlobalContext: true,
 			inheritSkills: true,
 			fanoutChild: true,
 		});
@@ -837,6 +968,7 @@ describe("subagent prompt runtime", () => {
 		const fanoutPrompt = `${CHILD_FANOUT_BOUNDARY_INSTRUCTIONS}\n\n${BASE_PROMPT}`;
 		const rewritten = rewriteSubagentPrompt(fanoutPrompt, {
 			inheritProjectContext: true,
+			inheritGlobalContext: true,
 			inheritSkills: true,
 		});
 
@@ -848,6 +980,7 @@ describe("subagent prompt runtime", () => {
 	it("keeps explicitly injected skill content when inherited skills are stripped", () => {
 		const rewritten = rewriteSubagentPrompt(PROMPT_WITH_EXPLICIT_SKILL, {
 			inheritProjectContext: false,
+			inheritGlobalContext: false,
 			inheritSkills: false,
 		});
 		assert.ok(rewritten.includes("<skill name=\"explicit\">"));
@@ -865,6 +998,7 @@ describe("subagent prompt runtime", () => {
 		].join("");
 		const rewritten = rewriteSubagentPrompt(prompt, {
 			inheritProjectContext: false,
+			inheritGlobalContext: false,
 			inheritSkills: false,
 		});
 
@@ -877,6 +1011,7 @@ describe("subagent prompt runtime", () => {
 	it("strips the subagent orchestration skill even when inherited skills remain", () => {
 		const rewritten = rewriteSubagentPrompt(BASE_PROMPT, {
 			inheritProjectContext: true,
+			inheritGlobalContext: true,
 			inheritSkills: true,
 		});
 
@@ -1336,6 +1471,26 @@ describe("subagent prompt runtime", () => {
 		assert.equal(contextHandler?.({ messages }, { model: { api: "openai-responses" } }), undefined);
 	});
 
+	it("preserves composite tool ids for cursor-native children", () => {
+		let contextHandler: ((event: { messages: unknown[] }, ctx: { model?: { api: string } }) => { messages: unknown[] } | undefined) | undefined;
+		registerSubagentPromptRuntime({
+			on(event: string, handler: (payload: { messages: unknown[] }, ctx: { model?: { api: string } }) => { messages: unknown[] } | undefined) {
+				if (event === "context") contextHandler = handler;
+			},
+		} as { on(event: string, handler: (payload: { messages: unknown[] }, ctx: { model?: { api: string } }) => { messages: unknown[] } | undefined): void });
+
+		const toolCallId = "call_7XJjvAJfk07117JO8LgBCZjY\nfc_0e92b09b28010bac016a756e9e79cc8197b01825a5dc3d9eaa";
+		const messages = [
+			{ role: "user", content: "Task" },
+			{ role: "assistant", content: [{ type: "toolCall", id: toolCallId, name: "read", input: { path: "README.md" } }] },
+			{ role: "toolResult", toolName: "read", toolCallId, content: "file" },
+		];
+
+		assert.equal(contextHandler?.({ messages }, { model: { api: "cursor-native" } }), undefined);
+		assert.equal((messages[1] as { content: Array<{ id?: unknown }> }).content[0]?.id, toolCallId);
+		assert.equal((messages[2] as { toolCallId?: unknown }).toolCallId, toolCallId);
+	});
+
 	it("does not rewrite child context when no parent-only artifacts are present", () => {
 		let contextHandler: ((event: { messages: unknown[] }, ctx: { model?: { api: string } }) => { messages: unknown[] } | undefined) | undefined;
 		registerSubagentPromptRuntime({

package/dist/extensions/pi-subagents/test/unit/subagent-startup-retry.test.ts

@@ -78,7 +78,7 @@ describe("subagent startup retry", () => {
 		});
 
 		assert.match(formatted ?? "", /loaded conflicting ambient Pi extensions/);
-		assert.match(formatted ?? "", /\.pi\/settings\.json/);
+		assert.match(formatted ?? "", /\.selesai[\\/]settings\.json/);
 		assert.match(formatted ?? "", /\{"subagents":\{"agentOverrides":\{"reviewer":\{"extensions":\[\]\}\}\}\}/);
 		assert.equal(formatSubagentExtensionConflictError(conflict, { agent: "reviewer", ambientExtensionsEnabled: false }), conflict);
 		assert.equal(formatSubagentExtensionConflictError("authentication failed", { agent: "reviewer", ambientExtensionsEnabled: true }), "authentication failed");

package/dist/extensions/pi-subagents/test/unit/subagent-wait.test.ts

@@ -6,7 +6,7 @@ import { describe, it } from "node:test";
 import { updateActiveRunIndex } from "../../src/runs/background/active-run-index.ts";
 import { writeAsyncResultFile } from "../../src/runs/background/result-files.ts";
 import { createRunFanoutBudget } from "../../src/runs/shared/run-fanout-budget.ts";
-import { WAIT_TOOL_ENABLED_ENV, resolveWaitToolConfig, waitForSubagents, type SubagentWaitDeps } from "../../src/runs/background/subagent-wait.ts";
+import { WAIT_TOOL_DEFAULT_TIMEOUT_MS_ENV, WAIT_TOOL_ENABLED_ENV, resolveWaitToolConfig, waitForSubagents, type SubagentWaitDeps } from "../../src/runs/background/subagent-wait.ts";
 import { recordWaitCompletion } from "../../src/runs/background/wait-completions.ts";
 import type { AsyncStatus, SubagentState } from "../../src/shared/types.ts";
 
@@ -41,6 +41,7 @@ function writeRecoveryDescriptor(asyncRoot: string, runId: string, agent: string
 		cwd,
 		systemPromptMode: "append",
 		outputMode: "inline",
+		inheritGlobalContext: false,
 		inheritProjectContext: false,
 		inheritSkills: false,
 		maxSubagentDepth: 0,
@@ -88,10 +89,15 @@ describe("subagent_wait tool", () => {
 		assert.deepEqual(resolveWaitToolConfig(undefined, {}), { enabled: true });
 		assert.deepEqual(resolveWaitToolConfig(false, {}), { enabled: false });
 		assert.deepEqual(resolveWaitToolConfig({ enabled: false }, {}), { enabled: false });
+		assert.deepEqual(resolveWaitToolConfig({ defaultTimeoutMs: 120_000 }, {}), { enabled: true, defaultTimeoutMs: 120_000 });
+		assert.deepEqual(resolveWaitToolConfig({ defaultTimeoutMs: 120_000 }, { [WAIT_TOOL_DEFAULT_TIMEOUT_MS_ENV]: "3000" }), { enabled: true, defaultTimeoutMs: 3_000 });
 		assert.deepEqual(resolveWaitToolConfig({ enabled: false }, { [WAIT_TOOL_ENABLED_ENV]: "true" }), { enabled: true });
 		assert.deepEqual(resolveWaitToolConfig(true, { [WAIT_TOOL_ENABLED_ENV]: "off" }), { enabled: false });
 		assert.throws(() => resolveWaitToolConfig("false" as never, {}), /config\.waitTool/);
 		assert.throws(() => resolveWaitToolConfig({ enabled: "false" } as never, {}), /config\.waitTool\.enabled/);
+		assert.throws(() => resolveWaitToolConfig({ defaultTimeoutMs: 0 }, {}), /config\.waitTool\.defaultTimeoutMs/);
+		assert.throws(() => resolveWaitToolConfig({ defaultTimeoutMs: 1.5 }, {}), /config\.waitTool\.defaultTimeoutMs/);
+		assert.throws(() => resolveWaitToolConfig(undefined, { [WAIT_TOOL_DEFAULT_TIMEOUT_MS_ENV]: "0" }), /SELESAI_SUBAGENT_WAIT_TOOL_DEFAULT_TIMEOUT_MS/);
 		assert.throws(() => resolveWaitToolConfig(undefined, { [WAIT_TOOL_ENABLED_ENV]: "maybe" }), /SELESAI_SUBAGENT_WAIT_TOOL_ENABLED/);
 	});
 
@@ -335,6 +341,7 @@ describe("subagent_wait tool", () => {
 							success: true,
 							outputState: "present",
 							output: "full output text stays out of details",
+							usage: { input: 100, output: 50, cacheRead: 25, cacheWrite: 5, cost: 0.001, turns: 1 },
 							artifactPaths: {
 								outputPath: "/tmp/a1b2c3d4_reviewer_0_output.md",
 								metadataPath: "/tmp/a1b2c3d4_reviewer_0_meta.json",
@@ -350,6 +357,7 @@ describe("subagent_wait tool", () => {
 			assert.equal(completions![0]!.runId, "run-a");
 			assert.equal(completions![0]!.mode, "workflow");
 			assert.equal(completions![0]!.success, true);
+			assert.deepEqual(result.usage, { input: 100, output: 50, cacheRead: 25, cacheWrite: 5, totalTokens: 180, cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0.001 } });
 			const child = completions![0]!.results?.[0];
 			assert.equal(child?.agent, "reviewer");
 			assert.equal(child?.runId, "a1b2c3d4");
@@ -1145,11 +1153,62 @@ describe("subagent_wait tool", () => {
 				clock += ms + 10_000;
 			};
 
-			const result = await waitForSubagents({ timeoutMs: 5_000 }, undefined, baseDeps(root, state, { now, sleep }));
-			assert.equal(result.isError, true);
+			const result = await waitForSubagents({ timeoutMs: 5_000 }, undefined, baseDeps(root, state, { now, sleep, defaultTimeoutMs: 1_000 }));
+			assert.equal(result.isError, undefined);
 			const text = textOf(result);
-			assert.match(text, /timed out/i);
+			assert.match(text, /window elapsed after 5\.0s/i, "explicit timeoutMs must override the configured default");
 			assert.match(text, /run-stuck \(running\)/);
+			assert.deepEqual(result.details.wait, {
+				reason: "window_elapsed",
+				timedOut: true,
+				activeRunIds: ["run-stuck"],
+				activeProviderItems: [],
+			});
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
+	it("uses the configured wait window when timeoutMs is omitted", async () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-wait-config-timeout-"));
+		try {
+			const asyncRoot = path.join(root, "runs");
+			const state = makeState("sess-1");
+			writeStatus(asyncRoot, "run-configured", "running", { sessionId: "sess-1", pid: 999999 });
+			let clock = 0;
+			const result = await waitForSubagents({}, undefined, baseDeps(root, state, {
+				now: () => clock,
+				sleep: async (ms) => { clock += ms + 10_000; },
+				defaultTimeoutMs: 2_000,
+			}));
+
+			assert.equal(result.isError, undefined);
+			assert.match(textOf(result), /window elapsed after 2\.0s/i);
+			assert.equal(result.details.wait?.reason, "window_elapsed");
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
+	it("reports still-active provider identities when the wait window elapses", async () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-wait-provider-timeout-"));
+		try {
+			const state = makeState("sess-1");
+			let clock = 0;
+			const result = await waitForSubagents({ timeoutMs: 1_000 }, undefined, baseDeps(root, state, {
+				now: () => clock,
+				sleep: async (ms) => { clock += ms + 10_000; },
+				backgroundWork: {
+					snapshot: () => ({
+						providers: ["herdr"],
+						items: [{ provider: "herdr", id: "pane-1", sessionId: "sess-1" }],
+					}),
+					wakeChannels: () => [],
+				},
+			}));
+
+			assert.equal(result.isError, undefined);
+			assert.deepEqual(result.details.wait?.activeProviderItems, [{ provider: "herdr", id: "pane-1" }]);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}

package/dist/extensions/pi-subagents/test/unit/tool-description.test.ts

@@ -9,11 +9,8 @@ import {
 	buildSubagentToolDescription,
 	buildSubagentToolPromptMetadata,
 	COMPACT_SUBAGENT_TOOL_DESCRIPTION,
-	DEFAULT_SUBAGENT_TOOL_DESCRIPTION,
 	FULL_SUBAGENT_TOOL_DESCRIPTION,
 	SUBAGENT_SAFETY_GUIDANCE,
-	SUBAGENT_TOOL_PROMPT_GUIDELINES,
-	SUBAGENT_TOOL_PROMPT_SNIPPET,
 } from "../../src/extension/tool-description.ts";
 import { SUBAGENT_CHILD_ENV, SUBAGENT_FANOUT_CHILD_ENV } from "../../src/runs/shared/pi-args.ts";
 
@@ -32,31 +29,26 @@ function parentToolEnv(agentDir?: string): NodeJS.ProcessEnv {
 }
 
 describe("registered subagent tool description", () => {
-	it("uses split metadata by default", () => {
+	it("uses the full description by default", () => {
 		const description = buildSubagentToolDescription();
 		const metadata = buildSubagentToolPromptMetadata();
-		assert.equal(description, DEFAULT_SUBAGENT_TOOL_DESCRIPTION);
-		assert.equal(Buffer.byteLength(description), 712);
-		assert.equal(metadata.promptSnippet, SUBAGENT_TOOL_PROMPT_SNIPPET);
-		assert.equal(Buffer.byteLength(metadata.promptSnippet!), 62);
-		assert.deepEqual(metadata.promptGuidelines, SUBAGENT_TOOL_PROMPT_GUIDELINES);
-		assert.equal(Buffer.byteLength(metadata.promptGuidelines!.join("\n")), 1249);
-		assert.match(metadata.promptGuidelines!.join("\n"), /Use subagent only when delegation is needed/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /action: \"list\".*executable, non-disabled/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /workflowScript for multi-step or parallel work/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /workflowScript means exactly one top-level subagent tool call with async:true/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /Inside it, use runs\.run\/runs\.all to launch children/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /do not make another top-level subagent call for those children/i);
-		assert.match(metadata.promptGuidelines!.join("\n"), /await runs\.all.*do not read \.output from unawaited runs\.run launches/i);
+		assert.equal(description, FULL_SUBAGENT_TOOL_DESCRIPTION);
+		assert.equal(metadata.promptSnippet, undefined);
+		assert.equal(metadata.promptGuidelines, undefined);
+		assert.match(description, /^Run one child with \{ agent, task\? \}; use \{ workflowScript \} for inline orchestration/i);
+		assert.match(description, /SAFETY-CRITICAL SUBAGENT GUIDANCE/);
 	});
 
 	it("keeps the full description when configured", () => {
 		const description = buildSubagentToolDescription({ toolDescriptionMode: "full" });
 		assert.equal(buildSubagentToolPromptMetadata({ toolDescriptionMode: "full" }).promptSnippet, undefined);
-		assert.match(description, /^Run one child with \{ agent, task\? \}; use \{ workflowScript \} for orchestration/i);
+		assert.match(description, /^Run one child with \{ agent, task\? \}; use \{ workflowScript \} for inline orchestration or \{ workflowScriptPath \}/i);
+		assert.match(description, /workflowScriptPath:"workflows\/review\.js".*host reads the file.*sandbox/i);
 		assert.match(description, /SINGLE CHILD:.*starts exactly one direct child/i);
-		assert.match(description, /Do not combine agent\/task with action or workflowScript/i);
+		assert.match(description, /lane\.status.*lane\.recordMerge.*lane\.recordSupersession/i);
+		assert.match(description, /Do not combine agent\/task with action, workflowScript, or workflowScriptPath/i);
 		assert.match(description, /runs\.run for one child and await runs\.all.*ordinary parallel children/i);
+		assert.match(description, /runs\.lanes\(\[\{key,stages:.*later stages sequence per lane/i);
 		assert.match(description, /do not read \.output from unawaited runs\.run launches/i);
 		assert.match(description, /runs\.steer\(key, message, \{mode\?, index\?, ackTimeoutMs\?\}\).*prior keyed child.*without exposing its run id/i);
 		assert.match(description, /receipts are queued, delivered, missed, or failed/i);
@@ -74,19 +66,26 @@ describe("registered subagent tool description", () => {
 		assert.match(description, /continue independent work only until its next dependency barrier; consume the result before work that depends on it/i);
 		assert.match(description, /children\.list.*resumable\/not-resumable reasons/i);
 		assert.match(description, /Resume only rows reported resumable/i);
+		assert.match(description, /Each workflow key identifies one result lane.*new stable workflow key.*retained resume pass/i);
+		assert.match(description, /output.*not an output declaration.*outputReference.*outputPathMapping.*artifactPaths/i);
 		assert.match(description, /implementation challenge.*\{action:\"resume\", id:\"run-id\", message:\"\.\.\.\"\}/i);
 		assert.match(description, /Resume keeps the stored agent\/model\/tool contract/i);
 		assert.match(description, /Oracle\/advisor consultations should use supervisor dialogue for material unknowns when available/i);
 		assert.match(description, /same-role fallback challenge and label it as fallback/i);
 		assert.match(description, /status\.json/);
+		assert.match(description, /suffix on the model string.*off\/minimal\/low\/medium\/high\/xhigh\/max/i);
+		assert.match(description, /suffix wins over the agent's thinking default/i);
+		assert.match(description, /watchdog\.configure' and is ignored on dispatch/i);
 	});
 
 	it("offers a compact mode that keeps the two-tier contract and safety guidance", () => {
 		const description = buildSubagentToolDescription({ toolDescriptionMode: "compact" });
 		assert.equal(description, COMPACT_SUBAGENT_TOOL_DESCRIPTION);
-		assert.match(description, /^Run one child with \{ agent, task\? \}; use \{ workflowScript \} for orchestration/i);
+		assert.match(description, /^Run one child with \{ agent, task\? \}; use \{ workflowScript \} for inline orchestration or \{ workflowScriptPath \}/i);
+		assert.match(description, /workflowScriptPath:"workflows\/review\.js".*request cwd.*sandbox/i);
 		assert.match(description, /SINGLE .*starts exactly one direct child/i);
 		assert.match(description, /runs\.run for one child and await runs\.all.*ordinary parallel work/i);
+		assert.match(description, /runs\.lanes\(\[\{key,stages:.*later stages sequence per lane/i);
 		assert.match(description, /do not read \.output from unawaited runs\.run launches/i);
 		assert.match(description, /runs\.steer\(key,message,options\?\).*prior keyed child/i);
 		assert.match(description, /never accepts a raw run id/i);
@@ -95,12 +94,17 @@ describe("registered subagent tool description", () => {
 		assert.match(description, /subagent_wait/i);
 		assert.match(description, /continue independent work only until its next dependency barrier; consume the result before work that depends on it/i);
 		assert.match(description, /children\.list.*resume only rows reported resumable/i);
+		assert.match(description, /Each workflow key identifies one result lane.*new stable workflow key.*retained resume pass/i);
+		assert.match(description, /output.*not an output declaration.*outputReference.*outputPathMapping.*artifactPaths/i);
 		assert.match(description, /\{action:\"resume\",id:\"run-id\",message:\"\.\.\.\"\} for a simple follow-up or challenge/i);
 		assert.match(description, /resume keeps the stored agent\/model\/tool contract/i);
 		assert.match(description, /Oracle\/advisor consultations use available supervisor dialogue/i);
 		assert.match(description, /same-role fallback challenge and label it as fallback/i);
 		assert.match(description, /exactly one non-empty title or summary/i);
 		assert.match(description, /goal may only be true and requires budget:\{tokens\}/i);
+		assert.match(description, /Per-run thinking is a suffix on the model string.*off\/minimal\/low\/medium\/high\/xhigh\/max/i);
+		assert.match(description, /suffix wins over the agent's thinking default/i);
+		assert.match(description, /watchdog\.configure' and is ignored on dispatch/i);
 		assert.ok(description.length < FULL_SUBAGENT_TOOL_DESCRIPTION.length);
 	});
 
@@ -258,9 +262,9 @@ describe("registered subagent tool description", () => {
 		const defaultAgentDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagents-tool-desc-default-"));
 		writeExtensionConfig(defaultAgentDir, {});
 		const defaultTool = readRegisteredTool(defaultAgentDir);
-		assert.equal(defaultTool.description, DEFAULT_SUBAGENT_TOOL_DESCRIPTION);
-		assert.equal(defaultTool.promptSnippet, SUBAGENT_TOOL_PROMPT_SNIPPET);
-		assert.deepEqual(defaultTool.promptGuidelines, SUBAGENT_TOOL_PROMPT_GUIDELINES);
+		assert.equal(defaultTool.description, FULL_SUBAGENT_TOOL_DESCRIPTION);
+		assert.equal(defaultTool.promptSnippet, undefined);
+		assert.equal(defaultTool.promptGuidelines, undefined);
 
 		const fullAgentDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagents-tool-desc-full-"));
 		writeExtensionConfig(fullAgentDir, { toolDescriptionMode: "full" });

package/dist/extensions/pi-subagents/test/unit/wait-completions.test.ts

@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { toWaitCompletion } from "../../src/runs/background/wait-completions.ts";
+
+describe("workflow wait completion projection", () => {
+	it("retains the bounded workflow-child summary and excludes result output", () => {
+		const completion = toWaitCompletion({
+			agent: "workflow",
+			mode: "workflow",
+			state: "complete",
+			success: true,
+			workflowChildren: {
+				version: 1,
+				parentToolCallId: "tool-1",
+				workflowRunId: "workflow-1",
+				inventoryComplete: true,
+				workflowState: "completed",
+				children: [{ childId: "review", runId: "run-1", agent: "reviewer", model: "openai-codex/gpt", thinking: "high", state: "completed" }],
+			},
+			results: [{
+				agent: "reviewer",
+				runId: "run-1",
+				success: true,
+				sessionFile: "/sessions/run-1.jsonl",
+				usage: { input: 10, output: 2, cacheRead: 30, cacheWrite: 0, cost: 0.04, turns: 1 },
+				output: "must not be copied",
+				task: "must not be copied",
+			}],
+		}, "workflow-1");
+
+		assert.equal(completion.workflowChildren?.children[0]?.childId, "review");
+		assert.deepEqual(completion.results?.[0]?.usage, { input: 10, output: 2, cacheRead: 30, cacheWrite: 0, cost: 0.04, turns: 1 });
+		assert.equal(completion.results?.[0]?.sessionFile, "/sessions/run-1.jsonl");
+		assert.doesNotMatch(JSON.stringify(completion), /must not be copied/);
+	});
+
+	it("rejects unbounded or unknown summary fields at the replay boundary", () => {
+		assert.throws(() => toWaitCompletion({ workflowChildren: { version: 1, parentToolCallId: "tool", workflowRunId: "run", inventoryComplete: true, workflowState: "completed", children: [], output: "secret" } }, "run"), /unsupported fields/);
+	});
+
+	it("rejects a summary bound to another completion", () => {
+		assert.throws(() => toWaitCompletion({ workflowChildren: { version: 1, parentToolCallId: "tool", workflowRunId: "other", inventoryComplete: true, workflowState: "completed", children: [] } }, "run"), /does not match its completion run id/);
+	});
+});

package/dist/extensions/pi-subagents/test/unit/wait-subscriptions.test.ts

@@ -35,6 +35,7 @@ function writeRecoveryDescriptor(asyncRoot: string, runId: string, agent: string
 		cwd,
 		systemPromptMode: "append",
 		outputMode: "inline",
+		inheritGlobalContext: false,
 		inheritProjectContext: false,
 		inheritSkills: false,
 		maxSubagentDepth: 0,