substrate-ai 0.1.20 → 0.1.22

package/dist/cli/index.js

@@ -3,6 +3,7 @@ import { AdapterRegistry, ConfigError, ConfigIncompatibleFormatError, DatabaseWr
 import { CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, PartialSubstrateConfigSchema, SUPPORTED_CONFIG_FORMAT_VERSIONS, SubstrateConfigSchema } from "../config-schema-C9tTMcm1.js";
 import { defaultConfigMigrator } from "../version-manager-impl-O25ieEjS.js";
 import { registerUpgradeCommand } from "../upgrade-CHhsJc_q.js";
+import { createRequire } from "module";
 import { Command } from "commander";
 import { fileURLToPath } from "url";
 import { dirname, extname, isAbsolute, join, relative, resolve } from "path";
@@ -23,8 +24,12 @@ import * as readline$1 from "readline";
 import * as readline from "readline";
 import { createInterface as createInterface$1 } from "readline";
 import { randomUUID as randomUUID$1 } from "crypto";
-import { createRequire } from "node:module";
+import { createRequire as createRequire$1 } from "node:module";
 
+//#region rolldown:runtime
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+
+//#endregion
 //#region src/cli/utils/formatting.ts
 /**
 * Build adapter list rows from discovery results.
@@ -384,7 +389,7 @@ function listTemplates() {
 
 //#endregion
 //#region src/cli/commands/init.ts
-const logger$30 = createLogger("init");
+const logger$32 = createLogger("init");
 /**
 * Detect whether the CLI was invoked via `npx substrate`.
 * When true, prefix suggested commands with `npx `.
@@ -568,7 +573,7 @@ async function runInit(options = {}) {
 		discoveryReport = await registry.discoverAndRegister();
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		logger$30.error({ err }, "Adapter discovery failed");
+		logger$32.error({ err }, "Adapter discovery failed");
 		process.stderr.write(`  Error: adapter discovery failed — ${message}\n`);
 		return INIT_EXIT_ERROR;
 	}
@@ -606,7 +611,7 @@ async function runInit(options = {}) {
 		await writeFile(routingPolicyPath, routingHeader + yaml.dump(routingPolicy), "utf-8");
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		logger$30.error({ err }, "Failed to write config files");
+		logger$32.error({ err }, "Failed to write config files");
 		process.stderr.write(`  Error: failed to write configuration — ${message}\n`);
 		return INIT_EXIT_ERROR;
 	}
@@ -681,7 +686,7 @@ function formatUnsupportedVersionError(formatType, version, supported) {
 
 //#endregion
 //#region src/modules/config/config-system-impl.ts
-const logger$29 = createLogger("config");
+const logger$31 = createLogger("config");
 function deepMerge(base, override) {
 	const result = { ...base };
 	for (const [key, val] of Object.entries(override)) if (val !== null && val !== void 0 && typeof val === "object" && !Array.isArray(val) && typeof result[key] === "object" && result[key] !== null && !Array.isArray(result[key])) result[key] = deepMerge(result[key], val);
@@ -726,7 +731,7 @@ function readEnvOverrides() {
 	}
 	const parsed = PartialSubstrateConfigSchema.safeParse(overrides);
 	if (!parsed.success) {
-		logger$29.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
+		logger$31.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
 		return {};
 	}
 	return parsed.data;
@@ -790,7 +795,7 @@ var ConfigSystemImpl = class {
 			throw new ConfigError(`Configuration validation failed:\n${issues}`, { issues: result.error.issues });
 		}
 		this._config = result.data;
-		logger$29.debug("Configuration loaded successfully");
+		logger$31.debug("Configuration loaded successfully");
 	}
 	getConfig() {
 		if (this._config === null) throw new ConfigError("Configuration has not been loaded. Call load() before getConfig().", {});
@@ -853,7 +858,7 @@ var ConfigSystemImpl = class {
 				if (version !== void 0 && typeof version === "string" && !isVersionSupported(version, SUPPORTED_CONFIG_FORMAT_VERSIONS)) if (defaultConfigMigrator.canMigrate(version, CURRENT_CONFIG_FORMAT_VERSION)) {
 					const migrationOutput = defaultConfigMigrator.migrate(rawObj, version, CURRENT_CONFIG_FORMAT_VERSION, filePath);
 					if (migrationOutput.result.success) {
-						logger$29.info({
+						logger$31.info({
 							from: version,
 							to: CURRENT_CONFIG_FORMAT_VERSION,
 							backup: migrationOutput.result.backupPath
@@ -896,7 +901,7 @@ function createConfigSystem(options = {}) {
 
 //#endregion
 //#region src/cli/commands/config.ts
-const logger$28 = createLogger("config-cmd");
+const logger$30 = createLogger("config-cmd");
 const CONFIG_EXIT_SUCCESS = 0;
 const CONFIG_EXIT_ERROR = 1;
 const CONFIG_EXIT_INVALID = 2;
@@ -922,7 +927,7 @@ async function runConfigShow(opts = {}) {
 			return CONFIG_EXIT_INVALID;
 		}
 		const message = err instanceof Error ? err.message : String(err);
-		logger$28.error({ err }, "Failed to load configuration");
+		logger$30.error({ err }, "Failed to load configuration");
 		process.stderr.write(`  Error loading configuration: ${message}\n`);
 		return CONFIG_EXIT_ERROR;
 	}
@@ -996,7 +1001,7 @@ async function runConfigExport(opts = {}) {
 			return CONFIG_EXIT_INVALID;
 		}
 		const message = err instanceof Error ? err.message : String(err);
-		logger$28.error({ err }, "Failed to load configuration");
+		logger$30.error({ err }, "Failed to load configuration");
 		process.stderr.write(`Error loading configuration: ${message}\n`);
 		return CONFIG_EXIT_ERROR;
 	}
@@ -1150,7 +1155,7 @@ function registerConfigCommand(program, _version) {
 
 //#endregion
 //#region src/cli/commands/merge.ts
-const logger$27 = createLogger("merge-cmd");
+const logger$29 = createLogger("merge-cmd");
 const MERGE_EXIT_SUCCESS = 0;
 const MERGE_EXIT_CONFLICT = 1;
 const MERGE_EXIT_ERROR = 2;
@@ -1188,7 +1193,7 @@ async function mergeTask(taskId, targetBranch, projectRoot) {
 		projectRoot
 	});
 	try {
-		logger$27.info({
+		logger$29.info({
 			taskId,
 			targetBranch
 		}, "Running conflict detection...");
@@ -1210,7 +1215,7 @@ async function mergeTask(taskId, targetBranch, projectRoot) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		console.error(`Error merging task "${taskId}": ${message}`);
-		logger$27.error({
+		logger$29.error({
 			taskId,
 			err
 		}, "merge --task failed");
@@ -1264,7 +1269,7 @@ async function mergeAll(targetBranch, projectRoot, taskIds) {
 			error: message
 		});
 		console.log(`  Error for task "${taskId}": ${message}`);
-		logger$27.error({
+		logger$29.error({
 			taskId,
 			err
 		}, "merge --all: task failed");
@@ -1317,7 +1322,7 @@ function registerMergeCommand(program, projectRoot = process.cwd()) {
 
 //#endregion
 //#region src/cli/commands/worktrees.ts
-const logger$26 = createLogger("worktrees-cmd");
+const logger$28 = createLogger("worktrees-cmd");
 const WORKTREES_EXIT_SUCCESS = 0;
 const WORKTREES_EXIT_ERROR = 1;
 /** Valid task statuses for filtering */
@@ -1444,7 +1449,7 @@ async function listWorktreesAction(options) {
 		try {
 			worktreeInfos = await manager.listWorktrees();
 		} catch (err) {
-			logger$26.error({ err }, "Failed to list worktrees");
+			logger$28.error({ err }, "Failed to list worktrees");
 			const message = err instanceof Error ? err.message : String(err);
 			process.stderr.write(`Error listing worktrees: ${message}\n`);
 			return WORKTREES_EXIT_ERROR;
@@ -1471,7 +1476,7 @@ async function listWorktreesAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$26.error({ err }, "listWorktreesAction failed");
+		logger$28.error({ err }, "listWorktreesAction failed");
 		return WORKTREES_EXIT_ERROR;
 	}
 }
@@ -1733,7 +1738,7 @@ function getPlanningCostTotal(db, sessionId) {
 
 //#endregion
 //#region src/cli/commands/cost.ts
-const logger$25 = createLogger("cost-cmd");
+const logger$27 = createLogger("cost-cmd");
 const COST_EXIT_SUCCESS = 0;
 const COST_EXIT_ERROR = 1;
 /**
@@ -1979,7 +1984,7 @@ async function runCostAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$25.error({ err }, "runCostAction failed");
+		logger$27.error({ err }, "runCostAction failed");
 		return COST_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2041,7 +2046,7 @@ function emitStatusSnapshot(snapshot) {
 
 //#endregion
 //#region src/recovery/crash-recovery.ts
-const logger$24 = createLogger("crash-recovery");
+const logger$26 = createLogger("crash-recovery");
 var CrashRecoveryManager = class {
 	db;
 	gitWorktreeManager;
@@ -2094,7 +2099,7 @@ var CrashRecoveryManager = class {
 			});
 		}
 		if (this.gitWorktreeManager !== void 0) this.cleanupOrphanedWorktrees().catch((err) => {
-			logger$24.warn({ err }, "Worktree cleanup failed during recovery (non-fatal)");
+			logger$26.warn({ err }, "Worktree cleanup failed during recovery (non-fatal)");
 		});
 		let newlyReady = 0;
 		if (sessionId !== void 0) {
@@ -2104,7 +2109,7 @@ var CrashRecoveryManager = class {
 			const row = db.prepare("SELECT COUNT(*) as count FROM ready_tasks").get();
 			newlyReady = row.count;
 		}
-		logger$24.info({
+		logger$26.info({
 			event: "recovery:complete",
 			recovered,
 			failed,
@@ -2126,10 +2131,10 @@ var CrashRecoveryManager = class {
 		if (this.gitWorktreeManager === void 0) return 0;
 		try {
 			const count = await this.gitWorktreeManager.cleanupAllWorktrees();
-			logger$24.info({ count }, "Cleaned up orphaned worktrees");
+			logger$26.info({ count }, "Cleaned up orphaned worktrees");
 			return count;
 		} catch (err) {
-			logger$24.warn({ err }, "Failed to clean up orphaned worktrees — continuing");
+			logger$26.warn({ err }, "Failed to clean up orphaned worktrees — continuing");
 			return 0;
 		}
 	}
@@ -2212,7 +2217,7 @@ function setupGracefulShutdown(options) {
 
 //#endregion
 //#region src/cli/commands/start.ts
-const logger$23 = createLogger("start-cmd");
+const logger$25 = createLogger("start-cmd");
 const START_EXIT_SUCCESS = 0;
 const START_EXIT_ERROR = 1;
 const START_EXIT_USAGE_ERROR = 2;
@@ -2321,7 +2326,7 @@ async function runStartAction(options) {
 		let configWatcher$1 = null;
 		const configFilePath = join(projectRoot, "substrate.config.yaml");
 		if (noWatchConfig) {
-			logger$23.info("Config hot-reload disabled (--no-watch-config).");
+			logger$25.info("Config hot-reload disabled (--no-watch-config).");
 			process.stdout.write("Config hot-reload disabled (--no-watch-config).\n");
 		} else {
 			let currentHotConfig = config;
@@ -2336,7 +2341,7 @@ async function runStartAction(options) {
 					const changedKeys = computeChangedKeys(previousConfig, newConfig);
 					currentHotConfig = newConfig;
 					const n = changedKeys.length;
-					logger$23.info({
+					logger$25.info({
 						changedKeys,
 						configPath: configFilePath
 					}, `Config reloaded: ${n} setting(s) changed`);
@@ -2348,7 +2353,7 @@ async function runStartAction(options) {
 					});
 				},
 				onError: (err) => {
-					logger$23.error({
+					logger$25.error({
 						err,
 						configPath: configFilePath
 					}, `Config reload failed: ${err.message}. Continuing with previous config.`);
@@ -2361,7 +2366,7 @@ async function runStartAction(options) {
 		let cleanupShutdown = null;
 		if (resolvedGraphFile === null) if (interruptedSession !== void 0) {
 			process.stdout.write(`Resuming interrupted session ${interruptedSession.id}\n`);
-			logger$23.info({ sessionId: interruptedSession.id }, "session:resumed");
+			logger$25.info({ sessionId: interruptedSession.id }, "session:resumed");
 			const recovery = new CrashRecoveryManager({
 				db: databaseService.db,
 				gitWorktreeManager
@@ -2485,7 +2490,7 @@ async function runStartAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$23.error({ err }, "runStartAction failed");
+		logger$25.error({ err }, "runStartAction failed");
 		return START_EXIT_ERROR;
 	} finally {
 		try {
@@ -2643,7 +2648,7 @@ function renderTaskGraph(snapshot, tasks) {
 
 //#endregion
 //#region src/cli/commands/status.ts
-const logger$22 = createLogger("status-cmd");
+const logger$24 = createLogger("status-cmd");
 const STATUS_EXIT_SUCCESS = 0;
 const STATUS_EXIT_ERROR = 1;
 const STATUS_EXIT_NOT_FOUND = 2;
@@ -2796,7 +2801,7 @@ async function runStatusAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$22.error({ err }, "runStatusAction failed");
+		logger$24.error({ err }, "runStatusAction failed");
 		return STATUS_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2829,7 +2834,7 @@ function registerStatusCommand(program, _version = "0.0.0", projectRoot = proces
 
 //#endregion
 //#region src/cli/commands/pause.ts
-const logger$21 = createLogger("pause-cmd");
+const logger$23 = createLogger("pause-cmd");
 const PAUSE_EXIT_SUCCESS = 0;
 const PAUSE_EXIT_ERROR = 1;
 const PAUSE_EXIT_USAGE_ERROR = 2;
@@ -2898,7 +2903,7 @@ async function runPauseAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$21.error({ err }, "runPauseAction failed");
+		logger$23.error({ err }, "runPauseAction failed");
 		return PAUSE_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2928,7 +2933,7 @@ function registerPauseCommand(program, version = "0.0.0", projectRoot = process.
 
 //#endregion
 //#region src/cli/commands/resume.ts
-const logger$20 = createLogger("resume-cmd");
+const logger$22 = createLogger("resume-cmd");
 const RESUME_EXIT_SUCCESS = 0;
 const RESUME_EXIT_ERROR = 1;
 const RESUME_EXIT_USAGE_ERROR = 2;
@@ -3013,7 +3018,7 @@ async function runResumeAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$20.error({ err }, "runResumeAction failed");
+		logger$22.error({ err }, "runResumeAction failed");
 		return RESUME_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3046,7 +3051,7 @@ function registerResumeCommand(program, version = "0.0.0", projectRoot = process
 
 //#endregion
 //#region src/cli/commands/cancel.ts
-const logger$19 = createLogger("cancel-cmd");
+const logger$21 = createLogger("cancel-cmd");
 const CANCEL_EXIT_SUCCESS = 0;
 const CANCEL_EXIT_ERROR = 1;
 const CANCEL_EXIT_USAGE_ERROR = 2;
@@ -3143,7 +3148,7 @@ async function runCancelAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$19.error({ err }, "runCancelAction failed");
+		logger$21.error({ err }, "runCancelAction failed");
 		return CANCEL_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3258,7 +3263,7 @@ function renderFailedTasksJson(tasks) {
 
 //#endregion
 //#region src/cli/commands/retry.ts
-const logger$18 = createLogger("retry-cmd");
+const logger$20 = createLogger("retry-cmd");
 const RETRY_EXIT_SUCCESS = 0;
 const RETRY_EXIT_PARTIAL_FAILURE = 1;
 const RETRY_EXIT_USAGE_ERROR = 2;
@@ -3363,7 +3368,7 @@ async function runRetryAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$18.error({ err }, "runRetryAction failed");
+		logger$20.error({ err }, "runRetryAction failed");
 		return RETRY_EXIT_USAGE_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3492,11 +3497,11 @@ async function runFollowMode(opts) {
 			});
 		});
 		const sigintHandler = () => {
-			logger$18.info("SIGINT received — initiating graceful shutdown");
+			logger$20.info("SIGINT received — initiating graceful shutdown");
 			taskGraphEngine.cancelAll();
 		};
 		const sigtermHandler = () => {
-			logger$18.info("SIGTERM received — initiating graceful shutdown");
+			logger$20.info("SIGTERM received — initiating graceful shutdown");
 			taskGraphEngine.cancelAll();
 		};
 		process.once("SIGINT", sigintHandler);
@@ -3509,7 +3514,7 @@ async function runFollowMode(opts) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$18.error({ err }, "runFollowMode failed");
+		logger$20.error({ err }, "runFollowMode failed");
 		return RETRY_EXIT_USAGE_ERROR;
 	} finally {
 		try {
@@ -3969,7 +3974,7 @@ function buildMultiAgentInstructionsSection(agentCount) {
 
 //#endregion
 //#region src/modules/plan-generator/plan-generator.ts
-const logger$17 = createLogger("plan-generator");
+const logger$19 = createLogger("plan-generator");
 /**
 * Wrapper around execFile that immediately closes stdin on the child process.
 * Some CLI tools (e.g. Claude Code) wait for stdin to close before processing
@@ -4146,7 +4151,7 @@ var PlanGenerator = class {
 				else {
 					const slugified = dep.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 64);
 					if (taskKeys.has(slugified)) resolvedDeps.push(slugified);
-					else logger$17.warn({
+					else logger$19.warn({
 						taskKey,
 						dep
 					}, `depends_on reference '${dep}' not found in task keys; removing`);
@@ -4893,7 +4898,7 @@ function getLatestPlanVersion(db, planId) {
 
 //#endregion
 //#region src/modules/plan-generator/plan-refiner.ts
-const logger$16 = createLogger("plan-refiner");
+const logger$18 = createLogger("plan-refiner");
 var PlanRefiner = class {
 	db;
 	planGenerator;
@@ -4936,7 +4941,7 @@ var PlanRefiner = class {
 			newFeedback: feedback,
 			availableAgents: this.availableAgents
 		});
-		logger$16.info({
+		logger$18.info({
 			planId,
 			currentVersion,
 			feedbackRounds: feedbackHistory.length
@@ -4983,7 +4988,7 @@ var PlanRefiner = class {
 			newVersion,
 			taskCount
 		});
-		logger$16.info({
+		logger$18.info({
 			planId,
 			newVersion,
 			taskCount
@@ -5065,7 +5070,7 @@ function normalizeForDiff(value) {
 
 //#endregion
 //#region src/cli/commands/plan-refine.ts
-const logger$15 = createLogger("plan-refine-cmd");
+const logger$17 = createLogger("plan-refine-cmd");
 const REFINE_EXIT_SUCCESS = 0;
 const REFINE_EXIT_ERROR = 1;
 const REFINE_EXIT_USAGE_ERROR = 2;
@@ -5107,7 +5112,7 @@ async function runPlanRefineAction(options) {
 		let result;
 		try {
 			result = await refiner.refine(planId, feedback, (event, payload) => {
-				logger$15.info({
+				logger$17.info({
 					event,
 					payload
 				}, "Plan refinement event");
@@ -5150,7 +5155,7 @@ async function runPlanRefineAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$15.error({ err }, "runPlanRefineAction failed");
+		logger$17.error({ err }, "runPlanRefineAction failed");
 		return REFINE_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5175,7 +5180,7 @@ function registerPlanRefineCommand(planCmd, _version = "0.0.0", projectRoot = pr
 
 //#endregion
 //#region src/cli/commands/plan-diff.ts
-const logger$14 = createLogger("plan-diff-cmd");
+const logger$16 = createLogger("plan-diff-cmd");
 const DIFF_EXIT_SUCCESS = 0;
 const DIFF_EXIT_ERROR = 1;
 const DIFF_EXIT_NOT_FOUND = 2;
@@ -5218,7 +5223,7 @@ async function runPlanDiffAction(options) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$14.error({ err }, "runPlanDiffAction failed");
+		logger$16.error({ err }, "runPlanDiffAction failed");
 		return DIFF_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5266,7 +5271,7 @@ function registerPlanDiffCommand(planCmd, _version = "0.0.0", projectRoot = proc
 
 //#endregion
 //#region src/cli/commands/plan-rollback.ts
-const logger$13 = createLogger("plan-rollback-cmd");
+const logger$15 = createLogger("plan-rollback-cmd");
 const ROLLBACK_EXIT_SUCCESS = 0;
 const ROLLBACK_EXIT_ERROR = 1;
 const ROLLBACK_EXIT_USAGE_ERROR = 2;
@@ -5314,7 +5319,7 @@ async function runPlanRollbackAction(options, onEvent) {
 			toVersion,
 			newVersion
 		});
-		logger$13.info({
+		logger$15.info({
 			planId,
 			fromVersion,
 			toVersion,
@@ -5355,7 +5360,7 @@ async function runPlanRollbackAction(options, onEvent) {
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$13.error({ err }, "runPlanRollbackAction failed");
+		logger$15.error({ err }, "runPlanRollbackAction failed");
 		return ROLLBACK_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5549,7 +5554,7 @@ function validatePlan(raw, adapterRegistry, options) {
 
 //#endregion
 //#region src/cli/commands/plan.ts
-const logger$12 = createLogger("plan-cmd");
+const logger$14 = createLogger("plan-cmd");
 const PLAN_EXIT_SUCCESS = 0;
 const PLAN_EXIT_ERROR = 1;
 const PLAN_EXIT_USAGE_ERROR = 2;
@@ -5693,7 +5698,7 @@ async function runPlanReviewAction(options) {
 		}
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$12.error({ err }, "runPlanReviewAction failed");
+		logger$14.error({ err }, "runPlanReviewAction failed");
 		return PLAN_EXIT_ERROR;
 	}
 	if (dryRun) {
@@ -5719,7 +5724,7 @@ async function runPlanReviewAction(options) {
 		if (ext.endsWith(".yaml") || ext.endsWith(".yml")) taskGraph = load(planYaml);
 		else taskGraph = JSON.parse(planYaml);
 	} catch {
-		logger$12.warn("Could not read generated plan file for DB storage");
+		logger$14.warn("Could not read generated plan file for DB storage");
 	}
 	if (outputFormat === "json") {
 		const envelope = {
@@ -6492,6 +6497,193 @@ const PIPELINE_EVENT_METADATA = [
 				description: "Log message."
 			}
 		]
+	},
+	{
+		type: "pipeline:heartbeat",
+		description: "Periodic heartbeat emitted every 30s when no other progress events have fired.",
+		when: "Every 30 seconds during pipeline execution. Allows detection of stalled pipelines.",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string",
+				description: "Pipeline run ID."
+			},
+			{
+				name: "active_dispatches",
+				type: "number",
+				description: "Number of sub-agents currently running."
+			},
+			{
+				name: "completed_dispatches",
+				type: "number",
+				description: "Number of dispatches completed."
+			},
+			{
+				name: "queued_dispatches",
+				type: "number",
+				description: "Number of dispatches waiting to start."
+			}
+		]
+	},
+	{
+		type: "story:stall",
+		description: "Emitted when the watchdog detects no progress for an extended period (default: 10 minutes).",
+		when: "When a story has shown no progress for longer than the watchdog timeout. Indicates likely stall.",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string",
+				description: "Pipeline run ID."
+			},
+			{
+				name: "story_key",
+				type: "string",
+				description: "Story key that appears stalled."
+			},
+			{
+				name: "phase",
+				type: "string",
+				description: "Phase the story was in when stall was detected."
+			},
+			{
+				name: "elapsed_ms",
+				type: "number",
+				description: "Milliseconds since last progress event."
+			}
+		]
+	},
+	{
+		type: "supervisor:kill",
+		description: "Emitted by the supervisor when it kills a stalled pipeline process tree.",
+		when: "When the supervisor detects a STALLED verdict and staleness exceeds the stall threshold.",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string|null",
+				description: "Pipeline run ID that was killed."
+			},
+			{
+				name: "reason",
+				type: "stall",
+				description: "Reason for the kill — always \"stall\" for threshold-triggered kills."
+			},
+			{
+				name: "staleness_seconds",
+				type: "number",
+				description: "Seconds the pipeline had been stalled."
+			},
+			{
+				name: "pids",
+				type: "number[]",
+				description: "PIDs that were killed (orchestrator + child processes)."
+			}
+		]
+	},
+	{
+		type: "supervisor:restart",
+		description: "Emitted by the supervisor when it restarts a killed pipeline via auto resume.",
+		when: "Immediately after killing a stalled pipeline, when the restart count is within the max limit.",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string|null",
+				description: "Pipeline run ID being resumed."
+			},
+			{
+				name: "attempt",
+				type: "number",
+				description: "Restart attempt number (1-based)."
+			}
+		]
+	},
+	{
+		type: "supervisor:abort",
+		description: "Emitted by the supervisor when it exceeds the maximum restart limit and gives up.",
+		when: "When the restart count reaches or exceeds --max-restarts and another stall is detected.",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string|null",
+				description: "Pipeline run ID that was abandoned."
+			},
+			{
+				name: "reason",
+				type: "max_restarts_exceeded",
+				description: "Always \"max_restarts_exceeded\"."
+			},
+			{
+				name: "attempts",
+				type: "number",
+				description: "Number of restart attempts that were made."
+			}
+		]
+	},
+	{
+		type: "supervisor:summary",
+		description: "Emitted by the supervisor when the pipeline reaches a terminal state.",
+		when: "When the supervisor detects a NO_PIPELINE_RUNNING verdict (completed, failed, or stopped).",
+		fields: [
+			{
+				name: "ts",
+				type: "string",
+				description: "ISO-8601 timestamp generated at emit time."
+			},
+			{
+				name: "run_id",
+				type: "string|null",
+				description: "Pipeline run ID."
+			},
+			{
+				name: "elapsed_seconds",
+				type: "number",
+				description: "Total elapsed seconds from supervisor start to terminal state."
+			},
+			{
+				name: "succeeded",
+				type: "string[]",
+				description: "Story keys that completed successfully."
+			},
+			{
+				name: "failed",
+				type: "string[]",
+				description: "Story keys that failed (non-COMPLETE, non-PENDING phases)."
+			},
+			{
+				name: "escalated",
+				type: "string[]",
+				description: "Story keys that were escalated."
+			},
+			{
+				name: "restarts",
+				type: "number",
+				description: "Number of restart cycles performed by the supervisor."
+			}
+		]
 	}
 ];
 /**
@@ -6709,12 +6901,29 @@ async function resolveMainRepoRoot(cwd = process.cwd()) {
 
 //#endregion
 //#region src/modules/methodology-pack/schemas.ts
+/**
+* A reference to a context value to inject into a step prompt.
+* Sources can be params (runtime parameters) or decisions (from the decision store).
+*/
+const ContextRefSchema = z.object({
+	placeholder: z.string().min(1),
+	source: z.string().min(1)
+});
+/**
+* A single step within a multi-step phase decomposition.
+*/
+const StepDefinitionSchema = z.object({
+	name: z.string().min(1),
+	template: z.string().min(1),
+	context: z.array(ContextRefSchema).default([])
+});
 const PhaseDefinitionSchema = z.object({
 	name: z.string().min(1),
 	description: z.string().min(1),
 	entryGates: z.array(z.string()),
 	exitGates: z.array(z.string()),
-	artifacts: z.array(z.string())
+	artifacts: z.array(z.string()),
+	steps: z.array(StepDefinitionSchema).optional()
 });
 const PackManifestSchema = z.object({
 	name: z.string().min(1),
@@ -6972,7 +7181,7 @@ function truncateToTokens(text, maxTokens) {
 
 //#endregion
 //#region src/modules/context-compiler/context-compiler-impl.ts
-const logger$11 = createLogger("context-compiler");
+const logger$13 = createLogger("context-compiler");
 /**
 * Fraction of the original token budget that must remain (after required +
 * important sections) before an optional section is included.
@@ -7064,7 +7273,7 @@ var ContextCompilerImpl = class {
 				includedParts.push(truncated);
 				remainingBudget -= truncatedTokens;
 				anyTruncated = true;
-				logger$11.warn({
+				logger$13.warn({
 					section: section.name,
 					originalTokens: tokens,
 					budgetTokens: truncatedTokens
@@ -7078,7 +7287,7 @@ var ContextCompilerImpl = class {
 				});
 			} else {
 				anyTruncated = true;
-				logger$11.warn({
+				logger$13.warn({
 					section: section.name,
 					tokens
 				}, "Context compiler: omitted \"important\" section — no budget remaining");
@@ -7105,7 +7314,7 @@ var ContextCompilerImpl = class {
 				} else {
 					if (tokens > 0) {
 						anyTruncated = true;
-						logger$11.warn({
+						logger$13.warn({
 							section: section.name,
 							tokens,
 							budgetFractionRemaining: budgetFractionRemaining.toFixed(2)
@@ -7206,7 +7415,17 @@ const DEFAULT_TIMEOUTS = {
 	"dev-story": 18e5,
 	"code-review": 9e5,
 	"minor-fixes": 6e5,
-	"major-rework": 9e5
+	"major-rework": 9e5,
+	"analysis-vision": 18e4,
+	"analysis-scope": 18e4,
+	"planning-classification": 18e4,
+	"planning-frs": 24e4,
+	"planning-nfrs": 24e4,
+	"arch-context": 18e4,
+	"arch-decisions": 24e4,
+	"arch-patterns": 24e4,
+	"story-epics": 24e4,
+	"story-stories": 3e5
 };
 /**
 * Default max agentic turns per task type.
@@ -7225,7 +7444,17 @@ const DEFAULT_MAX_TURNS = {
 	"major-rework": 50,
 	"code-review": 25,
 	"create-story": 20,
-	"minor-fixes": 25
+	"minor-fixes": 25,
+	"analysis-vision": 8,
+	"analysis-scope": 10,
+	"planning-classification": 8,
+	"planning-frs": 12,
+	"planning-nfrs": 12,
+	"arch-context": 10,
+	"arch-decisions": 15,
+	"arch-patterns": 12,
+	"story-epics": 15,
+	"story-stories": 20
 };
 /**
 * Error thrown when dispatch is attempted on a shutting-down dispatcher.
@@ -7351,7 +7580,7 @@ function parseYamlResult(yamlText, schema) {
 
 //#endregion
 //#region src/modules/agent-dispatch/dispatcher-impl.ts
-const logger$10 = createLogger("agent-dispatch");
+const logger$12 = createLogger("agent-dispatch");
 const SHUTDOWN_GRACE_MS = 1e4;
 const SHUTDOWN_MAX_WAIT_MS = 3e4;
 const CHARS_PER_TOKEN = 4;
@@ -7420,7 +7649,7 @@ var DispatcherImpl = class {
 					resolve: typedResolve,
 					reject
 				});
-				logger$10.debug({
+				logger$12.debug({
 					id,
 					queueLength: this._queue.length
 				}, "Dispatch queued");
@@ -7450,7 +7679,7 @@ var DispatcherImpl = class {
 	}
 	async shutdown() {
 		this._shuttingDown = true;
-		logger$10.info({
+		logger$12.info({
 			running: this._running.size,
 			queued: this._queue.length
 		}, "Dispatcher shutting down");
@@ -7483,13 +7712,13 @@ var DispatcherImpl = class {
 				}
 			}, 50);
 		});
-		logger$10.info("Dispatcher shutdown complete");
+		logger$12.info("Dispatcher shutdown complete");
 	}
 	async _startDispatch(id, request, resolve$2) {
 		const { prompt, agent, taskType, timeout, outputSchema, workingDirectory, model, maxTurns } = request;
 		const adapter = this._adapterRegistry.get(agent);
 		if (adapter === void 0) {
-			logger$10.warn({
+			logger$12.warn({
 				id,
 				agent
 			}, "No adapter found for agent");
@@ -7533,7 +7762,7 @@ var DispatcherImpl = class {
 		});
 		const startedAt = Date.now();
 		proc.on("error", (err) => {
-			logger$10.error({
+			logger$12.error({
 				id,
 				binary: cmd.binary,
 				error: err.message
@@ -7541,7 +7770,7 @@ var DispatcherImpl = class {
 		});
 		if (proc.stdin !== null) {
 			proc.stdin.on("error", (err) => {
-				if (err.code !== "EPIPE") logger$10.warn({
+				if (err.code !== "EPIPE") logger$12.warn({
 					id,
 					error: err.message
 				}, "stdin write error");
@@ -7583,7 +7812,7 @@ var DispatcherImpl = class {
 			agent,
 			taskType
 		});
-		logger$10.debug({
+		logger$12.debug({
 			id,
 			agent,
 			taskType,
@@ -7600,7 +7829,7 @@ var DispatcherImpl = class {
 				dispatchId: id,
 				timeoutMs
 			});
-			logger$10.warn({
+			logger$12.warn({
 				id,
 				agent,
 				taskType,
@@ -7654,7 +7883,7 @@ var DispatcherImpl = class {
 					exitCode: code,
 					output: stdout
 				});
-				logger$10.debug({
+				logger$12.debug({
 					id,
 					agent,
 					taskType,
@@ -7680,7 +7909,7 @@ var DispatcherImpl = class {
 					error: stderr || `Process exited with code ${String(code)}`,
 					exitCode: code
 				});
-				logger$10.debug({
+				logger$12.debug({
 					id,
 					agent,
 					taskType,
@@ -7732,7 +7961,7 @@ var DispatcherImpl = class {
 		const next = this._queue.shift();
 		if (next === void 0) return;
 		next.handle.status = "running";
-		logger$10.debug({
+		logger$12.debug({
 			id: next.id,
 			queueLength: this._queue.length
 		}, "Dequeued dispatch");
@@ -8093,7 +8322,7 @@ function getTokenUsageSummary(db, runId) {
 
 //#endregion
 //#region src/modules/compiled-workflows/prompt-assembler.ts
-const logger$9 = createLogger("compiled-workflows:prompt-assembler");
+const logger$11 = createLogger("compiled-workflows:prompt-assembler");
 /**
 * Assemble a final prompt from a template and sections map.
 *
@@ -8118,7 +8347,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		tokenCount,
 		truncated: false
 	};
-	logger$9.warn({
+	logger$11.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Prompt exceeds token ceiling — truncating optional sections");
@@ -8134,10 +8363,10 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 			const targetSectionTokens = Math.max(0, currentSectionTokens - overBy);
 			if (targetSectionTokens === 0) {
 				contentMap[section.name] = "";
-				logger$9.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
+				logger$11.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
 			} else {
 				contentMap[section.name] = truncateToTokens(section.content, targetSectionTokens);
-				logger$9.warn({
+				logger$11.warn({
 					sectionName: section.name,
 					targetSectionTokens
 				}, "Section truncated to fit token budget");
@@ -8148,7 +8377,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		}
 		if (tokenCount <= tokenCeiling) break;
 	}
-	if (tokenCount > tokenCeiling) logger$9.warn({
+	if (tokenCount > tokenCeiling) logger$11.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Required sections alone exceed token ceiling — returning over-budget prompt");
@@ -8289,7 +8518,7 @@ const CodeReviewResultSchema = z.object({
 
 //#endregion
 //#region src/modules/compiled-workflows/create-story.ts
-const logger$8 = createLogger("compiled-workflows:create-story");
+const logger$10 = createLogger("compiled-workflows:create-story");
 /**
 * Hard ceiling for the assembled create-story prompt.
 */
@@ -8313,7 +8542,7 @@ const TOKEN_CEILING$2 = 3e3;
 */
 async function runCreateStory(deps, params) {
 	const { epicId, storyKey, pipelineRunId } = params;
-	logger$8.debug({
+	logger$10.debug({
 		epicId,
 		storyKey,
 		pipelineRunId
@@ -8323,7 +8552,7 @@ async function runCreateStory(deps, params) {
 		template = await deps.pack.getPrompt("create-story");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.error({ error }, "Failed to retrieve create-story prompt template");
+		logger$10.error({ error }, "Failed to retrieve create-story prompt template");
 		return {
 			result: "failed",
 			error: `Failed to retrieve prompt template: ${error}`,
@@ -8365,7 +8594,7 @@ async function runCreateStory(deps, params) {
 			priority: "important"
 		}
 	], TOKEN_CEILING$2);
-	logger$8.debug({
+	logger$10.debug({
 		tokenCount,
 		truncated,
 		tokenCeiling: TOKEN_CEILING$2
@@ -8382,7 +8611,7 @@ async function runCreateStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.error({
+		logger$10.error({
 			epicId,
 			storyKey,
 			error
@@ -8403,7 +8632,7 @@ async function runCreateStory(deps, params) {
 	if (dispatchResult.status === "failed") {
 		const errorMsg = dispatchResult.parseError ?? `Dispatch failed with exit code ${dispatchResult.exitCode}`;
 		const stderrDetail = dispatchResult.output ? ` Output: ${dispatchResult.output}` : "";
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			storyKey,
 			exitCode: dispatchResult.exitCode
@@ -8415,7 +8644,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			storyKey
 		}, "Create-story dispatch timed out");
@@ -8428,7 +8657,7 @@ async function runCreateStory(deps, params) {
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
 		const rawSnippet = dispatchResult.output ? dispatchResult.output.slice(0, 1e3) : "(empty)";
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			storyKey,
 			details,
@@ -8444,7 +8673,7 @@ async function runCreateStory(deps, params) {
 	const parseResult = CreateStoryResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			storyKey,
 			details
@@ -8457,7 +8686,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	logger$8.info({
+	logger$10.info({
 		epicId,
 		storyKey,
 		storyFile: parsed.story_file,
@@ -8479,7 +8708,7 @@ function getImplementationDecisions(deps) {
 	try {
 		return getDecisionsByPhase(deps.db, "implementation");
 	} catch (err) {
-		logger$8.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
 		return [];
 	}
 }
@@ -8495,13 +8724,13 @@ function getEpicShard(decisions, epicId, projectRoot) {
 		if (projectRoot) {
 			const fallback = readEpicShardFromFile(projectRoot, epicId);
 			if (fallback) {
-				logger$8.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
+				logger$10.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve epic shard");
@@ -8518,7 +8747,7 @@ function getPrevDevNotes(decisions, epicId) {
 		if (devNotes.length === 0) return "";
 		return devNotes[devNotes.length - 1].value;
 	} catch (err) {
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve prev dev notes");
@@ -8538,13 +8767,13 @@ function getArchConstraints$1(deps) {
 		if (deps.projectRoot) {
 			const fallback = readArchConstraintsFromFile(deps.projectRoot);
 			if (fallback) {
-				logger$8.info("Using file-based fallback for architecture constraints (decisions table empty)");
+				logger$10.info("Using file-based fallback for architecture constraints (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$8.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -8564,7 +8793,7 @@ function readEpicShardFromFile(projectRoot, epicId) {
 		const match = pattern.exec(content);
 		return match ? match[0].trim() : "";
 	} catch (err) {
-		logger$8.warn({
+		logger$10.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "File-based epic shard fallback failed");
@@ -8587,7 +8816,7 @@ function readArchConstraintsFromFile(projectRoot) {
 		const content = readFileSync$1(archPath, "utf-8");
 		return content.slice(0, 1500);
 	} catch (err) {
-		logger$8.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
 		return "";
 	}
 }
@@ -8600,14 +8829,14 @@ async function getStoryTemplate(deps) {
 	try {
 		return await deps.pack.getTemplate("story");
 	} catch (err) {
-		logger$8.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
 		return "";
 	}
 }
 
 //#endregion
 //#region src/modules/compiled-workflows/git-helpers.ts
-const logger$7 = createLogger("compiled-workflows:git-helpers");
+const logger$9 = createLogger("compiled-workflows:git-helpers");
 /**
 * Capture the full git diff for HEAD (working tree vs current commit).
 *
@@ -8731,7 +8960,7 @@ async function runGitCommand(args, cwd, logLabel) {
 			stderr += chunk.toString("utf-8");
 		});
 		proc.on("error", (err) => {
-			logger$7.warn({
+			logger$9.warn({
 				label: logLabel,
 				cwd,
 				error: err.message
@@ -8740,7 +8969,7 @@ async function runGitCommand(args, cwd, logLabel) {
 		});
 		proc.on("close", (code) => {
 			if (code !== 0) {
-				logger$7.warn({
+				logger$9.warn({
 					label: logLabel,
 					cwd,
 					code,
@@ -8756,7 +8985,7 @@ async function runGitCommand(args, cwd, logLabel) {
 
 //#endregion
 //#region src/modules/compiled-workflows/dev-story.ts
-const logger$6 = createLogger("compiled-workflows:dev-story");
+const logger$8 = createLogger("compiled-workflows:dev-story");
 /** Hard token ceiling for the assembled dev-story prompt */
 const TOKEN_CEILING$1 = 24e3;
 /** Default timeout for dev-story dispatches in milliseconds (30 min) */
@@ -8778,7 +9007,7 @@ const DEFAULT_VITEST_PATTERNS = `## Test Patterns (defaults)
 */
 async function runDevStory(deps, params) {
 	const { storyKey, storyFilePath, taskScope, priorFiles } = params;
-	logger$6.info({
+	logger$8.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled dev-story workflow");
@@ -8820,10 +9049,10 @@ async function runDevStory(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("dev-story");
-		logger$6.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
+		logger$8.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			error
 		}, "Failed to retrieve dev-story prompt template");
@@ -8834,14 +9063,14 @@ async function runDevStory(deps, params) {
 		storyContent = await readFile$2(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$6.error({
+			logger$8.error({
 				storyKey,
 				storyFilePath
 			}, "Story file not found");
 			return makeFailureResult("story_file_not_found");
 		}
 		const error = err instanceof Error ? err.message : String(err);
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			storyFilePath,
 			error
@@ -8849,7 +9078,7 @@ async function runDevStory(deps, params) {
 		return makeFailureResult(`story_file_read_error: ${error}`);
 	}
 	if (storyContent.trim().length === 0) {
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			storyFilePath
 		}, "Story file is empty");
@@ -8861,17 +9090,17 @@ async function runDevStory(deps, params) {
 		const testPatternDecisions = solutioningDecisions.filter((d) => d.category === "test-patterns");
 		if (testPatternDecisions.length > 0) {
 			testPatternsContent = "## Test Patterns\n" + testPatternDecisions.map((d) => `- ${d.key}: ${d.value}`).join("\n");
-			logger$6.debug({
+			logger$8.debug({
 				storyKey,
 				count: testPatternDecisions.length
 			}, "Loaded test patterns from decision store");
 		} else {
 			testPatternsContent = DEFAULT_VITEST_PATTERNS;
-			logger$6.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
+			logger$8.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
 		}
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$6.warn({
+		logger$8.warn({
 			storyKey,
 			error
 		}, "Failed to load test patterns — using defaults");
@@ -8914,7 +9143,7 @@ async function runDevStory(deps, params) {
 		}
 	];
 	const { prompt, tokenCount, truncated } = assemblePrompt(template, sections, TOKEN_CEILING$1);
-	logger$6.info({
+	logger$8.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING$1,
@@ -8933,7 +9162,7 @@ async function runDevStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			error
 		}, "Dispatch threw an unexpected error");
@@ -8944,11 +9173,11 @@ async function runDevStory(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Dev-story dispatch timed out");
-		if (dispatchResult.output.length > 0) logger$6.info({
+		if (dispatchResult.output.length > 0) logger$8.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output before timeout");
@@ -8958,12 +9187,12 @@ async function runDevStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
 		}, "Dev-story dispatch failed");
-		if (dispatchResult.output.length > 0) logger$6.info({
+		if (dispatchResult.output.length > 0) logger$8.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output from failed dispatch");
@@ -8975,7 +9204,7 @@ async function runDevStory(deps, params) {
 	if (dispatchResult.parseError !== null || dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "parsed result was null";
 		const rawSnippet = dispatchResult.output ? dispatchResult.output.slice(0, 1e3) : "(empty)";
-		logger$6.error({
+		logger$8.error({
 			storyKey,
 			parseError: details,
 			rawOutputSnippet: rawSnippet
@@ -8983,12 +9212,12 @@ async function runDevStory(deps, params) {
 		let filesModified = [];
 		try {
 			filesModified = await getGitChangedFiles(deps.projectRoot ?? process.cwd());
-			if (filesModified.length > 0) logger$6.info({
+			if (filesModified.length > 0) logger$8.info({
 				storyKey,
 				fileCount: filesModified.length
 			}, "Recovered files_modified from git status (YAML fallback)");
 		} catch (err) {
-			logger$6.warn({
+			logger$8.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to recover files_modified from git");
@@ -9005,7 +9234,7 @@ async function runDevStory(deps, params) {
 		};
 	}
 	const parsed = dispatchResult.parsed;
-	logger$6.info({
+	logger$8.info({
 		storyKey,
 		result: parsed.result,
 		acMet: parsed.ac_met.length
@@ -9144,7 +9373,7 @@ function extractFilesInScope(storyContent) {
 
 //#endregion
 //#region src/modules/compiled-workflows/code-review.ts
-const logger$5 = createLogger("compiled-workflows:code-review");
+const logger$7 = createLogger("compiled-workflows:code-review");
 /**
 * Hard token ceiling for the assembled code-review prompt (50,000 tokens).
 * Quality reviews require seeing actual code diffs, not just file names.
@@ -9184,7 +9413,7 @@ function defaultFailResult(error, tokenUsage) {
 async function runCodeReview(deps, params) {
 	const { storyKey, storyFilePath, workingDirectory, pipelineRunId, filesModified, previousIssues } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$5.debug({
+	logger$7.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
@@ -9195,7 +9424,7 @@ async function runCodeReview(deps, params) {
 		template = await deps.pack.getPrompt("code-review");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$5.error({ error }, "Failed to retrieve code-review prompt template");
+		logger$7.error({ error }, "Failed to retrieve code-review prompt template");
 		return defaultFailResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -9206,7 +9435,7 @@ async function runCodeReview(deps, params) {
 		storyContent = await readFile$2(storyFilePath, "utf-8");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$5.error({
+		logger$7.error({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -9226,12 +9455,12 @@ async function runCodeReview(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$5.debug({
+			logger$7.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$5.warn({
+			logger$7.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -9245,7 +9474,7 @@ async function runCodeReview(deps, params) {
 		const fullTotal = nonDiffTokens + countTokens(fullDiff);
 		if (fullTotal <= TOKEN_CEILING) gitDiffContent = fullDiff;
 		else {
-			logger$5.warn({
+			logger$7.warn({
 				estimatedTotal: fullTotal,
 				ceiling: TOKEN_CEILING
 			}, "Full git diff would exceed token ceiling — using stat-only summary");
@@ -9283,11 +9512,11 @@ async function runCodeReview(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$5.warn({
+	if (assembleResult.truncated) logger$7.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Code-review prompt truncated to fit token ceiling");
-	logger$5.debug({
+	logger$7.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -9305,7 +9534,7 @@ async function runCodeReview(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$5.error({
+		logger$7.error({
 			storyKey,
 			error
 		}, "Code-review dispatch threw unexpected error");
@@ -9321,7 +9550,7 @@ async function runCodeReview(deps, params) {
 	const rawOutput = dispatchResult.output ?? void 0;
 	if (dispatchResult.status === "failed") {
 		const errorMsg = `Dispatch status: failed. Exit code: ${dispatchResult.exitCode}. ${dispatchResult.parseError ?? ""} ${dispatchResult.output ? `Stderr: ${dispatchResult.output}` : ""}`.trim();
-		logger$5.warn({
+		logger$7.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Code-review dispatch failed");
@@ -9331,7 +9560,7 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$5.warn({ storyKey }, "Code-review dispatch timed out");
+		logger$7.warn({ storyKey }, "Code-review dispatch timed out");
 		return {
 			...defaultFailResult("Dispatch status: timeout. The agent did not complete within the allowed time.", tokenUsage),
 			rawOutput
@@ -9339,7 +9568,7 @@ async function runCodeReview(deps, params) {
 	}
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
-		logger$5.warn({
+		logger$7.warn({
 			storyKey,
 			details
 		}, "Code-review output schema validation failed");
@@ -9356,7 +9585,7 @@ async function runCodeReview(deps, params) {
 	const parseResult = CodeReviewResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$5.warn({
+		logger$7.warn({
 			storyKey,
 			details
 		}, "Code-review output failed schema validation");
@@ -9371,13 +9600,13 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	if (parsed.agentVerdict !== parsed.verdict) logger$5.info({
+	if (parsed.agentVerdict !== parsed.verdict) logger$7.info({
 		storyKey,
 		agentVerdict: parsed.agentVerdict,
 		pipelineVerdict: parsed.verdict,
 		issues: parsed.issues
 	}, "Pipeline overrode agent verdict based on issue severities");
-	logger$5.info({
+	logger$7.info({
 		storyKey,
 		verdict: parsed.verdict,
 		issues: parsed.issues
@@ -9402,7 +9631,7 @@ function getArchConstraints(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$5.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$7.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -9734,7 +9963,7 @@ function detectConflictGroups(storyKeys, config) {
 
 //#endregion
 //#region src/modules/implementation-orchestrator/seed-methodology-context.ts
-const logger$4 = createLogger("implementation-orchestrator:seed");
+const logger$6 = createLogger("implementation-orchestrator:seed");
 /** Max chars for the architecture summary seeded into decisions */
 const MAX_ARCH_CHARS = 6e3;
 /** Max chars per epic shard */
@@ -9768,12 +9997,12 @@ function seedMethodologyContext(db, projectRoot) {
 		const testCount = seedTestPatterns(db, projectRoot);
 		if (testCount === -1) result.skippedCategories.push("test-patterns");
 		else result.decisionsCreated += testCount;
-		logger$4.info({
+		logger$6.info({
 			decisionsCreated: result.decisionsCreated,
 			skippedCategories: result.skippedCategories
 		}, "Methodology context seeding complete");
 	} catch (err) {
-		logger$4.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
+		logger$6.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
 	}
 	return result;
 }
@@ -9817,7 +10046,7 @@ function seedArchitecture(db, projectRoot) {
 		});
 		count = 1;
 	}
-	logger$4.debug({ count }, "Seeded architecture decisions");
+	logger$6.debug({ count }, "Seeded architecture decisions");
 	return count;
 }
 /**
@@ -9845,7 +10074,7 @@ function seedEpicShards(db, projectRoot) {
 		});
 		count++;
 	}
-	logger$4.debug({ count }, "Seeded epic shard decisions");
+	logger$6.debug({ count }, "Seeded epic shard decisions");
 	return count;
 }
 /**
@@ -9866,7 +10095,7 @@ function seedTestPatterns(db, projectRoot) {
 		value: patterns.slice(0, MAX_TEST_PATTERNS_CHARS),
 		rationale: "Detected from project configuration at orchestrator startup"
 	});
-	logger$4.debug("Seeded test patterns decision");
+	logger$6.debug("Seeded test patterns decision");
 	return 1;
 }
 /**
@@ -10058,7 +10287,7 @@ function createPauseGate() {
 */
 function createImplementationOrchestrator(deps) {
 	const { db, pack, contextCompiler, dispatcher, eventBus, config, projectRoot } = deps;
-	const logger$31 = createLogger("implementation-orchestrator");
+	const logger$33 = createLogger("implementation-orchestrator");
 	let _state = "IDLE";
 	let _startedAt;
 	let _completedAt;
@@ -10066,6 +10295,10 @@ function createImplementationOrchestrator(deps) {
 	const _stories = new Map();
 	let _paused = false;
 	let _pauseGate = null;
+	let _lastProgressTs = Date.now();
+	let _heartbeatTimer = null;
+	const HEARTBEAT_INTERVAL_MS = 3e4;
+	const WATCHDOG_TIMEOUT_MS = 6e5;
 	function getStatus() {
 		const stories = {};
 		for (const [key, s] of _stories) stories[key] = { ...s };
@@ -10087,6 +10320,7 @@ function createImplementationOrchestrator(deps) {
 	}
 	function persistState() {
 		if (config.pipelineRunId === void 0) return;
+		recordProgress();
 		try {
 			const serialized = JSON.stringify(getStatus());
 			updatePipelineRun(db, config.pipelineRunId, {
@@ -10094,7 +10328,51 @@ function createImplementationOrchestrator(deps) {
 				token_usage_json: serialized
 			});
 		} catch (err) {
-			logger$31.warn("Failed to persist orchestrator state", { err });
+			logger$33.warn("Failed to persist orchestrator state", { err });
+		}
+	}
+	function recordProgress() {
+		_lastProgressTs = Date.now();
+	}
+	function startHeartbeat() {
+		if (_heartbeatTimer !== null) return;
+		_heartbeatTimer = setInterval(() => {
+			if (_state !== "RUNNING") return;
+			let active = 0;
+			let completed = 0;
+			let queued = 0;
+			for (const s of _stories.values()) if (s.phase === "COMPLETE" || s.phase === "ESCALATED") completed++;
+			else if (s.phase === "PENDING") queued++;
+			else active++;
+			eventBus.emit("orchestrator:heartbeat", {
+				runId: config.pipelineRunId ?? "",
+				activeDispatches: active,
+				completedDispatches: completed,
+				queuedDispatches: queued
+			});
+			const elapsed = Date.now() - _lastProgressTs;
+			if (elapsed >= WATCHDOG_TIMEOUT_MS) {
+				for (const [key, s] of _stories) if (s.phase !== "PENDING" && s.phase !== "COMPLETE" && s.phase !== "ESCALATED") {
+					logger$33.warn({
+						storyKey: key,
+						phase: s.phase,
+						elapsedMs: elapsed
+					}, "Watchdog: possible stall detected");
+					eventBus.emit("orchestrator:stall", {
+						runId: config.pipelineRunId ?? "",
+						storyKey: key,
+						phase: s.phase,
+						elapsedMs: elapsed
+					});
+				}
+			}
+		}, HEARTBEAT_INTERVAL_MS);
+		if (_heartbeatTimer && typeof _heartbeatTimer === "object" && "unref" in _heartbeatTimer) _heartbeatTimer.unref();
+	}
+	function stopHeartbeat() {
+		if (_heartbeatTimer !== null) {
+			clearInterval(_heartbeatTimer);
+			_heartbeatTimer = null;
 		}
 	}
 	/**
@@ -10111,7 +10389,7 @@ function createImplementationOrchestrator(deps) {
 	* exhausted retries the story is ESCALATED.
 	*/
 	async function processStory(storyKey) {
-		logger$31.info("Processing story", { storyKey });
+		logger$33.info("Processing story", { storyKey });
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
 		updateStory(storyKey, {
@@ -10125,7 +10403,7 @@ function createImplementationOrchestrator(deps) {
 			const match = files.find((f) => f.startsWith(`${storyKey}-`) && f.endsWith(".md"));
 			if (match) {
 				storyFilePath = join$1(artifactsDir, match);
-				logger$31.info({
+				logger$33.info({
 					storyKey,
 					storyFilePath
 				}, "Found existing story file — skipping create-story");
@@ -10219,7 +10497,7 @@ function createImplementationOrchestrator(deps) {
 			try {
 				storyContentForAnalysis = await readFile$2(storyFilePath ?? "", "utf-8");
 			} catch (err) {
-				logger$31.error({
+				logger$33.error({
 					storyKey,
 					storyFilePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -10227,7 +10505,7 @@ function createImplementationOrchestrator(deps) {
 			}
 			const analysis = analyzeStoryComplexity(storyContentForAnalysis);
 			const batches = planTaskBatches(analysis);
-			logger$31.info({
+			logger$33.info({
 				storyKey,
 				estimatedScope: analysis.estimatedScope,
 				batchCount: batches.length,
@@ -10245,7 +10523,7 @@ function createImplementationOrchestrator(deps) {
 					if (_state !== "RUNNING") break;
 					const taskScope = batch.taskIds.map((id, i) => `T${id}: ${batch.taskTitles[i] ?? ""}`).join("\n");
 					const priorFiles = allFilesModified.size > 0 ? Array.from(allFilesModified) : void 0;
-					logger$31.info({
+					logger$33.info({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						taskCount: batch.taskIds.length
@@ -10268,7 +10546,7 @@ function createImplementationOrchestrator(deps) {
 						});
 					} catch (batchErr) {
 						const errMsg = batchErr instanceof Error ? batchErr.message : String(batchErr);
-						logger$31.warn({
+						logger$33.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							error: errMsg
@@ -10288,7 +10566,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: batchFilesModified,
 						result: batchResult.result === "success" ? "success" : "failed"
 					};
-					logger$31.info(batchMetrics, "Batch dev-story metrics");
+					logger$33.info(batchMetrics, "Batch dev-story metrics");
 					for (const f of batchFilesModified) allFilesModified.add(f);
 					if (batchFilesModified.length > 0) batchFileGroups.push({
 						batchIndex: batch.batchIndex,
@@ -10310,13 +10588,13 @@ function createImplementationOrchestrator(deps) {
 							})
 						});
 					} catch (tokenErr) {
-						logger$31.warn({
+						logger$33.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							err: tokenErr
 						}, "Failed to record batch token usage");
 					}
-					if (batchResult.result === "failed") logger$31.warn({
+					if (batchResult.result === "failed") logger$33.warn({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						error: batchResult.error
@@ -10348,7 +10626,7 @@ function createImplementationOrchestrator(deps) {
 					result: devResult
 				});
 				persistState();
-				if (devResult.result === "failed") logger$31.warn("Dev-story reported failure, proceeding to code review", {
+				if (devResult.result === "failed") logger$33.warn("Dev-story reported failure, proceeding to code review", {
 					storyKey,
 					error: devResult.error,
 					filesModified: devFilesModified.length
@@ -10401,7 +10679,7 @@ function createImplementationOrchestrator(deps) {
 						"NEEDS_MAJOR_REWORK": 2
 					};
 					for (const group of batchFileGroups) {
-						logger$31.info({
+						logger$33.info({
 							storyKey,
 							batchIndex: group.batchIndex,
 							fileCount: group.files.length
@@ -10437,7 +10715,7 @@ function createImplementationOrchestrator(deps) {
 						rawOutput: lastRawOutput,
 						tokenUsage: aggregateTokens
 					};
-					logger$31.info({
+					logger$33.info({
 						storyKey,
 						batchCount: batchFileGroups.length,
 						verdict: worstVerdict,
@@ -10460,7 +10738,7 @@ function createImplementationOrchestrator(deps) {
 				const isPhantomReview = reviewResult.verdict !== "SHIP_IT" && (reviewResult.issue_list === void 0 || reviewResult.issue_list.length === 0) && reviewResult.error !== void 0;
 				if (isPhantomReview && !timeoutRetried) {
 					timeoutRetried = true;
-					logger$31.warn({
+					logger$33.warn({
 						storyKey,
 						reviewCycles,
 						error: reviewResult.error
@@ -10470,7 +10748,7 @@ function createImplementationOrchestrator(deps) {
 				verdict = reviewResult.verdict;
 				issueList = reviewResult.issue_list ?? [];
 				if (verdict === "NEEDS_MAJOR_REWORK" && reviewCycles > 0 && previousIssueList.length > 0 && issueList.length < previousIssueList.length) {
-					logger$31.info({
+					logger$33.info({
 						storyKey,
 						originalVerdict: verdict,
 						issuesBefore: previousIssueList.length,
@@ -10506,7 +10784,7 @@ function createImplementationOrchestrator(deps) {
 					if (_decomposition !== void 0) parts.push(`decomposed: ${_decomposition.batchCount} batches`);
 					parts.push(`${fileCount} files`);
 					parts.push(`${totalTokensK} tokens`);
-					logger$31.info({
+					logger$33.info({
 						storyKey,
 						verdict,
 						agentVerdict: reviewResult.agentVerdict
@@ -10558,7 +10836,7 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				logger$31.info({
+				logger$33.info({
 					storyKey,
 					reviewCycles: finalReviewCycles,
 					issueCount: issueList.length
@@ -10608,7 +10886,7 @@ function createImplementationOrchestrator(deps) {
 						fixPrompt = assembled.prompt;
 					} catch {
 						fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, minor fixes needed`;
-						logger$31.warn("Failed to assemble auto-approve fix prompt, using fallback", { storyKey });
+						logger$33.warn("Failed to assemble auto-approve fix prompt, using fallback", { storyKey });
 					}
 					const handle = dispatcher.dispatch({
 						prompt: fixPrompt,
@@ -10625,9 +10903,9 @@ function createImplementationOrchestrator(deps) {
 							output: fixResult.tokenEstimate.output
 						} : void 0 }
 					});
-					if (fixResult.status === "timeout") logger$31.warn("Auto-approve fix timed out — approving anyway (issues were minor)", { storyKey });
+					if (fixResult.status === "timeout") logger$33.warn("Auto-approve fix timed out — approving anyway (issues were minor)", { storyKey });
 				} catch (err) {
-					logger$31.warn("Auto-approve fix dispatch failed — approving anyway (issues were minor)", {
+					logger$33.warn("Auto-approve fix dispatch failed — approving anyway (issues were minor)", {
 						storyKey,
 						err
 					});
@@ -10697,7 +10975,7 @@ function createImplementationOrchestrator(deps) {
 					fixPrompt = assembled.prompt;
 				} catch {
 					fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, taskType=${taskType}`;
-					logger$31.warn("Failed to assemble fix prompt, using fallback", {
+					logger$33.warn("Failed to assemble fix prompt, using fallback", {
 						storyKey,
 						taskType
 					});
@@ -10719,7 +10997,7 @@ function createImplementationOrchestrator(deps) {
 					} : void 0 }
 				});
 				if (fixResult.status === "timeout") {
-					logger$31.warn("Fix dispatch timed out — escalating story", {
+					logger$33.warn("Fix dispatch timed out — escalating story", {
 						storyKey,
 						taskType
 					});
@@ -10737,13 +11015,13 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				if (fixResult.status === "failed") logger$31.warn("Fix dispatch failed", {
+				if (fixResult.status === "failed") logger$33.warn("Fix dispatch failed", {
 					storyKey,
 					taskType,
 					exitCode: fixResult.exitCode
 				});
 			} catch (err) {
-				logger$31.warn("Fix dispatch failed, continuing to next review", {
+				logger$33.warn("Fix dispatch failed, continuing to next review", {
 					storyKey,
 					taskType,
 					err
@@ -10796,11 +11074,11 @@ function createImplementationOrchestrator(deps) {
 	}
 	async function run(storyKeys) {
 		if (_state === "RUNNING" || _state === "PAUSED") {
-			logger$31.warn("run() called while orchestrator is already running or paused — ignoring", { state: _state });
+			logger$33.warn("run() called while orchestrator is already running or paused — ignoring", { state: _state });
 			return getStatus();
 		}
 		if (_state === "COMPLETE") {
-			logger$31.warn("run() called on a COMPLETE orchestrator — ignoring", { state: _state });
+			logger$33.warn("run() called on a COMPLETE orchestrator — ignoring", { state: _state });
 			return getStatus();
 		}
 		_state = "RUNNING";
@@ -10814,15 +11092,17 @@ function createImplementationOrchestrator(deps) {
 			pipelineRunId: config.pipelineRunId
 		});
 		persistState();
+		recordProgress();
+		startHeartbeat();
 		if (projectRoot !== void 0) {
 			const seedResult = seedMethodologyContext(db, projectRoot);
-			if (seedResult.decisionsCreated > 0) logger$31.info({
+			if (seedResult.decisionsCreated > 0) logger$33.info({
 				decisionsCreated: seedResult.decisionsCreated,
 				skippedCategories: seedResult.skippedCategories
 			}, "Methodology context seeded from planning artifacts");
 		}
 		const groups = detectConflictGroups(storyKeys);
-		logger$31.info("Orchestrator starting", {
+		logger$33.info("Orchestrator starting", {
 			storyCount: storyKeys.length,
 			groupCount: groups.length,
 			maxConcurrency: config.maxConcurrency
@@ -10830,12 +11110,14 @@ function createImplementationOrchestrator(deps) {
 		try {
 			await runWithConcurrency(groups, config.maxConcurrency);
 		} catch (err) {
+			stopHeartbeat();
 			_state = "FAILED";
 			_completedAt = new Date().toISOString();
 			persistState();
-			logger$31.error("Orchestrator failed with unhandled error", { err });
+			logger$33.error("Orchestrator failed with unhandled error", { err });
 			return getStatus();
 		}
+		stopHeartbeat();
 		_state = "COMPLETE";
 		_completedAt = new Date().toISOString();
 		let completed = 0;
@@ -10859,7 +11141,7 @@ function createImplementationOrchestrator(deps) {
 		_pauseGate = createPauseGate();
 		_state = "PAUSED";
 		eventBus.emit("orchestrator:paused", {});
-		logger$31.info("Orchestrator paused");
+		logger$33.info("Orchestrator paused");
 	}
 	function resume() {
 		if (_state !== "PAUSED") return;
@@ -10870,7 +11152,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		_state = "RUNNING";
 		eventBus.emit("orchestrator:resumed", {});
-		logger$31.info("Orchestrator resumed");
+		logger$33.info("Orchestrator resumed");
 	}
 	return {
 		run,
@@ -11340,53 +11622,479 @@ function createPhaseOrchestrator(deps) {
 }
 
 //#endregion
-//#region src/modules/phase-orchestrator/phases/schemas.ts
-/**
-* Zod schema for the ProductBrief structure emitted by the analysis agent.
-* Validates that all required fields are present and non-empty.
-*/
-const ProductBriefSchema = z.object({
-	problem_statement: z.string().min(10),
-	target_users: z.array(z.string().min(1)).min(1),
-	core_features: z.array(z.string().min(1)).min(1),
-	success_metrics: z.array(z.string().min(1)).min(1),
-	constraints: z.array(z.string()).default([])
-});
+//#region src/modules/phase-orchestrator/budget-utils.ts
 /**
-* Zod schema for the full YAML output emitted by the analysis agent.
-* The agent must emit a YAML block with `result` and `product_brief` fields.
-*/
-const AnalysisOutputSchema = z.object({
-	result: z.enum(["success", "failed"]),
-	product_brief: ProductBriefSchema
-});
-/**
-* Zod schema for a single functional requirement.
+* Shared utilities for dynamic prompt token budget calculation
+* and decision summarization.
+*
+* Extracted from phases/solutioning.ts to avoid inappropriate dependency
+* direction (step-runner.ts importing from a phase-specific module).
 */
-const FunctionalRequirementSchema = z.object({
-	description: z.string().min(5),
-	priority: z.enum([
-		"must",
-		"should",
-		"could"
-	]).default("must")
-});
+/** Absolute maximum prompt tokens (model context safety margin) */
+const ABSOLUTE_MAX_PROMPT_TOKENS = 12e3;
+/** Additional tokens per architecture decision injected into story generation prompt */
+const TOKENS_PER_DECISION = 100;
+/** Priority order for decision categories when summarizing (higher priority kept first) */
+const DECISION_CATEGORY_PRIORITY = [
+	"data",
+	"auth",
+	"api",
+	"frontend",
+	"infra",
+	"observability",
+	"ci"
+];
 /**
-* Zod schema for a single non-functional requirement.
+* Calculate the dynamic prompt token budget based on the number of decisions
+* that will be injected into the prompt.
+*
+* Formula: base_budget + (decision_count * tokens_per_decision)
+* Capped at ABSOLUTE_MAX_PROMPT_TOKENS.
+*
+* @param baseBudget - Base token budget for the phase
+* @param decisionCount - Number of decisions to inject
+* @returns Calculated token budget, capped at ABSOLUTE_MAX_PROMPT_TOKENS
 */
-const NonFunctionalRequirementSchema = z.object({
-	description: z.string().min(5),
-	category: z.string().min(1)
-});
+function calculateDynamicBudget(baseBudget, decisionCount) {
+	const budget = baseBudget + decisionCount * TOKENS_PER_DECISION;
+	return Math.min(budget, ABSOLUTE_MAX_PROMPT_TOKENS);
+}
 /**
-* Zod schema for a single user story.
+* Summarize architecture decisions into compact key:value one-liners,
+* dropping rationale and optionally dropping lower-priority categories
+* to fit within a character budget.
+*
+* Strategy:
+* 1. Sort decisions by priority (known categories first, then alphabetical)
+* 2. For each decision, produce a compact `key: value` one-liner (drop rationale)
+* 3. If still over budget, drop lower-priority categories
+* 4. Return the compact summary string
+*
+* @param decisions - Full architecture decisions from the decision store
+* @param maxChars - Maximum character budget for the summarized output
+* @returns Compact summary string
 */
-const UserStorySchema = z.object({
-	title: z.string().min(3),
-	description: z.string().min(5)
-});
-/**
-* Zod schema for the full YAML output emitted by the planning agent.
+function summarizeDecisions(decisions, maxChars) {
+	const sorted = [...decisions].sort((a, b) => {
+		const aCat = (a.category ?? "").toLowerCase();
+		const bCat = (b.category ?? "").toLowerCase();
+		const aIdx = DECISION_CATEGORY_PRIORITY.indexOf(aCat);
+		const bIdx = DECISION_CATEGORY_PRIORITY.indexOf(bCat);
+		const aPri = aIdx === -1 ? DECISION_CATEGORY_PRIORITY.length : aIdx;
+		const bPri = bIdx === -1 ? DECISION_CATEGORY_PRIORITY.length : bIdx;
+		return aPri - bPri;
+	});
+	const header = "## Architecture Decisions (Summarized)";
+	const lines = [header];
+	let currentLength = header.length;
+	for (const d of sorted) {
+		const truncatedValue = d.value.length > 120 ? d.value.slice(0, 117) + "..." : d.value;
+		const line = `- ${d.key}: ${truncatedValue}`;
+		if (currentLength + line.length + 1 > maxChars) break;
+		lines.push(line);
+		currentLength += line.length + 1;
+	}
+	return lines.join("\n");
+}
+
+//#endregion
+//#region src/modules/phase-orchestrator/step-runner.ts
+const logger$5 = createLogger("step-runner");
+/**
+* Format an array of decision records into a markdown section for injection.
+*
+* @param decisions - Decision records from the store
+* @param sectionTitle - Title for the markdown section
+* @returns Formatted markdown string
+*/
+function formatDecisionsForInjection(decisions, sectionTitle) {
+	if (decisions.length === 0) return "";
+	const parts = [];
+	if (sectionTitle) parts.push(`## ${sectionTitle}`);
+	for (const d of decisions) {
+		const rationale = d.rationale ? ` (${d.rationale})` : "";
+		try {
+			const parsed = JSON.parse(d.value);
+			if (Array.isArray(parsed)) {
+				parts.push(`### ${d.key.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())}`);
+				for (const item of parsed) parts.push(`- ${String(item)}`);
+			} else if (typeof parsed === "object" && parsed !== null) parts.push(`- **${d.key}**: ${JSON.stringify(parsed)}${rationale}`);
+			else parts.push(`- **${d.key}**: ${String(parsed)}${rationale}`);
+		} catch {
+			parts.push(`- **${d.key}**: ${d.value}${rationale}`);
+		}
+	}
+	return parts.join("\n");
+}
+/**
+* Resolve a single context reference to a string value.
+*
+* @param ref - The context reference to resolve
+* @param deps - Phase dependencies (for DB access)
+* @param runId - Pipeline run ID
+* @param params - Runtime parameters map
+* @param stepOutputs - Map of step name → raw parsed output from prior steps
+* @returns Resolved string value
+*/
+function resolveContext(ref, deps, runId, params, stepOutputs) {
+	const { source } = ref;
+	if (source.startsWith("param:")) {
+		const key = source.slice(6);
+		return params[key] ?? "";
+	}
+	if (source.startsWith("decision:")) {
+		const path$1 = source.slice(9);
+		const [phase, category] = path$1.split(".");
+		if (!phase || !category) return "";
+		const decisions = getDecisionsByPhaseForRun(deps.db, runId, phase);
+		const filtered = decisions.filter((d) => d.category === category);
+		return formatDecisionsForInjection(filtered.map((d) => ({
+			key: d.key,
+			value: d.value,
+			rationale: d.rationale ?? null
+		})), category.replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()));
+	}
+	if (source.startsWith("step:")) {
+		const stepName = source.slice(5);
+		const output = stepOutputs.get(stepName);
+		if (!output) return "";
+		const parts = [];
+		for (const [key, value] of Object.entries(output)) {
+			if (key === "result") continue;
+			if (Array.isArray(value)) {
+				parts.push(`### ${key.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase())}`);
+				for (const item of value) if (typeof item === "object" && item !== null) parts.push(`- ${JSON.stringify(item)}`);
+				else parts.push(`- ${String(item)}`);
+			} else if (typeof value === "object" && value !== null) parts.push(`- **${key}**: ${JSON.stringify(value)}`);
+			else parts.push(`- **${key}**: ${String(value)}`);
+		}
+		return parts.join("\n");
+	}
+	return "";
+}
+/**
+* Execute a sequence of steps, accumulating context and persisting results.
+*
+* Halts on the first step that fails. Each step's output is available to
+* subsequent steps via the stepOutputs map and decision store.
+*
+* @param steps - Ordered list of step definitions to execute
+* @param deps - Shared phase dependencies
+* @param runId - Pipeline run ID
+* @param phase - Phase name (for decision store persistence)
+* @param params - Runtime parameters map (concept, product_brief, etc.)
+* @returns Aggregated multi-step result
+*/
+async function runSteps(steps, deps, runId, phase, params) {
+	const stepResults = [];
+	const stepOutputs = new Map();
+	let totalInput = 0;
+	let totalOutput = 0;
+	for (const step of steps) try {
+		const template = await deps.pack.getPrompt(step.name);
+		let prompt = template;
+		for (const ref of step.context) {
+			const value = resolveContext(ref, deps, runId, params, stepOutputs);
+			prompt = prompt.replace(`{{${ref.placeholder}}}`, value);
+		}
+		const allDecisions = getDecisionsByPhaseForRun(deps.db, runId, phase);
+		const budgetTokens = calculateDynamicBudget(4e3, allDecisions.length);
+		let estimatedTokens = Math.ceil(prompt.length / 4);
+		if (estimatedTokens > budgetTokens) {
+			const decisionRefs = step.context.filter((ref) => ref.source.startsWith("decision:"));
+			if (decisionRefs.length > 0) {
+				logger$5.warn({
+					step: step.name,
+					estimatedTokens,
+					budgetTokens
+				}, "Prompt exceeds budget — attempting decision summarization");
+				let summarizedPrompt = template;
+				for (const ref of step.context) {
+					let value;
+					if (ref.source.startsWith("decision:")) {
+						const path$1 = ref.source.slice(9);
+						const [decPhase, decCategory] = path$1.split(".");
+						if (decPhase && decCategory) {
+							const decisions = getDecisionsByPhaseForRun(deps.db, runId, decPhase);
+							const filtered = decisions.filter((d) => d.category === decCategory);
+							const budgetChars = budgetTokens * 4;
+							const availableChars = Math.max(200, Math.floor(budgetChars / decisionRefs.length));
+							value = summarizeDecisions(filtered.map((d) => ({
+								key: d.key,
+								value: d.value,
+								category: d.category
+							})), availableChars);
+						} else value = resolveContext(ref, deps, runId, params, stepOutputs);
+					} else value = resolveContext(ref, deps, runId, params, stepOutputs);
+					summarizedPrompt = summarizedPrompt.replace(`{{${ref.placeholder}}}`, value);
+				}
+				prompt = summarizedPrompt;
+				estimatedTokens = Math.ceil(prompt.length / 4);
+				if (estimatedTokens <= budgetTokens) logger$5.info({
+					step: step.name,
+					estimatedTokens,
+					budgetTokens
+				}, "Decision summarization brought prompt within budget");
+			}
+			if (estimatedTokens > budgetTokens) {
+				const errorMsg = `Step '${step.name}' prompt exceeds token budget after summarization: ${estimatedTokens} tokens (max ${budgetTokens})`;
+				stepResults.push({
+					name: step.name,
+					success: false,
+					parsed: null,
+					error: errorMsg,
+					tokenUsage: {
+						input: 0,
+						output: 0
+					}
+				});
+				return {
+					success: false,
+					steps: stepResults,
+					tokenUsage: {
+						input: totalInput,
+						output: totalOutput
+					},
+					error: errorMsg
+				};
+			}
+		}
+		const handle = deps.dispatcher.dispatch({
+			prompt,
+			agent: "claude-code",
+			taskType: step.taskType,
+			outputSchema: step.outputSchema
+		});
+		const dispatchResult = await handle.result;
+		const tokenUsage = {
+			input: dispatchResult.tokenEstimate.input,
+			output: dispatchResult.tokenEstimate.output
+		};
+		totalInput += tokenUsage.input;
+		totalOutput += tokenUsage.output;
+		if (dispatchResult.status === "timeout") {
+			const errorMsg = `Step '${step.name}' timed out after ${dispatchResult.durationMs}ms`;
+			stepResults.push({
+				name: step.name,
+				success: false,
+				parsed: null,
+				error: errorMsg,
+				tokenUsage
+			});
+			return {
+				success: false,
+				steps: stepResults,
+				tokenUsage: {
+					input: totalInput,
+					output: totalOutput
+				},
+				error: errorMsg
+			};
+		}
+		if (dispatchResult.status === "failed") {
+			const errorMsg = `Step '${step.name}' dispatch failed: ${dispatchResult.parseError ?? dispatchResult.output}`;
+			stepResults.push({
+				name: step.name,
+				success: false,
+				parsed: null,
+				error: errorMsg,
+				tokenUsage
+			});
+			return {
+				success: false,
+				steps: stepResults,
+				tokenUsage: {
+					input: totalInput,
+					output: totalOutput
+				},
+				error: errorMsg
+			};
+		}
+		if (dispatchResult.parsed === null || dispatchResult.parseError !== null) {
+			const errorMsg = `Step '${step.name}' schema validation failed: ${dispatchResult.parseError ?? "No parsed output"}`;
+			stepResults.push({
+				name: step.name,
+				success: false,
+				parsed: null,
+				error: errorMsg,
+				tokenUsage
+			});
+			return {
+				success: false,
+				steps: stepResults,
+				tokenUsage: {
+					input: totalInput,
+					output: totalOutput
+				},
+				error: errorMsg
+			};
+		}
+		const parsed = dispatchResult.parsed;
+		if (parsed.result === "failed") {
+			const errorMsg = `Step '${step.name}' agent reported failure`;
+			stepResults.push({
+				name: step.name,
+				success: false,
+				parsed: null,
+				error: errorMsg,
+				tokenUsage
+			});
+			return {
+				success: false,
+				steps: stepResults,
+				tokenUsage: {
+					input: totalInput,
+					output: totalOutput
+				},
+				error: errorMsg
+			};
+		}
+		stepOutputs.set(step.name, parsed);
+		for (const mapping of step.persist) {
+			const fieldValue = parsed[mapping.field];
+			if (fieldValue === void 0) continue;
+			if (mapping.key === "array" && Array.isArray(fieldValue)) for (const [index, item] of fieldValue.entries()) upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: mapping.category,
+				key: `${step.name}-${index}`,
+				value: typeof item === "object" ? JSON.stringify(item) : String(item)
+			});
+			else if (typeof fieldValue === "object" && fieldValue !== null) upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: mapping.category,
+				key: mapping.key,
+				value: JSON.stringify(fieldValue)
+			});
+			else upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: mapping.category,
+				key: mapping.key,
+				value: String(fieldValue)
+			});
+		}
+		let artifactId;
+		if (step.registerArtifact) {
+			const artifact = registerArtifact(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				type: step.registerArtifact.type,
+				path: step.registerArtifact.path,
+				summary: step.registerArtifact.summarize(parsed)
+			});
+			artifactId = artifact.id;
+		}
+		const stepResult = {
+			name: step.name,
+			success: true,
+			parsed,
+			error: null,
+			tokenUsage
+		};
+		if (artifactId !== void 0) stepResult.artifactId = artifactId;
+		stepResults.push(stepResult);
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		const errorMsg = `Step '${step.name}' unexpected error: ${message}`;
+		stepResults.push({
+			name: step.name,
+			success: false,
+			parsed: null,
+			error: errorMsg,
+			tokenUsage: {
+				input: 0,
+				output: 0
+			}
+		});
+		return {
+			success: false,
+			steps: stepResults,
+			tokenUsage: {
+				input: totalInput,
+				output: totalOutput
+			},
+			error: errorMsg
+		};
+	}
+	return {
+		success: true,
+		steps: stepResults,
+		tokenUsage: {
+			input: totalInput,
+			output: totalOutput
+		}
+	};
+}
+
+//#endregion
+//#region src/modules/phase-orchestrator/phases/schemas.ts
+/**
+* Zod schema for the ProductBrief structure emitted by the analysis agent.
+* Validates that all required fields are present and non-empty.
+*/
+const ProductBriefSchema = z.object({
+	problem_statement: z.string().min(10),
+	target_users: z.array(z.string().min(1)).min(1),
+	core_features: z.array(z.string().min(1)).min(1),
+	success_metrics: z.array(z.string().min(1)).min(1),
+	constraints: z.array(z.string()).default([])
+});
+/**
+* Zod schema for the full YAML output emitted by the analysis agent.
+* The agent must emit a YAML block with `result` and `product_brief` fields.
+*/
+const AnalysisOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	product_brief: ProductBriefSchema
+});
+/**
+* Step 1 output: Vision & problem analysis.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const AnalysisVisionOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	problem_statement: z.string().min(10).optional(),
+	target_users: z.array(z.string().min(1)).min(1).optional()
+});
+/**
+* Step 2 output: Scope & features (builds on vision output).
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const AnalysisScopeOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	core_features: z.array(z.string().min(1)).min(1).optional(),
+	success_metrics: z.array(z.string().min(1)).min(1).optional(),
+	constraints: z.array(z.string()).default([])
+});
+/**
+* Zod schema for a single functional requirement.
+*/
+const FunctionalRequirementSchema = z.object({
+	description: z.string().min(5),
+	priority: z.enum([
+		"must",
+		"should",
+		"could"
+	]).default("must")
+});
+/**
+* Zod schema for a single non-functional requirement.
+*/
+const NonFunctionalRequirementSchema = z.object({
+	description: z.string().min(5),
+	category: z.string().min(1)
+});
+/**
+* Zod schema for a single user story.
+*/
+const UserStorySchema = z.object({
+	title: z.string().min(3),
+	description: z.string().min(5)
+});
+/**
+* Zod schema for the full YAML output emitted by the planning agent.
 * The agent must emit a YAML block with all PRD fields.
 */
 const PlanningOutputSchema = z.object({
@@ -11399,6 +12107,36 @@ const PlanningOutputSchema = z.object({
 	out_of_scope: z.array(z.string()).default([])
 });
 /**
+* Step 1 output: Project classification & vision.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const PlanningClassificationOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	project_type: z.string().min(1).optional(),
+	vision: z.string().min(10).optional(),
+	key_goals: z.array(z.string().min(1)).min(1).optional()
+});
+/**
+* Step 2 output: Functional requirements & user stories.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const PlanningFRsOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	functional_requirements: z.array(FunctionalRequirementSchema).min(3).optional(),
+	user_stories: z.array(UserStorySchema).min(1).optional()
+});
+/**
+* Step 3 output: NFRs, tech stack, domain model, out-of-scope.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const PlanningNFRsOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	non_functional_requirements: z.array(NonFunctionalRequirementSchema).min(2).optional(),
+	tech_stack: z.record(z.string(), z.string()).optional(),
+	domain_model: z.record(z.string(), z.unknown()).optional(),
+	out_of_scope: z.array(z.string()).default([])
+});
+/**
 * Zod schema for a single architecture decision emitted by the architecture agent.
 */
 const ArchitectureDecisionSchema = z.object({
@@ -11443,6 +12181,26 @@ const StoryGenerationOutputSchema = z.object({
 	result: z.enum(["success", "failed"]),
 	epics: z.array(EpicDefinitionSchema).min(1)
 });
+/**
+* Architecture Step 1 output: Context analysis — initial architecture decisions.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const ArchContextOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	architecture_decisions: z.array(ArchitectureDecisionSchema).min(1).optional()
+});
+/**
+* Epic Design Step output: Epic structure with FR coverage mapping.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const EpicDesignOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	epics: z.array(z.object({
+		title: z.string().min(3),
+		description: z.string().min(5),
+		fr_coverage: z.array(z.string()).default([])
+	})).min(1).optional()
+});
 
 //#endregion
 //#region src/modules/phase-orchestrator/phases/analysis.ts
@@ -11468,11 +12226,120 @@ const BRIEF_FIELDS$1 = [
 	"constraints"
 ];
 /**
+* Build step definitions for 2-step analysis decomposition.
+*/
+function buildAnalysisSteps() {
+	return [{
+		name: "analysis-step-1-vision",
+		taskType: "analysis-vision",
+		outputSchema: AnalysisVisionOutputSchema,
+		context: [{
+			placeholder: "concept",
+			source: "param:concept"
+		}],
+		persist: [{
+			field: "problem_statement",
+			category: "product-brief",
+			key: "problem_statement"
+		}, {
+			field: "target_users",
+			category: "product-brief",
+			key: "target_users"
+		}]
+	}, {
+		name: "analysis-step-2-scope",
+		taskType: "analysis-scope",
+		outputSchema: AnalysisScopeOutputSchema,
+		context: [{
+			placeholder: "concept",
+			source: "param:concept"
+		}, {
+			placeholder: "vision_output",
+			source: "step:analysis-step-1-vision"
+		}],
+		persist: [
+			{
+				field: "core_features",
+				category: "product-brief",
+				key: "core_features"
+			},
+			{
+				field: "success_metrics",
+				category: "product-brief",
+				key: "success_metrics"
+			},
+			{
+				field: "constraints",
+				category: "product-brief",
+				key: "constraints"
+			}
+		],
+		registerArtifact: {
+			type: "product-brief",
+			path: "decision-store://analysis/product-brief",
+			summarize: (parsed) => {
+				const features = parsed.core_features;
+				return features ? `${features.length} core features defined` : "Product brief complete";
+			}
+		}
+	}];
+}
+/**
+* Run analysis phase using multi-step decomposition (2 steps).
+*/
+async function runAnalysisMultiStep(deps, params) {
+	const zeroTokenUsage = {
+		input: 0,
+		output: 0
+	};
+	try {
+		let effectiveConcept = params.concept;
+		if (params.concept.length > MAX_CONCEPT_CHARS) effectiveConcept = params.concept.slice(0, MAX_CONCEPT_CHARS) + "...";
+		const steps = buildAnalysisSteps();
+		const result = await runSteps(steps, deps, params.runId, "analysis", { concept: effectiveConcept });
+		if (!result.success) return {
+			result: "failed",
+			error: result.error ?? "multi_step_failed",
+			details: result.error ?? "Multi-step analysis failed",
+			tokenUsage: result.tokenUsage
+		};
+		const visionOutput = result.steps[0]?.parsed;
+		const scopeOutput = result.steps[1]?.parsed;
+		if (!visionOutput || !scopeOutput) return {
+			result: "failed",
+			error: "incomplete_steps",
+			details: "Not all analysis steps produced output",
+			tokenUsage: result.tokenUsage
+		};
+		const brief = {
+			problem_statement: visionOutput.problem_statement,
+			target_users: visionOutput.target_users,
+			core_features: scopeOutput.core_features,
+			success_metrics: scopeOutput.success_metrics,
+			constraints: scopeOutput.constraints ?? []
+		};
+		const analysisResult = {
+			result: "success",
+			product_brief: brief,
+			tokenUsage: result.tokenUsage
+		};
+		const artifactId = result.steps[1]?.artifactId;
+		if (artifactId !== void 0) analysisResult.artifact_id = artifactId;
+		return analysisResult;
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		return {
+			result: "failed",
+			error: message,
+			tokenUsage: zeroTokenUsage
+		};
+	}
+}
+/**
 * Execute the analysis phase of the BMAD pipeline.
 *
-* Retrieves the compiled analysis prompt, injects the user concept,
-* dispatches to a claude-code agent, validates the output, and persists
-* the product brief to the decision store.
+* If the manifest defines steps for the analysis phase, uses multi-step
+* decomposition. Otherwise falls back to the single-dispatch code path.
 *
 * @param deps - Shared phase dependencies (db, pack, contextCompiler, dispatcher)
 * @param params - Phase parameters (runId, concept)
@@ -11481,6 +12348,8 @@ const BRIEF_FIELDS$1 = [
 async function runAnalysisPhase(deps, params) {
 	const { db, pack, dispatcher } = deps;
 	const { runId, concept, amendmentContext } = params;
+	const analysisPhase = pack.manifest.phases?.find((p) => p.name === "analysis");
+	if (analysisPhase?.steps && analysisPhase.steps.length > 0 && !amendmentContext) return runAnalysisMultiStep(deps, params);
 	const zeroTokenUsage = {
 		input: 0,
 		output: 0
@@ -11625,11 +12494,199 @@ function formatProductBriefFromDecisions(decisions) {
 	return parts.join("\n\n");
 }
 /**
+* Build step definitions for 3-step planning decomposition.
+*/
+function buildPlanningSteps() {
+	return [
+		{
+			name: "planning-step-1-classification",
+			taskType: "planning-classification",
+			outputSchema: PlanningClassificationOutputSchema,
+			context: [{
+				placeholder: "product_brief",
+				source: "decision:analysis.product-brief"
+			}],
+			persist: [
+				{
+					field: "project_type",
+					category: "classification",
+					key: "project_type"
+				},
+				{
+					field: "vision",
+					category: "classification",
+					key: "vision"
+				},
+				{
+					field: "key_goals",
+					category: "classification",
+					key: "key_goals"
+				}
+			]
+		},
+		{
+			name: "planning-step-2-frs",
+			taskType: "planning-frs",
+			outputSchema: PlanningFRsOutputSchema,
+			context: [{
+				placeholder: "product_brief",
+				source: "decision:analysis.product-brief"
+			}, {
+				placeholder: "classification",
+				source: "step:planning-step-1-classification"
+			}],
+			persist: [{
+				field: "functional_requirements",
+				category: "functional-requirements",
+				key: "array"
+			}, {
+				field: "user_stories",
+				category: "user-stories",
+				key: "array"
+			}]
+		},
+		{
+			name: "planning-step-3-nfrs",
+			taskType: "planning-nfrs",
+			outputSchema: PlanningNFRsOutputSchema,
+			context: [
+				{
+					placeholder: "product_brief",
+					source: "decision:analysis.product-brief"
+				},
+				{
+					placeholder: "classification",
+					source: "step:planning-step-1-classification"
+				},
+				{
+					placeholder: "functional_requirements",
+					source: "step:planning-step-2-frs"
+				}
+			],
+			persist: [
+				{
+					field: "non_functional_requirements",
+					category: "non-functional-requirements",
+					key: "array"
+				},
+				{
+					field: "tech_stack",
+					category: "tech-stack",
+					key: "tech_stack"
+				},
+				{
+					field: "domain_model",
+					category: "domain-model",
+					key: "entities"
+				},
+				{
+					field: "out_of_scope",
+					category: "out-of-scope",
+					key: "items"
+				}
+			],
+			registerArtifact: {
+				type: "prd",
+				path: "decision-store://planning/prd",
+				summarize: (parsed) => {
+					const nfrs = parsed.non_functional_requirements;
+					return `Planning complete: ${nfrs?.length ?? 0} NFRs, tech stack defined`;
+				}
+			}
+		}
+	];
+}
+/**
+* Run planning phase using multi-step decomposition (3 steps).
+*/
+async function runPlanningMultiStep(deps, params) {
+	const { db, runId } = {
+		db: deps.db,
+		runId: params.runId
+	};
+	const zeroTokenUsage = {
+		input: 0,
+		output: 0
+	};
+	try {
+		const allAnalysisDecisions = getDecisionsByPhaseForRun(db, runId, "analysis");
+		const productBriefDecisions = allAnalysisDecisions.filter((d) => d.category === "product-brief");
+		if (productBriefDecisions.length === 0) return {
+			result: "failed",
+			error: "missing_product_brief",
+			details: "No product brief decisions found in the analysis phase.",
+			tokenUsage: zeroTokenUsage
+		};
+		const steps = buildPlanningSteps();
+		const result = await runSteps(steps, deps, params.runId, "planning", {});
+		if (!result.success) return {
+			result: "failed",
+			error: result.error ?? "multi_step_failed",
+			details: result.error ?? "Multi-step planning failed",
+			tokenUsage: result.tokenUsage
+		};
+		const frsOutput = result.steps[1]?.parsed;
+		const nfrsOutput = result.steps[2]?.parsed;
+		if (!frsOutput || !nfrsOutput) return {
+			result: "failed",
+			error: "incomplete_steps",
+			details: "Not all planning steps produced output",
+			tokenUsage: result.tokenUsage
+		};
+		const frs = frsOutput.functional_requirements;
+		const nfrs = nfrsOutput.non_functional_requirements;
+		const userStories = frsOutput.user_stories;
+		if (!frs?.length) return {
+			result: "failed",
+			error: "missing_functional_requirements",
+			details: "FRs step did not return functional_requirements",
+			tokenUsage: result.tokenUsage
+		};
+		if (!nfrs?.length) return {
+			result: "failed",
+			error: "missing_non_functional_requirements",
+			details: "NFRs step did not return non_functional_requirements",
+			tokenUsage: result.tokenUsage
+		};
+		for (const fr of frs) createRequirement(db, {
+			pipeline_run_id: params.runId,
+			source: "planning-phase",
+			type: "functional",
+			description: fr.description,
+			priority: fr.priority
+		});
+		for (const nfr of nfrs) createRequirement(db, {
+			pipeline_run_id: params.runId,
+			source: "planning-phase",
+			type: "non_functional",
+			description: nfr.description,
+			priority: "should"
+		});
+		const requirementsCount = frs.length + nfrs.length;
+		const userStoriesCount = userStories?.length ?? 0;
+		const planningResult = {
+			result: "success",
+			requirements_count: requirementsCount,
+			user_stories_count: userStoriesCount,
+			tokenUsage: result.tokenUsage
+		};
+		const artifactId = result.steps[2]?.artifactId;
+		if (artifactId !== void 0) planningResult.artifact_id = artifactId;
+		return planningResult;
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		return {
+			result: "failed",
+			error: message,
+			tokenUsage: zeroTokenUsage
+		};
+	}
+}
+/**
 * Execute the planning phase of the BMAD pipeline.
 *
-* Retrieves the compiled planning prompt, injects the product brief from the
-* analysis phase decision store, dispatches to a claude-code agent, validates
-* the output, creates requirement records, and persists planning decisions.
+* If the manifest defines steps for the planning phase, uses multi-step
+* decomposition. Otherwise falls back to the single-dispatch code path.
 *
 * @param deps - Shared phase dependencies (db, pack, contextCompiler, dispatcher)
 * @param params - Phase parameters (runId)
@@ -11638,6 +12695,8 @@ function formatProductBriefFromDecisions(decisions) {
 async function runPlanningPhase(deps, params) {
 	const { db, pack, dispatcher } = deps;
 	const { runId, amendmentContext } = params;
+	const planningPhase = pack.manifest.phases?.find((p) => p.name === "planning");
+	if (planningPhase?.steps && planningPhase.steps.length > 0 && !amendmentContext) return runPlanningMultiStep(deps, params);
 	const zeroTokenUsage = {
 		input: 0,
 		output: 0
@@ -11876,82 +12935,27 @@ var QualityGateImpl = class {
 function createQualityGate(config) {
 	return new QualityGateImpl(config);
 }
-
-//#endregion
-//#region src/modules/phase-orchestrator/phases/solutioning.ts
-/** Base token budget for architecture generation (covers template + requirements) */
-const BASE_ARCH_PROMPT_TOKENS = 3e3;
-/** Base token budget for story generation (covers template + requirements + architecture) */
-const BASE_STORY_PROMPT_TOKENS = 4e3;
-/** Additional tokens per architecture decision injected into story generation prompt */
-const TOKENS_PER_DECISION = 100;
-/** Absolute maximum prompt tokens (model context safety margin) */
-const ABSOLUTE_MAX_PROMPT_TOKENS = 12e3;
-/** Placeholder in architecture prompt template */
-const REQUIREMENTS_PLACEHOLDER = "{{requirements}}";
-/** Amendment context framing block prefix */
-const AMENDMENT_CONTEXT_HEADER = "\n\n--- AMENDMENT CONTEXT (Parent Run Decisions) ---\n";
-/** Amendment context framing block suffix */
-const AMENDMENT_CONTEXT_FOOTER = "\n--- END AMENDMENT CONTEXT ---\n";
-/** Marker appended when amendment context is truncated to fit token budget */
-const TRUNCATED_MARKER = "\n[TRUNCATED]";
-/** Placeholders in story generation prompt template */
-const STORY_REQUIREMENTS_PLACEHOLDER = "{{requirements}}";
-const STORY_ARCHITECTURE_PLACEHOLDER = "{{architecture_decisions}}";
-/** Gap analysis placeholder used in retry prompt */
-const GAP_ANALYSIS_PLACEHOLDER = "{{gap_analysis}}";
-/** Priority order for decision categories when summarizing (higher priority kept first) */
-const DECISION_CATEGORY_PRIORITY = [
-	"data",
-	"auth",
-	"api",
-	"frontend",
-	"infra",
-	"observability",
-	"ci"
-];
-/**
-* Calculate the dynamic prompt token budget based on the number of decisions
-* that will be injected into the prompt.
-*
-* @param baseBudget - Base token budget for the phase
-* @param decisionCount - Number of decisions to inject
-* @returns Calculated token budget, capped at ABSOLUTE_MAX_PROMPT_TOKENS
-*/
-function calculateDynamicBudget(baseBudget, decisionCount) {
-	const budget = baseBudget + decisionCount * TOKENS_PER_DECISION;
-	return Math.min(budget, ABSOLUTE_MAX_PROMPT_TOKENS);
-}
-/**
-* Summarize architecture decisions into compact key:value one-liners,
-* dropping rationale and optionally dropping lower-priority categories
-* to fit within a character budget.
-*
-* @param decisions - Full architecture decisions from the decision store
-* @param maxChars - Maximum character budget for the summarized output
-* @returns Compact summary string
-*/
-function summarizeDecisions(decisions, maxChars) {
-	const sorted = [...decisions].sort((a, b) => {
-		const aCat = (a.category ?? "").toLowerCase();
-		const bCat = (b.category ?? "").toLowerCase();
-		const aIdx = DECISION_CATEGORY_PRIORITY.indexOf(aCat);
-		const bIdx = DECISION_CATEGORY_PRIORITY.indexOf(bCat);
-		const aPri = aIdx === -1 ? DECISION_CATEGORY_PRIORITY.length : aIdx;
-		const bPri = bIdx === -1 ? DECISION_CATEGORY_PRIORITY.length : bIdx;
-		return aPri - bPri;
-	});
-	const lines = ["## Architecture Decisions (Summarized)"];
-	let currentLength = lines[0].length;
-	for (const d of sorted) {
-		const truncatedValue = d.value.length > 120 ? d.value.slice(0, 117) + "..." : d.value;
-		const line = `- ${d.key}: ${truncatedValue}`;
-		if (currentLength + line.length + 1 > maxChars) break;
-		lines.push(line);
-		currentLength += line.length + 1;
-	}
-	return lines.join("\n");
-}
+
+//#endregion
+//#region src/modules/phase-orchestrator/phases/solutioning.ts
+const logger$4 = createLogger("solutioning");
+/** Base token budget for architecture generation (covers template + requirements) */
+const BASE_ARCH_PROMPT_TOKENS = 3e3;
+/** Base token budget for story generation (covers template + requirements + architecture) */
+const BASE_STORY_PROMPT_TOKENS = 4e3;
+/** Placeholder in architecture prompt template */
+const REQUIREMENTS_PLACEHOLDER = "{{requirements}}";
+/** Amendment context framing block prefix */
+const AMENDMENT_CONTEXT_HEADER = "\n\n--- AMENDMENT CONTEXT (Parent Run Decisions) ---\n";
+/** Amendment context framing block suffix */
+const AMENDMENT_CONTEXT_FOOTER = "\n--- END AMENDMENT CONTEXT ---\n";
+/** Marker appended when amendment context is truncated to fit token budget */
+const TRUNCATED_MARKER = "\n[TRUNCATED]";
+/** Placeholders in story generation prompt template */
+const STORY_REQUIREMENTS_PLACEHOLDER = "{{requirements}}";
+const STORY_ARCHITECTURE_PLACEHOLDER = "{{architecture_decisions}}";
+/** Gap analysis placeholder used in retry prompt */
+const GAP_ANALYSIS_PLACEHOLDER = "{{gap_analysis}}";
 /**
 * Format functional and non-functional requirements from the planning phase
 * into a compact text block suitable for prompt injection.
@@ -12293,6 +13297,211 @@ async function runReadinessCheck(deps, runId) {
 	};
 }
 /**
+* Build step definitions for 3-step architecture decomposition.
+*/
+function buildArchitectureSteps() {
+	return [
+		{
+			name: "architecture-step-1-context",
+			taskType: "arch-context",
+			outputSchema: ArchContextOutputSchema,
+			context: [{
+				placeholder: "requirements",
+				source: "decision:planning.functional-requirements"
+			}, {
+				placeholder: "nfr",
+				source: "decision:planning.non-functional-requirements"
+			}],
+			persist: [{
+				field: "architecture_decisions",
+				category: "architecture",
+				key: "array"
+			}]
+		},
+		{
+			name: "architecture-step-2-decisions",
+			taskType: "arch-decisions",
+			outputSchema: ArchContextOutputSchema,
+			context: [{
+				placeholder: "requirements",
+				source: "decision:planning.functional-requirements"
+			}, {
+				placeholder: "starter_decisions",
+				source: "step:architecture-step-1-context"
+			}],
+			persist: [{
+				field: "architecture_decisions",
+				category: "architecture",
+				key: "array"
+			}]
+		},
+		{
+			name: "architecture-step-3-patterns",
+			taskType: "arch-patterns",
+			outputSchema: ArchContextOutputSchema,
+			context: [{
+				placeholder: "architecture_decisions",
+				source: "decision:solutioning.architecture"
+			}],
+			persist: [{
+				field: "architecture_decisions",
+				category: "architecture",
+				key: "array"
+			}],
+			registerArtifact: {
+				type: "architecture",
+				path: "decision-store://solutioning/architecture",
+				summarize: (parsed) => {
+					const decisions = parsed.architecture_decisions;
+					return `${decisions?.length ?? 0} pattern decisions (multi-step)`;
+				}
+			}
+		}
+	];
+}
+/**
+* Run architecture generation using multi-step decomposition (3 steps).
+*/
+async function runArchitectureGenerationMultiStep(deps, params) {
+	const steps = buildArchitectureSteps();
+	const result = await runSteps(steps, deps, params.runId, "solutioning", {});
+	if (!result.success) return {
+		error: result.error ?? "multi_step_arch_failed",
+		tokenUsage: result.tokenUsage
+	};
+	const allDecisions = getDecisionsByPhaseForRun(deps.db, params.runId, "solutioning").filter((d) => d.category === "architecture");
+	const decisions = allDecisions.map((d) => {
+		try {
+			const parsed = JSON.parse(d.value);
+			return {
+				category: parsed.category ?? d.category,
+				key: parsed.key ?? d.key,
+				value: parsed.value ?? d.value,
+				rationale: parsed.rationale ?? d.rationale ?? ""
+			};
+		} catch {
+			return {
+				category: d.category,
+				key: d.key,
+				value: d.value,
+				rationale: d.rationale ?? ""
+			};
+		}
+	});
+	const artifactId = result.steps[result.steps.length - 1]?.artifactId ?? "";
+	return {
+		decisions,
+		artifactId,
+		tokenUsage: result.tokenUsage
+	};
+}
+/**
+* Build step definitions for 2-step story decomposition.
+*/
+function buildStorySteps() {
+	return [{
+		name: "stories-step-1-epics",
+		taskType: "story-epics",
+		outputSchema: EpicDesignOutputSchema,
+		context: [{
+			placeholder: "requirements",
+			source: "decision:planning.functional-requirements"
+		}, {
+			placeholder: "architecture_decisions",
+			source: "decision:solutioning.architecture"
+		}],
+		persist: [{
+			field: "epics",
+			category: "epic-design",
+			key: "array"
+		}]
+	}, {
+		name: "stories-step-2-stories",
+		taskType: "story-stories",
+		outputSchema: StoryGenerationOutputSchema,
+		context: [
+			{
+				placeholder: "epic_structure",
+				source: "step:stories-step-1-epics"
+			},
+			{
+				placeholder: "requirements",
+				source: "decision:planning.functional-requirements"
+			},
+			{
+				placeholder: "architecture_decisions",
+				source: "decision:solutioning.architecture"
+			}
+		],
+		persist: [],
+		registerArtifact: {
+			type: "stories",
+			path: "decision-store://solutioning/stories",
+			summarize: (parsed) => {
+				const epics = parsed.epics;
+				const totalStories = epics?.reduce((sum, e) => sum + (e.stories?.length ?? 0), 0) ?? 0;
+				return `${epics?.length ?? 0} epics, ${totalStories} stories (multi-step)`;
+			}
+		}
+	}];
+}
+/**
+* Run story generation using multi-step decomposition (2 steps).
+*/
+async function runStoryGenerationMultiStep(deps, params) {
+	const steps = buildStorySteps();
+	const result = await runSteps(steps, deps, params.runId, "solutioning", {});
+	if (!result.success) return {
+		error: result.error ?? "multi_step_story_failed",
+		tokenUsage: result.tokenUsage
+	};
+	const storyStep = result.steps.find((s) => s.name === "stories-step-2-stories");
+	const storyOutput = storyStep?.parsed;
+	if (!storyOutput || !storyOutput.epics) return {
+		error: "Story generation step produced no epics",
+		tokenUsage: result.tokenUsage
+	};
+	const epics = storyOutput.epics;
+	for (const [epicIndex, epic] of epics.entries()) {
+		upsertDecision(deps.db, {
+			pipeline_run_id: params.runId,
+			phase: "solutioning",
+			category: "epics",
+			key: `epic-${epicIndex + 1}`,
+			value: JSON.stringify({
+				title: epic.title,
+				description: epic.description
+			})
+		});
+		for (const story of epic.stories) upsertDecision(deps.db, {
+			pipeline_run_id: params.runId,
+			phase: "solutioning",
+			category: "stories",
+			key: story.key,
+			value: JSON.stringify({
+				key: story.key,
+				title: story.title,
+				description: story.description,
+				ac: story.acceptance_criteria,
+				priority: story.priority
+			})
+		});
+	}
+	for (const epic of epics) for (const story of epic.stories) createRequirement(deps.db, {
+		pipeline_run_id: params.runId,
+		source: "solutioning-phase",
+		type: "functional",
+		description: `${story.title}: ${story.description}`,
+		priority: story.priority
+	});
+	const artifactId = storyStep?.artifactId ?? "";
+	return {
+		epics,
+		artifactId,
+		tokenUsage: result.tokenUsage
+	};
+}
+/**
 * Execute the solutioning phase of the BMAD pipeline.
 *
 * Orchestrates the two-phase dispatch strategy:
@@ -12314,12 +13523,20 @@ async function runSolutioningPhase(deps, params) {
 	let totalInput = 0;
 	let totalOutput = 0;
 	try {
+		const solutioningPhase = deps.pack.manifest.phases?.find((p) => p.name === "solutioning");
+		const hasSteps = solutioningPhase?.steps && solutioningPhase.steps.length > 0 && !params.amendmentContext;
 		const existingArchArtifact = getArtifactByTypeForRun(deps.db, params.runId, "solutioning", "architecture");
 		let archResult;
 		if (existingArchArtifact) {
 			const existingDecisions = getDecisionsByPhaseForRun(deps.db, params.runId, "solutioning").filter((d) => d.category === "architecture");
+			logger$4.info({
+				runId: params.runId,
+				artifactId: existingArchArtifact.id,
+				decisionCount: existingDecisions.length
+			}, "Architecture artifact already exists — skipping architecture sub-phase, transitioning to story generation");
 			archResult = {
 				decisions: existingDecisions.map((d) => ({
+					category: d.category,
 					key: d.key,
 					value: d.value,
 					rationale: d.rationale ?? ""
@@ -12330,7 +13547,8 @@ async function runSolutioningPhase(deps, params) {
 					output: 0
 				}
 			};
-		} else archResult = await runArchitectureGeneration(deps, params);
+		} else if (hasSteps) archResult = await runArchitectureGenerationMultiStep(deps, params);
+		else archResult = await runArchitectureGeneration(deps, params);
 		totalInput += archResult.tokenUsage.input;
 		totalOutput += archResult.tokenUsage.output;
 		if ("error" in archResult) return {
@@ -12342,7 +13560,12 @@ async function runSolutioningPhase(deps, params) {
 				output: totalOutput
 			}
 		};
-		const storyResult = await runStoryGeneration(deps, params);
+		logger$4.info({
+			runId: params.runId,
+			decisionCount: archResult.decisions.length,
+			mode: hasSteps ? "multi-step" : "single-dispatch"
+		}, "Architecture sub-phase complete — transitioning to story generation");
+		const storyResult = hasSteps ? await runStoryGenerationMultiStep(deps, params) : await runStoryGeneration(deps, params);
 		totalInput += storyResult.tokenUsage.input;
 		totalOutput += storyResult.tokenUsage.output;
 		if ("error" in storyResult) return {
@@ -13027,8 +14250,8 @@ const PACKAGE_ROOT = join(__dirname, "..", "..", "..");
 */
 function resolveBmadMethodSrcPath(fromDir = __dirname) {
 	try {
-		const require = createRequire(join(fromDir, "synthetic.js"));
-		const pkgJsonPath = require.resolve("bmad-method/package.json");
+		const require$1 = createRequire$1(join(fromDir, "synthetic.js"));
+		const pkgJsonPath = require$1.resolve("bmad-method/package.json");
 		return join(dirname(pkgJsonPath), "src");
 	} catch {
 		return null;
@@ -13040,9 +14263,9 @@ function resolveBmadMethodSrcPath(fromDir = __dirname) {
 */
 function resolveBmadMethodVersion(fromDir = __dirname) {
 	try {
-		const require = createRequire(join(fromDir, "synthetic.js"));
-		const pkgJsonPath = require.resolve("bmad-method/package.json");
-		const pkg = require(pkgJsonPath);
+		const require$1 = createRequire$1(join(fromDir, "synthetic.js"));
+		const pkgJsonPath = require$1.resolve("bmad-method/package.json");
+		const pkg = require$1(pkgJsonPath);
 		return pkg.version ?? "unknown";
 	} catch {
 		return "unknown";
@@ -13163,7 +14386,9 @@ function buildPipelineStatusOutput(run, tokenSummary, decisionsCount, storiesCou
 			cost_usd: totalCost
 		},
 		decisions_count: decisionsCount,
-		stories_count: storiesCount
+		stories_count: storiesCount,
+		last_activity: run.updated_at,
+		staleness_seconds: Math.round((Date.now() - new Date(run.updated_at).getTime()) / 1e3)
 	};
 }
 /**
@@ -13799,6 +15024,26 @@ async function runAutoRun(options) {
 					msg: payload.msg
 				});
 			});
+			eventBus.on("orchestrator:heartbeat", (payload) => {
+				ndjsonEmitter.emit({
+					type: "pipeline:heartbeat",
+					ts: new Date().toISOString(),
+					run_id: payload.runId,
+					active_dispatches: payload.activeDispatches,
+					completed_dispatches: payload.completedDispatches,
+					queued_dispatches: payload.queuedDispatches
+				});
+			});
+			eventBus.on("orchestrator:stall", (payload) => {
+				ndjsonEmitter.emit({
+					type: "story:stall",
+					ts: new Date().toISOString(),
+					run_id: payload.runId,
+					story_key: payload.storyKey,
+					phase: payload.phase,
+					elapsed_ms: payload.elapsedMs
+				});
+			});
 		}
 		const orchestrator = createImplementationOrchestrator({
 			db,
@@ -14501,6 +15746,397 @@ async function runAutoStatus(options) {
 		} catch {}
 	}
 }
+function inspectProcessTree() {
+	const result = {
+		orchestrator_pid: null,
+		child_pids: [],
+		zombies: []
+	};
+	try {
+		const { execFileSync } = __require("node:child_process");
+		const psOutput = execFileSync("ps", ["-eo", "pid,ppid,stat,command"], {
+			encoding: "utf-8",
+			timeout: 5e3
+		});
+		const lines = psOutput.split("\n");
+		for (const line of lines) if (line.includes("substrate auto run") && !line.includes("grep")) {
+			const match = line.trim().match(/^(\d+)/);
+			if (match) {
+				result.orchestrator_pid = parseInt(match[1], 10);
+				break;
+			}
+		}
+		if (result.orchestrator_pid !== null) for (const line of lines) {
+			const parts = line.trim().split(/\s+/);
+			if (parts.length >= 3) {
+				const pid = parseInt(parts[0], 10);
+				const ppid = parseInt(parts[1], 10);
+				const stat$2 = parts[2];
+				if (ppid === result.orchestrator_pid && pid !== result.orchestrator_pid) {
+					result.child_pids.push(pid);
+					if (stat$2.includes("Z")) result.zombies.push(pid);
+				}
+			}
+		}
+	} catch {}
+	return result;
+}
+async function runAutoHealth(options) {
+	const { outputFormat, runId, projectRoot } = options;
+	const dbRoot = await resolveMainRepoRoot(projectRoot);
+	const dbPath = join(dbRoot, ".substrate", "substrate.db");
+	if (!existsSync(dbPath)) {
+		const output = {
+			verdict: "NO_PIPELINE_RUNNING",
+			run_id: null,
+			status: null,
+			current_phase: null,
+			staleness_seconds: 0,
+			last_activity: "",
+			process: {
+				orchestrator_pid: null,
+				child_pids: [],
+				zombies: []
+			},
+			stories: {
+				active: 0,
+				completed: 0,
+				escalated: 0,
+				details: {}
+			}
+		};
+		if (outputFormat === "json") process.stdout.write(formatOutput(output, "json", true) + "\n");
+		else process.stdout.write("NO_PIPELINE_RUNNING — no substrate database found\n");
+		return 0;
+	}
+	const dbWrapper = new DatabaseWrapper(dbPath);
+	try {
+		dbWrapper.open();
+		const db = dbWrapper.db;
+		let run;
+		if (runId !== void 0) run = getPipelineRunById(db, runId);
+		else run = getLatestRun(db);
+		if (run === void 0) {
+			const output$1 = {
+				verdict: "NO_PIPELINE_RUNNING",
+				run_id: null,
+				status: null,
+				current_phase: null,
+				staleness_seconds: 0,
+				last_activity: "",
+				process: {
+					orchestrator_pid: null,
+					child_pids: [],
+					zombies: []
+				},
+				stories: {
+					active: 0,
+					completed: 0,
+					escalated: 0,
+					details: {}
+				}
+			};
+			if (outputFormat === "json") process.stdout.write(formatOutput(output$1, "json", true) + "\n");
+			else process.stdout.write("NO_PIPELINE_RUNNING — no pipeline runs found\n");
+			return 0;
+		}
+		const updatedAt = new Date(run.updated_at);
+		const stalenessSeconds = Math.round((Date.now() - updatedAt.getTime()) / 1e3);
+		let storyDetails = {};
+		let active = 0;
+		let completed = 0;
+		let escalated = 0;
+		try {
+			if (run.token_usage_json) {
+				const state = JSON.parse(run.token_usage_json);
+				if (state.stories) for (const [key, s] of Object.entries(state.stories)) {
+					storyDetails[key] = {
+						phase: s.phase,
+						review_cycles: s.reviewCycles
+					};
+					if (s.phase === "COMPLETE") completed++;
+					else if (s.phase === "ESCALATED") escalated++;
+					else if (s.phase !== "PENDING") active++;
+				}
+			}
+		} catch {}
+		const processInfo = inspectProcessTree();
+		let verdict = "NO_PIPELINE_RUNNING";
+		if (run.status === "running") if (processInfo.zombies.length > 0) verdict = "STALLED";
+		else if (stalenessSeconds > 600) verdict = "STALLED";
+		else if (processInfo.orchestrator_pid !== null && processInfo.child_pids.length === 0 && active > 0) verdict = "STALLED";
+		else verdict = "HEALTHY";
+		else if (run.status === "completed" || run.status === "failed" || run.status === "stopped") verdict = "NO_PIPELINE_RUNNING";
+		const output = {
+			verdict,
+			run_id: run.id,
+			status: run.status,
+			current_phase: run.current_phase,
+			staleness_seconds: stalenessSeconds,
+			last_activity: run.updated_at,
+			process: processInfo,
+			stories: {
+				active,
+				completed,
+				escalated,
+				details: storyDetails
+			}
+		};
+		if (outputFormat === "json") process.stdout.write(formatOutput(output, "json", true) + "\n");
+		else {
+			const verdictLabel = verdict === "HEALTHY" ? "HEALTHY" : verdict === "STALLED" ? "STALLED" : "NO PIPELINE RUNNING";
+			process.stdout.write(`\nPipeline Health: ${verdictLabel}\n`);
+			process.stdout.write(`  Run:          ${run.id}\n`);
+			process.stdout.write(`  Status:       ${run.status}\n`);
+			process.stdout.write(`  Phase:        ${run.current_phase ?? "N/A"}\n`);
+			process.stdout.write(`  Last Active:  ${run.updated_at} (${stalenessSeconds}s ago)\n`);
+			if (processInfo.orchestrator_pid !== null) {
+				process.stdout.write(`  Orchestrator: PID ${processInfo.orchestrator_pid}\n`);
+				process.stdout.write(`  Children:     ${processInfo.child_pids.length} active`);
+				if (processInfo.zombies.length > 0) process.stdout.write(` (${processInfo.zombies.length} ZOMBIE)`);
+				process.stdout.write("\n");
+			} else process.stdout.write("  Orchestrator: not running\n");
+			if (Object.keys(storyDetails).length > 0) {
+				process.stdout.write("\n  Stories:\n");
+				for (const [key, s] of Object.entries(storyDetails)) process.stdout.write(`    ${key}: ${s.phase} (${s.review_cycles} review cycles)\n`);
+				process.stdout.write(`\n  Summary: ${active} active, ${completed} completed, ${escalated} escalated\n`);
+			}
+		}
+		return 0;
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, msg) + "\n");
+		else process.stderr.write(`Error: ${msg}\n`);
+		logger$3.error({ err }, "auto health failed");
+		return 1;
+	} finally {
+		try {
+			dbWrapper.close();
+		} catch {}
+	}
+}
+/**
+* Fetch pipeline health data as a structured object without any stdout side-effects.
+* Used by runAutoSupervisor to poll health without formatting overhead.
+*
+* Returns a NO_PIPELINE_RUNNING health object for all graceful "no data" cases
+* (missing DB, missing run, terminal run status). Throws only on unexpected errors.
+*/
+async function getAutoHealthData(options) {
+	const { runId, projectRoot } = options;
+	const dbRoot = await resolveMainRepoRoot(projectRoot);
+	const dbPath = join(dbRoot, ".substrate", "substrate.db");
+	const NO_PIPELINE = {
+		verdict: "NO_PIPELINE_RUNNING",
+		run_id: null,
+		status: null,
+		current_phase: null,
+		staleness_seconds: 0,
+		last_activity: "",
+		process: {
+			orchestrator_pid: null,
+			child_pids: [],
+			zombies: []
+		},
+		stories: {
+			active: 0,
+			completed: 0,
+			escalated: 0,
+			details: {}
+		}
+	};
+	if (!existsSync(dbPath)) return NO_PIPELINE;
+	const dbWrapper = new DatabaseWrapper(dbPath);
+	try {
+		dbWrapper.open();
+		const db = dbWrapper.db;
+		let run;
+		if (runId !== void 0) run = getPipelineRunById(db, runId);
+		else run = getLatestRun(db);
+		if (run === void 0) return NO_PIPELINE;
+		const updatedAt = new Date(run.updated_at);
+		const stalenessSeconds = Math.round((Date.now() - updatedAt.getTime()) / 1e3);
+		let storyDetails = {};
+		let active = 0;
+		let completed = 0;
+		let escalated = 0;
+		try {
+			if (run.token_usage_json) {
+				const state = JSON.parse(run.token_usage_json);
+				if (state.stories) for (const [key, s] of Object.entries(state.stories)) {
+					storyDetails[key] = {
+						phase: s.phase,
+						review_cycles: s.reviewCycles
+					};
+					if (s.phase === "COMPLETE") completed++;
+					else if (s.phase === "ESCALATED") escalated++;
+					else if (s.phase !== "PENDING") active++;
+				}
+			}
+		} catch {}
+		const processInfo = inspectProcessTree();
+		let verdict = "NO_PIPELINE_RUNNING";
+		if (run.status === "running") if (processInfo.zombies.length > 0) verdict = "STALLED";
+		else if (stalenessSeconds > 600) verdict = "STALLED";
+		else if (processInfo.orchestrator_pid !== null && processInfo.child_pids.length === 0 && active > 0) verdict = "STALLED";
+		else verdict = "HEALTHY";
+		else if (run.status === "completed" || run.status === "failed" || run.status === "stopped") verdict = "NO_PIPELINE_RUNNING";
+		return {
+			verdict,
+			run_id: run.id,
+			status: run.status,
+			current_phase: run.current_phase,
+			staleness_seconds: stalenessSeconds,
+			last_activity: run.updated_at,
+			process: processInfo,
+			stories: {
+				active,
+				completed,
+				escalated,
+				details: storyDetails
+			}
+		};
+	} finally {
+		try {
+			dbWrapper.close();
+		} catch {}
+	}
+}
+function defaultSupervisorDeps() {
+	return {
+		getHealth: getAutoHealthData,
+		killPid: (pid, signal) => {
+			process.kill(pid, signal);
+		},
+		resumePipeline: runAutoResume,
+		sleep: (ms) => new Promise((resolve$2) => setTimeout(resolve$2, ms))
+	};
+}
+/**
+* Run the pipeline supervisor — a long-running watchdog that polls pipeline health
+* and automatically kills and restarts stalled pipelines.
+*
+* State machine: POLLING → (stall detected) → KILLING → RESTARTING → POLLING
+*
+* Exit codes:
+*   0 — pipeline reached terminal state with no failures
+*   1 — pipeline completed with failures or escalations
+*   2 — max restarts exceeded (safety valve triggered)
+*/
+async function runAutoSupervisor(options, deps = {}) {
+	const { pollInterval, stallThreshold, maxRestarts, outputFormat, projectRoot, runId, pack } = options;
+	const { getHealth, killPid, resumePipeline, sleep } = {
+		...defaultSupervisorDeps(),
+		...deps
+	};
+	let restartCount = 0;
+	const startTime = Date.now();
+	function emitEvent$1(event) {
+		if (outputFormat === "json") {
+			const stamped = {
+				...event,
+				ts: new Date().toISOString()
+			};
+			process.stdout.write(JSON.stringify(stamped) + "\n");
+		}
+	}
+	function log(message) {
+		if (outputFormat === "human") process.stdout.write(message + "\n");
+	}
+	while (true) {
+		const health = await getHealth({
+			runId,
+			projectRoot
+		});
+		const ts = new Date().toISOString();
+		log(`[${ts}] Health: ${health.verdict} | staleness=${health.staleness_seconds}s | stories: active=${health.stories.active} completed=${health.stories.completed} escalated=${health.stories.escalated}`);
+		if (health.verdict === "NO_PIPELINE_RUNNING") {
+			const elapsedSeconds = Math.round((Date.now() - startTime) / 1e3);
+			const succeeded = Object.entries(health.stories.details).filter(([, s]) => s.phase === "COMPLETE").map(([k]) => k);
+			const failed = Object.entries(health.stories.details).filter(([, s]) => s.phase !== "COMPLETE" && s.phase !== "PENDING").map(([k]) => k);
+			const escalated = Object.entries(health.stories.details).filter(([, s]) => s.phase === "ESCALATED").map(([k]) => k);
+			emitEvent$1({
+				type: "supervisor:summary",
+				run_id: health.run_id,
+				elapsed_seconds: elapsedSeconds,
+				succeeded,
+				failed,
+				escalated,
+				restarts: restartCount
+			});
+			log(`\nPipeline reached terminal state. Elapsed: ${elapsedSeconds}s | succeeded: ${succeeded.length} | failed: ${failed.length} | restarts: ${restartCount}`);
+			return failed.length > 0 ? 1 : 0;
+		}
+		if (health.staleness_seconds >= stallThreshold) {
+			const pids = [...health.process.orchestrator_pid !== null ? [health.process.orchestrator_pid] : [], ...health.process.child_pids];
+			emitEvent$1({
+				type: "supervisor:kill",
+				run_id: health.run_id,
+				reason: "stall",
+				staleness_seconds: health.staleness_seconds,
+				pids
+			});
+			log(`Supervisor: Stall confirmed (${health.staleness_seconds}s ≥ ${stallThreshold}s threshold). Killing PIDs: ${pids.join(", ") || "none"}`);
+			for (const pid of pids) try {
+				killPid(pid, "SIGTERM");
+			} catch {}
+			await sleep(5e3);
+			for (const pid of pids) try {
+				killPid(pid, "SIGKILL");
+			} catch {}
+			if (pids.length > 0) {
+				let allDead = false;
+				for (let attempt = 0; attempt < 5; attempt++) {
+					await sleep(1e3);
+					allDead = pids.every((pid) => {
+						try {
+							process.kill(pid, 0);
+							return false;
+						} catch {
+							return true;
+						}
+					});
+					if (allDead) break;
+				}
+				if (!allDead) log(`Supervisor: Warning: Some PIDs may still be alive after SIGKILL`);
+			}
+			if (restartCount >= maxRestarts) {
+				emitEvent$1({
+					type: "supervisor:abort",
+					run_id: health.run_id,
+					reason: "max_restarts_exceeded",
+					attempts: restartCount
+				});
+				log(`Supervisor: Max restarts (${maxRestarts}) exceeded. Aborting.`);
+				return 2;
+			}
+			restartCount++;
+			emitEvent$1({
+				type: "supervisor:restart",
+				run_id: health.run_id,
+				attempt: restartCount
+			});
+			log(`Supervisor: Restarting pipeline (attempt ${restartCount}/${maxRestarts})`);
+			resumePipeline({
+				runId: health.run_id ?? void 0,
+				outputFormat,
+				projectRoot,
+				concurrency: 3,
+				pack
+			}).catch((err) => {
+				const message = err instanceof Error ? err.message : String(err);
+				log(`Supervisor: Resume error: ${message}`);
+				if (outputFormat === "json") process.stderr.write(JSON.stringify({
+					type: "supervisor:error",
+					reason: "resume_failed",
+					message,
+					ts: new Date().toISOString()
+				}) + "\n");
+			});
+		}
+		await sleep(pollInterval * 1e3);
+	}
+}
 /**
 * Detect and apply supersessions after a phase completes in an amendment run.
 *
@@ -14869,6 +16505,28 @@ function registerAutoCommand(program, _version = "0.0.0", projectRoot = process.
 		});
 		process.exitCode = exitCode;
 	});
+	auto.command("health").description("Check pipeline health: process status, stall detection, and verdict").option("--run-id <id>", "Pipeline run ID to query (defaults to latest)").option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").action(async (opts) => {
+		const outputFormat = opts.outputFormat === "json" ? "json" : "human";
+		const exitCode = await runAutoHealth({
+			outputFormat,
+			runId: opts.runId,
+			projectRoot: opts.projectRoot
+		});
+		process.exitCode = exitCode;
+	});
+	auto.command("supervisor").description("Monitor a pipeline run and automatically recover from stalls").option("--poll-interval <seconds>", "Health poll interval in seconds", (v) => parseInt(v, 10), 60).option("--stall-threshold <seconds>", "Staleness in seconds before killing a stalled pipeline", (v) => parseInt(v, 10), 600).option("--max-restarts <n>", "Maximum automatic restarts before aborting", (v) => parseInt(v, 10), 3).option("--run-id <id>", "Pipeline run ID to monitor (defaults to latest)").option("--pack <name>", "Methodology pack name", "bmad").option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").action(async (opts) => {
+		const outputFormat = opts.outputFormat === "json" ? "json" : "human";
+		const exitCode = await runAutoSupervisor({
+			pollInterval: opts.pollInterval,
+			stallThreshold: opts.stallThreshold,
+			maxRestarts: opts.maxRestarts,
+			runId: opts.runId,
+			pack: opts.pack,
+			outputFormat,
+			projectRoot: opts.projectRoot
+		});
+		process.exitCode = exitCode;
+	});
 	auto.command("amend").description("Run an amendment pipeline against a completed run and an existing run").option("--concept <text>", "Amendment concept description (inline)").option("--concept-file <path>", "Path to concept file").option("--run-id <id>", "Parent run ID (defaults to latest completed run)").option("--stop-after <phase>", "Stop pipeline after this phase completes").option("--from <phase>", "Start pipeline from this phase").option("--pack <name>", "Methodology pack name", "bmad").option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").action(async (opts) => {
 		const exitCode = await runAmendCommand({
 			concept: opts.concept,