pi-crew 0.1.45 → 0.1.49

package/src/extension/registration/subagent-tools.ts

@@ -1,148 +1,149 @@
-import type { ExtensionAPI, ToolDefinition } from "@mariozechner/pi-coding-agent";
-import { Type } from "typebox";
-import type { TeamToolParamsValue } from "../../schema/team-tool-schema.ts";
-import { handleTeamTool } from "../team-tool.ts";
-import { checkSubagentSpawnPermission, currentCrewRole } from "../../runtime/role-permission.ts";
-import { readPersistedSubagentRecord, savePersistedSubagentRecord, type SubagentManager, type SubagentSpawnOptions } from "../../subagents/manager.ts";
-import { loadConfig } from "../../config/config.ts";
-import { logInternalError } from "../../utils/internal-error.ts";
-import { __test__subagentSpawnParams, formatSubagentRecord, readSubagentRunResult, refreshPersistedSubagentRecord, subagentToolResult } from "./subagent-helpers.ts";
-import { t } from "../../i18n.ts";
-
-export interface SubagentToolRegistrationOptions {
-	ownerSessionGeneration?: () => number;
-}
-
-export function registerSubagentTools(pi: ExtensionAPI, subagentManager: SubagentManager, options: SubagentToolRegistrationOptions = {}): void {
-	const agentTool: ToolDefinition = {
-		name: "Agent",
-		label: "Agent",
-		description: "Launch a real pi-crew subagent. Uses pi-crew's durable child-process runtime by default; set run_in_background=true for parallel/background work, then use get_subagent_result.",
-		promptSnippet: "Use Agent to delegate focused work to a real pi-crew subagent. Use run_in_background=true for parallel work and get_subagent_result to join results.",
-		promptGuidelines: [
-			"Use Agent for independent exploration, review, verification, or implementation subtasks instead of doing all work in the parent turn.",
-			"For parallel work, launch multiple Agent calls with run_in_background=true, then call get_subagent_result for each result.",
-			"Available pi-crew subagent types include explorer, planner, analyst, executor, reviewer, verifier, writer, security-reviewer, and test-engineer.",
-		],
-		parameters: Type.Object({
-			prompt: Type.String({ description: "The task for the subagent to perform." }),
-			description: Type.String({ description: "Short 3-5 word task description." }),
-			subagent_type: Type.String({ description: "pi-crew agent name, e.g. explorer, planner, executor, reviewer, verifier, writer, security-reviewer, test-engineer." }),
-			model: Type.Optional(Type.String({ description: "Optional model override. If omitted, pi-crew uses Pi-configured model fallback." })),
-			max_turns: Type.Optional(Type.Number({ description: "Reserved for live-session subagents; child-process runtime may ignore this." })),
-			run_in_background: Type.Optional(Type.Boolean({ description: "Run in background and return an agent ID immediately." })),
-		}) as never,
-		async execute(_id, params, signal, _onUpdate, ctx) {
-			const currentRole = currentCrewRole();
-			const permission = checkSubagentSpawnPermission(currentRole);
-			if (!permission.allowed) return subagentToolResult(permission.reason ?? "Current role cannot spawn subagents.", { role: currentRole, mode: permission.mode }, true);
-			const spawnOptions = __test__subagentSpawnParams(params as Record<string, unknown>, ctx);
-			spawnOptions.ownerSessionGeneration = options.ownerSessionGeneration?.();
-			if (!spawnOptions.prompt.trim()) return subagentToolResult(t("agent.requiresPrompt"), {}, true);
-			const runner = async (currentOptions: SubagentSpawnOptions, childSignal?: AbortSignal) => handleTeamTool({ action: "run", agent: currentOptions.type, goal: currentOptions.prompt, model: currentOptions.model, async: currentOptions.background, config: currentOptions.maxTurns ? { runtime: { maxTurns: currentOptions.maxTurns } } : undefined } as TeamToolParamsValue, currentOptions.background ? { ...ctx, signal: childSignal } : { ...ctx, signal: childSignal });
-			const record = subagentManager.spawn(spawnOptions, runner, spawnOptions.background ? undefined : signal);
-			if (spawnOptions.background || record.status === "queued") {
-				// Phase 1.1a: Terminate turn for background queued — no LLM follow-up needed.
-				// Phase 1.6: Record was terminated for telemetry.
-				record.terminated = true;
-				savePersistedSubagentRecord(ctx.cwd, record);
-				return { ...subagentToolResult([t("agent.started", { state: record.status === "queued" ? "queued" : "started" }), t("agent.id", { id: record.id }), t("agent.type", { type: record.type }), t("agent.description", { description: record.description }), t("agent.retrieveHint")].join("\n"), { agentId: record.id, status: record.status }), terminate: true };
-			}
-			await record.promise;
-			const output = readSubagentRunResult(ctx, record) ?? record.result ?? t("agent.noOutput");
-			const foregroundResult = subagentToolResult([t("agent.foregroundStatus", { id: record.id, status: record.status }), "", output].join("\n"), { agentId: record.id, runId: record.runId, status: record.status }, record.status === "failed" || record.status === "error");
-			if (loadConfig(ctx.cwd).config.tools?.terminateOnForeground === true) {
-				record.terminated = true;
-				savePersistedSubagentRecord(ctx.cwd, record);
-				return { ...foregroundResult, terminate: true };
-			}
-			return foregroundResult;
-		},
-	};
-
-	const getSubagentResultTool: ToolDefinition = {
-		name: "get_subagent_result",
-		label: "Get Agent Result",
-		description: "Check status and retrieve results from a pi-crew background subagent.",
-		parameters: Type.Object({ agent_id: Type.String({ description: "Agent ID returned by Agent." }), wait: Type.Optional(Type.Boolean({ description: "Wait for completion before returning." })), verbose: Type.Optional(Type.Boolean({ description: "Include status metadata before output." })) }) as never,
-		async execute(_id, params, signal, _onUpdate, ctx) {
-			const p = params as { agent_id?: string; wait?: boolean; verbose?: boolean };
-			if (!p.agent_id) return subagentToolResult(t("result.requiresAgentId"), {}, true);
-			const inMemory = subagentManager.getRecord(p.agent_id);
-			const record = inMemory ?? readPersistedSubagentRecord(ctx.cwd, p.agent_id);
-			if (!record) return subagentToolResult(t("result.notFound", { id: p.agent_id }), {}, true);
-			let current = refreshPersistedSubagentRecord(ctx, record);
-			if (inMemory && current !== inMemory) Object.assign(inMemory, current);
-			if (!inMemory && !current.runId && (current.status === "running" || current.status === "queued")) {
-				current = { ...current, status: "error", error: t("result.unrecoverable"), completedAt: current.completedAt ?? Date.now() };
-				savePersistedSubagentRecord(ctx.cwd, current);
-			}
-			if (p.wait && (current.status === "running" || current.status === "queued")) {
-				const waited = await subagentManager.waitForRecord(current.id);
-				if (waited) current = waited;
-				if (current.status === "blocked") {
-					current.resultConsumed = false;
-					if (inMemory) inMemory.resultConsumed = false;
-					savePersistedSubagentRecord(ctx.cwd, current);
-				} else {
-					const waitStartMs = Date.now();
-					const maxWaitMs = 300_000; // 5 minutes
-					while (current.status === "running" || current.status === "queued") {
-						if (signal?.aborted) {
-							current = { ...current, status: "error", error: t("result.waitAborted"), completedAt: Date.now() };
-							savePersistedSubagentRecord(ctx.cwd, current);
-							break;
-						}
-						if (Date.now() - waitStartMs > maxWaitMs) {
-							current = { ...current, status: "error", error: t("result.waitTimeout"), completedAt: Date.now() };
-							savePersistedSubagentRecord(ctx.cwd, current);
-							break;
-						}
-						await new Promise((resolve) => setTimeout(resolve, 1000));
-						current = refreshPersistedSubagentRecord(ctx, current);
-						if (!current.runId) break;
-					}
-				}
-			}
-			const output = readSubagentRunResult(ctx, current);
-			if (current.status !== "running" && current.status !== "queued" && current.status !== "blocked") {
-				current.resultConsumed = true;
-				if (inMemory) inMemory.resultConsumed = true;
-				savePersistedSubagentRecord(ctx.cwd, current);
-			}
-			const text = [p.verbose ? formatSubagentRecord(current) : undefined, output ? `${p.verbose ? "\n" : ""}${output}` : current.status === "running" || current.status === "queued" ? t("result.stillRunning") : current.error ?? t("agent.noOutput")].filter((line): line is string => Boolean(line)).join("\n");
-			return subagentToolResult(text, { agentId: current.id, runId: current.runId, status: current.status }, current.status === "failed" || current.status === "error");
-		},
-	};
-
-	const steerSubagentTool: ToolDefinition = {
-		name: "steer_subagent",
-		label: "Steer Agent",
-		description: "Send a steering note to a running pi-crew subagent. Live-session steering is planned; child-process runs expose durable status and can be cancelled if needed.",
-		parameters: Type.Object({ agent_id: Type.String(), message: Type.String() }) as never,
-		async execute(_id, params, _signal, _onUpdate, ctx) {
-			const p = params as { agent_id?: string; message?: string };
-			const record = p.agent_id ? subagentManager.getRecord(p.agent_id) ?? readPersistedSubagentRecord(ctx.cwd, p.agent_id) : undefined;
-			if (!record) return subagentToolResult(t("result.notFound", { id: p.agent_id ?? "" }), {}, true);
-			return subagentToolResult([t("steer.noted", { id: record.id }), t("steer.unavailable"), record.runId ? t("steer.cancelHint", { runId: record.runId }) : undefined].filter((line): line is string => Boolean(line)).join("\n"), { agentId: record.id, runId: record.runId, status: record.status });
-		},
-	};
-
-	const crewAgentTool: ToolDefinition = { ...agentTool, name: "crew_agent", label: "Crew Agent", description: "Launch a real pi-crew subagent using a conflict-safe pi-crew-specific tool name.", promptSnippet: "Use crew_agent when you need pi-crew subagents and another extension may own the generic Agent tool." };
-	const crewAgentResultTool: ToolDefinition = { ...getSubagentResultTool, name: "crew_agent_result", label: "Get Crew Agent Result", description: "Check status and retrieve results from a pi-crew subagent using the conflict-safe tool name." };
-	const crewAgentSteerTool: ToolDefinition = { ...steerSubagentTool, name: "crew_agent_steer", label: "Steer Crew Agent", description: "Send a steering note to a pi-crew subagent using the conflict-safe tool name." };
-	const toolConfig = loadConfig(process.cwd()).config.tools;
-	const enableSteer = toolConfig?.enableSteer !== false;
-	const enableClaudeStyleAliases = toolConfig?.enableClaudeStyleAliases !== false;
-
-	for (const extraTool of enableSteer ? [crewAgentTool, crewAgentResultTool, crewAgentSteerTool] : [crewAgentTool, crewAgentResultTool]) pi.registerTool(extraTool);
-	if (enableClaudeStyleAliases) {
-		for (const extraTool of enableSteer ? [agentTool, getSubagentResultTool, steerSubagentTool] : [agentTool, getSubagentResultTool]) {
-			try {
-				pi.registerTool(extraTool);
-			} catch (error) {
-				logInternalError("register.duplicate-tool", error, `tool=${extraTool.name}`);
-			}
-		}
-	}
-}
+import type { ExtensionAPI, ToolDefinition } from "@mariozechner/pi-coding-agent";
+import { Type } from "typebox";
+import type { TeamToolParamsValue } from "../../schema/team-tool-schema.ts";
+import { handleTeamTool } from "../team-tool.ts";
+import { checkSubagentSpawnPermission, currentCrewRole } from "../../runtime/role-permission.ts";
+import { readPersistedSubagentRecord, savePersistedSubagentRecord, type SubagentManager, type SubagentSpawnOptions } from "../../subagents/manager.ts";
+import { loadConfig } from "../../config/config.ts";
+import { logInternalError } from "../../utils/internal-error.ts";
+import { __test__subagentSpawnParams, formatSubagentRecord, readSubagentRunResult, refreshPersistedSubagentRecord, subagentToolResult } from "./subagent-helpers.ts";
+import { t } from "../../i18n.ts";
+
+export interface SubagentToolRegistrationOptions {
+	ownerSessionGeneration?: () => number;
+}
+
+export function registerSubagentTools(pi: ExtensionAPI, subagentManager: SubagentManager, options: SubagentToolRegistrationOptions = {}): void {
+	const agentTool: ToolDefinition = {
+		name: "Agent",
+		label: "Agent",
+		description: "Launch a real pi-crew subagent. Uses pi-crew's durable child-process runtime by default; set run_in_background=true for parallel/background work, then use get_subagent_result.",
+		promptSnippet: "Use Agent to delegate focused work to a real pi-crew subagent. Use run_in_background=true for parallel work and get_subagent_result to join results.",
+		promptGuidelines: [
+			"Use Agent for independent exploration, review, verification, or implementation subtasks instead of doing all work in the parent turn.",
+			"For parallel work, launch multiple Agent calls with run_in_background=true, then call get_subagent_result for each result.",
+			"Available pi-crew subagent types include explorer, planner, analyst, executor, reviewer, verifier, writer, security-reviewer, and test-engineer.",
+		],
+		parameters: Type.Object({
+			prompt: Type.String({ description: "The task for the subagent to perform." }),
+			description: Type.String({ description: "Short 3-5 word task description." }),
+			subagent_type: Type.String({ description: "pi-crew agent name, e.g. explorer, planner, executor, reviewer, verifier, writer, security-reviewer, test-engineer." }),
+			model: Type.Optional(Type.String({ description: "Optional model override. If omitted, pi-crew uses Pi-configured model fallback." })),
+			skill: Type.Optional(Type.Union([Type.String(), Type.Array(Type.String()), Type.Boolean()], { description: "Skill name(s) to inject for this subagent, or false to disable selected/default skills." })),
+			max_turns: Type.Optional(Type.Number({ description: "Reserved for live-session subagents; child-process runtime may ignore this." })),
+			run_in_background: Type.Optional(Type.Boolean({ description: "Run in background and return an agent ID immediately." })),
+		}) as never,
+		async execute(_id, params, signal, _onUpdate, ctx) {
+			const currentRole = currentCrewRole();
+			const permission = checkSubagentSpawnPermission(currentRole);
+			if (!permission.allowed) return subagentToolResult(permission.reason ?? "Current role cannot spawn subagents.", { role: currentRole, mode: permission.mode }, true);
+			const spawnOptions = __test__subagentSpawnParams(params as Record<string, unknown>, ctx);
+			spawnOptions.ownerSessionGeneration = options.ownerSessionGeneration?.();
+			if (!spawnOptions.prompt.trim()) return subagentToolResult(t("agent.requiresPrompt"), {}, true);
+			const runner = async (currentOptions: SubagentSpawnOptions, childSignal?: AbortSignal) => handleTeamTool({ action: "run", agent: currentOptions.type, goal: currentOptions.prompt, model: currentOptions.model, skill: currentOptions.skill, async: currentOptions.background, config: currentOptions.maxTurns ? { runtime: { maxTurns: currentOptions.maxTurns } } : undefined } as TeamToolParamsValue, currentOptions.background ? { ...ctx, signal: childSignal } : { ...ctx, signal: childSignal });
+			const record = subagentManager.spawn(spawnOptions, runner, spawnOptions.background ? undefined : signal);
+			if (spawnOptions.background || record.status === "queued") {
+				// Phase 1.1a: Terminate turn for background queued — no LLM follow-up needed.
+				// Phase 1.6: Record was terminated for telemetry.
+				record.terminated = true;
+				savePersistedSubagentRecord(ctx.cwd, record);
+				return { ...subagentToolResult([t("agent.started", { state: record.status === "queued" ? "queued" : "started" }), t("agent.id", { id: record.id }), t("agent.type", { type: record.type }), t("agent.description", { description: record.description }), t("agent.retrieveHint")].join("\n"), { agentId: record.id, status: record.status }), terminate: true };
+			}
+			await record.promise;
+			const output = readSubagentRunResult(ctx, record) ?? record.result ?? t("agent.noOutput");
+			const foregroundResult = subagentToolResult([t("agent.foregroundStatus", { id: record.id, status: record.status }), "", output].join("\n"), { agentId: record.id, runId: record.runId, status: record.status }, record.status === "failed" || record.status === "error");
+			if (loadConfig(ctx.cwd).config.tools?.terminateOnForeground === true) {
+				record.terminated = true;
+				savePersistedSubagentRecord(ctx.cwd, record);
+				return { ...foregroundResult, terminate: true };
+			}
+			return foregroundResult;
+		},
+	};
+
+	const getSubagentResultTool: ToolDefinition = {
+		name: "get_subagent_result",
+		label: "Get Agent Result",
+		description: "Check status and retrieve results from a pi-crew background subagent.",
+		parameters: Type.Object({ agent_id: Type.String({ description: "Agent ID returned by Agent." }), wait: Type.Optional(Type.Boolean({ description: "Wait for completion before returning." })), verbose: Type.Optional(Type.Boolean({ description: "Include status metadata before output." })) }) as never,
+		async execute(_id, params, signal, _onUpdate, ctx) {
+			const p = params as { agent_id?: string; wait?: boolean; verbose?: boolean };
+			if (!p.agent_id) return subagentToolResult(t("result.requiresAgentId"), {}, true);
+			const inMemory = subagentManager.getRecord(p.agent_id);
+			const record = inMemory ?? readPersistedSubagentRecord(ctx.cwd, p.agent_id);
+			if (!record) return subagentToolResult(t("result.notFound", { id: p.agent_id }), {}, true);
+			let current = refreshPersistedSubagentRecord(ctx, record);
+			if (inMemory && current !== inMemory) Object.assign(inMemory, current);
+			if (!inMemory && !current.runId && (current.status === "running" || current.status === "queued")) {
+				current = { ...current, status: "error", error: t("result.unrecoverable"), completedAt: current.completedAt ?? Date.now() };
+				savePersistedSubagentRecord(ctx.cwd, current);
+			}
+			if (p.wait && (current.status === "running" || current.status === "queued")) {
+				const waited = await subagentManager.waitForRecord(current.id);
+				if (waited) current = waited;
+				if (current.status === "blocked") {
+					current.resultConsumed = false;
+					if (inMemory) inMemory.resultConsumed = false;
+					savePersistedSubagentRecord(ctx.cwd, current);
+				} else {
+					const waitStartMs = Date.now();
+					const maxWaitMs = 300_000; // 5 minutes
+					while (current.status === "running" || current.status === "queued") {
+						if (signal?.aborted) {
+							current = { ...current, status: "error", error: t("result.waitAborted"), completedAt: Date.now() };
+							savePersistedSubagentRecord(ctx.cwd, current);
+							break;
+						}
+						if (Date.now() - waitStartMs > maxWaitMs) {
+							current = { ...current, status: "error", error: t("result.waitTimeout"), completedAt: Date.now() };
+							savePersistedSubagentRecord(ctx.cwd, current);
+							break;
+						}
+						await new Promise((resolve) => setTimeout(resolve, 1000));
+						current = refreshPersistedSubagentRecord(ctx, current);
+						if (!current.runId) break;
+					}
+				}
+			}
+			const output = readSubagentRunResult(ctx, current);
+			if (current.status !== "running" && current.status !== "queued" && current.status !== "blocked") {
+				current.resultConsumed = true;
+				if (inMemory) inMemory.resultConsumed = true;
+				savePersistedSubagentRecord(ctx.cwd, current);
+			}
+			const text = [p.verbose ? formatSubagentRecord(current) : undefined, output ? `${p.verbose ? "\n" : ""}${output}` : current.status === "running" || current.status === "queued" ? t("result.stillRunning") : current.error ?? t("agent.noOutput")].filter((line): line is string => Boolean(line)).join("\n");
+			return subagentToolResult(text, { agentId: current.id, runId: current.runId, status: current.status }, current.status === "failed" || current.status === "error");
+		},
+	};
+
+	const steerSubagentTool: ToolDefinition = {
+		name: "steer_subagent",
+		label: "Steer Agent",
+		description: "Send a steering note to a running pi-crew subagent. Live-session steering is planned; child-process runs expose durable status and can be cancelled if needed.",
+		parameters: Type.Object({ agent_id: Type.String(), message: Type.String() }) as never,
+		async execute(_id, params, _signal, _onUpdate, ctx) {
+			const p = params as { agent_id?: string; message?: string };
+			const record = p.agent_id ? subagentManager.getRecord(p.agent_id) ?? readPersistedSubagentRecord(ctx.cwd, p.agent_id) : undefined;
+			if (!record) return subagentToolResult(t("result.notFound", { id: p.agent_id ?? "" }), {}, true);
+			return subagentToolResult([t("steer.noted", { id: record.id }), t("steer.unavailable"), record.runId ? t("steer.cancelHint", { runId: record.runId }) : undefined].filter((line): line is string => Boolean(line)).join("\n"), { agentId: record.id, runId: record.runId, status: record.status });
+		},
+	};
+
+	const crewAgentTool: ToolDefinition = { ...agentTool, name: "crew_agent", label: "Crew Agent", description: "Launch a real pi-crew subagent using a conflict-safe pi-crew-specific tool name.", promptSnippet: "Use crew_agent when you need pi-crew subagents and another extension may own the generic Agent tool." };
+	const crewAgentResultTool: ToolDefinition = { ...getSubagentResultTool, name: "crew_agent_result", label: "Get Crew Agent Result", description: "Check status and retrieve results from a pi-crew subagent using the conflict-safe tool name." };
+	const crewAgentSteerTool: ToolDefinition = { ...steerSubagentTool, name: "crew_agent_steer", label: "Steer Crew Agent", description: "Send a steering note to a pi-crew subagent using the conflict-safe tool name." };
+	const toolConfig = loadConfig(process.cwd()).config.tools;
+	const enableSteer = toolConfig?.enableSteer !== false;
+	const enableClaudeStyleAliases = toolConfig?.enableClaudeStyleAliases !== false;
+
+	for (const extraTool of enableSteer ? [crewAgentTool, crewAgentResultTool, crewAgentSteerTool] : [crewAgentTool, crewAgentResultTool]) pi.registerTool(extraTool);
+	if (enableClaudeStyleAliases) {
+		for (const extraTool of enableSteer ? [agentTool, getSubagentResultTool, steerSubagentTool] : [agentTool, getSubagentResultTool]) {
+			try {
+				pi.registerTool(extraTool);
+			} catch (error) {
+				logInternalError("register.duplicate-tool", error, `tool=${extraTool.name}`);
+			}
+		}
+	}
+}

package/src/extension/registration/team-tool.ts

@@ -1,5 +1,4 @@
 import * as fs from "node:fs";
-import * as path from "node:path";
 import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@mariozechner/pi-coding-agent";
 import { loadConfig } from "../../config/config.ts";
 import { TeamToolParams, type TeamToolParamsValue } from "../../schema/team-tool-schema.ts";
@@ -9,12 +8,15 @@ import { updatePiCrewPowerbar } from "../../ui/powerbar-publisher.ts";
 import type { createManifestCache } from "../../runtime/manifest-cache.ts";
 import type { createRunSnapshotCache } from "../../ui/run-snapshot-cache.ts";
 import type { MetricRegistry } from "../../observability/metric-registry.ts";
+import { resolveRealContainedPath } from "../../utils/safe-paths.ts";
 import { handleTeamTool } from "../team-tool.ts";
+import { withSessionId } from "../team-tool/context.ts";
 import { toolResult } from "../tool-result.ts";
 
 export interface RegisterTeamToolDeps {
-	foregroundControllers: Set<AbortController>;
+	foregroundControllers: Map<string | symbol, AbortController>;
 	startForegroundRun: (ctx: ExtensionContext, runner: (signal?: AbortSignal) => Promise<void>, runId?: string) => void;
+	abortForegroundRun: (runId: string) => boolean;
 	openLiveSidebar: (ctx: ExtensionContext, runId: string) => void;
 	getManifestCache: (cwd: string) => ReturnType<typeof createManifestCache>;
 	getRunSnapshotCache?: (cwd: string) => ReturnType<typeof createRunSnapshotCache>;
@@ -23,15 +25,16 @@ export interface RegisterTeamToolDeps {
 	onJsonEvent?: (taskId: string, runId: string, event: unknown) => void;
 }
 
-function resolveCwdOverride(baseCwd: string, override: string | undefined): { ok: true; cwd: string } | { ok: false; error: string } {
+export function resolveCwdOverride(baseCwd: string, override: string | undefined): { ok: true; cwd: string } | { ok: false; error: string } {
 	if (!override) return { ok: true, cwd: baseCwd };
-	const resolved = path.resolve(baseCwd, override);
 	try {
+		const resolved = resolveRealContainedPath(baseCwd, override);
 		const stat = fs.statSync(resolved);
 		if (!stat.isDirectory()) return { ok: false, error: `cwd override is not a directory: ${resolved}` };
 		return { ok: true, cwd: resolved };
-	} catch {
-		return { ok: false, error: `cwd override does not exist: ${resolved}` };
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return { ok: false, error: `Invalid cwd override: ${message}` };
 	}
 }
 
@@ -44,20 +47,21 @@ export function registerTeamTool(pi: ExtensionAPI, deps: RegisterTeamToolDeps):
 		parameters: TeamToolParams as never,
 		async execute(_id, params, signal, _onUpdate, ctx) {
 			const controller = new AbortController();
-			deps.foregroundControllers.add(controller);
+			const toolKey = Symbol();
+			deps.foregroundControllers.set(toolKey, controller);
 			const abort = (): void => controller.abort();
 			signal?.addEventListener("abort", abort, { once: true });
 			try {
 				const resolved = params as TeamToolParamsValue;
 				const cwdOverride = resolveCwdOverride(ctx.cwd, resolved.cwd);
 				if (!cwdOverride.ok) return toolResult(cwdOverride.error, { action: resolved.action ?? "list", status: "error" }, true);
-				const toolCtx = { ...ctx, cwd: cwdOverride.cwd };
+				const toolCtx = withSessionId({ ...ctx, cwd: cwdOverride.cwd });
 				// Phase 1.5: Auto-set session name from team run context
 				if (resolved.action === "run" && resolved.goal && !pi.getSessionName()) {
 					const runLabel = resolved.team ?? resolved.agent ?? "direct";
 					pi.setSessionName(`pi-crew: ${runLabel}/${resolved.workflow ?? "default"} — ${resolved.goal.slice(0, 60)}`);
 				}
-				const output = await handleTeamTool(resolved, { ...toolCtx, signal: controller.signal, metricRegistry: deps.getMetricRegistry?.(), startForegroundRun: (runner, runId) => deps.startForegroundRun(toolCtx, runner, runId), onRunStarted: (runId) => deps.openLiveSidebar(toolCtx, runId), onJsonEvent: deps.onJsonEvent });
+				const output = await handleTeamTool(resolved, { ...toolCtx, signal: controller.signal, metricRegistry: deps.getMetricRegistry?.(), startForegroundRun: (runner, runId) => deps.startForegroundRun(toolCtx, runner, runId), abortForegroundRun: deps.abortForegroundRun, onRunStarted: (runId) => deps.openLiveSidebar(toolCtx, runId), onJsonEvent: deps.onJsonEvent });
 				if (resolved.action === "run" && !output.isError && typeof output.details?.runId === "string") {
 					pi.appendEntry("crew:run-started", {
 						runId: output.details.runId,
@@ -77,7 +81,7 @@ export function registerTeamTool(pi: ExtensionAPI, deps: RegisterTeamToolDeps):
 				return output;
 			} finally {
 				signal?.removeEventListener("abort", abort);
-				deps.foregroundControllers.delete(controller);
+				deps.foregroundControllers.delete(toolKey);
 			}
 		},
 	};

package/src/extension/run-index.ts

@@ -3,9 +3,14 @@ import * as path from "node:path";
 import type { TeamRunManifest } from "../state/types.ts";
 import { DEFAULT_PATHS } from "../config/defaults.ts";
 import { findRepoRoot, projectCrewRoot, userCrewRoot } from "../utils/paths.ts";
+import { activeRunEntries } from "../state/active-run-registry.ts";
 import { isSafePathId, resolveRealContainedPath } from "../utils/safe-paths.ts";
+import { sharedScanCache } from "../utils/scan-cache.ts";
+import { CancellationToken, createCancellationToken } from "../runtime/cancellation-token.ts";
 
 function readManifest(filePath: string): TeamRunManifest | undefined {
+	const cached = sharedScanCache.readAndCache("manifests", filePath, filePath);
+	if (cached) return cached.raw as TeamRunManifest;
 	try {
 		return JSON.parse(fs.readFileSync(filePath, "utf-8")) as TeamRunManifest;
 	} catch {
@@ -13,23 +18,25 @@ function readManifest(filePath: string): TeamRunManifest | undefined {
 	}
 }
 
-function collectRuns(root: string, maxEntries?: number): TeamRunManifest[] {
+function collectRuns(root: string, maxEntries?: number, signal?: AbortSignal): TeamRunManifest[] {
 	const runsRoot = path.join(root, DEFAULT_PATHS.state.runsSubdir);
 	if (!fs.existsSync(runsRoot)) return [];
+	if (signal?.aborted) return [];
+	const token = createCancellationToken({ signal });
 	const entries = fs.readdirSync(runsRoot, { withFileTypes: true })
 		.filter((entry) => entry.isDirectory() && isSafePathId(entry.name))
 		.map((entry) => entry.name)
 		.sort((a, b) => b.localeCompare(a));
 	const selected = maxEntries !== undefined ? entries.slice(0, Math.max(0, maxEntries)) : entries;
-	return selected
-		.map((entry) => {
-			try {
-				return readManifest(path.join(resolveRealContainedPath(runsRoot, entry), DEFAULT_PATHS.state.manifestFile));
-			} catch {
-				return undefined;
-			}
-		})
-		.filter((manifest): manifest is TeamRunManifest => manifest !== undefined);
+	const results: TeamRunManifest[] = [];
+	for (let i = 0; i < selected.length; i++) {
+		if (i % 10 === 0) token.heartbeat(`collectRuns:${i}/${selected.length}`);
+		try {
+			const manifest = readManifest(path.join(resolveRealContainedPath(runsRoot, selected[i]), DEFAULT_PATHS.state.manifestFile));
+			if (manifest) results.push(manifest);
+		} catch { /* skip unreadable manifests */ }
+	}
+	return results;
 }
 
 function mergeRuns(runSets: TeamRunManifest[][], max?: number): TeamRunManifest[] {
@@ -40,20 +47,27 @@ function mergeRuns(runSets: TeamRunManifest[][], max?: number): TeamRunManifest[
 }
 
 function scopedRunRoots(cwd: string): string[] {
-	const roots: string[] = [userCrewRoot()];
+	const roots = new Set<string>();
+	roots.add(userCrewRoot());
 	const projectRoot = findRepoRoot(cwd);
-	if (projectRoot) roots.unshift(projectCrewRoot(cwd));
-	return roots;
+	if (projectRoot) roots.add(projectCrewRoot(cwd));
+	return [...roots];
+}
+
+function collectActiveRuns(): TeamRunManifest[] {
+	return activeRunEntries()
+		.map((entry) => readManifest(entry.manifestPath))
+		.filter((manifest): manifest is TeamRunManifest => manifest !== undefined);
 }
 
-export function listRuns(cwd: string): TeamRunManifest[] {
+export function listRuns(cwd: string, signal?: AbortSignal): TeamRunManifest[] {
 	const roots = scopedRunRoots(cwd);
-	return mergeRuns(roots.map((root) => collectRuns(root)));
+	return mergeRuns([...roots.map((root) => collectRuns(root, undefined, signal)), collectActiveRuns()]);
 }
 
-export function listRecentRuns(cwd: string, max = 20): TeamRunManifest[] {
+export function listRecentRuns(cwd: string, max = 20, signal?: AbortSignal): TeamRunManifest[] {
 	const roots = scopedRunRoots(cwd);
-	return mergeRuns(roots.map((root) => collectRuns(root, max)), max);
+	return mergeRuns([...roots.map((root) => collectRuns(root, max, signal)), collectActiveRuns()], max);
 }
 
 /**
@@ -62,15 +76,15 @@ export function listRecentRuns(cwd: string, max = 20): TeamRunManifest[] {
  * - "user": only runs in the user crew root
  * - "all" (default): merge both scopes (current behavior)
  */
-export function listRunsByScope(cwd: string, scope: "project" | "user" | "all" = "all", max?: number): TeamRunManifest[] {
+export function listRunsByScope(cwd: string, scope: "project" | "user" | "all" = "all", max?: number, signal?: AbortSignal): TeamRunManifest[] {
 	const projectRoot = findRepoRoot(cwd);
 	switch (scope) {
 		case "project":
-			return projectRoot ? collectRuns(projectCrewRoot(cwd), max) : [];
+			return projectRoot ? collectRuns(projectCrewRoot(cwd), max, signal) : [];
 		case "user":
-			return collectRuns(userCrewRoot(), max);
+			return collectRuns(userCrewRoot(), max, signal);
 		case "all":
 		default:
-			return max !== undefined ? listRecentRuns(cwd, max) : listRuns(cwd);
+			return max !== undefined ? listRecentRuns(cwd, max, signal) : listRuns(cwd, signal);
 	}
 }

package/src/extension/run-maintenance.ts

@@ -1,13 +1,22 @@
 import * as fs from "node:fs";
+import * as path from "node:path";
 import type { TeamRunManifest } from "../state/types.ts";
 import { resolveRealContainedPath } from "../utils/safe-paths.ts";
 import { projectCrewRoot } from "../utils/paths.ts";
 import { listRuns } from "./run-index.ts";
 import { logInternalError } from "../utils/internal-error.ts";
+import { redactSecrets } from "../utils/redaction.ts";
+import { createCancellationToken } from "../runtime/cancellation-token.ts";
 
 export interface PruneRunsResult {
 	kept: string[];
 	removed: string[];
+	auditPath?: string;
+}
+
+export interface PruneRunsOptions {
+	intent?: string;
+	signal?: AbortSignal;
 }
 
 function isFinished(run: TeamRunManifest): boolean {
@@ -25,12 +34,27 @@ function isSafeToPrune(cwd: string, run: TeamRunManifest): boolean {
 	}
 }
 
-export function pruneFinishedRuns(cwd: string, keep: number): PruneRunsResult {
-	const crewRoot = projectCrewRoot(cwd);
-	const finished = listRuns(cwd).filter((run) => run.cwd === cwd && isFinished(run)).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+function appendPruneAudit(cwd: string, payload: Record<string, unknown>): string | undefined {
+	try {
+		const filePath = path.join(projectCrewRoot(cwd), "audit", "prune.jsonl");
+		fs.mkdirSync(path.dirname(filePath), { recursive: true });
+		fs.appendFileSync(filePath, `${JSON.stringify(redactSecrets({ ...payload, auditedAt: new Date().toISOString() }))}\n`, "utf-8");
+		return filePath;
+	} catch (error) {
+		logInternalError("prune.audit-write", error, `cwd=${cwd}`);
+		return undefined;
+	}
+}
+
+export function pruneFinishedRuns(cwd: string, keep: number, options: PruneRunsOptions = {}): PruneRunsResult {
+	const token = createCancellationToken({ signal: options.signal });
+	const finished = listRuns(cwd, options.signal).filter((run) => run.cwd === cwd && isFinished(run)).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
 	const kept = finished.slice(0, keep).map((run) => run.runId);
 	const removed: string[] = [];
-	for (const run of finished.slice(keep)) {
+	const toRemove = finished.slice(keep);
+	for (let i = 0; i < toRemove.length; i++) {
+		if (i % 5 === 0) token.heartbeat(`prune:${i}/${toRemove.length}`);
+		const run = toRemove[i];
 		if (!isSafeToPrune(cwd, run)) {
 			logInternalError("prune.path-unsafe", new Error(`Skipping unsafe prune: stateRoot=${run.stateRoot}, artifactsRoot=${run.artifactsRoot}`), `runId=${run.runId}`);
 			continue;
@@ -39,5 +63,6 @@ export function pruneFinishedRuns(cwd: string, keep: number): PruneRunsResult {
 		fs.rmSync(run.artifactsRoot, { recursive: true, force: true });
 		removed.push(run.runId);
 	}
-	return { kept, removed };
+	const auditPath = appendPruneAudit(cwd, { action: "prune", keep, intent: options.intent, kept, removed });
+	return { kept, removed, auditPath };
 }