pi-crew 0.2.3 → 0.2.5

package/src/runtime/team-runner.ts

@@ -1,945 +1,693 @@
-import * as fs from "node:fs";
-import type { AgentConfig } from "../agents/agent-config.ts";
-import type { CrewLimitsConfig, CrewRuntimeConfig, CrewReliabilityConfig } from "../config/config.ts";
-import type { CrewRuntimeCapabilities } from "./runtime-resolver.ts";
-import { writeArtifact } from "../state/artifact-store.ts";
-import { executeHook, appendHookEvent } from "../hooks/registry.ts";
-import { appendEvent } from "../state/event-log.ts";
-import type { TeamConfig } from "../teams/team-config.ts";
-import type { ArtifactDescriptor, PolicyDecision, TeamRunManifest, TaskAttemptState, TeamTaskState } from "../state/types.ts";
-import { loadRunManifestById, saveRunManifest, saveRunManifestAsync, saveRunTasksAsync, updateRunStatus } from "../state/state-store.ts";
-import { aggregateUsage, formatUsage } from "../state/usage.ts";
-import type { WorkflowConfig, WorkflowStep } from "../workflows/workflow-config.ts";
-import { evaluateCrewPolicy, summarizePolicyDecisions } from "./policy-engine.ts";
-import { buildRecoveryLedger } from "./recovery-recipes.ts";
-import { buildTaskGraphIndex, refreshTaskGraphQueues, taskGraphSnapshot } from "./task-graph-scheduler.ts";
-import { buildExecutionPlan as buildDagExecutionPlan, getReadyTasks as getDagReadyTasks, type TaskNode } from "./task-graph.ts";
-import { checkBranchFreshness } from "../worktree/branch-freshness.ts";
-import { aggregateTaskOutputs } from "./task-output-context.ts";
-import { saveCrewAgents } from "./crew-agent-records.ts";
-import { recordsForMaterializedTasks } from "./task-display.ts";
-import { deliverGroupJoin, resolveGroupJoinMode } from "./group-join.ts";
-import { runTeamTask } from "./task-runner.ts";
-import { createWorkflowStateMachine, validatePhasePreconditions, transitionPhase, type PhaseState, type PhaseGuardContext } from "./workflow-state.ts";
-import { executeWithRetry, DEFAULT_RETRY_POLICY, type RetryPolicy } from "./retry-executor.ts";
-import { appendDeadletter } from "./deadletter.ts";
-import type { MetricRegistry } from "../observability/metric-registry.ts";
-import { childCorrelation, withCorrelation } from "../observability/correlation.ts";
-import { resolveBatchConcurrency } from "./concurrency.ts";
-import { mapConcurrent } from "./parallel-utils.ts";
-import { permissionForRole } from "./role-permission.ts";
-import { CrewCancellationError, buildSyntheticTerminalEvidence, cancellationReasonFromSignal } from "./cancellation.ts";
-import { effectivenessPolicyDecision, evaluateRunEffectiveness, formatRunEffectivenessLines } from "./effectiveness.ts";
-
-export interface ExecuteTeamRunInput {
-	manifest: TeamRunManifest;
-	tasks: TeamTaskState[];
-	team: TeamConfig;
-	workflow: WorkflowConfig;
-	agents: AgentConfig[];
-	executeWorkers: boolean;
-	limits?: CrewLimitsConfig;
-	runtime?: CrewRuntimeCapabilities;
-	runtimeConfig?: CrewRuntimeConfig;
-	parentContext?: string;
-	parentModel?: unknown;
-	modelRegistry?: unknown;
-	modelOverride?: string;
-	signal?: AbortSignal;
-	reliability?: CrewReliabilityConfig;
-	metricRegistry?: MetricRegistry;
-	/** Skill override from the team tool. false disables skill injection for this run. */
-	skillOverride?: string[] | false;
-	/** Optional callback for JSON events from child Pi. Used for overflow recovery tracking. */
-	onJsonEvent?: (taskId: string, runId: string, event: unknown) => void;
-}
-
-function findStep(workflow: WorkflowConfig, task: TeamTaskState): WorkflowStep {
-	const step = workflow.steps.find((candidate) => candidate.id === task.stepId);
-	if (!step) throw new Error(`Workflow step '${task.stepId}' not found for task '${task.id}'.`);
-	return step;
-}
-
-function findAgent(agents: AgentConfig[], task: TeamTaskState): AgentConfig {
-	const agent = agents.find((candidate) => candidate.name === task.agent);
-	if (!agent) throw new Error(`Agent '${task.agent}' not found for task '${task.id}'.`);
-	return agent;
-}
-
-function markBlocked(tasks: TeamTaskState[], reason: string): TeamTaskState[] {
-	return tasks.map((task) => task.status === "queued" ? { ...task, status: "skipped", error: reason, finishedAt: new Date().toISOString(), graph: task.graph ? { ...task.graph, queue: "blocked" } : undefined } : task);
-}
-
-function mergeArtifacts(items: ArtifactDescriptor[]): ArtifactDescriptor[] {
-	const byPath = new Map<string, ArtifactDescriptor>();
-	for (const item of items) byPath.set(item.path, item);
-	return [...byPath.values()];
-}
-
-function isNonTerminalTaskStatus(status: TeamTaskState["status"]): boolean {
-	return status === "queued" || status === "running" || status === "waiting";
-}
-
-function shouldMergeTaskUpdate(current: TeamTaskState, updated: TeamTaskState): boolean {
-	// Parallel workers receive the same input snapshot. A later result may still
-	// contain stale queued/running copies of tasks that another worker already
-	// completed. Never let those stale snapshots regress durable task state.
-	if (!isNonTerminalTaskStatus(current.status) && isNonTerminalTaskStatus(updated.status)) return false;
-	// Prevent a stale completed task from overwriting a fresher one.
-	if (current.finishedAt && updated.finishedAt) {
-		const currentFinished = new Date(current.finishedAt).getTime();
-		const updatedFinished = new Date(updated.finishedAt).getTime();
-		if (!Number.isNaN(currentFinished) && !Number.isNaN(updatedFinished) && updatedFinished < currentFinished) return false;
-	}
-	return updated.status !== current.status || updated.finishedAt !== current.finishedAt || updated.startedAt !== current.startedAt || Boolean(updated.resultArtifact) || Boolean(updated.error) || Boolean(updated.modelAttempts?.length) || Boolean(updated.usage) || Boolean(updated.attempts?.length);
-}
-
-export function __test__mergeTaskUpdates(base: TeamTaskState[], results: Array<{ tasks: TeamTaskState[] }>): TeamTaskState[] {
-	let merged = base;
-	for (const result of results) {
-		for (const updated of result.tasks) {
-			const current = merged.find((task) => task.id === updated.id);
-			if (!current || !shouldMergeTaskUpdate(current, updated)) continue;
-			merged = merged.map((task) => task.id === updated.id ? updated : task);
-		}
-	}
-	return refreshTaskGraphQueues(merged);
-}
-
-interface AdaptivePlanTask {
-	role: string;
-	title?: string;
-	task: string;
-}
-
-interface AdaptivePlanPhase {
-	name: string;
-	tasks: AdaptivePlanTask[];
-}
-
-interface AdaptivePlan {
-	phases: AdaptivePlanPhase[];
-}
-
-const MAX_ADAPTIVE_TASKS = 12;
-
-function slug(value: string): string {
-	return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 32) || "task";
-}
-
-function extractAdaptivePlanJson(text: string): string | undefined {
-	const markerMatch = text.match(/ADAPTIVE_PLAN_JSON_START\s*([\s\S]*?)\s*ADAPTIVE_PLAN_JSON_END/);
-	if (markerMatch?.[1]) return markerMatch[1];
-	const startIndex = text.indexOf("ADAPTIVE_PLAN_JSON_START");
-	if (startIndex >= 0) return text.slice(startIndex + "ADAPTIVE_PLAN_JSON_START".length).trim();
-	const fencedMatch = text.match(/```(?:json)?\s*([\s\S]*?)```/i);
-	return fencedMatch?.[1];
-}
-
-export function __test__parseAdaptivePlan(text: string, allowedRoles: string[]): AdaptivePlan | undefined {
-	const raw = extractAdaptivePlanJson(text);
-	if (!raw) return undefined;
-	let parsed: unknown;
-	try { parsed = JSON.parse(raw); } catch { return undefined; }
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
-	const phasesRaw = Array.isArray((parsed as { phases?: unknown }).phases) ? (parsed as { phases: unknown[] }).phases : Array.isArray((parsed as { tasks?: unknown }).tasks) ? [{ name: "adaptive", tasks: (parsed as { tasks: unknown[] }).tasks }] : undefined;
-	if (!phasesRaw) return undefined;
-	const allowed = new Set(allowedRoles);
-	const phases: AdaptivePlanPhase[] = [];
-	let total = 0;
-	for (const [phaseIndex, phaseRaw] of phasesRaw.entries()) {
-		if (!phaseRaw || typeof phaseRaw !== "object" || Array.isArray(phaseRaw)) return undefined;
-		const phaseObj = phaseRaw as { name?: unknown; tasks?: unknown };
-		if (!Array.isArray(phaseObj.tasks) || phaseObj.tasks.length === 0) return undefined;
-		const tasks: AdaptivePlanTask[] = [];
-		for (const taskRaw of phaseObj.tasks) {
-			if (!taskRaw || typeof taskRaw !== "object" || Array.isArray(taskRaw)) return undefined;
-			const taskObj = taskRaw as { role?: unknown; title?: unknown; task?: unknown };
-			if (typeof taskObj.role !== "string" || !allowed.has(taskObj.role)) return undefined;
-			if (typeof taskObj.task !== "string" || !taskObj.task.trim()) return undefined;
-			if (total >= MAX_ADAPTIVE_TASKS) return undefined;
-			tasks.push({ role: taskObj.role, title: typeof taskObj.title === "string" ? taskObj.title : undefined, task: taskObj.task.trim() });
-			total++;
-		}
-		phases.push({ name: typeof phaseObj.name === "string" && phaseObj.name.trim() ? phaseObj.name.trim() : `phase-${phaseIndex + 1}`, tasks });
-	}
-	return phases.length ? { phases } : undefined;
-}
-
-interface CloseUnbalancedJsonResult {
-	text: string;
-	status: "repaired" | "unstable";
-	warning?: string;
-}
-
-function closeUnbalancedJson(raw: string): CloseUnbalancedJsonResult {
-	let result = raw.trim();
-	const stack: string[] = [];
-	let inString = false;
-	let escaped = false;
-	for (const char of result) {
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-		if (char === "\\" && inString) {
-			escaped = true;
-			continue;
-		}
-		if (char === '"') {
-			inString = !inString;
-			continue;
-		}
-		if (inString) continue;
-		if (char === "{") stack.push("}");
-		else if (char === "[") stack.push("]");
-		else if ((char === "}" || char === "]") && stack.at(-1) === char) stack.pop();
-	}
-	while (stack.length) result += stack.pop();
-	// If still in a string, the JSON string was truncated — values may be semantically different
-	if (inString) {
-		return { text: result, status: "unstable", warning: "JSON string was truncated — values may be incorrect" };
-	}
-	return { text: result, status: "repaired" };
-}
-
-function salvageCompletePhaseObjects(raw: string): unknown | undefined {
-	const phasesIndex = raw.indexOf('"phases"');
-	if (phasesIndex < 0) return undefined;
-	const arrayStart = raw.indexOf("[", phasesIndex);
-	if (arrayStart < 0) return undefined;
-	const phases: unknown[] = [];
-	let objectStart = -1;
-	let depth = 0;
-	let inString = false;
-	let escaped = false;
-	for (let index = arrayStart + 1; index < raw.length; index++) {
-		const char = raw[index];
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-		if (char === "\\" && inString) {
-			escaped = true;
-			continue;
-		}
-		if (char === '"') {
-			inString = !inString;
-			continue;
-		}
-		if (inString) continue;
-		if (char === "{") {
-			if (depth === 0) objectStart = index;
-			depth++;
-			continue;
-		}
-		if (char === "}") {
-			if (depth <= 0) continue;
-			depth--;
-			if (depth === 0 && objectStart >= 0) {
-				try {
-					phases.push(JSON.parse(raw.slice(objectStart, index + 1)));
-				} catch {
-					// Ignore malformed trailing phase objects and keep earlier complete phases.
-				}
-				objectStart = -1;
-			}
-		}
-	}
-	return phases.length ? { phases } : undefined;
-}
-
-function adaptiveRoleAlias(role: string, allowed: Set<string>): string | undefined {
-	if (allowed.has(role)) return role;
-	const normalized = slug(role);
-	const aliases: Record<string, string[]> = {
-		reviewer: ["code-reviewer", "review", "code-review", "critic"],
-		"security-reviewer": ["security", "security-review", "sec-review"],
-		"test-engineer": ["tester", "qa", "test"],
-		executor: ["developer", "implementer", "coder", "engineer"],
-		explorer: ["researcher", "scout"],
-		analyst: ["analysis", "analyzer"],
-	};
-	for (const [target, names] of Object.entries(aliases)) if (allowed.has(target) && names.includes(normalized)) return target;
-	return undefined;
-}
-
-export function __test__repairAdaptivePlan(text: string, allowedRoles: string[]): { plan?: AdaptivePlan; repaired: boolean; reason?: string } {
-	const raw = extractAdaptivePlanJson(text);
-	if (!raw) return { repaired: false, reason: "missing-json" };
-	const closeResult = closeUnbalancedJson(raw);
-	const candidates = [raw, closeResult.text];
-	let parsed: unknown;
-	let salvageUsed = false;
-	for (const candidate of candidates) {
-		try {
-			parsed = JSON.parse(candidate);
-			break;
-		} catch {
-			// Try the next repair candidate.
-		}
-	}
-	if (!parsed) {
-		parsed = salvageCompletePhaseObjects(raw);
-		salvageUsed = parsed !== undefined;
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return { repaired: false, reason: "invalid-json" };
-	const phasesRaw = Array.isArray((parsed as { phases?: unknown }).phases) ? (parsed as { phases: unknown[] }).phases : Array.isArray((parsed as { tasks?: unknown }).tasks) ? [{ name: "adaptive", tasks: (parsed as { tasks: unknown[] }).tasks }] : undefined;
-	if (!phasesRaw) return { repaired: false, reason: "missing-phases" };
-	const allowed = new Set(allowedRoles);
-	const phases: AdaptivePlanPhase[] = [];
-	let total = 0;
-	let repaired = salvageUsed || raw !== closeResult.text;
-	for (const [phaseIndex, phaseRaw] of phasesRaw.entries()) {
-		if (!phaseRaw || typeof phaseRaw !== "object" || Array.isArray(phaseRaw)) continue;
-		const phaseObj = phaseRaw as { name?: unknown; tasks?: unknown };
-		if (!Array.isArray(phaseObj.tasks)) continue;
-		const tasks: AdaptivePlanTask[] = [];
-		for (const taskRaw of phaseObj.tasks) {
-			if (total >= MAX_ADAPTIVE_TASKS) {
-				repaired = true;
-				break;
-			}
-			if (!taskRaw || typeof taskRaw !== "object" || Array.isArray(taskRaw)) {
-				repaired = true;
-				continue;
-			}
-			const taskObj = taskRaw as { role?: unknown; title?: unknown; task?: unknown };
-			const role = typeof taskObj.role === "string" ? adaptiveRoleAlias(taskObj.role, allowed) : undefined;
-			const taskText = typeof taskObj.task === "string" ? taskObj.task.trim() : "";
-			if (!role || !taskText) {
-				repaired = true;
-				continue;
-			}
-			tasks.push({ role, title: typeof taskObj.title === "string" ? taskObj.title : undefined, task: taskText });
-			total++;
-		}
-		if (tasks.length) phases.push({ name: typeof phaseObj.name === "string" && phaseObj.name.trim() ? phaseObj.name.trim() : `phase-${phaseIndex + 1}`, tasks });
-		if (total >= MAX_ADAPTIVE_TASKS) break;
-	}
-	return phases.length ? { plan: { phases }, repaired: true, reason: repaired ? "repaired" : "normalized" } : { repaired: false, reason: "empty-plan" };
-}
-
-function reconstructAdaptiveWorkflow(workflow: WorkflowConfig, tasks: TeamTaskState[]): WorkflowConfig {
-	const existing = new Set(workflow.steps.map((step) => step.id));
-	const steps: WorkflowStep[] = [];
-	for (const task of tasks) {
-		if (!task.stepId?.startsWith("adaptive-") || !task.adaptive?.task || existing.has(task.stepId)) continue;
-		steps.push({ id: task.stepId, role: task.role, dependsOn: task.graph?.dependencies ?? task.dependsOn, parallelGroup: `adaptive-${slug(task.adaptive.phase)}`, task: task.adaptive.task });
-	}
-	return steps.length ? { ...workflow, steps: [...workflow.steps, ...steps] } : workflow;
-}
-
-function injectAdaptivePlanIfReady(input: { manifest: TeamRunManifest; tasks: TeamTaskState[]; workflow: WorkflowConfig; team: TeamConfig }): { tasks: TeamTaskState[]; workflow: WorkflowConfig; injected: boolean; missingPlan: boolean } {
-	if (input.workflow.name !== "implementation") return { tasks: input.tasks, workflow: input.workflow, injected: false, missingPlan: false };
-	if (input.tasks.some((task) => task.stepId?.startsWith("adaptive-"))) return { tasks: input.tasks, workflow: reconstructAdaptiveWorkflow(input.workflow, input.tasks), injected: false, missingPlan: false };
-	const completedAssess = input.tasks.find((task) => task.stepId === "assess" && task.status === "completed");
-	if (!completedAssess) return { tasks: input.tasks, workflow: input.workflow, injected: false, missingPlan: false };
-	if (!completedAssess.resultArtifact?.path) {
-		appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_missing", runId: input.manifest.runId, taskId: completedAssess.id, message: "Adaptive planner result artifact is missing." });
-		return { tasks: input.tasks, workflow: input.workflow, injected: false, missingPlan: true };
-	}
-	const assessTask = completedAssess;
-	const resultPath = completedAssess.resultArtifact.path;
-	let text = "";
-	try { text = fs.readFileSync(resultPath, "utf-8"); } catch {
-		appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_missing", runId: input.manifest.runId, taskId: assessTask.id, message: "Adaptive planner result artifact could not be read." });
-		return { tasks: input.tasks, workflow: input.workflow, injected: false, missingPlan: true };
-	}
-	const allowedRoles = input.team.roles.map((role) => role.name);
-	let plan = __test__parseAdaptivePlan(text, allowedRoles);
-	if (!plan) {
-		const repair = process.env.PI_CREW_ADAPTIVE_REPAIR === "0" || process.env.PI_TEAMS_ADAPTIVE_REPAIR === "0" ? { repaired: false, reason: "disabled" } : __test__repairAdaptivePlan(text, allowedRoles);
-		if (repair.plan) {
-			plan = repair.plan;
-			const repairArtifact = writeArtifact(input.manifest.artifactsRoot, { kind: "metadata", relativePath: "metadata/adaptive-repair.json", producer: assessTask.id, content: `${JSON.stringify({ reason: repair.reason, phases: repair.plan.phases.map((phase) => ({ name: phase.name, count: phase.tasks.length, roles: phase.tasks.map((task) => task.role) })) }, null, 2)}\n` });
-			saveRunManifest({ ...input.manifest, updatedAt: new Date().toISOString(), artifacts: [...input.manifest.artifacts, repairArtifact] });
-			appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_repaired", runId: input.manifest.runId, taskId: assessTask.id, message: "Adaptive planner output was repaired before dynamic subagents were spawned.", data: { reason: repair.reason } });
-		} else {
-			appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_repair_failed", runId: input.manifest.runId, taskId: assessTask.id, message: "Adaptive planner output could not be repaired.", data: { reason: repair.reason } });
-			appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_missing", runId: input.manifest.runId, taskId: assessTask.id, message: "Adaptive planner did not produce a valid plan; no dynamic subagents were spawned." });
-			return { tasks: input.tasks, workflow: input.workflow, injected: false, missingPlan: true };
-		}
-	}
-	const steps: WorkflowStep[] = [];
-	const tasks: TeamTaskState[] = [];
-	let previousStepIds = ["assess"];
-	let counter = 0;
-	for (const [phaseIndex, phase] of plan.phases.entries()) {
-		const currentStepIds: string[] = [];
-		for (const [taskIndex, planned] of phase.tasks.entries()) {
-			counter++;
-			const stepId = `adaptive-${phaseIndex + 1}-${taskIndex + 1}-${slug(planned.role)}`;
-			const taskId = `adaptive-${String(counter).padStart(2, "0")}-${slug(planned.role)}`;
-			steps.push({ id: stepId, role: planned.role, dependsOn: previousStepIds, parallelGroup: `adaptive-${slug(phase.name)}`, task: planned.task });
-			tasks.push({
-				id: taskId,
-				runId: input.manifest.runId,
-				stepId,
-				role: planned.role,
-				agent: input.team.roles.find((role) => role.name === planned.role)?.agent ?? planned.role,
-				title: planned.title ?? stepId,
-				status: "queued",
-				dependsOn: previousStepIds,
-				cwd: input.manifest.cwd,
-				adaptive: { phase: phase.name, task: planned.task },
-				graph: { taskId, dependencies: previousStepIds, children: [], queue: "blocked" },
-			});
-			currentStepIds.push(stepId);
-		}
-		previousStepIds = currentStepIds;
-	}
-	const dependencyTaskIdByStep = new Map<string, string>([["assess", assessTask.id], ...tasks.map((task) => [task.stepId ?? task.id, task.id] as const)]);
-	const withGraph = tasks.map((task) => ({
-		...task,
-		dependsOn: task.dependsOn.map((dep) => dependencyTaskIdByStep.get(dep) ?? dep),
-		graph: task.graph ? { ...task.graph, dependencies: task.dependsOn.map((dep) => dependencyTaskIdByStep.get(dep) ?? dep), queue: "blocked" as const } : task.graph,
-	}));
-	const allTasks = refreshTaskGraphQueues([...input.tasks, ...withGraph]);
-	appendEvent(input.manifest.eventsPath, { type: "adaptive.plan_injected", runId: input.manifest.runId, taskId: assessTask.id, message: `Injected ${withGraph.length} adaptive subagent task(s) across ${plan.phases.length} phase(s).`, data: { phases: plan.phases.map((phase) => ({ name: phase.name, count: phase.tasks.length, roles: phase.tasks.map((task) => task.role) })) } });
-	return { tasks: allTasks, workflow: { ...input.workflow, steps: [...input.workflow.steps, ...steps] }, injected: true, missingPlan: false };
-}
-
-function formatTaskProgress(task: TeamTaskState): string {
-	return `- ${task.id}: ${task.status} (${task.role} -> ${task.agent})${task.taskPacket ? ` scope=${task.taskPacket.scope}` : ""}${task.verification ? ` green=${task.verification.observedGreenLevel}/${task.verification.requiredGreenLevel}` : ""}${task.error ? ` - ${task.error}` : ""}`;
-}
-
-function runEffectivenessLines(manifest: TeamRunManifest, tasks: TeamTaskState[], executeWorkers: boolean, runtimeConfig?: CrewRuntimeConfig): string[] {
-	return formatRunEffectivenessLines(evaluateRunEffectiveness({ manifest, tasks, executeWorkers, runtimeConfig }));
-}
-
-function writeProgress(manifest: TeamRunManifest, tasks: TeamTaskState[], producer: string, executeWorkers = true, runtimeConfig?: CrewRuntimeConfig): TeamRunManifest {
-	const counts = new Map<string, number>();
-	for (const task of tasks) counts.set(task.status, (counts.get(task.status) ?? 0) + 1);
-	const queue = taskGraphSnapshot(tasks);
-	const progress = writeArtifact(manifest.artifactsRoot, {
-		kind: "progress",
-		relativePath: "progress.md",
-		producer,
-		content: [
-			`# pi-crew progress ${manifest.runId}`,
-			"",
-			`Status: ${manifest.status}`,
-			`Team: ${manifest.team}`,
-			`Workflow: ${manifest.workflow ?? "(none)"}`,
-			`Updated: ${new Date().toISOString()}`,
-			`Task counts: ${[...counts.entries()].map(([status, count]) => `${status}=${count}`).join(", ") || "none"}`,
-			`Queue: ready=${queue.ready.length}, blocked=${queue.blocked.length}, running=${queue.running.length}, done=${queue.done.length}, failed=${queue.failed.length}, cancelled=${queue.cancelled.length}`,
-			"",
-			"## Tasks",
-			...tasks.map(formatTaskProgress),
-			"",
-			"## Effectiveness",
-			...runEffectivenessLines(manifest, tasks, executeWorkers, runtimeConfig),
-			"",
-		].join("\n"),
-	});
-	return { ...manifest, updatedAt: new Date().toISOString(), artifacts: [...manifest.artifacts.filter((artifact) => !(artifact.kind === "progress" && artifact.path === progress.path)), progress] };
-}
-
-function applyPolicy(manifest: TeamRunManifest, tasks: TeamTaskState[], limits?: CrewLimitsConfig): TeamRunManifest {
-	const branchFreshness = checkBranchFreshness(manifest.cwd);
-	const branchArtifact = writeArtifact(manifest.artifactsRoot, {
-		kind: "metadata",
-		relativePath: "metadata/branch-freshness.json",
-		producer: "branch-freshness",
-		content: `${JSON.stringify(branchFreshness, null, 2)}\n`,
-	});
-	let decisions: PolicyDecision[] = evaluateCrewPolicy({ manifest, tasks, limits });
-	if (branchFreshness.status === "stale" || branchFreshness.status === "diverged") {
-		const branchDecision: PolicyDecision = {
-			action: "notify",
-			reason: "branch_stale",
-			message: branchFreshness.message,
-			createdAt: new Date().toISOString(),
-		};
-		decisions = [...decisions, branchDecision];
-		appendEvent(manifest.eventsPath, { type: "branch.stale", runId: manifest.runId, message: branchFreshness.message, data: { branchFreshness } });
-	}
-	const policyArtifact = writeArtifact(manifest.artifactsRoot, {
-		kind: "metadata",
-		relativePath: "policy-decisions.json",
-		producer: "policy-engine",
-		content: `${JSON.stringify(decisions, null, 2)}\n`,
-	});
-	const recoveryLedger = buildRecoveryLedger(decisions);
-	const recoveryArtifact = writeArtifact(manifest.artifactsRoot, {
-		kind: "metadata",
-		relativePath: "recovery-ledger.json",
-		producer: "recovery-engine",
-		content: `${JSON.stringify(recoveryLedger, null, 2)}\n`,
-	});
-	for (const item of decisions) appendEvent(manifest.eventsPath, { type: item.action === "escalate" ? "policy.escalated" : "policy.action", runId: manifest.runId, taskId: item.taskId, message: item.message, data: { action: item.action, reason: item.reason } });
-	for (const item of recoveryLedger.entries) appendEvent(manifest.eventsPath, { type: item.state === "escalation_required" ? "recovery.escalated" : "recovery.attempted", runId: manifest.runId, taskId: item.taskId, message: item.message, data: { scenario: item.scenario, steps: item.steps, attempt: item.attempt, state: item.state } });
-	return { ...manifest, updatedAt: new Date().toISOString(), policyDecisions: decisions, artifacts: [...manifest.artifacts.filter((artifact) => !(artifact.kind === "metadata" && (artifact.path.endsWith("policy-decisions.json") || artifact.path.endsWith("recovery-ledger.json") || artifact.path.endsWith("branch-freshness.json")))), branchArtifact, policyArtifact, recoveryArtifact] };
-}
-
-function retryPolicyFromConfig(config: CrewReliabilityConfig | undefined): RetryPolicy {
-	return { ...DEFAULT_RETRY_POLICY, ...(config?.retryPolicy ?? {}) };
-}
-
-function failedTaskFrom(result: { tasks: TeamTaskState[] }, taskId: string): TeamTaskState | undefined {
-	return result.tasks.find((item) => item.id === taskId && item.status === "failed");
-}
-
-function requiresPlanApproval(workflow: WorkflowConfig, runtimeConfig: CrewRuntimeConfig | undefined): boolean {
-	return workflow.name === "implementation" && runtimeConfig?.requirePlanApproval === true;
-}
-
-function isPlanApprovalPending(manifest: TeamRunManifest): boolean {
-	return manifest.planApproval?.required === true && manifest.planApproval.status === "pending";
-}
-
-function isMutatingTask(task: TeamTaskState): boolean {
-	return permissionForRole(task.role) !== "read_only";
-}
-
-function ensurePlanApprovalRequested(manifest: TeamRunManifest, tasks: TeamTaskState[]): TeamRunManifest {
-	if (manifest.planApproval) return manifest;
-	const assessTask = tasks.find((task) => task.stepId === "assess" && task.status === "completed");
-	const now = new Date().toISOString();
-	const updated: TeamRunManifest = {
-		...manifest,
-		updatedAt: now,
-		planApproval: {
-			required: true,
-			status: "pending",
-			requestedAt: now,
-			updatedAt: now,
-			planTaskId: assessTask?.id,
-			planArtifactPath: assessTask?.resultArtifact?.path,
-		},
-	};
-	saveRunManifest(updated);
-	appendEvent(updated.eventsPath, { type: "plan.approval_required", runId: updated.runId, taskId: assessTask?.id, message: "Adaptive implementation plan requires explicit approval before mutating tasks run.", data: { planArtifactPath: assessTask?.resultArtifact?.path } });
-	return updated;
-}
-
-function cancelPlanTasks(tasks: TeamTaskState[], reason: string): TeamTaskState[] {
-	return tasks.map((task) => task.status === "queued" || task.status === "running" || task.status === "waiting" ? { ...task, status: "cancelled", finishedAt: new Date().toISOString(), error: reason, graph: task.graph ? { ...task.graph, queue: "done" } : undefined } : task);
-}
-
-function hasPendingMutatingAdaptiveTask(tasks: TeamTaskState[]): boolean {
-	return tasks.some((task) => task.status === "queued" && task.adaptive && isMutatingTask(task));
-}
-
-/**
- * Check whether any task uses explicit `dependsOn` that would benefit from DAG-based
- * execution planning. If so, build an execution plan and use `getDagReadyTasks`
- * to augment the ready-set selection.
- */
-function dagReadyTaskIds(tasks: TeamTaskState[], completedIds: Set<string>): string[] | null {
-	const hasExplicitDeps = tasks.some((t) => t.dependsOn.length > 0);
-	if (!hasExplicitDeps) return null;
-	const nodes: TaskNode[] = tasks.map((t) => ({
-		id: t.id,
-		dependsOn: t.dependsOn,
-		phase: t.adaptive?.phase ?? t.stepId,
-	}));
-	const plan = buildDagExecutionPlan(nodes);
-	if (plan.hasCycle) return null; // fall back to existing scheduler
-	return getDagReadyTasks(plan, completedIds);
-}
-
-export async function executeTeamRun(input: ExecuteTeamRunInput): Promise<{ manifest: TeamRunManifest; tasks: TeamTaskState[] }> {
-	let workflow = input.workflow;
-	let manifest = updateRunStatus(input.manifest, "running", input.executeWorkers ? "Executing team workflow." : "Creating workflow prompts and placeholder results.");
-
-	try {
-		return await executeTeamRunCore(input, manifest, workflow);
-	} catch (error) {
-		// P1: Catch unhandled errors — ensure manifest is set to "failed" so it doesn't stay "running" forever.
-		const message = error instanceof Error ? error.message : String(error);
-		try {
-			manifest = updateRunStatus(manifest, "failed", `Unhandled error in team runner: ${message}`);
-			await saveRunManifestAsync(manifest);
-		} catch {
-			// Best-effort — state write may also fail
-		}
-		const tasks = refreshTaskGraphQueues(input.tasks).map((task) =>
-			task.status === "running" || task.status === "queued" || task.status === "waiting"
-				? { ...task, status: "failed" as const, finishedAt: new Date().toISOString(), error: message }
-				: task,
-		);
-		return { manifest, tasks };
-	}
-}
-
-async function executeTeamRunCore(
-	input: ExecuteTeamRunInput,
-	manifest: TeamRunManifest,
-	workflow: WorkflowConfig,
-): Promise<{ manifest: TeamRunManifest; tasks: TeamTaskState[] }> {
-	// Execute before_run_start hook (non-blocking by default)
-	const beforeRunReport = await executeHook("before_run_start", { runId: manifest.runId, cwd: manifest.cwd });
-	appendHookEvent(manifest, beforeRunReport);
-	if (beforeRunReport.outcome === "block") {
-		manifest = updateRunStatus(manifest, "blocked", beforeRunReport.reason ?? "before_run_start hook blocked the run.");
-		return { manifest, tasks: input.tasks };
-	}
-	let tasks = refreshTaskGraphQueues(input.tasks);
-	let queueIndex = buildTaskGraphIndex(tasks);
-	const canInjectAdaptivePlan = workflow.name === "implementation";
-	let adaptivePlanInjected = false;
-	let adaptivePlanMissing = false;
-	const attemptAdaptivePlan = () => {
-		if (!canInjectAdaptivePlan || adaptivePlanInjected || adaptivePlanMissing) return { injected: false, missing: false };
-		const adaptivePlan = injectAdaptivePlanIfReady({ manifest, tasks, workflow, team: input.team });
-		adaptivePlanInjected = adaptivePlanInjected || adaptivePlan.injected;
-		adaptivePlanMissing = adaptivePlan.missingPlan;
-		workflow = adaptivePlan.workflow;
-		if (adaptivePlan.injected) tasks = adaptivePlan.tasks;
-		return { injected: adaptivePlan.injected, missing: adaptivePlan.missingPlan };
-	};
-	const initialAdaptive = attemptAdaptivePlan();
-	if (initialAdaptive.missing) {
-		tasks = markBlocked(tasks, "Adaptive planner did not produce a valid subagent plan.");
-		await saveRunTasksAsync(manifest, tasks);
-		manifest = updateRunStatus(manifest, "blocked", "Adaptive planner did not produce a valid subagent plan.");
-		return { manifest, tasks };
-	}
-	if (initialAdaptive.injected) {
-		manifest = requiresPlanApproval(workflow, input.runtimeConfig) ? ensurePlanApprovalRequested(manifest, tasks) : manifest;
-		queueIndex = buildTaskGraphIndex(tasks);
-	} else if (requiresPlanApproval(workflow, input.runtimeConfig) && hasPendingMutatingAdaptiveTask(tasks)) {
-		manifest = ensurePlanApprovalRequested(manifest, tasks);
-	}
-	if (manifest.planApproval?.status === "cancelled") {
-		tasks = cancelPlanTasks(tasks, "Plan approval was cancelled.");
-		await saveRunTasksAsync(manifest, tasks);
-		manifest = updateRunStatus(manifest, "cancelled", "Plan approval was cancelled.");
-		return { manifest, tasks };
-	}
-	manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
-	await saveRunManifestAsync(manifest);
-	const runtimeKind = input.runtime?.kind ?? (input.executeWorkers ? "child-process" : "scaffold");
-	saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-
-	// Build a workflow phase state machine from workflow steps for precondition tracking.
-	const workflowPhases: PhaseState[] = workflow.steps.map((step): PhaseState => ({
-		name: step.id,
-		status: "pending",
-		inputs: step.reads === false ? [] : Array.isArray(step.reads) ? step.reads : [],
-		outputs: step.output === false ? [] : step.output ? [step.output] : [],
-	}));
-	let wfMachine = createWorkflowStateMachine(workflowPhases);
-
-	while (tasks.some((task) => task.status === "queued")) {
-		if (input.signal?.aborted) {
-			const cancelReason = cancellationReasonFromSignal(input.signal);
-			const message = `${cancelReason.message} (${cancelReason.code})`;
-			const cancelledTaskIds: string[] = [];
-			tasks = tasks.map((task) => {
-				if (task.status !== "queued" && task.status !== "running" && task.status !== "waiting") return task;
-				cancelledTaskIds.push(task.id);
-				const base = { ...task, status: "cancelled" as const, finishedAt: new Date().toISOString(), error: message };
-				if (task.status === "running") {
-					return { ...base, terminalEvidence: [...(task.terminalEvidence ?? []), buildSyntheticTerminalEvidence("worker", cancelReason, task.startedAt)] };
-				}
-				return base;
-			});
-			await saveRunTasksAsync(manifest, tasks);
-			for (const taskId of cancelledTaskIds) appendEvent(manifest.eventsPath, { type: "task.cancelled", runId: manifest.runId, taskId, message, data: { reason: cancelReason.code } });
-			manifest = updateRunStatus(manifest, "cancelled", message, { data: { reason: cancelReason.code, cancelledTaskIds } });
-			return { manifest, tasks };
-		}
-
-		const failed = tasks.find((task) => task.status === "failed");
-		if (failed) {
-			tasks = markBlocked(tasks, `Blocked by failed task '${failed.id}'.`);
-			await saveRunTasksAsync(manifest, tasks);
-			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-			manifest = updateRunStatus(manifest, "failed", `Failed at task '${failed.id}'.`);
-			return { manifest, tasks };
-		}
-
-		const snapshot = taskGraphSnapshot(tasks, queueIndex);
-
-		// DAG-based execution plan: when tasks have explicit dependsOn, use the
-		// topological wave planner to determine ready tasks. Fall back to the
-		// existing task-graph-scheduler when no explicit deps exist (backward compat).
-		const completedIds = new Set(tasks.filter((t) => t.status === "completed").map((t) => t.id));
-		const dagReady = dagReadyTaskIds(tasks, completedIds);
-		const effectiveReady = dagReady ?? snapshot.ready;
-
-		// Workflow phase precondition check (non-blocking: log warnings only).
-		if (wfMachine.currentPhaseIndex < wfMachine.phases.length) {
-			const completedArtifacts = manifest.artifacts.filter((a) => a.kind === "result" || a.kind === "summary").map((a) => a.path);
-			const previousPhaseStatus = wfMachine.currentPhaseIndex > 0 ? (wfMachine.phases[wfMachine.currentPhaseIndex - 1]?.status ?? "pending") : "completed";
-			const wfContext: PhaseGuardContext = {
-				completedArtifacts,
-				previousPhaseStatus,
-				taskResults: tasks.filter((t) => t.status === "completed").map((t) => ({ taskId: t.id, status: t.status, outputPath: t.resultArtifact?.path })),
-			};
-			const preconditions = validatePhasePreconditions(wfMachine, wfContext);
-			if (!preconditions.ready) {
-				appendEvent(manifest.eventsPath, { type: "workflow.preconditions", runId: manifest.runId, message: `Workflow phase '${wfMachine.phases[wfMachine.currentPhaseIndex]?.name}' is missing inputs: ${preconditions.blocking.join(", ")}`, data: { phaseIndex: wfMachine.currentPhaseIndex, phaseName: wfMachine.phases[wfMachine.currentPhaseIndex]?.name, blocking: preconditions.blocking } });
-			} else {
-				// Advance the machine past completed phases.
-				while (wfMachine.currentPhaseIndex < wfMachine.phases.length && wfMachine.phases[wfMachine.currentPhaseIndex]?.status === "completed") {
-					wfMachine = { ...wfMachine, currentPhaseIndex: wfMachine.currentPhaseIndex + 1 };
-				}
-			}
-		}
-
-		const readyRoles = effectiveReady.map((taskId) => tasks.find((task) => task.id === taskId)?.role).filter((role): role is string => Boolean(role));
-		const concurrency = resolveBatchConcurrency({ workflowName: workflow.name, workflowMaxConcurrency: workflow.maxConcurrency, teamMaxConcurrency: input.team.maxConcurrency, limitMaxConcurrentWorkers: input.limits?.maxConcurrentWorkers, allowUnboundedConcurrency: input.limits?.allowUnboundedConcurrency, readyCount: effectiveReady.length, workspaceMode: manifest.workspaceMode, readyRoles });
-		if (concurrency.reason.includes(";unbounded:")) {
-			appendEvent(manifest.eventsPath, { type: "limits.unbounded", runId: manifest.runId, message: "Unbounded worker concurrency was explicitly enabled for this run.", data: { concurrencyReason: concurrency.reason, maxConcurrent: concurrency.maxConcurrent } });
-		}
-		const approvalPending = isPlanApprovalPending(manifest);
-		const readyIds = approvalPending ? effectiveReady : effectiveReady.slice(0, concurrency.selectedCount);
-		const candidateBatch = readyIds.map((id) => tasks.find((task) => task.id === id)).filter((task): task is TeamTaskState => Boolean(task));
-		const readyBatch = approvalPending ? candidateBatch.filter((task) => !isMutatingTask(task)).slice(0, concurrency.selectedCount) : candidateBatch;
-		if (readyBatch.length === 0) {
-			if (approvalPending && candidateBatch.some(isMutatingTask)) {
-				await saveRunTasksAsync(manifest, tasks);
-				saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-				manifest = updateRunStatus(manifest, "blocked", "Plan approval required before mutating implementation tasks run.");
-				return { manifest, tasks };
-			}
-			tasks = markBlocked(tasks, "No ready queued task; dependency graph may be invalid.");
-			await saveRunTasksAsync(manifest, tasks);
-			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-			manifest = updateRunStatus(manifest, "blocked", "No ready queued task.");
-			return { manifest, tasks };
-		}
-
-		appendEvent(manifest.eventsPath, { type: "task.progress", runId: manifest.runId, message: `Starting ready batch with ${readyBatch.length} task(s).`, data: { taskIds: readyBatch.map((task) => task.id), readyCount: snapshot.ready.length, blockedCount: snapshot.blocked.length, runningCount: snapshot.running.length, doneCount: snapshot.done.length, selectedCount: readyBatch.length, maxConcurrent: concurrency.maxConcurrent, defaultConcurrency: concurrency.defaultConcurrency, concurrencyReason: approvalPending ? `${concurrency.reason};plan-approval-read-only` : concurrency.reason } });
-		// Execute before_task_start hooks for the batch
-		for (const task of readyBatch) {
-			const taskReport = await executeHook("before_task_start", { runId: manifest.runId, taskId: task.id, cwd: manifest.cwd });
-			appendHookEvent(manifest, taskReport);
-			if (taskReport.outcome === "block") {
-				tasks = tasks.map((t) => t.id === task.id ? { ...t, status: "skipped" as const, error: taskReport.reason ?? "before_task_start hook blocked execution." } : t);
-				manifest = updateRunStatus(manifest, manifest.status, `Task '${task.id}' blocked by hook.`);
-			}
-		}
-		const batchTasks = readyBatch.filter((task) => tasks.find((t) => t.id === task.id && t.status !== "skipped"));
-		if (batchTasks.length > 1) {
-			appendEvent(manifest.eventsPath, { type: "task.parallel_start", runId: manifest.runId, message: `Launching ${batchTasks.length} tasks in PARALLEL (concurrency=${concurrency.selectedCount}): ${batchTasks.map((t) => `${t.role}(${t.id})`).join(", ")}`, data: { taskIds: batchTasks.map((t) => t.id), roles: batchTasks.map((t) => t.role), concurrency: concurrency.selectedCount } });
-		}
-		const results = await mapConcurrent(
-			batchTasks,
-			concurrency.selectedCount,
-			async (task) => {
-				const step = findStep(workflow, task);
-				const agent = findAgent(input.agents, task);
-				const teamRole = input.team.roles.find((role) => role.name === task.role);
-				const baseInput = { manifest, tasks, task, step, agent, signal: input.signal, executeWorkers: input.executeWorkers, runtimeKind: input.runtime?.kind, runtimeConfig: input.runtimeConfig, parentContext: input.parentContext, parentModel: input.parentModel, modelRegistry: input.modelRegistry, modelOverride: input.modelOverride, teamRoleModel: teamRole?.model, teamRoleSkills: teamRole?.skills, skillOverride: input.skillOverride, limits: input.limits, onJsonEvent: input.onJsonEvent };
-				if (input.reliability?.autoRetry !== true) return withCorrelation(childCorrelation(manifest.runId, task.id), () => runTeamTask(baseInput));
-				let lastFailed: { manifest: TeamRunManifest; tasks: TeamTaskState[] } | undefined;
-				let lastAttemptId: string | undefined;
-				const attemptsSoFar: TaskAttemptState[] = [...(task.attempts ?? [])];
-				const policy = retryPolicyFromConfig(input.reliability);
-				try {
-					return await executeWithRetry(async (attempt, info) => {
-						const startedAt = new Date().toISOString();
-						const inFlightAttempts: TaskAttemptState[] = [...attemptsSoFar, { attemptId: info.attemptId, startedAt }];
-						input.metricRegistry?.counter("crew.task.retry_attempt_total", "Retry attempts by run and task").inc({ runId: manifest.runId, taskId: task.id });
-						const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
-						const freshManifest = fresh?.manifest ?? manifest;
-						const freshTasks = fresh?.tasks ?? tasks;
-						const freshTask = freshTasks.find((item) => item.id === task.id) ?? task;
-						if (freshTask.status !== "queued" && freshTask.status !== "running") return { manifest: freshManifest, tasks: freshTasks };
-						const taskWithAttempt: TeamTaskState = { ...freshTask, attempts: inFlightAttempts };
-						const result = await withCorrelation(childCorrelation(freshManifest.runId, task.id), () => runTeamTask({ ...baseInput, manifest: freshManifest, tasks: freshTasks, task: taskWithAttempt }));
-						const failed = failedTaskFrom(result, task.id);
-						const endedAt = new Date().toISOString();
-						const finishedAttempt: TaskAttemptState = { attemptId: info.attemptId, startedAt, endedAt, ...(failed?.error ? { error: failed.error } : {}) };
-						attemptsSoFar.push(finishedAttempt);
-						const withAttempt = result.tasks.map((item) => item.id === task.id ? { ...item, attempts: [...attemptsSoFar] } : item);
-						const enriched = { manifest: result.manifest, tasks: withAttempt };
-						if (failed) {
-							lastFailed = enriched;
-							throw new Error(failed.error ?? `Task ${task.id} failed.`);
-						}
-						input.metricRegistry?.histogram("crew.task.retry_count", "Retries per task", [0, 1, 2, 3, 5, 10]).observe({ runId: manifest.runId, team: input.team.name }, Math.max(0, attempt - 1));
-						return enriched;
-					}, policy, {
-						signal: input.signal,
-						attemptId: (attempt) => `${manifest.runId}:${task.id}:attempt-${attempt}`,
-						onAttemptFailed: (attempt, error, delayMs, info) => {
-							lastAttemptId = info.attemptId;
-							appendEvent(manifest.eventsPath, { type: "crew.task.retry_attempt", runId: manifest.runId, taskId: task.id, message: error.message, data: { attempt, attemptId: info.attemptId, delayMs }, metadata: { attemptId: info.attemptId } });
-							input.metricRegistry?.histogram("crew.task.retry_delay_ms", "Retry backoff delay, milliseconds").observe({ runId: manifest.runId, taskId: task.id }, delayMs);
-						},
-						onRetryGivenUp: (attempts, error, info) => {
-							lastAttemptId = info.attemptId;
-							appendDeadletter(manifest, { runId: manifest.runId, taskId: task.id, reason: "max-retries", attempts, attemptId: info.attemptId, lastError: error.message, timestamp: new Date().toISOString() });
-							input.metricRegistry?.counter("crew.task.deadletter_total", "Deadletter triggers by reason").inc({ reason: "max-retries" });
-							input.metricRegistry?.histogram("crew.task.retry_count", "Retries per task", [0, 1, 2, 3, 5, 10]).observe({ runId: manifest.runId, team: input.team.name }, Math.max(0, attempts - 1));
-						},
-					});
-				} catch (retryError) {
-					if (retryError instanceof CrewCancellationError || input.signal?.aborted) {
-						const reason = retryError instanceof CrewCancellationError ? retryError.reason : cancellationReasonFromSignal(input.signal);
-						const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
-						const freshManifest = fresh?.manifest ?? manifest;
-						const freshTasks = fresh?.tasks ?? tasks;
-						const cancelledTasks = freshTasks.map((item) => item.id === task.id && (item.status === "queued" || item.status === "running") ? { ...item, status: "cancelled" as const, finishedAt: new Date().toISOString(), error: `${reason.message} (${reason.code})` } : item);
-						appendEvent(freshManifest.eventsPath, { type: "task.cancelled", runId: freshManifest.runId, taskId: task.id, message: reason.message, data: { reason, phase: "retry" }, metadata: lastAttemptId ? { attemptId: lastAttemptId } : undefined });
-						return { manifest: updateRunStatus(freshManifest, "cancelled", reason.message), tasks: cancelledTasks };
-					}
-					if (lastFailed) return lastFailed;
-					const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
-					const freshManifest = fresh?.manifest ?? manifest;
-					const freshTasks = fresh?.tasks ?? tasks;
-					const freshTask = freshTasks.find((item) => item.id === task.id) ?? task;
-					if (freshTask.status !== "queued" && freshTask.status !== "running") return { manifest: freshManifest, tasks: freshTasks };
-					return withCorrelation(childCorrelation(freshManifest.runId, task.id), () => runTeamTask({ ...baseInput, manifest: freshManifest, tasks: freshTasks, task: freshTask }));
-				}
-			},
-		);
-		if (results.length === 0) break;
-		manifest = { ...results.at(-1)!.manifest, artifacts: mergeArtifacts([manifest.artifacts, ...results.map((item) => item.manifest.artifacts)].flat()) };
-		tasks = __test__mergeTaskUpdates(tasks, results);
-
-		// Advance workflow phases whose tasks are all in terminal state
-		const terminalStatuses = new Set(["completed", "failed", "skipped", "cancelled"]);
-		const phaseTaskMap = new Map<string, string[]>();
-		for (const task of tasks) {
-			if (!task.stepId) continue;
-			const existing = phaseTaskMap.get(task.stepId) ?? [];
-			existing.push(task.id);
-			phaseTaskMap.set(task.stepId, existing);
-		}
-		for (let pi = wfMachine.currentPhaseIndex; pi < wfMachine.phases.length; pi++) {
-			const phase = wfMachine.phases[pi]!;
-			const phaseTaskIds = phaseTaskMap.get(phase.name) ?? [];
-			if (phaseTaskIds.length === 0) continue;
-			const allTerminal = phaseTaskIds.every((taskId) => {
-				const task = tasks.find((t) => t.id === taskId);
-				return task ? terminalStatuses.has(task.status) : false;
-			});
-			if (!allTerminal) break;
-			if (phase.status !== "completed" && phase.status !== "failed" && phase.status !== "skipped") {
-				const completedArtifacts = manifest.artifacts.filter((a) => a.kind === "result" || a.kind === "summary").map((a) => a.path);
-				const previousPhaseStatus = pi > 0 ? (wfMachine.phases[pi - 1]?.status ?? "pending") : "completed";
-				const wfContext: PhaseGuardContext = {
-					completedArtifacts,
-					previousPhaseStatus,
-					taskResults: tasks.filter((t) => t.status === "completed").map((t) => ({ taskId: t.id, status: t.status, outputPath: t.resultArtifact?.path })),
-				};
-				// Determine phase transition status based on individual task outcomes
-				const phaseTasks = phaseTaskIds.map((taskId) => tasks.find((t) => t.id === taskId)).filter((t): t is NonNullable<typeof t> => t !== undefined);
-				const hasFailedOrCancelled = phaseTasks.some((t) => t.status === "failed" || t.status === "cancelled");
-				const phaseStatus = hasFailedOrCancelled ? "failed" : "completed";
-				const transition = transitionPhase(wfMachine, pi, phaseStatus, wfContext);
-				wfMachine = transition.machine;
-				if (transition.guardResult && !transition.guardResult.allowed) {
-					appendEvent(manifest.eventsPath, { type: "workflow.phase_guard_blocked", runId: manifest.runId, message: `Workflow phase '${phase.name}' guard blocked: ${transition.guardResult.reason ?? "unknown"}`, data: { phaseIndex: pi, phaseName: phase.name, reason: transition.guardResult.reason } });
-					break;
-				}
-				appendEvent(manifest.eventsPath, { type: phaseStatus === "failed" ? "workflow.phase_failed" : "workflow.phase_completed", runId: manifest.runId, message: `Workflow phase '${phase.name}' ${phaseStatus}.`, data: { phaseIndex: pi, phaseStatus } });
-			}
-			wfMachine = { ...wfMachine, currentPhaseIndex: pi + 1 };
-		}
-
-		const cancelledResult = results.find((item) => item.manifest.status === "cancelled");
-		if (cancelledResult || input.signal?.aborted) {
-			const reason = input.signal?.aborted ? cancellationReasonFromSignal(input.signal) : undefined;
-			const message = reason?.message ?? cancelledResult?.manifest.summary ?? "Run cancelled during task execution.";
-			manifest = { ...manifest, status: "running" };
-			manifest = updateRunStatus(manifest, "cancelled", message);
-			await saveRunTasksAsync(manifest, tasks);
-			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-			await saveRunManifestAsync(manifest);
-			appendEvent(manifest.eventsPath, { type: "run.cancelled", runId: manifest.runId, message, data: { reason, phase: "task-batch", cancelledResultRunId: cancelledResult?.manifest.runId } });
-			return { manifest, tasks };
-		}
-		queueIndex = buildTaskGraphIndex(tasks);
-		const injectedAfterBatch = attemptAdaptivePlan();
-		if (injectedAfterBatch.missing) {
-			tasks = markBlocked(tasks, "Adaptive planner did not produce a valid subagent plan.");
-			await saveRunTasksAsync(manifest, tasks);
-			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-			manifest = updateRunStatus(manifest, "blocked", "Adaptive planner did not produce a valid subagent plan.");
-			return { manifest, tasks };
-		}
-		if (injectedAfterBatch.injected) {
-			manifest = requiresPlanApproval(workflow, input.runtimeConfig) ? ensurePlanApprovalRequested(manifest, tasks) : manifest;
-			queueIndex = buildTaskGraphIndex(tasks);
-		} else if (requiresPlanApproval(workflow, input.runtimeConfig) && hasPendingMutatingAdaptiveTask(tasks)) {
-			manifest = ensurePlanApprovalRequested(manifest, tasks);
-		}
-		if (manifest.planApproval?.status === "cancelled") {
-			tasks = cancelPlanTasks(tasks, "Plan approval was cancelled.");
-			await saveRunTasksAsync(manifest, tasks);
-			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-			manifest = updateRunStatus(manifest, "cancelled", "Plan approval was cancelled.");
-			return { manifest, tasks };
-		}
-		await saveRunTasksAsync(manifest, tasks);
-		saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
-		const completedBatch = batchTasks.map((task) => tasks.find((item) => item.id === task.id) ?? task);
-		const batchArtifact = writeArtifact(manifest.artifactsRoot, {
-			kind: "summary",
-			relativePath: `batches/${batchTasks.map((task) => task.id).join("+")}.md`,
-			producer: "team-runner",
-			content: aggregateTaskOutputs(completedBatch, manifest),
-		});
-		const groupDelivery = deliverGroupJoin({ manifest, mode: resolveGroupJoinMode(input.runtimeConfig), batch: batchTasks, allTasks: tasks });
-		manifest = { ...manifest, artifacts: mergeArtifacts([...manifest.artifacts, batchArtifact, ...(groupDelivery?.artifact ? [groupDelivery.artifact] : [])]) };
-		manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
-		await saveRunManifestAsync(manifest);
-	}
-
-	const failed = tasks.find((task) => task.status === "failed");
-	const waiting = tasks.find((task) => task.status === "waiting");
-	const running = tasks.find((task) => task.status === "running");
-	manifest = applyPolicy(manifest, tasks, input.limits);
-	const effectiveness = evaluateRunEffectiveness({ manifest, tasks, executeWorkers: input.executeWorkers, runtimeConfig: input.runtimeConfig });
-	const effectivenessDecision = effectivenessPolicyDecision(effectiveness);
-	if (effectivenessDecision) {
-		manifest = { ...manifest, policyDecisions: [...(manifest.policyDecisions ?? []), effectivenessDecision], updatedAt: new Date().toISOString() };
-		appendEvent(manifest.eventsPath, { type: "run.effectiveness", runId: manifest.runId, message: effectivenessDecision.message, data: { effectiveness, policyDecision: effectivenessDecision } });
-	}
-	const blockingDecision = manifest.policyDecisions?.find((item) => item.action === "block" || item.action === "escalate");
-	if (failed) {
-		manifest = updateRunStatus(manifest, "failed", `Failed at task '${failed.id}'.`);
-	} else if (waiting) {
-		manifest = updateRunStatus(manifest, "blocked", `Waiting for response to task '${waiting.id}'.`);
-	} else if (running) {
-		manifest = updateRunStatus(manifest, "blocked", `Task '${running.id}' is still running.`);
-	} else if (effectiveness.severity === "failed") {
-		manifest = updateRunStatus(manifest, "failed", effectivenessDecision?.message ?? "Run effectiveness guard failed.");
-	} else if (effectiveness.severity === "blocked") {
-		manifest = updateRunStatus(manifest, "blocked", effectivenessDecision?.message ?? "Run effectiveness guard blocked completion.");
-	} else if (blockingDecision) {
-		manifest = updateRunStatus(manifest, "blocked", blockingDecision.message);
-	} else {
-		manifest = updateRunStatus(manifest, "completed", input.executeWorkers ? "Team workflow completed." : "Team workflow scaffold completed without launching child workers.");
-	}
-	manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
-	await saveRunManifestAsync(manifest);
-	const usage = aggregateUsage(tasks);
-	const summaryArtifact = writeArtifact(manifest.artifactsRoot, {
-		kind: "summary",
-		relativePath: "summary.md",
-		producer: "team-runner",
-		content: [
-			`# pi-crew run ${manifest.runId}`,
-			"",
-			`Status: ${manifest.status}`,
-			`Team: ${manifest.team}`,
-			`Workflow: ${manifest.workflow ?? "(none)"}`,
-			`Goal: ${manifest.goal}`,
-			`Usage: ${formatUsage(usage)}`,
-			"",
-			"## Tasks",
-			...tasks.map(formatTaskProgress),
-			"",
-			"## Effectiveness",
-			...runEffectivenessLines(manifest, tasks, input.executeWorkers, input.runtimeConfig),
-			"",
-			"## Policy decisions",
-			...(manifest.policyDecisions?.length ? summarizePolicyDecisions(manifest.policyDecisions) : ["- (none)"]),
-			"",
-		].join("\n"),
-	});
-	manifest = { ...manifest, updatedAt: new Date().toISOString(), artifacts: [...manifest.artifacts, summaryArtifact] };
-	await saveRunManifestAsync(manifest);
-	await saveRunTasksAsync(manifest, tasks);
-	return { manifest, tasks };
-}
+import * as fs from "node:fs";
+import type { AgentConfig } from "../agents/agent-config.ts";
+import type { CrewLimitsConfig, CrewRuntimeConfig, CrewReliabilityConfig } from "../config/config.ts";
+import type { CrewRuntimeCapabilities } from "./runtime-resolver.ts";
+import type { CrewRuntimeKind } from "./crew-agent-runtime.ts";
+import { resolveTaskRuntimeKind } from "./runtime-policy.ts";
+import { writeArtifact } from "../state/artifact-store.ts";
+import { executeHook, appendHookEvent } from "../hooks/registry.ts";
+import { appendEvent, appendEventFireAndForget } from "../state/event-log.ts";
+import type { TeamConfig } from "../teams/team-config.ts";
+import type { ArtifactDescriptor, PolicyDecision, TeamRunManifest, TaskAttemptState, TeamTaskState } from "../state/types.ts";
+import { loadRunManifestById, saveRunManifest, saveRunManifestAsync, saveRunTasksAsync, updateRunStatus } from "../state/state-store.ts";
+import { aggregateUsage, formatUsage } from "../state/usage.ts";
+import type { WorkflowConfig, WorkflowStep } from "../workflows/workflow-config.ts";
+import { evaluateCrewPolicy, summarizePolicyDecisions } from "./policy-engine.ts";
+import { buildRecoveryLedger } from "./recovery-recipes.ts";
+import { buildTaskGraphIndex, refreshTaskGraphQueues, taskGraphSnapshot } from "./task-graph-scheduler.ts";
+import { buildExecutionPlan as buildDagExecutionPlan, getReadyTasks as getDagReadyTasks, type TaskNode } from "./task-graph.ts";
+import { checkBranchFreshness } from "../worktree/branch-freshness.ts";
+import { aggregateTaskOutputs } from "./task-output-context.ts";
+import { readCrewAgents, saveCrewAgents } from "./crew-agent-records.ts";
+import { recordsForMaterializedTasks } from "./task-display.ts";
+import { deliverGroupJoin, resolveGroupJoinMode } from "./group-join.ts";
+import { runTeamTask } from "./task-runner.ts";
+import { terminateLiveAgentsForRun } from "./live-agent-manager.ts";
+import { createWorkflowStateMachine, validatePhasePreconditions, transitionPhase, type PhaseState, type PhaseGuardContext } from "./workflow-state.ts";
+import { executeWithRetry, DEFAULT_RETRY_POLICY, type RetryPolicy } from "./retry-executor.ts";
+import { appendDeadletter } from "./deadletter.ts";
+import type { MetricRegistry } from "../observability/metric-registry.ts";
+import { childCorrelation, withCorrelation } from "../observability/correlation.ts";
+import { resolveBatchConcurrency } from "./concurrency.ts";
+import { mapConcurrent } from "./parallel-utils.ts";
+import { permissionForRole } from "./role-permission.ts";
+import { registerRunPromise, resolveRunPromise, rejectRunPromise } from "./run-tracker.ts";
+import { clearTrackedTaskUsage } from "./usage-tracker.ts";
+import { CrewCancellationError, buildSyntheticTerminalEvidence, cancellationReasonFromSignal } from "./cancellation.ts";
+import { effectivenessPolicyDecision, evaluateRunEffectiveness, formatRunEffectivenessLines } from "./effectiveness.ts";
+
+export interface ExecuteTeamRunInput {
+	manifest: TeamRunManifest;
+	tasks: TeamTaskState[];
+	team: TeamConfig;
+	workflow: WorkflowConfig;
+	agents: AgentConfig[];
+	executeWorkers: boolean;
+	limits?: CrewLimitsConfig;
+	runtime?: CrewRuntimeCapabilities;
+	runtimeConfig?: CrewRuntimeConfig;
+	parentContext?: string;
+	parentModel?: unknown;
+	modelRegistry?: unknown;
+	modelOverride?: string;
+	signal?: AbortSignal;
+	reliability?: CrewReliabilityConfig;
+	metricRegistry?: MetricRegistry;
+	/** Skill override from the team tool. false disables skill injection for this run. */
+	skillOverride?: string[] | false;
+	/** Optional callback for JSON events from child Pi. Used for overflow recovery tracking. */
+	onJsonEvent?: (taskId: string, runId: string, event: unknown) => void;
+	/** Workspace where this run was initiated — used for session-scoped live-agent visibility. */
+	workspaceId: string;
+}
+
+function findStep(workflow: WorkflowConfig, task: TeamTaskState): WorkflowStep {
+	const step = workflow.steps.find((candidate) => candidate.id === task.stepId);
+	if (!step) throw new Error(`Workflow step '${task.stepId}' not found for task '${task.id}'.`);
+	return step;
+}
+
+function findAgent(agents: AgentConfig[], task: TeamTaskState): AgentConfig {
+	const agent = agents.find((candidate) => candidate.name === task.agent);
+	if (!agent) throw new Error(`Agent '${task.agent}' not found for task '${task.id}'.`);
+	return agent;
+}
+
+function markBlocked(tasks: TeamTaskState[], reason: string): TeamTaskState[] {
+	return tasks.map((task) => task.status === "queued" ? { ...task, status: "skipped", error: reason, finishedAt: new Date().toISOString(), graph: task.graph ? { ...task.graph, queue: "blocked" } : undefined } : task);
+}
+
+function mergeArtifacts(items: ArtifactDescriptor[]): ArtifactDescriptor[] {
+	const byPath = new Map<string, ArtifactDescriptor>();
+	for (const item of items) byPath.set(item.path, item);
+	return [...byPath.values()];
+}
+
+function isNonTerminalTaskStatus(status: TeamTaskState["status"]): boolean {
+	return status === "queued" || status === "running" || status === "waiting";
+}
+
+function shouldMergeTaskUpdate(current: TeamTaskState, updated: TeamTaskState): boolean {
+	// Parallel workers receive the same input snapshot. A later result may still
+	// contain stale queued/running copies of tasks that another worker already
+	// completed. Never let those stale snapshots regress durable task state.
+	if (!isNonTerminalTaskStatus(current.status) && isNonTerminalTaskStatus(updated.status)) return false;
+	// Prevent a stale completed task from overwriting a fresher one.
+	if (current.finishedAt && updated.finishedAt) {
+		const currentFinished = new Date(current.finishedAt).getTime();
+		const updatedFinished = new Date(updated.finishedAt).getTime();
+		if (!Number.isNaN(currentFinished) && !Number.isNaN(updatedFinished) && updatedFinished < currentFinished) return false;
+	}
+	return updated.status !== current.status || updated.finishedAt !== current.finishedAt || updated.startedAt !== current.startedAt || Boolean(updated.resultArtifact) || Boolean(updated.error) || Boolean(updated.modelAttempts?.length) || Boolean(updated.usage) || Boolean(updated.attempts?.length);
+}
+
+export function __test__mergeTaskUpdates(base: TeamTaskState[], results: Array<{ tasks: TeamTaskState[] }>): TeamTaskState[] {
+	let merged = base;
+	for (const result of results) {
+		for (const updated of result.tasks) {
+			const current = merged.find((task) => task.id === updated.id);
+			if (!current || !shouldMergeTaskUpdate(current, updated)) continue;
+			merged = merged.map((task) => task.id === updated.id ? updated : task);
+		}
+	}
+	return refreshTaskGraphQueues(merged);
+}
+
+// 2.8: adaptive-plan parsing/repair/injection moved to src/runtime/adaptive-plan.ts.
+// Re-export the test-only helpers so existing test imports still resolve.
+export { __test__parseAdaptivePlan, __test__repairAdaptivePlan } from "./adaptive-plan.ts";
+import { injectAdaptivePlanIfReady } from "./adaptive-plan.ts";
+
+function formatTaskProgress(task: TeamTaskState): string {
+	return `- ${task.id}: ${task.status} (${task.role} -> ${task.agent})${task.taskPacket ? ` scope=${task.taskPacket.scope}` : ""}${task.verification ? ` green=${task.verification.observedGreenLevel}/${task.verification.requiredGreenLevel}` : ""}${task.error ? ` - ${task.error}` : ""}`;
+}
+
+function runEffectivenessLines(manifest: TeamRunManifest, tasks: TeamTaskState[], executeWorkers: boolean, runtimeConfig?: CrewRuntimeConfig): string[] {
+	return formatRunEffectivenessLines(evaluateRunEffectiveness({ manifest, tasks, executeWorkers, runtimeConfig }));
+}
+
+function writeProgress(manifest: TeamRunManifest, tasks: TeamTaskState[], producer: string, executeWorkers = true, runtimeConfig?: CrewRuntimeConfig): TeamRunManifest {
+	const counts = new Map<string, number>();
+	for (const task of tasks) counts.set(task.status, (counts.get(task.status) ?? 0) + 1);
+	const queue = taskGraphSnapshot(tasks);
+	const progress = writeArtifact(manifest.artifactsRoot, {
+		kind: "progress",
+		relativePath: "progress.md",
+		producer,
+		content: [
+			`# pi-crew progress ${manifest.runId}`,
+			"",
+			`Status: ${manifest.status}`,
+			`Team: ${manifest.team}`,
+			`Workflow: ${manifest.workflow ?? "(none)"}`,
+			`Updated: ${new Date().toISOString()}`,
+			`Task counts: ${[...counts.entries()].map(([status, count]) => `${status}=${count}`).join(", ") || "none"}`,
+			`Queue: ready=${queue.ready.length}, blocked=${queue.blocked.length}, running=${queue.running.length}, done=${queue.done.length}, failed=${queue.failed.length}, cancelled=${queue.cancelled.length}`,
+			"",
+			"## Tasks",
+			...tasks.map(formatTaskProgress),
+			"",
+			"## Effectiveness",
+			...runEffectivenessLines(manifest, tasks, executeWorkers, runtimeConfig),
+			"",
+		].join("\n"),
+	});
+	return { ...manifest, updatedAt: new Date().toISOString(), artifacts: [...manifest.artifacts.filter((artifact) => !(artifact.kind === "progress" && artifact.path === progress.path)), progress] };
+}
+
+function applyPolicy(manifest: TeamRunManifest, tasks: TeamTaskState[], limits?: CrewLimitsConfig): TeamRunManifest {
+	const branchFreshness = checkBranchFreshness(manifest.cwd);
+	const branchArtifact = writeArtifact(manifest.artifactsRoot, {
+		kind: "metadata",
+		relativePath: "metadata/branch-freshness.json",
+		producer: "branch-freshness",
+		content: `${JSON.stringify(branchFreshness, null, 2)}\n`,
+	});
+	let decisions: PolicyDecision[] = evaluateCrewPolicy({ manifest, tasks, limits });
+	if (branchFreshness.status === "stale" || branchFreshness.status === "diverged") {
+		const branchDecision: PolicyDecision = {
+			action: "notify",
+			reason: "branch_stale",
+			message: branchFreshness.message,
+			createdAt: new Date().toISOString(),
+		};
+		decisions = [...decisions, branchDecision];
+		appendEvent(manifest.eventsPath, { type: "branch.stale", runId: manifest.runId, message: branchFreshness.message, data: { branchFreshness } });
+	}
+	const policyArtifact = writeArtifact(manifest.artifactsRoot, {
+		kind: "metadata",
+		relativePath: "policy-decisions.json",
+		producer: "policy-engine",
+		content: `${JSON.stringify(decisions, null, 2)}\n`,
+	});
+	const recoveryLedger = buildRecoveryLedger(decisions);
+	const recoveryArtifact = writeArtifact(manifest.artifactsRoot, {
+		kind: "metadata",
+		relativePath: "recovery-ledger.json",
+		producer: "recovery-engine",
+		content: `${JSON.stringify(recoveryLedger, null, 2)}\n`,
+	});
+	for (const item of decisions) appendEvent(manifest.eventsPath, { type: item.action === "escalate" ? "policy.escalated" : "policy.action", runId: manifest.runId, taskId: item.taskId, message: item.message, data: { action: item.action, reason: item.reason } });
+	for (const item of recoveryLedger.entries) appendEvent(manifest.eventsPath, { type: item.state === "escalation_required" ? "recovery.escalated" : "recovery.attempted", runId: manifest.runId, taskId: item.taskId, message: item.message, data: { scenario: item.scenario, steps: item.steps, attempt: item.attempt, state: item.state } });
+	return { ...manifest, updatedAt: new Date().toISOString(), policyDecisions: decisions, artifacts: [...manifest.artifacts.filter((artifact) => !(artifact.kind === "metadata" && (artifact.path.endsWith("policy-decisions.json") || artifact.path.endsWith("recovery-ledger.json") || artifact.path.endsWith("branch-freshness.json")))), branchArtifact, policyArtifact, recoveryArtifact] };
+}
+
+function retryPolicyFromConfig(config: CrewReliabilityConfig | undefined): RetryPolicy {
+	return { ...DEFAULT_RETRY_POLICY, ...(config?.retryPolicy ?? {}) };
+}
+
+function failedTaskFrom(result: { tasks: TeamTaskState[] }, taskId: string): TeamTaskState | undefined {
+	return result.tasks.find((item) => item.id === taskId && item.status === "failed");
+}
+
+function requiresPlanApproval(workflow: WorkflowConfig, runtimeConfig: CrewRuntimeConfig | undefined): boolean {
+	return workflow.name === "implementation" && runtimeConfig?.requirePlanApproval === true;
+}
+
+function isPlanApprovalPending(manifest: TeamRunManifest): boolean {
+	return manifest.planApproval?.required === true && manifest.planApproval.status === "pending";
+}
+
+function isMutatingTask(task: TeamTaskState): boolean {
+	return permissionForRole(task.role) !== "read_only";
+}
+
+function ensurePlanApprovalRequested(manifest: TeamRunManifest, tasks: TeamTaskState[]): TeamRunManifest {
+	if (manifest.planApproval) return manifest;
+	const assessTask = tasks.find((task) => task.stepId === "assess" && task.status === "completed");
+	const now = new Date().toISOString();
+	const updated: TeamRunManifest = {
+		...manifest,
+		updatedAt: now,
+		planApproval: {
+			required: true,
+			status: "pending",
+			requestedAt: now,
+			updatedAt: now,
+			planTaskId: assessTask?.id,
+			planArtifactPath: assessTask?.resultArtifact?.path,
+		},
+	};
+	saveRunManifest(updated);
+	appendEvent(updated.eventsPath, { type: "plan.approval_required", runId: updated.runId, taskId: assessTask?.id, message: "Adaptive implementation plan requires explicit approval before mutating tasks run.", data: { planArtifactPath: assessTask?.resultArtifact?.path } });
+	return updated;
+}
+
+function cancelPlanTasks(tasks: TeamTaskState[], reason: string): TeamTaskState[] {
+	return tasks.map((task) => task.status === "queued" || task.status === "running" || task.status === "waiting" ? { ...task, status: "cancelled", finishedAt: new Date().toISOString(), error: reason, graph: task.graph ? { ...task.graph, queue: "done" } : undefined } : task);
+}
+
+function hasPendingMutatingAdaptiveTask(tasks: TeamTaskState[]): boolean {
+	return tasks.some((task) => task.status === "queued" && task.adaptive && isMutatingTask(task));
+}
+
+/**
+ * Check whether any task uses explicit `dependsOn` that would benefit from DAG-based
+ * execution planning. If so, build an execution plan and use `getDagReadyTasks`
+ * to augment the ready-set selection.
+ */
+function dagReadyTaskIds(tasks: TeamTaskState[], completedIds: Set<string>): string[] | null {
+	const hasExplicitDeps = tasks.some((t) => t.dependsOn.length > 0);
+	if (!hasExplicitDeps) return null;
+	const nodes: TaskNode[] = tasks.map((t) => ({
+		id: t.id,
+		dependsOn: t.dependsOn,
+		phase: t.adaptive?.phase ?? t.stepId,
+	}));
+	const plan = buildDagExecutionPlan(nodes);
+	if (plan.hasCycle) return null; // fall back to existing scheduler
+	return getDagReadyTasks(plan, completedIds);
+}
+
+export async function executeTeamRun(input: ExecuteTeamRunInput): Promise<{ manifest: TeamRunManifest; tasks: TeamTaskState[] }> {
+	let workflow = input.workflow;
+	let manifest = updateRunStatus(input.manifest, "running", input.executeWorkers ? "Executing team workflow." : "Creating workflow prompts and placeholder results.");
+
+	const runPromise = registerRunPromise(manifest.runId);
+
+	const cleanupUsage = (): void => {
+		for (const task of input.tasks) clearTrackedTaskUsage(task.id);
+	};
+
+	try {
+		const result = await executeTeamRunCore(input, manifest, workflow);
+		resolveRunPromise(manifest.runId, result);
+		cleanupUsage();
+		// Terminate live agents for this run — agents are done when the run ends.
+		void terminateLiveAgentsForRun(manifest.runId, "completed", appendEvent, manifest.eventsPath).catch(() => {});
+		return result;
+	} catch (error) {
+		// P1: Catch unhandled errors — ensure manifest/tasks/agents are terminal so they don't stay "running" forever.
+		const message = error instanceof Error ? error.message : String(error);
+		const loaded = loadRunManifestById(input.manifest.cwd, input.manifest.runId);
+		const freshManifest = loaded?.manifest ?? manifest;
+		const freshTasks = refreshTaskGraphQueues(loaded?.tasks ?? input.tasks);
+		const failedAt = new Date().toISOString();
+		const tasks = freshTasks.map((task) =>
+			task.status === "running" || task.status === "queued" || task.status === "waiting"
+				? { ...task, status: "failed" as const, finishedAt: failedAt, error: message }
+				: task,
+		);
+		manifest = freshManifest;
+		try {
+			await terminateLiveAgentsForRun(manifest.runId, "failed", appendEvent, manifest.eventsPath);
+			await saveRunTasksAsync(manifest, tasks);
+			const existingRuntimeByTask = new Map(readCrewAgents(manifest).map((agent) => [agent.taskId, agent.runtime]));
+			const globalRuntime = input.runtime?.kind ?? "child-process";
+			const runtimeForAgent = (agent: ReturnType<typeof recordsForMaterializedTasks>[number]): CrewRuntimeKind => {
+				const task = tasks.find((item) => item.id === agent.taskId);
+				return existingRuntimeByTask.get(agent.taskId) ?? resolveTaskRuntimeKind(globalRuntime, task?.role ?? agent.role, input.runtimeConfig?.isolationPolicy);
+			};
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, globalRuntime).map((agent) => ({ ...agent, runtime: runtimeForAgent(agent) })));
+			manifest = updateRunStatus(manifest, "failed", `Unhandled error in team runner: ${message}`);
+			await saveRunManifestAsync(manifest);
+		} catch {
+			// Best-effort — state write may also fail
+		}
+		const result = { manifest, tasks };
+		rejectRunPromise(manifest.runId, error instanceof Error ? error : new Error(message));
+		cleanupUsage();
+		return result;
+	}
+}
+
+async function executeTeamRunCore(
+	input: ExecuteTeamRunInput,
+	manifest: TeamRunManifest,
+	workflow: WorkflowConfig,
+): Promise<{ manifest: TeamRunManifest; tasks: TeamTaskState[] }> {
+	// Execute before_run_start hook (non-blocking by default)
+	const beforeRunReport = await executeHook("before_run_start", { runId: manifest.runId, cwd: manifest.cwd });
+	appendHookEvent(manifest, beforeRunReport);
+	if (beforeRunReport.outcome === "block") {
+		manifest = updateRunStatus(manifest, "blocked", beforeRunReport.reason ?? "before_run_start hook blocked the run.");
+		return { manifest, tasks: input.tasks };
+	}
+	let tasks = refreshTaskGraphQueues(input.tasks);
+	let queueIndex = buildTaskGraphIndex(tasks);
+	const canInjectAdaptivePlan = workflow.name === "implementation";
+	let adaptivePlanInjected = false;
+	let adaptivePlanMissing = false;
+	const attemptAdaptivePlan = () => {
+		if (!canInjectAdaptivePlan || adaptivePlanInjected || adaptivePlanMissing) return { injected: false, missing: false };
+		const adaptivePlan = injectAdaptivePlanIfReady({ manifest, tasks, workflow, team: input.team });
+		adaptivePlanInjected = adaptivePlanInjected || adaptivePlan.injected;
+		adaptivePlanMissing = adaptivePlan.missingPlan;
+		workflow = adaptivePlan.workflow;
+		if (adaptivePlan.injected) tasks = adaptivePlan.tasks;
+		return { injected: adaptivePlan.injected, missing: adaptivePlan.missingPlan };
+	};
+	const initialAdaptive = attemptAdaptivePlan();
+	if (initialAdaptive.missing) {
+		tasks = markBlocked(tasks, "Adaptive planner did not produce a valid subagent plan.");
+		await saveRunTasksAsync(manifest, tasks);
+		manifest = updateRunStatus(manifest, "blocked", "Adaptive planner did not produce a valid subagent plan.");
+		return { manifest, tasks };
+	}
+	if (initialAdaptive.injected) {
+		manifest = requiresPlanApproval(workflow, input.runtimeConfig) ? ensurePlanApprovalRequested(manifest, tasks) : manifest;
+		queueIndex = buildTaskGraphIndex(tasks);
+	} else if (requiresPlanApproval(workflow, input.runtimeConfig) && hasPendingMutatingAdaptiveTask(tasks)) {
+		manifest = ensurePlanApprovalRequested(manifest, tasks);
+	}
+	if (manifest.planApproval?.status === "cancelled") {
+		tasks = cancelPlanTasks(tasks, "Plan approval was cancelled.");
+		await saveRunTasksAsync(manifest, tasks);
+		manifest = updateRunStatus(manifest, "cancelled", "Plan approval was cancelled.");
+		return { manifest, tasks };
+	}
+	manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
+	await saveRunManifestAsync(manifest);
+	const runtimeKind = input.runtime?.kind ?? (input.executeWorkers ? "child-process" : "scaffold");
+	saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+
+	// Build a workflow phase state machine from workflow steps for precondition tracking.
+	const workflowPhases: PhaseState[] = workflow.steps.map((step): PhaseState => ({
+		name: step.id,
+		status: "pending",
+		inputs: step.reads === false ? [] : Array.isArray(step.reads) ? step.reads : [],
+		outputs: step.output === false ? [] : step.output ? [step.output] : [],
+	}));
+	let wfMachine = createWorkflowStateMachine(workflowPhases);
+
+	while (tasks.some((task) => task.status === "queued")) {
+		if (input.signal?.aborted) {
+			const cancelReason = cancellationReasonFromSignal(input.signal);
+			const message = `${cancelReason.message} (${cancelReason.code})`;
+			const cancelledTaskIds: string[] = [];
+			tasks = tasks.map((task) => {
+				if (task.status !== "queued" && task.status !== "running" && task.status !== "waiting") return task;
+				cancelledTaskIds.push(task.id);
+				const base = { ...task, status: "cancelled" as const, finishedAt: new Date().toISOString(), error: message };
+				if (task.status === "running") {
+					return { ...base, terminalEvidence: [...(task.terminalEvidence ?? []), buildSyntheticTerminalEvidence("worker", cancelReason, task.startedAt)] };
+				}
+				return base;
+			});
+			await saveRunTasksAsync(manifest, tasks);
+			for (const taskId of cancelledTaskIds) appendEvent(manifest.eventsPath, { type: "task.cancelled", runId: manifest.runId, taskId, message, data: { reason: cancelReason.code } });
+			manifest = updateRunStatus(manifest, "cancelled", message, { data: { reason: cancelReason.code, cancelledTaskIds } });
+			return { manifest, tasks };
+		}
+
+		const failed = tasks.find((task) => task.status === "failed");
+		if (failed) {
+			tasks = markBlocked(tasks, `Blocked by failed task '${failed.id}'.`);
+			await saveRunTasksAsync(manifest, tasks);
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+			manifest = updateRunStatus(manifest, "failed", `Failed at task '${failed.id}'.`);
+			return { manifest, tasks };
+		}
+
+		const snapshot = taskGraphSnapshot(tasks, queueIndex);
+
+		// DAG-based execution plan: when tasks have explicit dependsOn, use the
+		// topological wave planner to determine ready tasks. Fall back to the
+		// existing task-graph-scheduler when no explicit deps exist (backward compat).
+		const completedIds = new Set(tasks.filter((t) => t.status === "completed").map((t) => t.id));
+		const dagReady = dagReadyTaskIds(tasks, completedIds);
+		const effectiveReady = dagReady ?? snapshot.ready;
+
+		// Workflow phase precondition check (non-blocking: log warnings only).
+		if (wfMachine.currentPhaseIndex < wfMachine.phases.length) {
+			const completedArtifacts = manifest.artifacts.filter((a) => a.kind === "result" || a.kind === "summary").map((a) => a.path);
+			const previousPhaseStatus = wfMachine.currentPhaseIndex > 0 ? (wfMachine.phases[wfMachine.currentPhaseIndex - 1]?.status ?? "pending") : "completed";
+			const wfContext: PhaseGuardContext = {
+				completedArtifacts,
+				previousPhaseStatus,
+				taskResults: tasks.filter((t) => t.status === "completed").map((t) => ({ taskId: t.id, status: t.status, outputPath: t.resultArtifact?.path })),
+			};
+			const preconditions = validatePhasePreconditions(wfMachine, wfContext);
+			if (!preconditions.ready) {
+				appendEvent(manifest.eventsPath, { type: "workflow.preconditions", runId: manifest.runId, message: `Workflow phase '${wfMachine.phases[wfMachine.currentPhaseIndex]?.name}' is missing inputs: ${preconditions.blocking.join(", ")}`, data: { phaseIndex: wfMachine.currentPhaseIndex, phaseName: wfMachine.phases[wfMachine.currentPhaseIndex]?.name, blocking: preconditions.blocking } });
+			} else {
+				// Advance the machine past completed phases.
+				while (wfMachine.currentPhaseIndex < wfMachine.phases.length && wfMachine.phases[wfMachine.currentPhaseIndex]?.status === "completed") {
+					wfMachine = { ...wfMachine, currentPhaseIndex: wfMachine.currentPhaseIndex + 1 };
+				}
+			}
+		}
+
+		const readyRoles = effectiveReady.map((taskId) => tasks.find((task) => task.id === taskId)?.role).filter((role): role is string => Boolean(role));
+		const concurrency = resolveBatchConcurrency({ workflowName: workflow.name, workflowMaxConcurrency: workflow.maxConcurrency, teamMaxConcurrency: input.team.maxConcurrency, limitMaxConcurrentWorkers: input.limits?.maxConcurrentWorkers, allowUnboundedConcurrency: input.limits?.allowUnboundedConcurrency, readyCount: effectiveReady.length, workspaceMode: manifest.workspaceMode, readyRoles });
+		if (concurrency.reason.includes(";unbounded:")) {
+			appendEvent(manifest.eventsPath, { type: "limits.unbounded", runId: manifest.runId, message: "Unbounded worker concurrency was explicitly enabled for this run.", data: { concurrencyReason: concurrency.reason, maxConcurrent: concurrency.maxConcurrent } });
+		}
+		const approvalPending = isPlanApprovalPending(manifest);
+		const readyIds = approvalPending ? effectiveReady : effectiveReady.slice(0, concurrency.selectedCount);
+		const candidateBatch = readyIds.map((id) => tasks.find((task) => task.id === id)).filter((task): task is TeamTaskState => Boolean(task));
+		const readyBatch = approvalPending ? candidateBatch.filter((task) => !isMutatingTask(task)).slice(0, concurrency.selectedCount) : candidateBatch;
+		if (readyBatch.length === 0) {
+			if (approvalPending && candidateBatch.some(isMutatingTask)) {
+				await saveRunTasksAsync(manifest, tasks);
+				saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+				manifest = updateRunStatus(manifest, "blocked", "Plan approval required before mutating implementation tasks run.");
+				return { manifest, tasks };
+			}
+			tasks = markBlocked(tasks, "No ready queued task; dependency graph may be invalid.");
+			await saveRunTasksAsync(manifest, tasks);
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+			manifest = updateRunStatus(manifest, "blocked", "No ready queued task.");
+			return { manifest, tasks };
+		}
+
+		// 2.2 caller migration: batch progress is high-frequency informational.
+		appendEventFireAndForget(manifest.eventsPath, { type: "task.progress", runId: manifest.runId, message: `Starting ready batch with ${readyBatch.length} task(s).`, data: { taskIds: readyBatch.map((task) => task.id), readyCount: snapshot.ready.length, blockedCount: snapshot.blocked.length, runningCount: snapshot.running.length, doneCount: snapshot.done.length, selectedCount: readyBatch.length, maxConcurrent: concurrency.maxConcurrent, defaultConcurrency: concurrency.defaultConcurrency, concurrencyReason: approvalPending ? `${concurrency.reason};plan-approval-read-only` : concurrency.reason } });
+		// Execute before_task_start hooks for the batch
+		for (const task of readyBatch) {
+			const taskReport = await executeHook("before_task_start", { runId: manifest.runId, taskId: task.id, cwd: manifest.cwd });
+			appendHookEvent(manifest, taskReport);
+			if (taskReport.outcome === "block") {
+				tasks = tasks.map((t) => t.id === task.id ? { ...t, status: "skipped" as const, error: taskReport.reason ?? "before_task_start hook blocked execution." } : t);
+				manifest = updateRunStatus(manifest, manifest.status, `Task '${task.id}' blocked by hook.`);
+			}
+		}
+		const batchTasks = readyBatch.filter((task) => tasks.find((t) => t.id === task.id && t.status !== "skipped"));
+		if (batchTasks.length > 1) {
+			appendEvent(manifest.eventsPath, { type: "task.parallel_start", runId: manifest.runId, message: `Launching ${batchTasks.length} tasks in PARALLEL (concurrency=${concurrency.selectedCount}): ${batchTasks.map((t) => `${t.role}(${t.id})`).join(", ")}`, data: { taskIds: batchTasks.map((t) => t.id), roles: batchTasks.map((t) => t.role), concurrency: concurrency.selectedCount } });
+		}
+		const results = await mapConcurrent(
+			batchTasks,
+			concurrency.selectedCount,
+			async (task) => {
+				const step = findStep(workflow, task);
+				const agent = findAgent(input.agents, task);
+				const teamRole = input.team.roles.find((role) => role.name === task.role);
+				const perTaskRuntime = resolveTaskRuntimeKind(runtimeKind, task.role, input.runtimeConfig?.isolationPolicy);
+				const baseInput = { manifest, tasks, task, step, agent, signal: input.signal, executeWorkers: input.executeWorkers, runtimeKind: runtimeKind, taskRuntimeOverride: perTaskRuntime !== runtimeKind ? perTaskRuntime : undefined, runtimeConfig: input.runtimeConfig, parentContext: input.parentContext, parentModel: input.parentModel, modelRegistry: input.modelRegistry, modelOverride: input.modelOverride, teamRoleModel: teamRole?.model, teamRoleSkills: teamRole?.skills, skillOverride: input.skillOverride, limits: input.limits, onJsonEvent: input.onJsonEvent, workspaceId: input.workspaceId };
+				if (input.reliability?.autoRetry !== true) return withCorrelation(childCorrelation(manifest.runId, task.id), () => runTeamTask(baseInput));
+				let lastFailed: { manifest: TeamRunManifest; tasks: TeamTaskState[] } | undefined;
+				let lastAttemptId: string | undefined;
+				const attemptsSoFar: TaskAttemptState[] = [...(task.attempts ?? [])];
+				const policy = retryPolicyFromConfig(input.reliability);
+				try {
+					return await executeWithRetry(async (attempt, info) => {
+						const startedAt = new Date().toISOString();
+						const inFlightAttempts: TaskAttemptState[] = [...attemptsSoFar, { attemptId: info.attemptId, startedAt }];
+						input.metricRegistry?.counter("crew.task.retry_attempt_total", "Retry attempts by run and task").inc({ runId: manifest.runId, taskId: task.id });
+						const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
+						const freshManifest = fresh?.manifest ?? manifest;
+						const freshTasks = fresh?.tasks ?? tasks;
+						const freshTask = freshTasks.find((item) => item.id === task.id) ?? task;
+						if (freshTask.status !== "queued" && freshTask.status !== "running") return { manifest: freshManifest, tasks: freshTasks };
+						const taskWithAttempt: TeamTaskState = { ...freshTask, attempts: inFlightAttempts };
+						const result = await withCorrelation(childCorrelation(freshManifest.runId, task.id), () => runTeamTask({ ...baseInput, manifest: freshManifest, tasks: freshTasks, task: taskWithAttempt }));
+						const failed = failedTaskFrom(result, task.id);
+						const endedAt = new Date().toISOString();
+						const finishedAttempt: TaskAttemptState = { attemptId: info.attemptId, startedAt, endedAt, ...(failed?.error ? { error: failed.error } : {}) };
+						attemptsSoFar.push(finishedAttempt);
+						const withAttempt = result.tasks.map((item) => item.id === task.id ? { ...item, attempts: [...attemptsSoFar] } : item);
+						const enriched = { manifest: result.manifest, tasks: withAttempt };
+						if (failed) {
+							lastFailed = enriched;
+							throw new Error(failed.error ?? `Task ${task.id} failed.`);
+						}
+						input.metricRegistry?.histogram("crew.task.retry_count", "Retries per task", [0, 1, 2, 3, 5, 10]).observe({ runId: manifest.runId, team: input.team.name }, Math.max(0, attempt - 1));
+						return enriched;
+					}, policy, {
+						signal: input.signal,
+						attemptId: (attempt) => `${manifest.runId}:${task.id}:attempt-${attempt}`,
+						onAttemptFailed: (attempt, error, delayMs, info) => {
+							lastAttemptId = info.attemptId;
+							appendEvent(manifest.eventsPath, { type: "crew.task.retry_attempt", runId: manifest.runId, taskId: task.id, message: error.message, data: { attempt, attemptId: info.attemptId, delayMs }, metadata: { attemptId: info.attemptId } });
+							input.metricRegistry?.histogram("crew.task.retry_delay_ms", "Retry backoff delay, milliseconds").observe({ runId: manifest.runId, taskId: task.id }, delayMs);
+						},
+						onRetryGivenUp: (attempts, error, info) => {
+							lastAttemptId = info.attemptId;
+							appendDeadletter(manifest, { runId: manifest.runId, taskId: task.id, reason: "max-retries", attempts, attemptId: info.attemptId, lastError: error.message, timestamp: new Date().toISOString() });
+							input.metricRegistry?.counter("crew.task.deadletter_total", "Deadletter triggers by reason").inc({ reason: "max-retries" });
+							input.metricRegistry?.histogram("crew.task.retry_count", "Retries per task", [0, 1, 2, 3, 5, 10]).observe({ runId: manifest.runId, team: input.team.name }, Math.max(0, attempts - 1));
+						},
+					});
+				} catch (retryError) {
+					if (retryError instanceof CrewCancellationError || input.signal?.aborted) {
+						const reason = retryError instanceof CrewCancellationError ? retryError.reason : cancellationReasonFromSignal(input.signal);
+						const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
+						const freshManifest = fresh?.manifest ?? manifest;
+						const freshTasks = fresh?.tasks ?? tasks;
+						const cancelledTasks = freshTasks.map((item) => item.id === task.id && (item.status === "queued" || item.status === "running") ? { ...item, status: "cancelled" as const, finishedAt: new Date().toISOString(), error: `${reason.message} (${reason.code})` } : item);
+						appendEvent(freshManifest.eventsPath, { type: "task.cancelled", runId: freshManifest.runId, taskId: task.id, message: reason.message, data: { reason, phase: "retry" }, metadata: lastAttemptId ? { attemptId: lastAttemptId } : undefined });
+						return { manifest: updateRunStatus(freshManifest, "cancelled", reason.message), tasks: cancelledTasks };
+					}
+					if (lastFailed) return lastFailed;
+					const fresh = loadRunManifestById(manifest.cwd, manifest.runId);
+					const freshManifest = fresh?.manifest ?? manifest;
+					const freshTasks = fresh?.tasks ?? tasks;
+					const freshTask = freshTasks.find((item) => item.id === task.id) ?? task;
+					if (freshTask.status !== "queued" && freshTask.status !== "running") return { manifest: freshManifest, tasks: freshTasks };
+					return withCorrelation(childCorrelation(freshManifest.runId, task.id), () => runTeamTask({ ...baseInput, manifest: freshManifest, tasks: freshTasks, task: freshTask }));
+				}
+			},
+		);
+		if (results.length === 0) break;
+		manifest = { ...results.at(-1)!.manifest, artifacts: mergeArtifacts([manifest.artifacts, ...results.map((item) => item.manifest.artifacts)].flat()) };
+		tasks = __test__mergeTaskUpdates(tasks, results);
+
+		// Advance workflow phases whose tasks are all in terminal state
+		const terminalStatuses = new Set(["completed", "failed", "skipped", "cancelled"]);
+		const phaseTaskMap = new Map<string, string[]>();
+		for (const task of tasks) {
+			if (!task.stepId) continue;
+			const existing = phaseTaskMap.get(task.stepId) ?? [];
+			existing.push(task.id);
+			phaseTaskMap.set(task.stepId, existing);
+		}
+		for (let pi = wfMachine.currentPhaseIndex; pi < wfMachine.phases.length; pi++) {
+			const phase = wfMachine.phases[pi]!;
+			const phaseTaskIds = phaseTaskMap.get(phase.name) ?? [];
+			if (phaseTaskIds.length === 0) continue;
+			const allTerminal = phaseTaskIds.every((taskId) => {
+				const task = tasks.find((t) => t.id === taskId);
+				return task ? terminalStatuses.has(task.status) : false;
+			});
+			if (!allTerminal) break;
+			if (phase.status !== "completed" && phase.status !== "failed" && phase.status !== "skipped") {
+				const completedArtifacts = manifest.artifacts.filter((a) => a.kind === "result" || a.kind === "summary").map((a) => a.path);
+				const previousPhaseStatus = pi > 0 ? (wfMachine.phases[pi - 1]?.status ?? "pending") : "completed";
+				const wfContext: PhaseGuardContext = {
+					completedArtifacts,
+					previousPhaseStatus,
+					taskResults: tasks.filter((t) => t.status === "completed").map((t) => ({ taskId: t.id, status: t.status, outputPath: t.resultArtifact?.path })),
+				};
+				// Determine phase transition status based on individual task outcomes
+				const phaseTasks = phaseTaskIds.map((taskId) => tasks.find((t) => t.id === taskId)).filter((t): t is NonNullable<typeof t> => t !== undefined);
+				const hasFailedOrCancelled = phaseTasks.some((t) => t.status === "failed" || t.status === "cancelled");
+				const phaseStatus = hasFailedOrCancelled ? "failed" : "completed";
+				const transition = transitionPhase(wfMachine, pi, phaseStatus, wfContext);
+				wfMachine = transition.machine;
+				if (transition.guardResult && !transition.guardResult.allowed) {
+					appendEvent(manifest.eventsPath, { type: "workflow.phase_guard_blocked", runId: manifest.runId, message: `Workflow phase '${phase.name}' guard blocked: ${transition.guardResult.reason ?? "unknown"}`, data: { phaseIndex: pi, phaseName: phase.name, reason: transition.guardResult.reason } });
+					break;
+				}
+				appendEvent(manifest.eventsPath, { type: phaseStatus === "failed" ? "workflow.phase_failed" : "workflow.phase_completed", runId: manifest.runId, message: `Workflow phase '${phase.name}' ${phaseStatus}.`, data: { phaseIndex: pi, phaseStatus } });
+			}
+			wfMachine = { ...wfMachine, currentPhaseIndex: pi + 1 };
+		}
+
+		const cancelledResult = results.find((item) => item.manifest.status === "cancelled");
+		if (cancelledResult || input.signal?.aborted) {
+			const reason = input.signal?.aborted ? cancellationReasonFromSignal(input.signal) : undefined;
+			const message = reason?.message ?? cancelledResult?.manifest.summary ?? "Run cancelled during task execution.";
+			manifest = { ...manifest, status: "running" };
+			manifest = updateRunStatus(manifest, "cancelled", message);
+			await saveRunTasksAsync(manifest, tasks);
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+			await saveRunManifestAsync(manifest);
+			appendEvent(manifest.eventsPath, { type: "run.cancelled", runId: manifest.runId, message, data: { reason, phase: "task-batch", cancelledResultRunId: cancelledResult?.manifest.runId } });
+			return { manifest, tasks };
+		}
+		queueIndex = buildTaskGraphIndex(tasks);
+		const injectedAfterBatch = attemptAdaptivePlan();
+		if (injectedAfterBatch.missing) {
+			tasks = markBlocked(tasks, "Adaptive planner did not produce a valid subagent plan.");
+			await saveRunTasksAsync(manifest, tasks);
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+			manifest = updateRunStatus(manifest, "blocked", "Adaptive planner did not produce a valid subagent plan.");
+			return { manifest, tasks };
+		}
+		if (injectedAfterBatch.injected) {
+			manifest = requiresPlanApproval(workflow, input.runtimeConfig) ? ensurePlanApprovalRequested(manifest, tasks) : manifest;
+			queueIndex = buildTaskGraphIndex(tasks);
+		} else if (requiresPlanApproval(workflow, input.runtimeConfig) && hasPendingMutatingAdaptiveTask(tasks)) {
+			manifest = ensurePlanApprovalRequested(manifest, tasks);
+		}
+		if (manifest.planApproval?.status === "cancelled") {
+			tasks = cancelPlanTasks(tasks, "Plan approval was cancelled.");
+			await saveRunTasksAsync(manifest, tasks);
+			saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+			manifest = updateRunStatus(manifest, "cancelled", "Plan approval was cancelled.");
+			return { manifest, tasks };
+		}
+		await saveRunTasksAsync(manifest, tasks);
+		saveCrewAgents(manifest, recordsForMaterializedTasks(manifest, tasks, runtimeKind));
+		const completedBatch = batchTasks.map((task) => tasks.find((item) => item.id === task.id) ?? task);
+		const batchArtifact = writeArtifact(manifest.artifactsRoot, {
+			kind: "summary",
+			relativePath: `batches/${batchTasks.map((task) => task.id).join("+")}.md`,
+			producer: "team-runner",
+			content: aggregateTaskOutputs(completedBatch, manifest),
+		});
+		const groupDelivery = deliverGroupJoin({ manifest, mode: resolveGroupJoinMode(input.runtimeConfig), batch: batchTasks, allTasks: tasks });
+		manifest = { ...manifest, artifacts: mergeArtifacts([...manifest.artifacts, batchArtifact, ...(groupDelivery?.artifact ? [groupDelivery.artifact] : [])]) };
+		manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
+		await saveRunManifestAsync(manifest);
+	}
+
+	const failed = tasks.find((task) => task.status === "failed");
+	const waiting = tasks.find((task) => task.status === "waiting");
+	const running = tasks.find((task) => task.status === "running");
+	manifest = applyPolicy(manifest, tasks, input.limits);
+	const effectiveness = evaluateRunEffectiveness({ manifest, tasks, executeWorkers: input.executeWorkers, runtimeConfig: input.runtimeConfig });
+	const effectivenessDecision = effectivenessPolicyDecision(effectiveness);
+	if (effectivenessDecision) {
+		manifest = { ...manifest, policyDecisions: [...(manifest.policyDecisions ?? []), effectivenessDecision], updatedAt: new Date().toISOString() };
+		appendEvent(manifest.eventsPath, { type: "run.effectiveness", runId: manifest.runId, message: effectivenessDecision.message, data: { effectiveness, policyDecision: effectivenessDecision } });
+	}
+	const blockingDecision = manifest.policyDecisions?.find((item) => item.action === "block" || item.action === "escalate");
+	if (failed) {
+		manifest = updateRunStatus(manifest, "failed", `Failed at task '${failed.id}'.`);
+	} else if (waiting) {
+		manifest = updateRunStatus(manifest, "blocked", `Waiting for response to task '${waiting.id}'.`);
+	} else if (running) {
+		manifest = updateRunStatus(manifest, "blocked", `Task '${running.id}' is still running.`);
+	} else if (effectiveness.severity === "failed") {
+		manifest = updateRunStatus(manifest, "failed", effectivenessDecision?.message ?? "Run effectiveness guard failed.");
+	} else if (effectiveness.severity === "blocked") {
+		manifest = updateRunStatus(manifest, "blocked", effectivenessDecision?.message ?? "Run effectiveness guard blocked completion.");
+	} else if (blockingDecision) {
+		manifest = updateRunStatus(manifest, "blocked", blockingDecision.message);
+	} else {
+		manifest = updateRunStatus(manifest, "completed", input.executeWorkers ? "Team workflow completed." : "Team workflow scaffold completed without launching child workers.");
+	}
+	manifest = writeProgress(manifest, tasks, "team-runner", input.executeWorkers, input.runtimeConfig);
+	await saveRunManifestAsync(manifest);
+	const usage = aggregateUsage(tasks);
+	const summaryArtifact = writeArtifact(manifest.artifactsRoot, {
+		kind: "summary",
+		relativePath: "summary.md",
+		producer: "team-runner",
+		content: [
+			`# pi-crew run ${manifest.runId}`,
+			"",
+			`Status: ${manifest.status}`,
+			`Team: ${manifest.team}`,
+			`Workflow: ${manifest.workflow ?? "(none)"}`,
+			`Goal: ${manifest.goal}`,
+			`Usage: ${formatUsage(usage)}`,
+			"",
+			"## Tasks",
+			...tasks.map(formatTaskProgress),
+			"",
+			"## Effectiveness",
+			...runEffectivenessLines(manifest, tasks, input.executeWorkers, input.runtimeConfig),
+			"",
+			"## Policy decisions",
+			...(manifest.policyDecisions?.length ? summarizePolicyDecisions(manifest.policyDecisions) : ["- (none)"]),
+			"",
+		].join("\n"),
+	});
+	manifest = { ...manifest, updatedAt: new Date().toISOString(), artifacts: [...manifest.artifacts, summaryArtifact] };
+	await saveRunManifestAsync(manifest);
+	await saveRunTasksAsync(manifest, tasks);
+	return { manifest, tasks };
+}