substrate-ai 0.1.22 → 0.1.23

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { AdapterRegistry, ConfigError, ConfigIncompatibleFormatError, DatabaseWrapper, MonitorDatabaseImpl, ParseError, RecommendationEngine, TaskGraphFileSchema, ValidationError, computeChangedKeys, createConfigWatcher, createDatabaseService, createEventBus, createGitWorktreeManager, createLogger, createMonitorAgent, createMonitorDatabase, createRoutingEngine, createTaskGraphEngine, createTuiApp, createWorkerPoolManager, deepMask, detectCycle, getAllTasks, getLatestSessionId, getLogByEvent, getSession, getSessionLog, getTaskLog, isTuiCapable, parseGraphFile, printNonTtyWarning, queryLogFiltered, runMigrations, validateDependencies, validateGraph } from "../app-Bltq6BEm.js";
+import { AdapterRegistry, ConfigError, ConfigIncompatibleFormatError, DatabaseWrapper, MonitorDatabaseImpl, ParseError, RecommendationEngine, TaskGraphFileSchema, ValidationError, computeChangedKeys, createConfigWatcher, createDatabaseService, createEventBus, createGitWorktreeManager, createLogger, createMonitorAgent, createMonitorDatabase, createRoutingEngine, createTaskGraphEngine, createTuiApp, createWorkerPoolManager, deepMask, detectCycle, getAllTasks, getLatestSessionId, getLogByEvent, getSession, getSessionLog, getTaskLog, isTuiCapable, parseGraphFile, printNonTtyWarning, queryLogFiltered, runMigrations, validateDependencies, validateGraph } from "../app-CY3MaJtP.js";
 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";
@@ -389,7 +389,7 @@ function listTemplates() {
 
 //#endregion
 //#region src/cli/commands/init.ts
-const logger$32 = createLogger("init");
+const logger$34 = createLogger("init");
 /**
 * Detect whether the CLI was invoked via `npx substrate`.
 * When true, prefix suggested commands with `npx `.
@@ -573,7 +573,7 @@ async function runInit(options = {}) {
 		discoveryReport = await registry.discoverAndRegister();
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		logger$32.error({ err }, "Adapter discovery failed");
+		logger$34.error({ err }, "Adapter discovery failed");
 		process.stderr.write(`  Error: adapter discovery failed — ${message}\n`);
 		return INIT_EXIT_ERROR;
 	}
@@ -611,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$32.error({ err }, "Failed to write config files");
+		logger$34.error({ err }, "Failed to write config files");
 		process.stderr.write(`  Error: failed to write configuration — ${message}\n`);
 		return INIT_EXIT_ERROR;
 	}
@@ -686,7 +686,7 @@ function formatUnsupportedVersionError(formatType, version, supported) {
 
 //#endregion
 //#region src/modules/config/config-system-impl.ts
-const logger$31 = createLogger("config");
+const logger$33 = 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);
@@ -731,7 +731,7 @@ function readEnvOverrides() {
 	}
 	const parsed = PartialSubstrateConfigSchema.safeParse(overrides);
 	if (!parsed.success) {
-		logger$31.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
+		logger$33.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
 		return {};
 	}
 	return parsed.data;
@@ -795,7 +795,7 @@ var ConfigSystemImpl = class {
 			throw new ConfigError(`Configuration validation failed:\n${issues}`, { issues: result.error.issues });
 		}
 		this._config = result.data;
-		logger$31.debug("Configuration loaded successfully");
+		logger$33.debug("Configuration loaded successfully");
 	}
 	getConfig() {
 		if (this._config === null) throw new ConfigError("Configuration has not been loaded. Call load() before getConfig().", {});
@@ -858,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$31.info({
+						logger$33.info({
 							from: version,
 							to: CURRENT_CONFIG_FORMAT_VERSION,
 							backup: migrationOutput.result.backupPath
@@ -901,7 +901,7 @@ function createConfigSystem(options = {}) {
 
 //#endregion
 //#region src/cli/commands/config.ts
-const logger$30 = createLogger("config-cmd");
+const logger$32 = createLogger("config-cmd");
 const CONFIG_EXIT_SUCCESS = 0;
 const CONFIG_EXIT_ERROR = 1;
 const CONFIG_EXIT_INVALID = 2;
@@ -927,7 +927,7 @@ async function runConfigShow(opts = {}) {
 			return CONFIG_EXIT_INVALID;
 		}
 		const message = err instanceof Error ? err.message : String(err);
-		logger$30.error({ err }, "Failed to load configuration");
+		logger$32.error({ err }, "Failed to load configuration");
 		process.stderr.write(`  Error loading configuration: ${message}\n`);
 		return CONFIG_EXIT_ERROR;
 	}
@@ -1001,7 +1001,7 @@ async function runConfigExport(opts = {}) {
 			return CONFIG_EXIT_INVALID;
 		}
 		const message = err instanceof Error ? err.message : String(err);
-		logger$30.error({ err }, "Failed to load configuration");
+		logger$32.error({ err }, "Failed to load configuration");
 		process.stderr.write(`Error loading configuration: ${message}\n`);
 		return CONFIG_EXIT_ERROR;
 	}
@@ -1155,7 +1155,7 @@ function registerConfigCommand(program, _version) {
 
 //#endregion
 //#region src/cli/commands/merge.ts
-const logger$29 = createLogger("merge-cmd");
+const logger$31 = createLogger("merge-cmd");
 const MERGE_EXIT_SUCCESS = 0;
 const MERGE_EXIT_CONFLICT = 1;
 const MERGE_EXIT_ERROR = 2;
@@ -1193,7 +1193,7 @@ async function mergeTask(taskId, targetBranch, projectRoot) {
 		projectRoot
 	});
 	try {
-		logger$29.info({
+		logger$31.info({
 			taskId,
 			targetBranch
 		}, "Running conflict detection...");
@@ -1215,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$29.error({
+		logger$31.error({
 			taskId,
 			err
 		}, "merge --task failed");
@@ -1269,7 +1269,7 @@ async function mergeAll(targetBranch, projectRoot, taskIds) {
 			error: message
 		});
 		console.log(`  Error for task "${taskId}": ${message}`);
-		logger$29.error({
+		logger$31.error({
 			taskId,
 			err
 		}, "merge --all: task failed");
@@ -1322,7 +1322,7 @@ function registerMergeCommand(program, projectRoot = process.cwd()) {
 
 //#endregion
 //#region src/cli/commands/worktrees.ts
-const logger$28 = createLogger("worktrees-cmd");
+const logger$30 = createLogger("worktrees-cmd");
 const WORKTREES_EXIT_SUCCESS = 0;
 const WORKTREES_EXIT_ERROR = 1;
 /** Valid task statuses for filtering */
@@ -1449,7 +1449,7 @@ async function listWorktreesAction(options) {
 		try {
 			worktreeInfos = await manager.listWorktrees();
 		} catch (err) {
-			logger$28.error({ err }, "Failed to list worktrees");
+			logger$30.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;
@@ -1476,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$28.error({ err }, "listWorktreesAction failed");
+		logger$30.error({ err }, "listWorktreesAction failed");
 		return WORKTREES_EXIT_ERROR;
 	}
 }
@@ -1738,7 +1738,7 @@ function getPlanningCostTotal(db, sessionId) {
 
 //#endregion
 //#region src/cli/commands/cost.ts
-const logger$27 = createLogger("cost-cmd");
+const logger$29 = createLogger("cost-cmd");
 const COST_EXIT_SUCCESS = 0;
 const COST_EXIT_ERROR = 1;
 /**
@@ -1984,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$27.error({ err }, "runCostAction failed");
+		logger$29.error({ err }, "runCostAction failed");
 		return COST_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2046,7 +2046,7 @@ function emitStatusSnapshot(snapshot) {
 
 //#endregion
 //#region src/recovery/crash-recovery.ts
-const logger$26 = createLogger("crash-recovery");
+const logger$28 = createLogger("crash-recovery");
 var CrashRecoveryManager = class {
 	db;
 	gitWorktreeManager;
@@ -2099,7 +2099,7 @@ var CrashRecoveryManager = class {
 			});
 		}
 		if (this.gitWorktreeManager !== void 0) this.cleanupOrphanedWorktrees().catch((err) => {
-			logger$26.warn({ err }, "Worktree cleanup failed during recovery (non-fatal)");
+			logger$28.warn({ err }, "Worktree cleanup failed during recovery (non-fatal)");
 		});
 		let newlyReady = 0;
 		if (sessionId !== void 0) {
@@ -2109,7 +2109,7 @@ var CrashRecoveryManager = class {
 			const row = db.prepare("SELECT COUNT(*) as count FROM ready_tasks").get();
 			newlyReady = row.count;
 		}
-		logger$26.info({
+		logger$28.info({
 			event: "recovery:complete",
 			recovered,
 			failed,
@@ -2131,10 +2131,10 @@ var CrashRecoveryManager = class {
 		if (this.gitWorktreeManager === void 0) return 0;
 		try {
 			const count = await this.gitWorktreeManager.cleanupAllWorktrees();
-			logger$26.info({ count }, "Cleaned up orphaned worktrees");
+			logger$28.info({ count }, "Cleaned up orphaned worktrees");
 			return count;
 		} catch (err) {
-			logger$26.warn({ err }, "Failed to clean up orphaned worktrees — continuing");
+			logger$28.warn({ err }, "Failed to clean up orphaned worktrees — continuing");
 			return 0;
 		}
 	}
@@ -2217,7 +2217,7 @@ function setupGracefulShutdown(options) {
 
 //#endregion
 //#region src/cli/commands/start.ts
-const logger$25 = createLogger("start-cmd");
+const logger$27 = createLogger("start-cmd");
 const START_EXIT_SUCCESS = 0;
 const START_EXIT_ERROR = 1;
 const START_EXIT_USAGE_ERROR = 2;
@@ -2326,7 +2326,7 @@ async function runStartAction(options) {
 		let configWatcher$1 = null;
 		const configFilePath = join(projectRoot, "substrate.config.yaml");
 		if (noWatchConfig) {
-			logger$25.info("Config hot-reload disabled (--no-watch-config).");
+			logger$27.info("Config hot-reload disabled (--no-watch-config).");
 			process.stdout.write("Config hot-reload disabled (--no-watch-config).\n");
 		} else {
 			let currentHotConfig = config;
@@ -2341,7 +2341,7 @@ async function runStartAction(options) {
 					const changedKeys = computeChangedKeys(previousConfig, newConfig);
 					currentHotConfig = newConfig;
 					const n = changedKeys.length;
-					logger$25.info({
+					logger$27.info({
 						changedKeys,
 						configPath: configFilePath
 					}, `Config reloaded: ${n} setting(s) changed`);
@@ -2353,7 +2353,7 @@ async function runStartAction(options) {
 					});
 				},
 				onError: (err) => {
-					logger$25.error({
+					logger$27.error({
 						err,
 						configPath: configFilePath
 					}, `Config reload failed: ${err.message}. Continuing with previous config.`);
@@ -2366,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$25.info({ sessionId: interruptedSession.id }, "session:resumed");
+			logger$27.info({ sessionId: interruptedSession.id }, "session:resumed");
 			const recovery = new CrashRecoveryManager({
 				db: databaseService.db,
 				gitWorktreeManager
@@ -2490,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$25.error({ err }, "runStartAction failed");
+		logger$27.error({ err }, "runStartAction failed");
 		return START_EXIT_ERROR;
 	} finally {
 		try {
@@ -2648,7 +2648,7 @@ function renderTaskGraph(snapshot, tasks) {
 
 //#endregion
 //#region src/cli/commands/status.ts
-const logger$24 = createLogger("status-cmd");
+const logger$26 = createLogger("status-cmd");
 const STATUS_EXIT_SUCCESS = 0;
 const STATUS_EXIT_ERROR = 1;
 const STATUS_EXIT_NOT_FOUND = 2;
@@ -2801,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$24.error({ err }, "runStatusAction failed");
+		logger$26.error({ err }, "runStatusAction failed");
 		return STATUS_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2834,7 +2834,7 @@ function registerStatusCommand(program, _version = "0.0.0", projectRoot = proces
 
 //#endregion
 //#region src/cli/commands/pause.ts
-const logger$23 = createLogger("pause-cmd");
+const logger$25 = createLogger("pause-cmd");
 const PAUSE_EXIT_SUCCESS = 0;
 const PAUSE_EXIT_ERROR = 1;
 const PAUSE_EXIT_USAGE_ERROR = 2;
@@ -2903,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$23.error({ err }, "runPauseAction failed");
+		logger$25.error({ err }, "runPauseAction failed");
 		return PAUSE_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -2933,7 +2933,7 @@ function registerPauseCommand(program, version = "0.0.0", projectRoot = process.
 
 //#endregion
 //#region src/cli/commands/resume.ts
-const logger$22 = createLogger("resume-cmd");
+const logger$24 = createLogger("resume-cmd");
 const RESUME_EXIT_SUCCESS = 0;
 const RESUME_EXIT_ERROR = 1;
 const RESUME_EXIT_USAGE_ERROR = 2;
@@ -3018,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$22.error({ err }, "runResumeAction failed");
+		logger$24.error({ err }, "runResumeAction failed");
 		return RESUME_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3051,7 +3051,7 @@ function registerResumeCommand(program, version = "0.0.0", projectRoot = process
 
 //#endregion
 //#region src/cli/commands/cancel.ts
-const logger$21 = createLogger("cancel-cmd");
+const logger$23 = createLogger("cancel-cmd");
 const CANCEL_EXIT_SUCCESS = 0;
 const CANCEL_EXIT_ERROR = 1;
 const CANCEL_EXIT_USAGE_ERROR = 2;
@@ -3148,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$21.error({ err }, "runCancelAction failed");
+		logger$23.error({ err }, "runCancelAction failed");
 		return CANCEL_EXIT_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3263,7 +3263,7 @@ function renderFailedTasksJson(tasks) {
 
 //#endregion
 //#region src/cli/commands/retry.ts
-const logger$20 = createLogger("retry-cmd");
+const logger$22 = createLogger("retry-cmd");
 const RETRY_EXIT_SUCCESS = 0;
 const RETRY_EXIT_PARTIAL_FAILURE = 1;
 const RETRY_EXIT_USAGE_ERROR = 2;
@@ -3368,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$20.error({ err }, "runRetryAction failed");
+		logger$22.error({ err }, "runRetryAction failed");
 		return RETRY_EXIT_USAGE_ERROR;
 	} finally {
 		if (wrapper !== null) try {
@@ -3497,11 +3497,11 @@ async function runFollowMode(opts) {
 			});
 		});
 		const sigintHandler = () => {
-			logger$20.info("SIGINT received — initiating graceful shutdown");
+			logger$22.info("SIGINT received — initiating graceful shutdown");
 			taskGraphEngine.cancelAll();
 		};
 		const sigtermHandler = () => {
-			logger$20.info("SIGTERM received — initiating graceful shutdown");
+			logger$22.info("SIGTERM received — initiating graceful shutdown");
 			taskGraphEngine.cancelAll();
 		};
 		process.once("SIGINT", sigintHandler);
@@ -3514,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$20.error({ err }, "runFollowMode failed");
+		logger$22.error({ err }, "runFollowMode failed");
 		return RETRY_EXIT_USAGE_ERROR;
 	} finally {
 		try {
@@ -3974,7 +3974,7 @@ function buildMultiAgentInstructionsSection(agentCount) {
 
 //#endregion
 //#region src/modules/plan-generator/plan-generator.ts
-const logger$19 = createLogger("plan-generator");
+const logger$21 = 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
@@ -4151,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$19.warn({
+					else logger$21.warn({
 						taskKey,
 						dep
 					}, `depends_on reference '${dep}' not found in task keys; removing`);
@@ -4898,7 +4898,7 @@ function getLatestPlanVersion(db, planId) {
 
 //#endregion
 //#region src/modules/plan-generator/plan-refiner.ts
-const logger$18 = createLogger("plan-refiner");
+const logger$20 = createLogger("plan-refiner");
 var PlanRefiner = class {
 	db;
 	planGenerator;
@@ -4941,7 +4941,7 @@ var PlanRefiner = class {
 			newFeedback: feedback,
 			availableAgents: this.availableAgents
 		});
-		logger$18.info({
+		logger$20.info({
 			planId,
 			currentVersion,
 			feedbackRounds: feedbackHistory.length
@@ -4988,7 +4988,7 @@ var PlanRefiner = class {
 			newVersion,
 			taskCount
 		});
-		logger$18.info({
+		logger$20.info({
 			planId,
 			newVersion,
 			taskCount
@@ -5070,7 +5070,7 @@ function normalizeForDiff(value) {
 
 //#endregion
 //#region src/cli/commands/plan-refine.ts
-const logger$17 = createLogger("plan-refine-cmd");
+const logger$19 = createLogger("plan-refine-cmd");
 const REFINE_EXIT_SUCCESS = 0;
 const REFINE_EXIT_ERROR = 1;
 const REFINE_EXIT_USAGE_ERROR = 2;
@@ -5112,7 +5112,7 @@ async function runPlanRefineAction(options) {
 		let result;
 		try {
 			result = await refiner.refine(planId, feedback, (event, payload) => {
-				logger$17.info({
+				logger$19.info({
 					event,
 					payload
 				}, "Plan refinement event");
@@ -5155,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$17.error({ err }, "runPlanRefineAction failed");
+		logger$19.error({ err }, "runPlanRefineAction failed");
 		return REFINE_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5180,7 +5180,7 @@ function registerPlanRefineCommand(planCmd, _version = "0.0.0", projectRoot = pr
 
 //#endregion
 //#region src/cli/commands/plan-diff.ts
-const logger$16 = createLogger("plan-diff-cmd");
+const logger$18 = createLogger("plan-diff-cmd");
 const DIFF_EXIT_SUCCESS = 0;
 const DIFF_EXIT_ERROR = 1;
 const DIFF_EXIT_NOT_FOUND = 2;
@@ -5223,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$16.error({ err }, "runPlanDiffAction failed");
+		logger$18.error({ err }, "runPlanDiffAction failed");
 		return DIFF_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5271,7 +5271,7 @@ function registerPlanDiffCommand(planCmd, _version = "0.0.0", projectRoot = proc
 
 //#endregion
 //#region src/cli/commands/plan-rollback.ts
-const logger$15 = createLogger("plan-rollback-cmd");
+const logger$17 = createLogger("plan-rollback-cmd");
 const ROLLBACK_EXIT_SUCCESS = 0;
 const ROLLBACK_EXIT_ERROR = 1;
 const ROLLBACK_EXIT_USAGE_ERROR = 2;
@@ -5319,7 +5319,7 @@ async function runPlanRollbackAction(options, onEvent) {
 			toVersion,
 			newVersion
 		});
-		logger$15.info({
+		logger$17.info({
 			planId,
 			fromVersion,
 			toVersion,
@@ -5360,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$15.error({ err }, "runPlanRollbackAction failed");
+		logger$17.error({ err }, "runPlanRollbackAction failed");
 		return ROLLBACK_EXIT_ERROR;
 	} finally {
 		dbWrapper.close();
@@ -5554,7 +5554,7 @@ function validatePlan(raw, adapterRegistry, options) {
 
 //#endregion
 //#region src/cli/commands/plan.ts
-const logger$14 = createLogger("plan-cmd");
+const logger$16 = createLogger("plan-cmd");
 const PLAN_EXIT_SUCCESS = 0;
 const PLAN_EXIT_ERROR = 1;
 const PLAN_EXIT_USAGE_ERROR = 2;
@@ -5698,7 +5698,7 @@ async function runPlanReviewAction(options) {
 		}
 		const message = err instanceof Error ? err.message : String(err);
 		process.stderr.write(`Error: ${message}\n`);
-		logger$14.error({ err }, "runPlanReviewAction failed");
+		logger$16.error({ err }, "runPlanReviewAction failed");
 		return PLAN_EXIT_ERROR;
 	}
 	if (dryRun) {
@@ -5724,7 +5724,7 @@ async function runPlanReviewAction(options) {
 		if (ext.endsWith(".yaml") || ext.endsWith(".yml")) taskGraph = load(planYaml);
 		else taskGraph = JSON.parse(planYaml);
 	} catch {
-		logger$14.warn("Could not read generated plan file for DB storage");
+		logger$16.warn("Could not read generated plan file for DB storage");
 	}
 	if (outputFormat === "json") {
 		const envelope = {
@@ -7181,7 +7181,7 @@ function truncateToTokens(text, maxTokens) {
 
 //#endregion
 //#region src/modules/context-compiler/context-compiler-impl.ts
-const logger$13 = createLogger("context-compiler");
+const logger$15 = createLogger("context-compiler");
 /**
 * Fraction of the original token budget that must remain (after required +
 * important sections) before an optional section is included.
@@ -7273,7 +7273,7 @@ var ContextCompilerImpl = class {
 				includedParts.push(truncated);
 				remainingBudget -= truncatedTokens;
 				anyTruncated = true;
-				logger$13.warn({
+				logger$15.warn({
 					section: section.name,
 					originalTokens: tokens,
 					budgetTokens: truncatedTokens
@@ -7287,7 +7287,7 @@ var ContextCompilerImpl = class {
 				});
 			} else {
 				anyTruncated = true;
-				logger$13.warn({
+				logger$15.warn({
 					section: section.name,
 					tokens
 				}, "Context compiler: omitted \"important\" section — no budget remaining");
@@ -7314,7 +7314,7 @@ var ContextCompilerImpl = class {
 				} else {
 					if (tokens > 0) {
 						anyTruncated = true;
-						logger$13.warn({
+						logger$15.warn({
 							section: section.name,
 							tokens,
 							budgetFractionRemaining: budgetFractionRemaining.toFixed(2)
@@ -7416,6 +7416,8 @@ const DEFAULT_TIMEOUTS = {
 	"code-review": 9e5,
 	"minor-fixes": 6e5,
 	"major-rework": 9e5,
+	"readiness-check": 6e5,
+	"elicitation": 9e5,
 	"analysis-vision": 18e4,
 	"analysis-scope": 18e4,
 	"planning-classification": 18e4,
@@ -7580,7 +7582,7 @@ function parseYamlResult(yamlText, schema) {
 
 //#endregion
 //#region src/modules/agent-dispatch/dispatcher-impl.ts
-const logger$12 = createLogger("agent-dispatch");
+const logger$14 = createLogger("agent-dispatch");
 const SHUTDOWN_GRACE_MS = 1e4;
 const SHUTDOWN_MAX_WAIT_MS = 3e4;
 const CHARS_PER_TOKEN = 4;
@@ -7649,7 +7651,7 @@ var DispatcherImpl = class {
 					resolve: typedResolve,
 					reject
 				});
-				logger$12.debug({
+				logger$14.debug({
 					id,
 					queueLength: this._queue.length
 				}, "Dispatch queued");
@@ -7679,7 +7681,7 @@ var DispatcherImpl = class {
 	}
 	async shutdown() {
 		this._shuttingDown = true;
-		logger$12.info({
+		logger$14.info({
 			running: this._running.size,
 			queued: this._queue.length
 		}, "Dispatcher shutting down");
@@ -7712,13 +7714,13 @@ var DispatcherImpl = class {
 				}
 			}, 50);
 		});
-		logger$12.info("Dispatcher shutdown complete");
+		logger$14.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$12.warn({
+			logger$14.warn({
 				id,
 				agent
 			}, "No adapter found for agent");
@@ -7762,7 +7764,7 @@ var DispatcherImpl = class {
 		});
 		const startedAt = Date.now();
 		proc.on("error", (err) => {
-			logger$12.error({
+			logger$14.error({
 				id,
 				binary: cmd.binary,
 				error: err.message
@@ -7770,7 +7772,7 @@ var DispatcherImpl = class {
 		});
 		if (proc.stdin !== null) {
 			proc.stdin.on("error", (err) => {
-				if (err.code !== "EPIPE") logger$12.warn({
+				if (err.code !== "EPIPE") logger$14.warn({
 					id,
 					error: err.message
 				}, "stdin write error");
@@ -7812,7 +7814,7 @@ var DispatcherImpl = class {
 			agent,
 			taskType
 		});
-		logger$12.debug({
+		logger$14.debug({
 			id,
 			agent,
 			taskType,
@@ -7829,7 +7831,7 @@ var DispatcherImpl = class {
 				dispatchId: id,
 				timeoutMs
 			});
-			logger$12.warn({
+			logger$14.warn({
 				id,
 				agent,
 				taskType,
@@ -7883,7 +7885,7 @@ var DispatcherImpl = class {
 					exitCode: code,
 					output: stdout
 				});
-				logger$12.debug({
+				logger$14.debug({
 					id,
 					agent,
 					taskType,
@@ -7909,7 +7911,7 @@ var DispatcherImpl = class {
 					error: stderr || `Process exited with code ${String(code)}`,
 					exitCode: code
 				});
-				logger$12.debug({
+				logger$14.debug({
 					id,
 					agent,
 					taskType,
@@ -7961,7 +7963,7 @@ var DispatcherImpl = class {
 		const next = this._queue.shift();
 		if (next === void 0) return;
 		next.handle.status = "running";
-		logger$12.debug({
+		logger$14.debug({
 			id: next.id,
 			queueLength: this._queue.length
 		}, "Dequeued dispatch");
@@ -8320,9 +8322,120 @@ function getTokenUsageSummary(db, runId) {
 	return stmt.all(runId);
 }
 
+//#endregion
+//#region src/persistence/queries/metrics.ts
+/**
+* Write or update run-level metrics.
+*/
+function writeRunMetrics(db, input) {
+	const stmt = db.prepare(`
+    INSERT OR REPLACE INTO run_metrics (
+      run_id, methodology, status, started_at, completed_at,
+      wall_clock_seconds, total_input_tokens, total_output_tokens, total_cost_usd,
+      stories_attempted, stories_succeeded, stories_failed, stories_escalated,
+      total_review_cycles, total_dispatches, concurrency_setting, max_concurrent_actual, restarts,
+      is_baseline
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `);
+	stmt.run(input.run_id, input.methodology, input.status, input.started_at, input.completed_at ?? null, input.wall_clock_seconds ?? 0, input.total_input_tokens ?? 0, input.total_output_tokens ?? 0, input.total_cost_usd ?? 0, input.stories_attempted ?? 0, input.stories_succeeded ?? 0, input.stories_failed ?? 0, input.stories_escalated ?? 0, input.total_review_cycles ?? 0, input.total_dispatches ?? 0, input.concurrency_setting ?? 1, input.max_concurrent_actual ?? 1, input.restarts ?? 0, input.is_baseline ?? 0);
+}
+/**
+* Get run metrics for a specific run.
+*/
+function getRunMetrics(db, runId) {
+	return db.prepare("SELECT * FROM run_metrics WHERE run_id = ?").get(runId);
+}
+/**
+* List the most recent N run metrics rows, newest first.
+*/
+function listRunMetrics(db, limit = 10) {
+	return db.prepare("SELECT * FROM run_metrics ORDER BY started_at DESC LIMIT ?").all(limit);
+}
+/**
+* Tag a run as the baseline (clears any existing baseline first).
+*/
+function tagRunAsBaseline(db, runId) {
+	db.transaction(() => {
+		db.prepare("UPDATE run_metrics SET is_baseline = 0").run();
+		db.prepare("UPDATE run_metrics SET is_baseline = 1 WHERE run_id = ?").run(runId);
+	})();
+}
+/**
+* Write or update story-level metrics.
+*/
+function writeStoryMetrics(db, input) {
+	const stmt = db.prepare(`
+    INSERT INTO story_metrics (
+      run_id, story_key, result, phase_durations_json, started_at, completed_at,
+      wall_clock_seconds, input_tokens, output_tokens, cost_usd,
+      review_cycles, dispatches
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(run_id, story_key) DO UPDATE SET
+      result = excluded.result,
+      phase_durations_json = excluded.phase_durations_json,
+      started_at = COALESCE(excluded.started_at, story_metrics.started_at),
+      completed_at = excluded.completed_at,
+      wall_clock_seconds = excluded.wall_clock_seconds,
+      input_tokens = excluded.input_tokens,
+      output_tokens = excluded.output_tokens,
+      cost_usd = excluded.cost_usd,
+      review_cycles = excluded.review_cycles,
+      dispatches = excluded.dispatches
+  `);
+	stmt.run(input.run_id, input.story_key, input.result, input.phase_durations_json ?? null, input.started_at ?? null, input.completed_at ?? null, input.wall_clock_seconds ?? 0, input.input_tokens ?? 0, input.output_tokens ?? 0, input.cost_usd ?? 0, input.review_cycles ?? 0, input.dispatches ?? 0);
+}
+/**
+* Compare two runs and return percentage deltas for key numeric fields.
+* Positive deltas mean run B is larger/longer than run A.
+* Returns null if either run does not exist.
+*/
+function compareRunMetrics(db, runIdA, runIdB) {
+	const a = getRunMetrics(db, runIdA);
+	const b = getRunMetrics(db, runIdB);
+	if (!a || !b) return null;
+	const pct = (base, diff) => base === 0 ? 0 : Math.round(diff / base * 100 * 10) / 10;
+	const inputDelta = b.total_input_tokens - a.total_input_tokens;
+	const outputDelta = b.total_output_tokens - a.total_output_tokens;
+	const clockDelta = (b.wall_clock_seconds ?? 0) - (a.wall_clock_seconds ?? 0);
+	const cycleDelta = b.total_review_cycles - a.total_review_cycles;
+	const costDelta = (b.total_cost_usd ?? 0) - (a.total_cost_usd ?? 0);
+	return {
+		run_id_a: runIdA,
+		run_id_b: runIdB,
+		token_input_delta: inputDelta,
+		token_output_delta: outputDelta,
+		token_input_pct: pct(a.total_input_tokens, inputDelta),
+		token_output_pct: pct(a.total_output_tokens, outputDelta),
+		wall_clock_delta_seconds: clockDelta,
+		wall_clock_pct: pct(a.wall_clock_seconds ?? 0, clockDelta),
+		review_cycles_delta: cycleDelta,
+		review_cycles_pct: pct(a.total_review_cycles, cycleDelta),
+		cost_delta: costDelta,
+		cost_pct: pct(a.total_cost_usd ?? 0, costDelta)
+	};
+}
+/**
+* Aggregate token usage from the token_usage table for a pipeline run.
+*/
+function aggregateTokenUsageForRun(db, runId) {
+	const row = db.prepare(`
+    SELECT
+      COALESCE(SUM(input_tokens), 0) as input,
+      COALESCE(SUM(output_tokens), 0) as output,
+      COALESCE(SUM(cost_usd), 0) as cost
+    FROM token_usage
+    WHERE pipeline_run_id = ?
+  `).get(runId);
+	return row ?? {
+		input: 0,
+		output: 0,
+		cost: 0
+	};
+}
+
 //#endregion
 //#region src/modules/compiled-workflows/prompt-assembler.ts
-const logger$11 = createLogger("compiled-workflows:prompt-assembler");
+const logger$13 = createLogger("compiled-workflows:prompt-assembler");
 /**
 * Assemble a final prompt from a template and sections map.
 *
@@ -8347,7 +8460,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		tokenCount,
 		truncated: false
 	};
-	logger$11.warn({
+	logger$13.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Prompt exceeds token ceiling — truncating optional sections");
@@ -8363,10 +8476,10 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 			const targetSectionTokens = Math.max(0, currentSectionTokens - overBy);
 			if (targetSectionTokens === 0) {
 				contentMap[section.name] = "";
-				logger$11.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
+				logger$13.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
 			} else {
 				contentMap[section.name] = truncateToTokens(section.content, targetSectionTokens);
-				logger$11.warn({
+				logger$13.warn({
 					sectionName: section.name,
 					targetSectionTokens
 				}, "Section truncated to fit token budget");
@@ -8377,7 +8490,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		}
 		if (tokenCount <= tokenCeiling) break;
 	}
-	if (tokenCount > tokenCeiling) logger$11.warn({
+	if (tokenCount > tokenCeiling) logger$13.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Required sections alone exceed token ceiling — returning over-budget prompt");
@@ -8518,7 +8631,7 @@ const CodeReviewResultSchema = z.object({
 
 //#endregion
 //#region src/modules/compiled-workflows/create-story.ts
-const logger$10 = createLogger("compiled-workflows:create-story");
+const logger$12 = createLogger("compiled-workflows:create-story");
 /**
 * Hard ceiling for the assembled create-story prompt.
 */
@@ -8542,7 +8655,7 @@ const TOKEN_CEILING$2 = 3e3;
 */
 async function runCreateStory(deps, params) {
 	const { epicId, storyKey, pipelineRunId } = params;
-	logger$10.debug({
+	logger$12.debug({
 		epicId,
 		storyKey,
 		pipelineRunId
@@ -8552,7 +8665,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$10.error({ error }, "Failed to retrieve create-story prompt template");
+		logger$12.error({ error }, "Failed to retrieve create-story prompt template");
 		return {
 			result: "failed",
 			error: `Failed to retrieve prompt template: ${error}`,
@@ -8594,7 +8707,7 @@ async function runCreateStory(deps, params) {
 			priority: "important"
 		}
 	], TOKEN_CEILING$2);
-	logger$10.debug({
+	logger$12.debug({
 		tokenCount,
 		truncated,
 		tokenCeiling: TOKEN_CEILING$2
@@ -8611,7 +8724,7 @@ async function runCreateStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$10.error({
+		logger$12.error({
 			epicId,
 			storyKey,
 			error
@@ -8632,7 +8745,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$10.warn({
+		logger$12.warn({
 			epicId,
 			storyKey,
 			exitCode: dispatchResult.exitCode
@@ -8644,7 +8757,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$10.warn({
+		logger$12.warn({
 			epicId,
 			storyKey
 		}, "Create-story dispatch timed out");
@@ -8657,7 +8770,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$10.warn({
+		logger$12.warn({
 			epicId,
 			storyKey,
 			details,
@@ -8673,7 +8786,7 @@ async function runCreateStory(deps, params) {
 	const parseResult = CreateStoryResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$10.warn({
+		logger$12.warn({
 			epicId,
 			storyKey,
 			details
@@ -8686,7 +8799,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	logger$10.info({
+	logger$12.info({
 		epicId,
 		storyKey,
 		storyFile: parsed.story_file,
@@ -8708,7 +8821,7 @@ function getImplementationDecisions(deps) {
 	try {
 		return getDecisionsByPhase(deps.db, "implementation");
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
+		logger$12.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
 		return [];
 	}
 }
@@ -8724,13 +8837,13 @@ function getEpicShard(decisions, epicId, projectRoot) {
 		if (projectRoot) {
 			const fallback = readEpicShardFromFile(projectRoot, epicId);
 			if (fallback) {
-				logger$10.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
+				logger$12.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$10.warn({
+		logger$12.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve epic shard");
@@ -8747,7 +8860,7 @@ function getPrevDevNotes(decisions, epicId) {
 		if (devNotes.length === 0) return "";
 		return devNotes[devNotes.length - 1].value;
 	} catch (err) {
-		logger$10.warn({
+		logger$12.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve prev dev notes");
@@ -8767,13 +8880,13 @@ function getArchConstraints$1(deps) {
 		if (deps.projectRoot) {
 			const fallback = readArchConstraintsFromFile(deps.projectRoot);
 			if (fallback) {
-				logger$10.info("Using file-based fallback for architecture constraints (decisions table empty)");
+				logger$12.info("Using file-based fallback for architecture constraints (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$12.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -8793,7 +8906,7 @@ function readEpicShardFromFile(projectRoot, epicId) {
 		const match = pattern.exec(content);
 		return match ? match[0].trim() : "";
 	} catch (err) {
-		logger$10.warn({
+		logger$12.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "File-based epic shard fallback failed");
@@ -8816,7 +8929,7 @@ function readArchConstraintsFromFile(projectRoot) {
 		const content = readFileSync$1(archPath, "utf-8");
 		return content.slice(0, 1500);
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
+		logger$12.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
 		return "";
 	}
 }
@@ -8829,14 +8942,14 @@ async function getStoryTemplate(deps) {
 	try {
 		return await deps.pack.getTemplate("story");
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
+		logger$12.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$9 = createLogger("compiled-workflows:git-helpers");
+const logger$11 = createLogger("compiled-workflows:git-helpers");
 /**
 * Capture the full git diff for HEAD (working tree vs current commit).
 *
@@ -8960,7 +9073,7 @@ async function runGitCommand(args, cwd, logLabel) {
 			stderr += chunk.toString("utf-8");
 		});
 		proc.on("error", (err) => {
-			logger$9.warn({
+			logger$11.warn({
 				label: logLabel,
 				cwd,
 				error: err.message
@@ -8969,7 +9082,7 @@ async function runGitCommand(args, cwd, logLabel) {
 		});
 		proc.on("close", (code) => {
 			if (code !== 0) {
-				logger$9.warn({
+				logger$11.warn({
 					label: logLabel,
 					cwd,
 					code,
@@ -8985,7 +9098,7 @@ async function runGitCommand(args, cwd, logLabel) {
 
 //#endregion
 //#region src/modules/compiled-workflows/dev-story.ts
-const logger$8 = createLogger("compiled-workflows:dev-story");
+const logger$10 = 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) */
@@ -9007,7 +9120,7 @@ const DEFAULT_VITEST_PATTERNS = `## Test Patterns (defaults)
 */
 async function runDevStory(deps, params) {
 	const { storyKey, storyFilePath, taskScope, priorFiles } = params;
-	logger$8.info({
+	logger$10.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled dev-story workflow");
@@ -9049,10 +9162,10 @@ async function runDevStory(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("dev-story");
-		logger$8.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
+		logger$10.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			error
 		}, "Failed to retrieve dev-story prompt template");
@@ -9063,14 +9176,14 @@ async function runDevStory(deps, params) {
 		storyContent = await readFile$2(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$8.error({
+			logger$10.error({
 				storyKey,
 				storyFilePath
 			}, "Story file not found");
 			return makeFailureResult("story_file_not_found");
 		}
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			storyFilePath,
 			error
@@ -9078,7 +9191,7 @@ async function runDevStory(deps, params) {
 		return makeFailureResult(`story_file_read_error: ${error}`);
 	}
 	if (storyContent.trim().length === 0) {
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			storyFilePath
 		}, "Story file is empty");
@@ -9090,17 +9203,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$8.debug({
+			logger$10.debug({
 				storyKey,
 				count: testPatternDecisions.length
 			}, "Loaded test patterns from decision store");
 		} else {
 			testPatternsContent = DEFAULT_VITEST_PATTERNS;
-			logger$8.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
+			logger$10.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
 		}
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.warn({
+		logger$10.warn({
 			storyKey,
 			error
 		}, "Failed to load test patterns — using defaults");
@@ -9143,7 +9256,7 @@ async function runDevStory(deps, params) {
 		}
 	];
 	const { prompt, tokenCount, truncated } = assemblePrompt(template, sections, TOKEN_CEILING$1);
-	logger$8.info({
+	logger$10.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING$1,
@@ -9162,7 +9275,7 @@ async function runDevStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			error
 		}, "Dispatch threw an unexpected error");
@@ -9173,11 +9286,11 @@ async function runDevStory(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Dev-story dispatch timed out");
-		if (dispatchResult.output.length > 0) logger$8.info({
+		if (dispatchResult.output.length > 0) logger$10.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output before timeout");
@@ -9187,12 +9300,12 @@ async function runDevStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$8.error({
+		logger$10.error({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
 		}, "Dev-story dispatch failed");
-		if (dispatchResult.output.length > 0) logger$8.info({
+		if (dispatchResult.output.length > 0) logger$10.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output from failed dispatch");
@@ -9204,7 +9317,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$8.error({
+		logger$10.error({
 			storyKey,
 			parseError: details,
 			rawOutputSnippet: rawSnippet
@@ -9212,12 +9325,12 @@ async function runDevStory(deps, params) {
 		let filesModified = [];
 		try {
 			filesModified = await getGitChangedFiles(deps.projectRoot ?? process.cwd());
-			if (filesModified.length > 0) logger$8.info({
+			if (filesModified.length > 0) logger$10.info({
 				storyKey,
 				fileCount: filesModified.length
 			}, "Recovered files_modified from git status (YAML fallback)");
 		} catch (err) {
-			logger$8.warn({
+			logger$10.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to recover files_modified from git");
@@ -9234,7 +9347,7 @@ async function runDevStory(deps, params) {
 		};
 	}
 	const parsed = dispatchResult.parsed;
-	logger$8.info({
+	logger$10.info({
 		storyKey,
 		result: parsed.result,
 		acMet: parsed.ac_met.length
@@ -9373,7 +9486,7 @@ function extractFilesInScope(storyContent) {
 
 //#endregion
 //#region src/modules/compiled-workflows/code-review.ts
-const logger$7 = createLogger("compiled-workflows:code-review");
+const logger$9 = 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.
@@ -9413,7 +9526,7 @@ function defaultFailResult(error, tokenUsage) {
 async function runCodeReview(deps, params) {
 	const { storyKey, storyFilePath, workingDirectory, pipelineRunId, filesModified, previousIssues } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$7.debug({
+	logger$9.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
@@ -9424,7 +9537,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$7.error({ error }, "Failed to retrieve code-review prompt template");
+		logger$9.error({ error }, "Failed to retrieve code-review prompt template");
 		return defaultFailResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -9435,7 +9548,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$7.error({
+		logger$9.error({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -9455,12 +9568,12 @@ async function runCodeReview(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$7.debug({
+			logger$9.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$7.warn({
+			logger$9.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -9474,7 +9587,7 @@ async function runCodeReview(deps, params) {
 		const fullTotal = nonDiffTokens + countTokens(fullDiff);
 		if (fullTotal <= TOKEN_CEILING) gitDiffContent = fullDiff;
 		else {
-			logger$7.warn({
+			logger$9.warn({
 				estimatedTotal: fullTotal,
 				ceiling: TOKEN_CEILING
 			}, "Full git diff would exceed token ceiling — using stat-only summary");
@@ -9512,11 +9625,11 @@ async function runCodeReview(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$7.warn({
+	if (assembleResult.truncated) logger$9.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Code-review prompt truncated to fit token ceiling");
-	logger$7.debug({
+	logger$9.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -9534,7 +9647,7 @@ async function runCodeReview(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$7.error({
+		logger$9.error({
 			storyKey,
 			error
 		}, "Code-review dispatch threw unexpected error");
@@ -9550,7 +9663,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$7.warn({
+		logger$9.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Code-review dispatch failed");
@@ -9560,7 +9673,7 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$7.warn({ storyKey }, "Code-review dispatch timed out");
+		logger$9.warn({ storyKey }, "Code-review dispatch timed out");
 		return {
 			...defaultFailResult("Dispatch status: timeout. The agent did not complete within the allowed time.", tokenUsage),
 			rawOutput
@@ -9568,7 +9681,7 @@ async function runCodeReview(deps, params) {
 	}
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
-		logger$7.warn({
+		logger$9.warn({
 			storyKey,
 			details
 		}, "Code-review output schema validation failed");
@@ -9585,7 +9698,7 @@ async function runCodeReview(deps, params) {
 	const parseResult = CodeReviewResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$7.warn({
+		logger$9.warn({
 			storyKey,
 			details
 		}, "Code-review output failed schema validation");
@@ -9600,13 +9713,13 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	if (parsed.agentVerdict !== parsed.verdict) logger$7.info({
+	if (parsed.agentVerdict !== parsed.verdict) logger$9.info({
 		storyKey,
 		agentVerdict: parsed.agentVerdict,
 		pipelineVerdict: parsed.verdict,
 		issues: parsed.issues
 	}, "Pipeline overrode agent verdict based on issue severities");
-	logger$7.info({
+	logger$9.info({
 		storyKey,
 		verdict: parsed.verdict,
 		issues: parsed.issues
@@ -9631,7 +9744,7 @@ function getArchConstraints(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$7.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$9.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -9963,7 +10076,7 @@ function detectConflictGroups(storyKeys, config) {
 
 //#endregion
 //#region src/modules/implementation-orchestrator/seed-methodology-context.ts
-const logger$6 = createLogger("implementation-orchestrator:seed");
+const logger$8 = createLogger("implementation-orchestrator:seed");
 /** Max chars for the architecture summary seeded into decisions */
 const MAX_ARCH_CHARS = 6e3;
 /** Max chars per epic shard */
@@ -9997,12 +10110,12 @@ function seedMethodologyContext(db, projectRoot) {
 		const testCount = seedTestPatterns(db, projectRoot);
 		if (testCount === -1) result.skippedCategories.push("test-patterns");
 		else result.decisionsCreated += testCount;
-		logger$6.info({
+		logger$8.info({
 			decisionsCreated: result.decisionsCreated,
 			skippedCategories: result.skippedCategories
 		}, "Methodology context seeding complete");
 	} catch (err) {
-		logger$6.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
+		logger$8.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
 	}
 	return result;
 }
@@ -10046,7 +10159,7 @@ function seedArchitecture(db, projectRoot) {
 		});
 		count = 1;
 	}
-	logger$6.debug({ count }, "Seeded architecture decisions");
+	logger$8.debug({ count }, "Seeded architecture decisions");
 	return count;
 }
 /**
@@ -10074,7 +10187,7 @@ function seedEpicShards(db, projectRoot) {
 		});
 		count++;
 	}
-	logger$6.debug({ count }, "Seeded epic shard decisions");
+	logger$8.debug({ count }, "Seeded epic shard decisions");
 	return count;
 }
 /**
@@ -10095,7 +10208,7 @@ function seedTestPatterns(db, projectRoot) {
 		value: patterns.slice(0, MAX_TEST_PATTERNS_CHARS),
 		rationale: "Detected from project configuration at orchestrator startup"
 	});
-	logger$6.debug("Seeded test patterns decision");
+	logger$8.debug("Seeded test patterns decision");
 	return 1;
 }
 /**
@@ -10287,7 +10400,7 @@ function createPauseGate() {
 */
 function createImplementationOrchestrator(deps) {
 	const { db, pack, contextCompiler, dispatcher, eventBus, config, projectRoot } = deps;
-	const logger$33 = createLogger("implementation-orchestrator");
+	const logger$35 = createLogger("implementation-orchestrator");
 	let _state = "IDLE";
 	let _startedAt;
 	let _completedAt;
@@ -10299,6 +10412,56 @@ function createImplementationOrchestrator(deps) {
 	let _heartbeatTimer = null;
 	const HEARTBEAT_INTERVAL_MS = 3e4;
 	const WATCHDOG_TIMEOUT_MS = 6e5;
+	const _phaseStartMs = new Map();
+	const _phaseEndMs = new Map();
+	const _storyDispatches = new Map();
+	function startPhase(storyKey, phase) {
+		if (!_phaseStartMs.has(storyKey)) _phaseStartMs.set(storyKey, new Map());
+		_phaseStartMs.get(storyKey).set(phase, Date.now());
+	}
+	function endPhase(storyKey, phase) {
+		if (!_phaseEndMs.has(storyKey)) _phaseEndMs.set(storyKey, new Map());
+		_phaseEndMs.get(storyKey).set(phase, Date.now());
+	}
+	function incrementDispatches(storyKey) {
+		_storyDispatches.set(storyKey, (_storyDispatches.get(storyKey) ?? 0) + 1);
+	}
+	function buildPhaseDurationsJson(storyKey) {
+		const starts = _phaseStartMs.get(storyKey);
+		const ends = _phaseEndMs.get(storyKey);
+		if (!starts || starts.size === 0) return "{}";
+		const durations = {};
+		for (const [phase, startMs] of starts) {
+			const endMs = ends?.get(phase) ?? Date.now();
+			durations[phase] = Math.round((endMs - startMs) / 1e3);
+		}
+		return JSON.stringify(durations);
+	}
+	function writeStoryMetricsBestEffort(storyKey, result, reviewCycles) {
+		if (config.pipelineRunId === void 0) return;
+		try {
+			const storyState = _stories.get(storyKey);
+			const startedAt = storyState?.startedAt;
+			const completedAt = storyState?.completedAt ?? new Date().toISOString();
+			const wallClockSeconds = startedAt ? Math.round((new Date(completedAt).getTime() - new Date(startedAt).getTime()) / 1e3) : 0;
+			writeStoryMetrics(db, {
+				run_id: config.pipelineRunId,
+				story_key: storyKey,
+				result,
+				phase_durations_json: buildPhaseDurationsJson(storyKey),
+				started_at: startedAt,
+				completed_at: completedAt,
+				wall_clock_seconds: wallClockSeconds,
+				review_cycles: reviewCycles,
+				dispatches: _storyDispatches.get(storyKey) ?? 0
+			});
+		} catch (err) {
+			logger$35.warn({
+				err,
+				storyKey
+			}, "Failed to write story metrics (best-effort)");
+		}
+	}
 	function getStatus() {
 		const stories = {};
 		for (const [key, s] of _stories) stories[key] = { ...s };
@@ -10328,7 +10491,7 @@ function createImplementationOrchestrator(deps) {
 				token_usage_json: serialized
 			});
 		} catch (err) {
-			logger$33.warn("Failed to persist orchestrator state", { err });
+			logger$35.warn("Failed to persist orchestrator state", { err });
 		}
 	}
 	function recordProgress() {
@@ -10353,7 +10516,7 @@ function createImplementationOrchestrator(deps) {
 			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({
+					logger$35.warn({
 						storyKey: key,
 						phase: s.phase,
 						elapsedMs: elapsed
@@ -10389,9 +10552,10 @@ function createImplementationOrchestrator(deps) {
 	* exhausted retries the story is ESCALATED.
 	*/
 	async function processStory(storyKey) {
-		logger$33.info("Processing story", { storyKey });
+		logger$35.info("Processing story", { storyKey });
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
+		startPhase(storyKey, "create-story");
 		updateStory(storyKey, {
 			phase: "IN_STORY_CREATION",
 			startedAt: new Date().toISOString()
@@ -10403,7 +10567,7 @@ function createImplementationOrchestrator(deps) {
 			const match = files.find((f) => f.startsWith(`${storyKey}-`) && f.endsWith(".md"));
 			if (match) {
 				storyFilePath = join$1(artifactsDir, match);
-				logger$33.info({
+				logger$35.info({
 					storyKey,
 					storyFilePath
 				}, "Found existing story file — skipping create-story");
@@ -10420,6 +10584,7 @@ function createImplementationOrchestrator(deps) {
 			}
 		} catch {}
 		if (storyFilePath === void 0) try {
+			incrementDispatches(storyKey);
 			const createResult = await runCreateStory({
 				db,
 				pack,
@@ -10431,6 +10596,7 @@ function createImplementationOrchestrator(deps) {
 				storyKey,
 				pipelineRunId: config.pipelineRunId
 			});
+			endPhase(storyKey, "create-story");
 			eventBus.emit("orchestrator:story-phase-complete", {
 				storyKey,
 				phase: "IN_STORY_CREATION",
@@ -10444,6 +10610,7 @@ function createImplementationOrchestrator(deps) {
 					error: errMsg,
 					completedAt: new Date().toISOString()
 				});
+				writeStoryMetricsBestEffort(storyKey, "failed", 0);
 				eventBus.emit("orchestrator:story-escalated", {
 					storyKey,
 					lastVerdict: "create-story-failed",
@@ -10460,6 +10627,7 @@ function createImplementationOrchestrator(deps) {
 					error: errMsg,
 					completedAt: new Date().toISOString()
 				});
+				writeStoryMetricsBestEffort(storyKey, "failed", 0);
 				eventBus.emit("orchestrator:story-escalated", {
 					storyKey,
 					lastVerdict: "create-story-no-file",
@@ -10472,11 +10640,13 @@ function createImplementationOrchestrator(deps) {
 			storyFilePath = createResult.story_file;
 		} catch (err) {
 			const errMsg = err instanceof Error ? err.message : String(err);
+			endPhase(storyKey, "create-story");
 			updateStory(storyKey, {
 				phase: "ESCALATED",
 				error: errMsg,
 				completedAt: new Date().toISOString()
 			});
+			writeStoryMetricsBestEffort(storyKey, "failed", 0);
 			eventBus.emit("orchestrator:story-escalated", {
 				storyKey,
 				lastVerdict: "create-story-exception",
@@ -10488,6 +10658,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
+		startPhase(storyKey, "dev-story");
 		updateStory(storyKey, { phase: "IN_DEV" });
 		persistState();
 		let devFilesModified = [];
@@ -10497,7 +10668,7 @@ function createImplementationOrchestrator(deps) {
 			try {
 				storyContentForAnalysis = await readFile$2(storyFilePath ?? "", "utf-8");
 			} catch (err) {
-				logger$33.error({
+				logger$35.error({
 					storyKey,
 					storyFilePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -10505,7 +10676,7 @@ function createImplementationOrchestrator(deps) {
 			}
 			const analysis = analyzeStoryComplexity(storyContentForAnalysis);
 			const batches = planTaskBatches(analysis);
-			logger$33.info({
+			logger$35.info({
 				storyKey,
 				estimatedScope: analysis.estimatedScope,
 				batchCount: batches.length,
@@ -10523,12 +10694,13 @@ 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$33.info({
+					logger$35.info({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						taskCount: batch.taskIds.length
 					}, "Dispatching dev-story batch");
 					const batchStartMs = Date.now();
+					incrementDispatches(storyKey);
 					let batchResult;
 					try {
 						batchResult = await runDevStory({
@@ -10546,7 +10718,7 @@ function createImplementationOrchestrator(deps) {
 						});
 					} catch (batchErr) {
 						const errMsg = batchErr instanceof Error ? batchErr.message : String(batchErr);
-						logger$33.warn({
+						logger$35.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							error: errMsg
@@ -10566,7 +10738,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: batchFilesModified,
 						result: batchResult.result === "success" ? "success" : "failed"
 					};
-					logger$33.info(batchMetrics, "Batch dev-story metrics");
+					logger$35.info(batchMetrics, "Batch dev-story metrics");
 					for (const f of batchFilesModified) allFilesModified.add(f);
 					if (batchFilesModified.length > 0) batchFileGroups.push({
 						batchIndex: batch.batchIndex,
@@ -10588,13 +10760,13 @@ function createImplementationOrchestrator(deps) {
 							})
 						});
 					} catch (tokenErr) {
-						logger$33.warn({
+						logger$35.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							err: tokenErr
 						}, "Failed to record batch token usage");
 					}
-					if (batchResult.result === "failed") logger$33.warn({
+					if (batchResult.result === "failed") logger$35.warn({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						error: batchResult.error
@@ -10608,6 +10780,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				devFilesModified = Array.from(allFilesModified);
 			} else {
+				incrementDispatches(storyKey);
 				const devResult = await runDevStory({
 					db,
 					pack,
@@ -10626,7 +10799,7 @@ function createImplementationOrchestrator(deps) {
 					result: devResult
 				});
 				persistState();
-				if (devResult.result === "failed") logger$33.warn("Dev-story reported failure, proceeding to code review", {
+				if (devResult.result === "failed") logger$35.warn("Dev-story reported failure, proceeding to code review", {
 					storyKey,
 					error: devResult.error,
 					filesModified: devFilesModified.length
@@ -10634,11 +10807,13 @@ function createImplementationOrchestrator(deps) {
 			}
 		} catch (err) {
 			const errMsg = err instanceof Error ? err.message : String(err);
+			endPhase(storyKey, "dev-story");
 			updateStory(storyKey, {
 				phase: "ESCALATED",
 				error: errMsg,
 				completedAt: new Date().toISOString()
 			});
+			writeStoryMetricsBestEffort(storyKey, "failed", 0);
 			eventBus.emit("orchestrator:story-escalated", {
 				storyKey,
 				lastVerdict: "dev-story-exception",
@@ -10648,6 +10823,7 @@ function createImplementationOrchestrator(deps) {
 			persistState();
 			return;
 		}
+		endPhase(storyKey, "dev-story");
 		let reviewCycles = 0;
 		let keepReviewing = true;
 		let timeoutRetried = false;
@@ -10655,6 +10831,7 @@ function createImplementationOrchestrator(deps) {
 		while (keepReviewing) {
 			await waitIfPaused();
 			if (_state !== "RUNNING") return;
+			if (reviewCycles === 0) startPhase(storyKey, "code-review");
 			updateStory(storyKey, {
 				phase: "IN_REVIEW",
 				reviewCycles
@@ -10679,11 +10856,12 @@ function createImplementationOrchestrator(deps) {
 						"NEEDS_MAJOR_REWORK": 2
 					};
 					for (const group of batchFileGroups) {
-						logger$33.info({
+						logger$35.info({
 							storyKey,
 							batchIndex: group.batchIndex,
 							fileCount: group.files.length
 						}, "Running batched code review");
+						incrementDispatches(storyKey);
 						const batchReview = await runCodeReview({
 							db,
 							pack,
@@ -10715,30 +10893,33 @@ function createImplementationOrchestrator(deps) {
 						rawOutput: lastRawOutput,
 						tokenUsage: aggregateTokens
 					};
-					logger$33.info({
+					logger$35.info({
 						storyKey,
 						batchCount: batchFileGroups.length,
 						verdict: worstVerdict,
 						issues: allIssues.length
 					}, "Batched code review complete — aggregate result");
-				} else reviewResult = await runCodeReview({
-					db,
-					pack,
-					contextCompiler,
-					dispatcher,
-					projectRoot
-				}, {
-					storyKey,
-					storyFilePath: storyFilePath ?? "",
-					workingDirectory: projectRoot,
-					pipelineRunId: config.pipelineRunId,
-					filesModified: devFilesModified,
-					...previousIssueList.length > 0 ? { previousIssues: previousIssueList } : {}
-				});
+				} else {
+					incrementDispatches(storyKey);
+					reviewResult = await runCodeReview({
+						db,
+						pack,
+						contextCompiler,
+						dispatcher,
+						projectRoot
+					}, {
+						storyKey,
+						storyFilePath: storyFilePath ?? "",
+						workingDirectory: projectRoot,
+						pipelineRunId: config.pipelineRunId,
+						filesModified: devFilesModified,
+						...previousIssueList.length > 0 ? { previousIssues: previousIssueList } : {}
+					});
+				}
 				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$33.warn({
+					logger$35.warn({
 						storyKey,
 						reviewCycles,
 						error: reviewResult.error
@@ -10748,7 +10929,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$33.info({
+					logger$35.info({
 						storyKey,
 						originalVerdict: verdict,
 						issuesBefore: previousIssueList.length,
@@ -10784,7 +10965,7 @@ function createImplementationOrchestrator(deps) {
 					if (_decomposition !== void 0) parts.push(`decomposed: ${_decomposition.batchCount} batches`);
 					parts.push(`${fileCount} files`);
 					parts.push(`${totalTokensK} tokens`);
-					logger$33.info({
+					logger$35.info({
 						storyKey,
 						verdict,
 						agentVerdict: reviewResult.agentVerdict
@@ -10792,11 +10973,13 @@ function createImplementationOrchestrator(deps) {
 				}
 			} catch (err) {
 				const errMsg = err instanceof Error ? err.message : String(err);
+				endPhase(storyKey, "code-review");
 				updateStory(storyKey, {
 					phase: "ESCALATED",
 					error: errMsg,
 					completedAt: new Date().toISOString()
 				});
+				writeStoryMetricsBestEffort(storyKey, "failed", reviewCycles);
 				eventBus.emit("orchestrator:story-escalated", {
 					storyKey,
 					lastVerdict: "code-review-exception",
@@ -10807,10 +10990,12 @@ function createImplementationOrchestrator(deps) {
 				return;
 			}
 			if (verdict === "SHIP_IT") {
+				endPhase(storyKey, "code-review");
 				updateStory(storyKey, {
 					phase: "COMPLETE",
 					completedAt: new Date().toISOString()
 				});
+				writeStoryMetricsBestEffort(storyKey, "success", reviewCycles + 1);
 				eventBus.emit("orchestrator:story-complete", {
 					storyKey,
 					reviewCycles
@@ -10822,11 +11007,13 @@ function createImplementationOrchestrator(deps) {
 			if (reviewCycles >= config.maxReviewCycles - 1) {
 				const finalReviewCycles = reviewCycles + 1;
 				if (verdict !== "NEEDS_MINOR_FIXES") {
+					endPhase(storyKey, "code-review");
 					updateStory(storyKey, {
 						phase: "ESCALATED",
 						reviewCycles: finalReviewCycles,
 						completedAt: new Date().toISOString()
 					});
+					writeStoryMetricsBestEffort(storyKey, "escalated", finalReviewCycles);
 					eventBus.emit("orchestrator:story-escalated", {
 						storyKey,
 						lastVerdict: verdict,
@@ -10836,7 +11023,7 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				logger$33.info({
+				logger$35.info({
 					storyKey,
 					reviewCycles: finalReviewCycles,
 					issueCount: issueList.length
@@ -10886,7 +11073,7 @@ function createImplementationOrchestrator(deps) {
 						fixPrompt = assembled.prompt;
 					} catch {
 						fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, minor fixes needed`;
-						logger$33.warn("Failed to assemble auto-approve fix prompt, using fallback", { storyKey });
+						logger$35.warn("Failed to assemble auto-approve fix prompt, using fallback", { storyKey });
 					}
 					const handle = dispatcher.dispatch({
 						prompt: fixPrompt,
@@ -10903,18 +11090,20 @@ function createImplementationOrchestrator(deps) {
 							output: fixResult.tokenEstimate.output
 						} : void 0 }
 					});
-					if (fixResult.status === "timeout") logger$33.warn("Auto-approve fix timed out — approving anyway (issues were minor)", { storyKey });
+					if (fixResult.status === "timeout") logger$35.warn("Auto-approve fix timed out — approving anyway (issues were minor)", { storyKey });
 				} catch (err) {
-					logger$33.warn("Auto-approve fix dispatch failed — approving anyway (issues were minor)", {
+					logger$35.warn("Auto-approve fix dispatch failed — approving anyway (issues were minor)", {
 						storyKey,
 						err
 					});
 				}
+				endPhase(storyKey, "code-review");
 				updateStory(storyKey, {
 					phase: "COMPLETE",
 					reviewCycles: finalReviewCycles,
 					completedAt: new Date().toISOString()
 				});
+				writeStoryMetricsBestEffort(storyKey, "success", finalReviewCycles);
 				eventBus.emit("orchestrator:story-complete", {
 					storyKey,
 					reviewCycles: finalReviewCycles
@@ -10975,11 +11164,12 @@ function createImplementationOrchestrator(deps) {
 					fixPrompt = assembled.prompt;
 				} catch {
 					fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, taskType=${taskType}`;
-					logger$33.warn("Failed to assemble fix prompt, using fallback", {
+					logger$35.warn("Failed to assemble fix prompt, using fallback", {
 						storyKey,
 						taskType
 					});
 				}
+				incrementDispatches(storyKey);
 				const handle = dispatcher.dispatch({
 					prompt: fixPrompt,
 					agent: "claude-code",
@@ -10997,15 +11187,17 @@ function createImplementationOrchestrator(deps) {
 					} : void 0 }
 				});
 				if (fixResult.status === "timeout") {
-					logger$33.warn("Fix dispatch timed out — escalating story", {
+					logger$35.warn("Fix dispatch timed out — escalating story", {
 						storyKey,
 						taskType
 					});
+					endPhase(storyKey, "code-review");
 					updateStory(storyKey, {
 						phase: "ESCALATED",
 						error: `fix-dispatch-timeout (${taskType})`,
 						completedAt: new Date().toISOString()
 					});
+					writeStoryMetricsBestEffort(storyKey, "escalated", reviewCycles + 1);
 					eventBus.emit("orchestrator:story-escalated", {
 						storyKey,
 						lastVerdict: verdict,
@@ -11015,13 +11207,13 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				if (fixResult.status === "failed") logger$33.warn("Fix dispatch failed", {
+				if (fixResult.status === "failed") logger$35.warn("Fix dispatch failed", {
 					storyKey,
 					taskType,
 					exitCode: fixResult.exitCode
 				});
 			} catch (err) {
-				logger$33.warn("Fix dispatch failed, continuing to next review", {
+				logger$35.warn("Fix dispatch failed, continuing to next review", {
 					storyKey,
 					taskType,
 					err
@@ -11074,11 +11266,11 @@ function createImplementationOrchestrator(deps) {
 	}
 	async function run(storyKeys) {
 		if (_state === "RUNNING" || _state === "PAUSED") {
-			logger$33.warn("run() called while orchestrator is already running or paused — ignoring", { state: _state });
+			logger$35.warn("run() called while orchestrator is already running or paused — ignoring", { state: _state });
 			return getStatus();
 		}
 		if (_state === "COMPLETE") {
-			logger$33.warn("run() called on a COMPLETE orchestrator — ignoring", { state: _state });
+			logger$35.warn("run() called on a COMPLETE orchestrator — ignoring", { state: _state });
 			return getStatus();
 		}
 		_state = "RUNNING";
@@ -11096,13 +11288,13 @@ function createImplementationOrchestrator(deps) {
 		startHeartbeat();
 		if (projectRoot !== void 0) {
 			const seedResult = seedMethodologyContext(db, projectRoot);
-			if (seedResult.decisionsCreated > 0) logger$33.info({
+			if (seedResult.decisionsCreated > 0) logger$35.info({
 				decisionsCreated: seedResult.decisionsCreated,
 				skippedCategories: seedResult.skippedCategories
 			}, "Methodology context seeded from planning artifacts");
 		}
 		const groups = detectConflictGroups(storyKeys);
-		logger$33.info("Orchestrator starting", {
+		logger$35.info("Orchestrator starting", {
 			storyCount: storyKeys.length,
 			groupCount: groups.length,
 			maxConcurrency: config.maxConcurrency
@@ -11114,7 +11306,7 @@ function createImplementationOrchestrator(deps) {
 			_state = "FAILED";
 			_completedAt = new Date().toISOString();
 			persistState();
-			logger$33.error("Orchestrator failed with unhandled error", { err });
+			logger$35.error("Orchestrator failed with unhandled error", { err });
 			return getStatus();
 		}
 		stopHeartbeat();
@@ -11141,7 +11333,7 @@ function createImplementationOrchestrator(deps) {
 		_pauseGate = createPauseGate();
 		_state = "PAUSED";
 		eventBus.emit("orchestrator:paused", {});
-		logger$33.info("Orchestrator paused");
+		logger$35.info("Orchestrator paused");
 	}
 	function resume() {
 		if (_state !== "PAUSED") return;
@@ -11152,7 +11344,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		_state = "RUNNING";
 		eventBus.emit("orchestrator:resumed", {});
-		logger$33.info("Orchestrator resumed");
+		logger$35.info("Orchestrator resumed");
 	}
 	return {
 		run,
@@ -11330,6 +11522,31 @@ function createPlanningPhaseDefinition() {
 	};
 }
 /**
+* Create the UX Design phase definition.
+*
+* Entry gates: 'prd' artifact from planning must exist
+* Exit gates: 'ux-design' artifact must exist for this run
+*
+* This phase is inserted between planning and solutioning when UX design is
+* enabled in the pack manifest (`uxDesign: true`).
+*/
+function createUxDesignPhaseDefinition() {
+	return {
+		name: "ux-design",
+		description: "Design the user experience: personas, core experience vision, design system, visual foundation, user journeys, and accessibility guidelines.",
+		entryGates: [createArtifactExistsGate("planning", "prd")],
+		exitGates: [createArtifactExistsGate("ux-design", "ux-design")],
+		onEnter: async (_db, runId) => {
+			logPhase(`UX Design phase starting for run ${runId}`);
+		},
+		onExit: async (db, runId) => {
+			const artifact = getArtifactByTypeForRun(db, runId, "ux-design", "ux-design");
+			if (artifact === void 0) logPhase(`UX Design phase exit WARNING: ux-design artifact not found for run ${runId}`);
+			else logPhase(`UX Design phase completed for run ${runId} — ux-design artifact registered: ${artifact.id}`);
+		}
+	};
+}
+/**
 * Create the Solutioning phase definition.
 *
 * Entry gates: 'prd' artifact from planning must exist
@@ -11383,15 +11600,19 @@ function createImplementationPhaseDefinition() {
 	};
 }
 /**
-* Return all four built-in phase definitions in execution order.
+* Return the built-in phase definitions in execution order.
+*
+* When `uxDesignEnabled` is true, the `ux-design` phase is inserted between
+* `planning` and `solutioning`, with its own entry/exit gates.
+*
+* @param config - Optional configuration for conditional phase inclusion
 */
-function createBuiltInPhases() {
-	return [
-		createAnalysisPhaseDefinition(),
-		createPlanningPhaseDefinition(),
-		createSolutioningPhaseDefinition(),
-		createImplementationPhaseDefinition()
-	];
+function createBuiltInPhases(config) {
+	const phases = [createAnalysisPhaseDefinition(), createPlanningPhaseDefinition()];
+	if (config?.uxDesignEnabled === true) phases.push(createUxDesignPhaseDefinition());
+	phases.push(createSolutioningPhaseDefinition());
+	phases.push(createImplementationPhaseDefinition());
+	return phases;
 }
 
 //#endregion
@@ -11454,7 +11675,8 @@ var PhaseOrchestratorImpl = class {
 		this._db = deps.db;
 		this._pack = deps.pack;
 		this._qualityGates = deps.qualityGates;
-		this._phases = createBuiltInPhases();
+		const uxDesignEnabled = this._pack.manifest.uxDesign === true;
+		this._phases = createBuiltInPhases({ uxDesignEnabled });
 		const builtInNames = new Set(this._phases.map((p) => p.name));
 		const packPhases = this._pack.getPhases();
 		for (const packPhase of packPhases) if (!builtInNames.has(packPhase.name)) this._phases.push({
@@ -11610,12 +11832,44 @@ var PhaseOrchestratorImpl = class {
 	getPhases() {
 		return [...this._phases];
 	}
+	markPhaseFailed(runId, phase, reason) {
+		updatePipelineRun(this._db, runId, { status: "failed" });
+		const run = getPipelineRunById(this._db, runId);
+		if (!run) return;
+		const config = parseConfigJson(run.config_json);
+		const history = config.phaseHistory;
+		const currentEntry = history.find((h) => h.phase === phase && !h.completedAt);
+		if (currentEntry) {
+			currentEntry.completedAt = new Date().toISOString();
+			currentEntry.gateResults = [{
+				gate: "sub-phase-execution",
+				passed: false,
+				error: reason
+			}];
+		} else history.push({
+			phase,
+			startedAt: new Date().toISOString(),
+			completedAt: new Date().toISOString(),
+			gateResults: [{
+				gate: "sub-phase-execution",
+				passed: false,
+				error: reason
+			}]
+		});
+		const newConfigJson = JSON.stringify({
+			...config,
+			phaseHistory: history
+		});
+		updatePipelineRunConfig(this._db, runId, newConfigJson);
+	}
 };
 /**
 * Create a new PhaseOrchestrator with the given dependencies.
 *
-* The orchestrator is pre-loaded with the four built-in phases
-* (analysis, planning, solutioning, implementation).
+* The orchestrator is pre-loaded with the built-in phases
+* (analysis, planning, [ux-design,] solutioning, implementation).
+* The optional ux-design phase is inserted between planning and solutioning
+* when `pack.manifest.uxDesign === true`.
 */
 function createPhaseOrchestrator(deps) {
 	return new PhaseOrchestratorImpl(deps);
@@ -11698,334 +11952,479 @@ function summarizeDecisions(decisions, maxChars) {
 }
 
 //#endregion
-//#region src/modules/phase-orchestrator/step-runner.ts
-const logger$5 = createLogger("step-runner");
+//#region src/modules/phase-orchestrator/schemas/critique-output.ts
 /**
-* 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
+* A single issue identified by the critique agent.
 */
-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})` : "";
+const CritiqueIssueSchema = z.object({
+	severity: z.enum([
+		"blocker",
+		"major",
+		"minor"
+	]),
+	category: z.string().min(1),
+	description: z.string().min(5),
+	suggestion: z.string().min(5)
+});
+/**
+* Full output schema for critique agent responses.
+*
+* The critique agent must emit a YAML block matching this schema.
+* - `pass` means the artifact meets quality standards with no blocking issues.
+* - `needs_work` means one or more issues must be addressed before the artifact
+*   can be considered complete.
+*/
+const CritiqueOutputSchema = z.object({
+	verdict: z.enum(["pass", "needs_work"]),
+	issue_count: z.number().int().min(0),
+	issues: z.array(CritiqueIssueSchema).default([])
+});
+
+//#endregion
+//#region src/modules/phase-orchestrator/critique-loop.ts
+const logger$7 = createLogger("critique-loop");
+/**
+* Maps a phase name to the critique prompt template name.
+* Falls back to `critique-${phase}` for unknown phases.
+*/
+function getCritiquePromptName(phase) {
+	const mapping = {
+		analysis: "critique-analysis",
+		planning: "critique-planning",
+		solutioning: "critique-architecture",
+		architecture: "critique-architecture",
+		stories: "critique-stories"
+	};
+	return mapping[phase] ?? `critique-${phase}`;
+}
+/**
+* Execute a critique-and-refine loop on a phase artifact.
+*
+* Dispatches a critique agent, checks the verdict, and if the artifact
+* needs work, dispatches a refinement agent and repeats up to maxIterations.
+* After each critique, stores the result in the decision store under category 'critique'.
+*
+* @param artifact - The artifact content (raw text/YAML/markdown) to critique
+* @param phaseId - Phase name used to select the critique prompt template
+* @param runId - Pipeline run ID for decision store scoping
+* @param phase - Phase name for decision store persistence
+* @param deps - Shared phase dependencies (db, pack, dispatcher)
+* @param options - Critique loop configuration options
+* @returns CritiqueLoopResult with verdict, token costs, and timing
+*/
+async function runCritiqueLoop(artifact, phaseId, runId, phase, deps, options = {}) {
+	const { maxIterations = 2, projectContext = "", phaseContext = "" } = options;
+	const startMs = Date.now();
+	const critiqueTokens = {
+		input: 0,
+		output: 0
+	};
+	const refinementTokens = {
+		input: 0,
+		output: 0
+	};
+	let iterations = 0;
+	let currentArtifact = artifact;
+	let lastCritiqueOutput = null;
+	const critiquePromptName = getCritiquePromptName(phaseId);
+	for (let i = 0; i < maxIterations; i++) {
+		iterations = i + 1;
+		let critiquePrompt;
 		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}`);
+			const critiqueTemplate = await deps.pack.getPrompt(critiquePromptName);
+			critiquePrompt = critiqueTemplate.replace("{{artifact_content}}", currentArtifact).replace("{{project_context}}", projectContext);
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			logger$7.warn({
+				phaseId,
+				promptName: critiquePromptName,
+				err: message
+			}, "Critique loop: failed to load critique prompt template — skipping critique");
+			return {
+				verdict: "pass",
+				iterations,
+				remainingIssues: [],
+				critiqueTokens,
+				refinementTokens,
+				totalMs: Date.now() - startMs,
+				error: `Failed to load critique prompt '${critiquePromptName}': ${message}`
+			};
+		}
+		let critiqueOutput;
+		try {
+			const handle = deps.dispatcher.dispatch({
+				prompt: critiquePrompt,
+				agent: "claude-code",
+				taskType: "critique",
+				outputSchema: CritiqueOutputSchema
+			});
+			const result = await handle.result;
+			critiqueTokens.input += result.tokenEstimate.input;
+			critiqueTokens.output += result.tokenEstimate.output;
+			if (result.status !== "completed" || result.parsed === null) {
+				const errMsg = result.parseError ?? `Critique dispatch ended with status '${result.status}'`;
+				logger$7.warn({
+					phaseId,
+					iteration: i + 1,
+					err: errMsg
+				}, "Critique loop: critique dispatch failed — treating as pass to avoid blocking pipeline");
+				return {
+					verdict: "pass",
+					iterations,
+					remainingIssues: [],
+					critiqueTokens,
+					refinementTokens,
+					totalMs: Date.now() - startMs,
+					error: errMsg
+				};
+			}
+			critiqueOutput = result.parsed;
+			lastCritiqueOutput = critiqueOutput;
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			logger$7.warn({
+				phaseId,
+				iteration: i + 1,
+				err: message
+			}, "Critique loop: critique dispatch threw — treating as pass to avoid blocking pipeline");
+			return {
+				verdict: "pass",
+				iterations,
+				remainingIssues: [],
+				critiqueTokens,
+				refinementTokens,
+				totalMs: Date.now() - startMs,
+				error: message
+			};
+		}
+		try {
+			upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: "critique",
+				key: `${phaseId}-iteration-${i + 1}-verdict`,
+				value: critiqueOutput.verdict,
+				rationale: `Critique loop iteration ${i + 1} of ${maxIterations}`
+			});
+			upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: "critique",
+				key: `${phaseId}-iteration-${i + 1}-issue_count`,
+				value: String(critiqueOutput.issue_count)
+			});
+			if (critiqueOutput.issues.length > 0) upsertDecision(deps.db, {
+				pipeline_run_id: runId,
+				phase,
+				category: "critique",
+				key: `${phaseId}-iteration-${i + 1}-issues`,
+				value: JSON.stringify(critiqueOutput.issues)
+			});
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			logger$7.warn({
+				phaseId,
+				iteration: i + 1,
+				err: message
+			}, "Critique loop: failed to store critique decision — continuing");
+		}
+		if (critiqueOutput.verdict === "pass") {
+			logger$7.info({
+				phaseId,
+				iteration: i + 1
+			}, "Critique loop: artifact passed critique — loop complete");
+			return {
+				verdict: "pass",
+				iterations,
+				remainingIssues: [],
+				critiqueTokens,
+				refinementTokens,
+				totalMs: Date.now() - startMs
+			};
+		}
+		logger$7.info({
+			phaseId,
+			iteration: i + 1,
+			issueCount: critiqueOutput.issue_count
+		}, "Critique loop: artifact needs work — dispatching refinement");
+		if (i < maxIterations - 1) {
+			let refinePrompt;
+			try {
+				const refineTemplate = await deps.pack.getPrompt("refine-artifact");
+				const issuesText = critiqueOutput.issues.map((issue) => `- [${issue.severity}] ${issue.category}: ${issue.description}\n  Suggestion: ${issue.suggestion}`).join("\n");
+				refinePrompt = refineTemplate.replace("{{original_artifact}}", currentArtifact).replace("{{critique_issues}}", issuesText).replace("{{phase_context}}", phaseContext);
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				logger$7.warn({
+					phaseId,
+					iteration: i + 1,
+					err: message
+				}, "Critique loop: failed to load refinement prompt — stopping loop");
+				break;
+			}
+			try {
+				const refineHandle = deps.dispatcher.dispatch({
+					prompt: refinePrompt,
+					agent: "claude-code",
+					taskType: "critique",
+					outputSchema: void 0
+				});
+				const refineResult = await refineHandle.result;
+				refinementTokens.input += refineResult.tokenEstimate.input;
+				refinementTokens.output += refineResult.tokenEstimate.output;
+				if (refineResult.status === "completed" && refineResult.output) {
+					const originalLength = currentArtifact.length;
+					const refinedLength = refineResult.output.length;
+					const delta = refinedLength - originalLength;
+					logger$7.info({
+						phaseId,
+						iteration: i + 1,
+						originalLength,
+						refinedLength,
+						delta
+					}, "Critique loop: refinement complete");
+					currentArtifact = refineResult.output;
+				} else {
+					logger$7.warn({
+						phaseId,
+						iteration: i + 1,
+						status: refineResult.status
+					}, "Critique loop: refinement dispatch failed — stopping loop");
+					break;
+				}
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				logger$7.warn({
+					phaseId,
+					iteration: i + 1,
+					err: message
+				}, "Critique loop: refinement dispatch threw — stopping loop");
+				break;
+			}
 		}
 	}
-	return parts.join("\n");
+	const remainingIssues = lastCritiqueOutput?.issues ?? [];
+	if (remainingIssues.length > 0) {
+		logger$7.warn({
+			phaseId,
+			maxIterations,
+			issueCount: remainingIssues.length
+		}, "Critique loop: max iterations reached with unresolved issues");
+		for (const issue of remainingIssues) logger$7.warn({
+			phaseId,
+			severity: issue.severity,
+			category: issue.category,
+			description: issue.description
+		}, `Critique loop: unresolved issue — ${issue.severity}: ${issue.description}`);
+	}
+	return {
+		verdict: "needs_work",
+		iterations,
+		remainingIssues,
+		critiqueTokens,
+		refinementTokens,
+		totalMs: Date.now() - startMs
+	};
 }
+
+//#endregion
+//#region src/modules/phase-orchestrator/elicitation-selector.ts
+const logger$6 = createLogger("elicitation-selector");
 /**
-* Resolve a single context reference to a string value.
+* Affinity scores (0.0–1.0) for each category per content type.
 *
-* @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] ?? "";
+* Higher score → more likely to be selected for that content type.
+* Based on the method-to-phase affinity matrix from the Dev Notes.
+*/
+const CATEGORY_AFFINITY = {
+	brief: {
+		core: 1,
+		collaboration: .9,
+		creative: .8,
+		research: .5,
+		risk: .4,
+		advanced: .3,
+		technical: .2,
+		competitive: .2,
+		learning: .1,
+		philosophical: .1,
+		retrospective: .1
+	},
+	prd: {
+		risk: 1,
+		core: .9,
+		research: .8,
+		collaboration: .6,
+		creative: .4,
+		advanced: .3,
+		technical: .2,
+		competitive: .2,
+		learning: .1,
+		philosophical: .1,
+		retrospective: .1
+	},
+	architecture: {
+		technical: 1,
+		competitive: .9,
+		risk: .8,
+		core: .5,
+		advanced: .5,
+		research: .4,
+		collaboration: .3,
+		creative: .2,
+		learning: .1,
+		philosophical: .1,
+		retrospective: .1
+	},
+	stories: {
+		collaboration: 1,
+		risk: .9,
+		core: .5,
+		research: .4,
+		creative: .3,
+		technical: .3,
+		advanced: .2,
+		competitive: .2,
+		learning: .1,
+		philosophical: .1,
+		retrospective: .1
+	},
+	"ux-design": {
+		creative: 1,
+		collaboration: .9,
+		research: .8,
+		core: .5,
+		risk: .4,
+		advanced: .3,
+		competitive: .3,
+		technical: .2,
+		learning: .1,
+		philosophical: .1,
+		retrospective: .1
 	}
-	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()));
+};
+const RECENCY_PENALTY_FACTOR = .2;
+/**
+* Parse a CSV string (with header) into an array of ElicitationMethod objects.
+*
+* Expected CSV format (columns): num,category,method_name,description,output_pattern
+*
+* @param csvContent - Raw CSV file content including header row
+* @returns Array of parsed elicitation methods
+*/
+function parseMethodsCsv(csvContent) {
+	const lines = csvContent.trim().split("\n");
+	if (lines.length < 2) return [];
+	const methods = [];
+	for (let i = 1; i < lines.length; i++) {
+		const line = lines[i].trim();
+		if (!line) continue;
+		const firstComma = line.indexOf(",");
+		const secondComma = line.indexOf(",", firstComma + 1);
+		const thirdComma = line.indexOf(",", secondComma + 1);
+		const lastComma = line.lastIndexOf(",");
+		if (firstComma < 0 || secondComma < 0 || thirdComma < 0 || lastComma <= thirdComma) continue;
+		const category = line.slice(firstComma + 1, secondComma);
+		const name = line.slice(secondComma + 1, thirdComma);
+		const description = line.slice(thirdComma + 1, lastComma);
+		const output_pattern = line.slice(lastComma + 1);
+		if (!category || !name || !description || !output_pattern) continue;
+		methods.push({
+			name,
+			category,
+			description,
+			output_pattern
+		});
 	}
-	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 "";
+	return methods;
 }
 /**
-* Execute a sequence of steps, accumulating context and persisting results.
+* Load elicitation methods from the pack data directory.
 *
-* Halts on the first step that fails. Each step's output is available to
-* subsequent steps via the stepOutputs map and decision store.
+* Reads from packs/bmad/data/elicitation-methods.csv relative to process.cwd().
+* Returns an empty array if the file cannot be read.
 *
-* @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
+* @returns Array of all available elicitation methods
 */
-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);
+function loadElicitationMethods() {
+	const csvPath = join(process.cwd(), "packs", "bmad", "data", "elicitation-methods.csv");
+	try {
+		const content = readFileSync(csvPath, "utf-8");
+		const methods = parseMethodsCsv(content);
+		logger$6.debug({ count: methods.length }, "Loaded elicitation methods");
+		return methods;
 	} 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
-			}
-		});
+		logger$6.warn({
+			csvPath,
+			err
+		}, "Failed to load elicitation methods CSV");
+		return [];
+	}
+}
+/**
+* Select 1–2 elicitation methods appropriate for the given context.
+*
+* Selection algorithm:
+*  1. Score each method: categoryAffinity × recencyFactor × riskBoost × complexityBoost
+*  2. Sort descending by score
+*  3. Return top 1–2 methods (always at least 1 if methods are available)
+*
+* Methods used in previous rounds (listed in `usedMethods`) are deprioritized
+* via `RECENCY_PENALTY_FACTOR` to encourage category rotation.
+*
+* @param context      - Elicitation context describing the artifact and domain
+* @param usedMethods  - Names of methods already used in this pipeline run
+* @param methods      - Optional pre-loaded method list (defaults to loadElicitationMethods())
+* @returns Array of 0–2 selected ElicitationMethod objects
+*/
+function selectMethods(context, usedMethods, methods) {
+	const allMethods = methods ?? loadElicitationMethods();
+	if (allMethods.length === 0) return [];
+	const affinity = CATEGORY_AFFINITY[context.content_type] ?? {};
+	const usedSet = new Set(usedMethods);
+	const complexityScore = context.complexity_score ?? .5;
+	const riskLevel = context.risk_level ?? "medium";
+	const scored = allMethods.map((method) => {
+		const categoryScore = affinity[method.category] ?? .3;
+		const recencyFactor = usedSet.has(method.name) ? RECENCY_PENALTY_FACTOR : 1;
+		const riskBoost = riskLevel === "high" && method.category === "risk" ? 1.3 : 1;
+		const complexityBoost = complexityScore > .7 && (method.category === "technical" || method.category === "advanced") ? 1.2 : 1;
+		const score = categoryScore * recencyFactor * riskBoost * complexityBoost;
 		return {
-			success: false,
-			steps: stepResults,
-			tokenUsage: {
-				input: totalInput,
-				output: totalOutput
-			},
-			error: errorMsg
+			method,
+			score
 		};
+	});
+	scored.sort((a, b) => {
+		if (b.score !== a.score) return b.score - a.score;
+		return a.method.name.localeCompare(b.method.name);
+	});
+	return scored.slice(0, 2).map((s) => s.method);
+}
+/**
+* Derive an ElicitationContext content_type from a phase name and step name.
+*
+* Mapping:
+*  - analysis phase          → 'brief'
+*  - planning phase          → 'prd'
+*  - solutioning + arch step → 'architecture'
+*  - solutioning + story/epic step → 'stories'
+*  - ux-design phase         → 'ux-design'
+*  - default                 → 'brief'
+*
+* @param phase    - Pipeline phase name
+* @param stepName - Step name within the phase
+* @returns Content type for method selection
+*/
+function deriveContentType(phase, stepName) {
+	if (phase === "analysis") return "brief";
+	if (phase === "planning") return "prd";
+	if (phase === "ux-design") return "ux-design";
+	if (phase === "solutioning") {
+		if (stepName.includes("arch")) return "architecture";
+		if (stepName.includes("stor") || stepName.includes("epic")) return "stories";
 	}
-	return {
-		success: true,
-		steps: stepResults,
-		tokenUsage: {
-			input: totalInput,
-			output: totalOutput
-		}
-	};
+	return "brief";
 }
 
 //#endregion
@@ -12201,6 +12600,502 @@ const EpicDesignOutputSchema = z.object({
 		fr_coverage: z.array(z.string()).default([])
 	})).min(1).optional()
 });
+/**
+* Step 1 output: UX Discovery + Core Experience.
+* Covers user personas, core experience goals, and emotional response targets.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const UxDiscoveryOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	target_personas: z.array(z.string().min(1)).optional(),
+	core_experience: z.string().optional(),
+	emotional_goals: z.array(z.string().min(1)).optional(),
+	inspiration_references: z.array(z.string()).default([])
+});
+/**
+* Step 2 output: Design System + Visual Foundation.
+* Covers design system approach, visual language, and design directions.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const UxDesignSystemOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	design_system: z.string().optional(),
+	visual_foundation: z.string().optional(),
+	design_principles: z.array(z.string().min(1)).optional(),
+	color_and_typography: z.string().optional()
+});
+/**
+* Step 3 output: User Journeys + Component Strategy + Accessibility.
+* Covers user flows, component architecture, UX patterns, and a11y guidelines.
+* Content fields are optional to allow `{result: 'failed'}` without Zod rejection.
+*/
+const UxJourneysOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	user_journeys: z.array(z.string().min(1)).optional(),
+	component_strategy: z.string().optional(),
+	ux_patterns: z.array(z.string()).default([]),
+	accessibility_guidelines: z.array(z.string()).default([])
+});
+/**
+* Zod schema for the YAML output emitted by an elicitation sub-agent.
+* The agent returns structured insights from applying an elicitation method.
+*/
+const ElicitationOutputSchema = z.object({
+	result: z.enum(["success", "failed"]),
+	insights: z.string()
+});
+
+//#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;
+	let totalElicitationInput = 0;
+	let totalElicitationOutput = 0;
+	const usedElicitationMethods = [];
+	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
+					},
+					elicitationTokenUsage: {
+						input: totalElicitationInput,
+						output: totalElicitationOutput
+					},
+					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
+				},
+				elicitationTokenUsage: {
+					input: totalElicitationInput,
+					output: totalElicitationOutput
+				},
+				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
+				},
+				elicitationTokenUsage: {
+					input: totalElicitationInput,
+					output: totalElicitationOutput
+				},
+				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
+				},
+				elicitationTokenUsage: {
+					input: totalElicitationInput,
+					output: totalElicitationOutput
+				},
+				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
+				},
+				elicitationTokenUsage: {
+					input: totalElicitationInput,
+					output: totalElicitationOutput
+				},
+				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;
+		}
+		if (step.critique === true) try {
+			const artifactContent = JSON.stringify(parsed, null, 2);
+			const critiqueResult = await runCritiqueLoop(artifactContent, phase, runId, phase, deps);
+			totalInput += critiqueResult.critiqueTokens.input + critiqueResult.refinementTokens.input;
+			totalOutput += critiqueResult.critiqueTokens.output + critiqueResult.refinementTokens.output;
+			logger$5.info({
+				step: step.name,
+				verdict: critiqueResult.verdict,
+				iterations: critiqueResult.iterations,
+				totalMs: critiqueResult.totalMs
+			}, "Step critique loop complete");
+		} catch (critiqueErr) {
+			const critiqueMsg = critiqueErr instanceof Error ? critiqueErr.message : String(critiqueErr);
+			logger$5.warn({
+				step: step.name,
+				err: critiqueMsg
+			}, "Step critique loop threw an error — continuing without critique");
+		}
+		let stepElicitationTokens;
+		if (step.elicitate === true) try {
+			const contentType = deriveContentType(phase, step.name);
+			const selectedMethods = selectMethods({ content_type: contentType }, usedElicitationMethods);
+			if (selectedMethods.length > 0) {
+				logger$5.info({
+					step: step.name,
+					methods: selectedMethods.map((m) => m.name),
+					contentType
+				}, "Running automated elicitation");
+				const elicitationTemplate = await deps.pack.getPrompt("elicitation-apply");
+				const artifactContent = JSON.stringify(parsed, null, 2);
+				let elicitInput = 0;
+				let elicitOutput = 0;
+				let roundIndex = 0;
+				for (const method of selectedMethods) {
+					roundIndex++;
+					const elicitPrompt = elicitationTemplate.replace(/\{\{method_name\}\}/g, method.name).replace(/\{\{method_description\}\}/g, method.description).replace(/\{\{output_pattern\}\}/g, method.output_pattern).replace(/\{\{artifact_content\}\}/g, artifactContent);
+					const elicitHandle = deps.dispatcher.dispatch({
+						prompt: elicitPrompt,
+						agent: "claude-code",
+						taskType: "elicitation",
+						outputSchema: ElicitationOutputSchema
+					});
+					const elicitResult = await elicitHandle.result;
+					elicitInput += elicitResult.tokenEstimate.input;
+					elicitOutput += elicitResult.tokenEstimate.output;
+					if (elicitResult.status === "completed" && elicitResult.parsed !== null) {
+						const elicitParsed = elicitResult.parsed;
+						if (elicitParsed.result === "success" && elicitParsed.insights) {
+							upsertDecision(deps.db, {
+								pipeline_run_id: runId,
+								phase,
+								category: "elicitation",
+								key: `${phase}-round-${roundIndex}-method`,
+								value: method.name
+							});
+							upsertDecision(deps.db, {
+								pipeline_run_id: runId,
+								phase,
+								category: "elicitation",
+								key: `${phase}-round-${roundIndex}-insights`,
+								value: elicitParsed.insights
+							});
+							logger$5.info({
+								step: step.name,
+								method: method.name,
+								roundIndex
+							}, "Elicitation insights stored in decision store");
+						}
+					} else logger$5.warn({
+						step: step.name,
+						method: method.name,
+						status: elicitResult.status
+					}, "Elicitation dispatch did not produce valid output — skipping");
+					usedElicitationMethods.push(method.name);
+				}
+				stepElicitationTokens = {
+					input: elicitInput,
+					output: elicitOutput
+				};
+				totalElicitationInput += elicitInput;
+				totalElicitationOutput += elicitOutput;
+			}
+		} catch (elicitErr) {
+			const elicitMsg = elicitErr instanceof Error ? elicitErr.message : String(elicitErr);
+			logger$5.warn({
+				step: step.name,
+				err: elicitMsg
+			}, "Step elicitation threw an error — continuing without elicitation");
+		}
+		const stepResult = {
+			name: step.name,
+			success: true,
+			parsed,
+			error: null,
+			tokenUsage
+		};
+		if (artifactId !== void 0) stepResult.artifactId = artifactId;
+		if (stepElicitationTokens !== void 0) stepResult.elicitationTokenUsage = stepElicitationTokens;
+		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
+			},
+			elicitationTokenUsage: {
+				input: totalElicitationInput,
+				output: totalElicitationOutput
+			},
+			error: errorMsg
+		};
+	}
+	return {
+		success: true,
+		steps: stepResults,
+		tokenUsage: {
+			input: totalInput,
+			output: totalOutput
+		},
+		elicitationTokenUsage: {
+			input: totalElicitationInput,
+			output: totalElicitationOutput
+		}
+	};
+}
 
 //#endregion
 //#region src/modules/phase-orchestrator/phases/analysis.ts
@@ -12877,64 +13772,43 @@ async function runPlanningPhase(deps, params) {
 }
 
 //#endregion
-//#region src/modules/quality-gates/gate-impl.ts
+//#region src/modules/phase-orchestrator/schemas/readiness-output.ts
 /**
-* Concrete implementation of QualityGate.
+* A single finding identified by the readiness check agent.
 */
-var QualityGateImpl = class {
-	config;
-	_retryCount = 0;
-	constructor(config) {
-		this.config = config;
-	}
-	get name() {
-		return this.config.name;
-	}
-	/**
-	* Evaluate the given output against this gate's evaluator function.
-	*
-	* Flow:
-	* - Run evaluator
-	* - If pass → return `{ action: 'proceed', result: output }`
-	* - If fail and retries remain → increment counter, return `{ action: 'retry', ... }`
-	* - If fail and no retries remain → return `{ action: 'warn', ... }`
-	*/
-	evaluate(output) {
-		const evaluation = this.config.evaluator(output);
-		if (evaluation.pass) return {
-			action: "proceed",
-			issues: evaluation.issues,
-			retriesRemaining: this.config.maxRetries - this._retryCount,
-			result: output
-		};
-		const retriesRemaining = this.config.maxRetries - this._retryCount;
-		if (retriesRemaining > 0) {
-			this._retryCount += 1;
-			return {
-				action: "retry",
-				issues: evaluation.issues,
-				retriesRemaining: retriesRemaining - 1
-			};
-		}
-		return {
-			action: "warn",
-			issues: evaluation.issues,
-			retriesRemaining: 0
-		};
-	}
-	/**
-	* Reset the retry counter to 0, allowing re-use of this gate.
-	*/
-	reset() {
-		this._retryCount = 0;
-	}
-};
+const ReadinessFindingSchema = z.object({
+	category: z.enum([
+		"fr_coverage",
+		"architecture_compliance",
+		"story_quality",
+		"ux_alignment",
+		"dependency_validity"
+	]),
+	severity: z.enum([
+		"blocker",
+		"major",
+		"minor"
+	]),
+	description: z.string().min(1),
+	affected_items: z.array(z.string()).default([])
+});
 /**
-* Factory function to create a QualityGate instance from config.
+* Full output schema for the readiness check agent.
+*
+* The agent must emit a YAML block matching this schema.
+* - READY: all FRs covered, no blockers, acceptable quality — pipeline may proceed
+* - NEEDS_WORK: gaps identified but fixable via targeted story regeneration
+* - NOT_READY: critical failures that cannot be auto-remediated
 */
-function createQualityGate(config) {
-	return new QualityGateImpl(config);
-}
+const ReadinessOutputSchema = z.object({
+	verdict: z.enum([
+		"READY",
+		"NEEDS_WORK",
+		"NOT_READY"
+	]),
+	coverage_score: z.number().min(0).max(100),
+	findings: z.array(ReadinessFindingSchema).default([])
+});
 
 //#endregion
 //#region src/modules/phase-orchestrator/phases/solutioning.ts
@@ -12956,6 +13830,12 @@ const STORY_REQUIREMENTS_PLACEHOLDER = "{{requirements}}";
 const STORY_ARCHITECTURE_PLACEHOLDER = "{{architecture_decisions}}";
 /** Gap analysis placeholder used in retry prompt */
 const GAP_ANALYSIS_PLACEHOLDER = "{{gap_analysis}}";
+/** Placeholders in readiness-check prompt template */
+const READINESS_FR_PLACEHOLDER = "{{functional_requirements}}";
+const READINESS_NFR_PLACEHOLDER = "{{non_functional_requirements}}";
+const READINESS_ARCH_PLACEHOLDER = STORY_ARCHITECTURE_PLACEHOLDER;
+const READINESS_STORIES_PLACEHOLDER = "{{stories}}";
+const READINESS_UX_PLACEHOLDER = "{{ux_decisions}}";
 /**
 * Format functional and non-functional requirements from the planning phase
 * into a compact text block suitable for prompt injection.
@@ -13227,73 +14107,146 @@ async function runStoryGeneration(deps, params, gapAnalysis) {
 	};
 }
 /**
-* Run the readiness check using a QualityGate to verify FR-to-story traceability.
-*
-* For each functional requirement from the planning phase, checks if at least
-* one solutioning-phase story references it (simple substring keyword match).
-*
-* @param deps - Shared phase dependencies
-* @param runId - Pipeline run ID to scope the query
-* @returns Object with `passed` boolean and optional `gaps` array (uncovered FRs)
+* Format functional requirements from pre-fetched planning phase decisions for prompt injection.
+* Accepts pre-fetched planning decisions to avoid duplicate DB queries (shared with formatNFRsForReadiness).
 */
-async function runReadinessCheck(deps, runId) {
-	const { db } = deps;
-	const planningDecisions = getDecisionsByPhaseForRun(db, runId, "planning");
+function formatFRsForReadiness(planningDecisions) {
 	const frDecisions = planningDecisions.filter((d) => d.category === "functional-requirements");
-	const functionalRequirements = [];
-	for (const d of frDecisions) try {
+	if (frDecisions.length === 0) return "(No functional requirements found)";
+	const lines = [];
+	for (const [i, d] of frDecisions.entries()) try {
 		const fr = JSON.parse(d.value);
-		if (fr.description) functionalRequirements.push(fr.description);
+		lines.push(`- [${d.key ?? `FR-${i}`}] [${fr.priority?.toUpperCase() ?? "MUST"}] ${fr.description}`);
+	} catch {
+		lines.push(`- [${d.key ?? `FR-${i}`}] ${d.value}`);
+	}
+	return lines.join("\n");
+}
+/**
+* Format non-functional requirements from pre-fetched planning phase decisions for prompt injection.
+* Accepts pre-fetched planning decisions to avoid duplicate DB queries (shared with formatFRsForReadiness).
+*/
+function formatNFRsForReadiness(planningDecisions) {
+	const nfrDecisions = planningDecisions.filter((d) => d.category === "non-functional-requirements");
+	if (nfrDecisions.length === 0) return "(No non-functional requirements found)";
+	const lines = [];
+	for (const d of nfrDecisions) try {
+		const nfr = JSON.parse(d.value);
+		lines.push(`- [${nfr.category?.toUpperCase() ?? "NFR"}] ${nfr.description}`);
 	} catch {
-		functionalRequirements.push(d.value);
+		lines.push(`- ${d.value}`);
 	}
+	return lines.join("\n");
+}
+/**
+* Format all stories from solutioning phase for prompt injection.
+*/
+function formatStoriesForReadiness(db, runId) {
 	const solutioningDecisions = getDecisionsByPhaseForRun(db, runId, "solutioning");
 	const storyDecisions = solutioningDecisions.filter((d) => d.category === "stories");
-	const stories = [];
+	if (storyDecisions.length === 0) return "(No stories found)";
+	const lines = [];
 	for (const d of storyDecisions) try {
 		const story = JSON.parse(d.value);
-		stories.push({
-			description: [story.title ?? "", story.description ?? ""].join(" "),
-			ac: story.ac ?? []
-		});
+		lines.push(`### Story ${story.key ?? d.key}: ${story.title ?? "(untitled)"}`);
+		lines.push(`**Priority**: ${story.priority ?? "must"}`);
+		lines.push(`**Description**: ${story.description ?? ""}`);
+		const acList = story.acceptance_criteria ?? story.ac;
+		if (acList && acList.length > 0) {
+			lines.push("**Acceptance Criteria**:");
+			for (const ac of acList) lines.push(`  - ${ac}`);
+		}
+		lines.push("");
 	} catch {
-		stories.push({
-			description: d.value,
-			ac: []
-		});
+		lines.push(`### Story ${d.key}: ${d.value}`);
+		lines.push("");
+	}
+	return lines.join("\n");
+}
+/**
+* Format UX decisions from the UX design phase (if any) for prompt injection.
+*/
+function formatUxDecisionsForReadiness(db, runId) {
+	const uxDecisions = getDecisionsByPhaseForRun(db, runId, "ux-design");
+	if (uxDecisions.length === 0) return "";
+	const lines = ["### UX Design Decisions"];
+	for (const d of uxDecisions) lines.push(`- **${d.key}** [${d.category}]: ${d.value}`);
+	return lines.join("\n");
+}
+/**
+* Run the adversarial readiness check by dispatching a sub-agent.
+*
+* Assembles comprehensive context (FRs, NFRs, architecture decisions, stories,
+* optional UX decisions) and dispatches a readiness-check agent to perform a
+* proper adversarial review — replacing the old QualityGate keyword matcher.
+*
+* @param deps - Shared phase dependencies
+* @param runId - Pipeline run ID to scope the query
+* @returns Readiness check result with verdict, findings, and coverage score
+*/
+async function runReadinessCheck(deps, runId) {
+	const { db, pack, dispatcher } = deps;
+	const zeroTokenUsage = {
+		input: 0,
+		output: 0
+	};
+	let template;
+	try {
+		template = await pack.getPrompt("readiness-check");
+	} catch {
+		return {
+			verdict: "error",
+			error: "readiness-check prompt template not found in methodology pack",
+			tokenUsage: zeroTokenUsage
+		};
 	}
-	const coverageData = {
-		functionalRequirements,
-		stories
+	const planningDecisions = getDecisionsByPhaseForRun(db, runId, "planning");
+	const formattedFRs = formatFRsForReadiness(planningDecisions);
+	const formattedNFRs = formatNFRsForReadiness(planningDecisions);
+	const formattedArchitecture = formatArchitectureDecisions(db, runId);
+	const formattedStories = formatStoriesForReadiness(db, runId);
+	const formattedUx = formatUxDecisionsForReadiness(db, runId);
+	let prompt = template.replace(READINESS_FR_PLACEHOLDER, formattedFRs).replace(READINESS_NFR_PLACEHOLDER, formattedNFRs).replace(READINESS_ARCH_PLACEHOLDER, formattedArchitecture).replace(READINESS_STORIES_PLACEHOLDER, formattedStories);
+	if (formattedUx) prompt = prompt.replace(READINESS_UX_PLACEHOLDER, formattedUx);
+	else prompt = prompt.replace(READINESS_UX_PLACEHOLDER, "");
+	const handle = dispatcher.dispatch({
+		prompt,
+		agent: "claude-code",
+		taskType: "readiness-check",
+		outputSchema: ReadinessOutputSchema
+	});
+	const dispatchResult = await handle.result;
+	const tokenEstimate = dispatchResult.tokenEstimate;
+	const tokenUsage = {
+		input: tokenEstimate.input,
+		output: tokenEstimate.output
+	};
+	logger$4.info({
+		runId,
+		durationMs: dispatchResult.durationMs,
+		tokens: tokenEstimate
+	}, "Readiness check dispatch completed");
+	if (dispatchResult.status === "timeout") return {
+		verdict: "error",
+		error: `Readiness check agent timed out after ${dispatchResult.durationMs}ms`,
+		tokenUsage
+	};
+	if (dispatchResult.status === "failed") return {
+		verdict: "error",
+		error: `Readiness check dispatch failed: ${dispatchResult.parseError ?? dispatchResult.output}`,
+		tokenUsage
+	};
+	if (dispatchResult.parsed === null || dispatchResult.parseError !== null) return {
+		verdict: "error",
+		error: `Readiness check schema validation failed: ${dispatchResult.parseError ?? "No parsed output"}`,
+		tokenUsage
 	};
-	const gate = createQualityGate({
-		name: "solutioning-readiness",
-		maxRetries: 0,
-		evaluator: (output) => {
-			const data = output;
-			const gaps$1 = [];
-			for (const fr of data.functionalRequirements) {
-				const frLower = fr.toLowerCase();
-				const frKeywords = frLower.split(/\s+/).filter((w) => w.length > 4);
-				const covered = data.stories.some((story) => {
-					const storyText = [story.description, ...story.ac].join(" ").toLowerCase();
-					return frKeywords.some((kw) => storyText.includes(kw)) || storyText.includes(frLower);
-				});
-				if (!covered) gaps$1.push(fr);
-			}
-			return {
-				pass: gaps$1.length === 0,
-				issues: gaps$1.map((g) => `Uncovered FR: ${g}`),
-				severity: gaps$1.length === 0 ? "info" : "error"
-			};
-		}
-	});
-	const gateResult = gate.evaluate(coverageData);
-	if (gateResult.action === "proceed") return { passed: true };
-	const gaps = gateResult.issues.map((issue) => issue.replace(/^Uncovered FR: /, ""));
+	const parsed = dispatchResult.parsed;
 	return {
-		passed: false,
-		gaps
+		verdict: parsed.verdict,
+		findings: parsed.findings ?? [],
+		coverageScore: parsed.coverage_score,
+		tokenUsage
 	};
 }
 /**
@@ -13579,65 +14532,228 @@ async function runSolutioningPhase(deps, params) {
 			}
 		};
 		const readinessResult = await runReadinessCheck(deps, params.runId);
-		if (!readinessResult.passed) {
-			const gaps = readinessResult.gaps ?? [];
-			const gapAnalysis = [
-				"## Gap Analysis: Uncovered Functional Requirements",
-				"The following functional requirements are not covered by any generated story:",
-				...gaps.map((g) => `- ${g}`),
-				"",
-				"Please generate additional stories to cover these requirements."
-			].join("\n");
-			const retryResult = await runStoryGeneration(deps, params, gapAnalysis);
-			totalInput += retryResult.tokenUsage.input;
-			totalOutput += retryResult.tokenUsage.output;
-			if ("error" in retryResult) return {
+		totalInput += readinessResult.tokenUsage.input;
+		totalOutput += readinessResult.tokenUsage.output;
+		if (readinessResult.verdict === "error") {
+			logger$4.error({
+				runId: params.runId,
+				error: readinessResult.error
+			}, "Readiness check agent failed");
+			return {
 				result: "failed",
-				error: "story_generation_retry_failed",
-				details: retryResult.error,
+				error: "readiness_check_error",
+				details: readinessResult.error,
 				readiness_passed: false,
-				gaps,
 				artifact_ids: [archResult.artifactId, storyResult.artifactId],
 				tokenUsage: {
 					input: totalInput,
 					output: totalOutput
 				}
 			};
-			const retryReadiness = await runReadinessCheck(deps, params.runId);
-			if (!retryReadiness.passed) return {
+		}
+		logger$4.info({
+			runId: params.runId,
+			verdict: readinessResult.verdict,
+			coverageScore: readinessResult.coverageScore,
+			findingCount: readinessResult.findings.length
+		}, "Readiness check verdict received");
+		if (readinessResult.verdict === "NOT_READY") {
+			const blockers = readinessResult.findings.filter((f) => f.severity === "blocker");
+			const majorFindings = readinessResult.findings.filter((f) => f.severity === "major");
+			for (const [i, finding] of readinessResult.findings.entries()) upsertDecision(deps.db, {
+				pipeline_run_id: params.runId,
+				phase: "solutioning",
+				category: "readiness-findings",
+				key: `finding-${i + 1}`,
+				value: JSON.stringify(finding)
+			});
+			logger$4.error({
+				runId: params.runId,
+				verdict: "NOT_READY",
+				coverageScore: readinessResult.coverageScore,
+				blockers: blockers.length,
+				major: majorFindings.length,
+				findings: readinessResult.findings
+			}, "Readiness check returned NOT_READY — solutioning phase failed");
+			if (deps.eventBus) {
+				deps.eventBus.emit("solutioning:readiness-check", {
+					runId: params.runId,
+					verdict: "NOT_READY",
+					coverageScore: readinessResult.coverageScore,
+					findingCount: readinessResult.findings.length,
+					blockerCount: blockers.length
+				});
+				deps.eventBus.emit("solutioning:readiness-failed", {
+					runId: params.runId,
+					verdict: "NOT_READY",
+					coverageScore: readinessResult.coverageScore,
+					findings: readinessResult.findings.map((f) => ({
+						category: f.category,
+						severity: f.severity,
+						description: f.description,
+						affected_items: f.affected_items
+					}))
+				});
+			}
+			return {
 				result: "failed",
-				error: "readiness_check_failed",
-				details: "Readiness check failed after maximum retries",
+				error: "readiness_not_ready",
+				details: `Readiness check returned NOT_READY: ${blockers.length} blockers, coverage score ${readinessResult.coverageScore}%`,
 				readiness_passed: false,
-				gaps: retryReadiness.gaps ?? gaps,
-				artifact_ids: [
-					archResult.artifactId,
-					storyResult.artifactId,
-					retryResult.artifactId
-				],
+				gaps: readinessResult.findings.filter((f) => f.category === "fr_coverage").map((f) => f.description),
+				artifact_ids: [archResult.artifactId, storyResult.artifactId],
 				tokenUsage: {
 					input: totalInput,
 					output: totalOutput
 				}
 			};
-			const retryStories = retryResult.epics.reduce((sum, epic) => sum + epic.stories.length, 0);
-			return {
-				result: "success",
-				architecture_decisions: archResult.decisions.length,
-				epics: retryResult.epics.length,
-				stories: retryStories,
-				readiness_passed: true,
-				artifact_ids: [
-					archResult.artifactId,
-					storyResult.artifactId,
-					retryResult.artifactId
-				],
-				tokenUsage: {
-					input: totalInput,
-					output: totalOutput
+		}
+		if (readinessResult.verdict === "NEEDS_WORK") {
+			const blockers = readinessResult.findings.filter((f) => f.severity === "blocker");
+			if (blockers.length > 0) {
+				for (const [i, finding] of readinessResult.findings.entries()) upsertDecision(deps.db, {
+					pipeline_run_id: params.runId,
+					phase: "solutioning",
+					category: "readiness-findings",
+					key: `finding-${i + 1}`,
+					value: JSON.stringify(finding)
+				});
+				if (deps.eventBus) deps.eventBus.emit("solutioning:readiness-check", {
+					runId: params.runId,
+					verdict: "NEEDS_WORK",
+					coverageScore: readinessResult.coverageScore,
+					findingCount: readinessResult.findings.length,
+					blockerCount: blockers.length
+				});
+				const gapAnalysis = [
+					"## Gap Analysis: Readiness Check Blocker Findings",
+					"The readiness check identified the following blocker issues that must be addressed:",
+					"",
+					...blockers.map((f) => [`### [${f.category.toUpperCase()}] ${f.description}`, f.affected_items.length > 0 ? `Affected: ${f.affected_items.join(", ")}` : ""].filter(Boolean).join("\n")),
+					"",
+					"Please generate additional or revised stories to specifically address each blocker above."
+				].join("\n");
+				logger$4.info({
+					runId: params.runId,
+					blockerCount: blockers.length
+				}, "Readiness NEEDS_WORK with blockers — retrying story generation with gap analysis");
+				const retryResult = await runStoryGeneration(deps, params, gapAnalysis);
+				totalInput += retryResult.tokenUsage.input;
+				totalOutput += retryResult.tokenUsage.output;
+				if ("error" in retryResult) return {
+					result: "failed",
+					error: "story_generation_retry_failed",
+					details: retryResult.error,
+					readiness_passed: false,
+					gaps: blockers.map((f) => f.description),
+					artifact_ids: [archResult.artifactId, storyResult.artifactId],
+					tokenUsage: {
+						input: totalInput,
+						output: totalOutput
+					}
+				};
+				const retryReadiness = await runReadinessCheck(deps, params.runId);
+				totalInput += retryReadiness.tokenUsage.input;
+				totalOutput += retryReadiness.tokenUsage.output;
+				if (retryReadiness.verdict === "error") return {
+					result: "failed",
+					error: "readiness_check_error",
+					details: retryReadiness.error,
+					readiness_passed: false,
+					artifact_ids: [
+						archResult.artifactId,
+						storyResult.artifactId,
+						retryResult.artifactId
+					],
+					tokenUsage: {
+						input: totalInput,
+						output: totalOutput
+					}
+				};
+				if (retryReadiness.verdict === "NOT_READY" || retryReadiness.verdict === "NEEDS_WORK") {
+					const retryBlockers = retryReadiness.findings.filter((f) => f.severity === "blocker");
+					logger$4.error({
+						runId: params.runId,
+						verdict: retryReadiness.verdict,
+						retryBlockers: retryBlockers.length
+					}, "Readiness check failed after maximum retries");
+					return {
+						result: "failed",
+						error: "readiness_check_failed",
+						details: `Readiness check failed after maximum retries: verdict=${retryReadiness.verdict}, coverage=${retryReadiness.coverageScore}%`,
+						readiness_passed: false,
+						gaps: retryReadiness.findings.filter((f) => f.category === "fr_coverage").map((f) => f.description),
+						artifact_ids: [
+							archResult.artifactId,
+							storyResult.artifactId,
+							retryResult.artifactId
+						],
+						tokenUsage: {
+							input: totalInput,
+							output: totalOutput
+						}
+					};
 				}
-			};
+				const retryStories = retryResult.epics.reduce((sum, epic) => sum + epic.stories.length, 0);
+				const minorFindings$1 = retryReadiness.findings.filter((f) => f.severity === "minor");
+				if (minorFindings$1.length > 0) logger$4.warn({
+					runId: params.runId,
+					minorFindings: minorFindings$1
+				}, "Readiness READY with minor findings after retry");
+				if (deps.eventBus) deps.eventBus.emit("solutioning:readiness-check", {
+					runId: params.runId,
+					verdict: "READY",
+					coverageScore: retryReadiness.coverageScore,
+					findingCount: retryReadiness.findings.length,
+					blockerCount: 0
+				});
+				return {
+					result: "success",
+					architecture_decisions: archResult.decisions.length,
+					epics: retryResult.epics.length,
+					stories: retryStories,
+					readiness_passed: true,
+					artifact_ids: [
+						archResult.artifactId,
+						storyResult.artifactId,
+						retryResult.artifactId
+					],
+					tokenUsage: {
+						input: totalInput,
+						output: totalOutput
+					}
+				};
+			}
+			const majorFindings = readinessResult.findings.filter((f) => f.severity === "major");
+			logger$4.warn({
+				runId: params.runId,
+				majorCount: majorFindings.length,
+				findings: readinessResult.findings
+			}, "Readiness NEEDS_WORK (no blockers) — proceeding with warnings");
+			if (deps.eventBus) deps.eventBus.emit("solutioning:readiness-check", {
+				runId: params.runId,
+				verdict: "NEEDS_WORK",
+				coverageScore: readinessResult.coverageScore,
+				findingCount: readinessResult.findings.length,
+				blockerCount: 0
+			});
+		}
+		const minorFindings = readinessResult.findings.filter((f) => f.severity === "minor");
+		if (minorFindings.length > 0) {
+			const verdictLabel = readinessResult.verdict === "READY" ? "READY" : "NEEDS_WORK (no blockers)";
+			logger$4.warn({
+				runId: params.runId,
+				verdict: readinessResult.verdict,
+				minorFindings
+			}, `Readiness ${verdictLabel} with minor findings — proceeding`);
 		}
+		if (readinessResult.verdict === "READY" && deps.eventBus) deps.eventBus.emit("solutioning:readiness-check", {
+			runId: params.runId,
+			verdict: "READY",
+			coverageScore: readinessResult.coverageScore,
+			findingCount: readinessResult.findings.length,
+			blockerCount: 0
+		});
 		const totalStories = storyResult.epics.reduce((sum, epic) => sum + epic.stories.length, 0);
 		return {
 			result: "success",
@@ -13664,6 +14780,222 @@ async function runSolutioningPhase(deps, params) {
 	}
 }
 
+//#endregion
+//#region src/modules/phase-orchestrator/phases/ux-design.ts
+/**
+* Build step definitions for 3-step UX design decomposition.
+*
+* Step 1: Discovery + Core Experience
+*   - Injects product brief and requirements context
+*   - Produces: target_personas, core_experience, emotional_goals, inspiration_references
+*
+* Step 2: Design System + Visual Foundation
+*   - Injects product brief, requirements, and Step 1 discoveries
+*   - Produces: design_system, visual_foundation, design_principles, color_and_typography
+*
+* Step 3: User Journeys + Components + Accessibility
+*   - Injects product brief, requirements, Step 1 discoveries, Step 2 design system
+*   - Produces: user_journeys, component_strategy, ux_patterns, accessibility_guidelines
+*   - Registers 'ux-design' artifact
+*/
+function buildUxDesignSteps() {
+	return [
+		{
+			name: "ux-step-1-discovery",
+			taskType: "ux-discovery",
+			outputSchema: UxDiscoveryOutputSchema,
+			context: [{
+				placeholder: "product_brief",
+				source: "decision:analysis.product-brief"
+			}, {
+				placeholder: "requirements",
+				source: "decision:planning.functional-requirements"
+			}],
+			persist: [
+				{
+					field: "target_personas",
+					category: "ux-design",
+					key: "target_personas"
+				},
+				{
+					field: "core_experience",
+					category: "ux-design",
+					key: "core_experience"
+				},
+				{
+					field: "emotional_goals",
+					category: "ux-design",
+					key: "emotional_goals"
+				},
+				{
+					field: "inspiration_references",
+					category: "ux-design",
+					key: "inspiration_references"
+				}
+			],
+			elicitate: true,
+			elicitationMethods: ["User Persona Focus Group", "SCAMPER"]
+		},
+		{
+			name: "ux-step-2-design-system",
+			taskType: "ux-design-system",
+			outputSchema: UxDesignSystemOutputSchema,
+			context: [
+				{
+					placeholder: "product_brief",
+					source: "decision:analysis.product-brief"
+				},
+				{
+					placeholder: "requirements",
+					source: "decision:planning.functional-requirements"
+				},
+				{
+					placeholder: "ux_discovery",
+					source: "step:ux-step-1-discovery"
+				}
+			],
+			persist: [
+				{
+					field: "design_system",
+					category: "ux-design",
+					key: "design_system"
+				},
+				{
+					field: "visual_foundation",
+					category: "ux-design",
+					key: "visual_foundation"
+				},
+				{
+					field: "design_principles",
+					category: "ux-design",
+					key: "design_principles"
+				},
+				{
+					field: "color_and_typography",
+					category: "ux-design",
+					key: "color_and_typography"
+				}
+			],
+			elicitate: true,
+			elicitationMethods: ["SCAMPER", "Design Thinking"]
+		},
+		{
+			name: "ux-step-3-journeys",
+			taskType: "ux-journeys",
+			outputSchema: UxJourneysOutputSchema,
+			context: [
+				{
+					placeholder: "product_brief",
+					source: "decision:analysis.product-brief"
+				},
+				{
+					placeholder: "requirements",
+					source: "decision:planning.functional-requirements"
+				},
+				{
+					placeholder: "ux_discovery",
+					source: "step:ux-step-1-discovery"
+				},
+				{
+					placeholder: "design_system",
+					source: "step:ux-step-2-design-system"
+				}
+			],
+			persist: [
+				{
+					field: "user_journeys",
+					category: "ux-design",
+					key: "user_journeys"
+				},
+				{
+					field: "component_strategy",
+					category: "ux-design",
+					key: "component_strategy"
+				},
+				{
+					field: "ux_patterns",
+					category: "ux-design",
+					key: "ux_patterns"
+				},
+				{
+					field: "accessibility_guidelines",
+					category: "ux-design",
+					key: "accessibility_guidelines"
+				}
+			],
+			registerArtifact: {
+				type: "ux-design",
+				path: "decision-store://ux-design/ux-design",
+				summarize: (parsed) => {
+					const journeys = Array.isArray(parsed.user_journeys) ? parsed.user_journeys : void 0;
+					const patterns = Array.isArray(parsed.ux_patterns) ? parsed.ux_patterns : void 0;
+					const count = (journeys?.length ?? 0) + (patterns?.length ?? 0);
+					return count > 0 ? `${count} UX decisions captured (journeys + patterns)` : "UX design complete";
+				}
+			},
+			critique: true
+		}
+	];
+}
+/**
+* Execute the UX design phase of the BMAD pipeline.
+*
+* Runs 3 sequential steps covering discovery, design system, and user journeys.
+* Each step builds on prior step decisions via the decision store.
+*
+* On success, a 'ux-design' artifact is registered and UX decisions are
+* available to the architecture phase via `decision:ux-design.*`.
+*
+* @param deps - Shared phase dependencies (db, pack, contextCompiler, dispatcher)
+* @param params - Phase parameters (runId)
+* @returns UxDesignResult with success/failure status and token usage
+*/
+async function runUxDesignPhase(deps, params) {
+	const { runId } = params;
+	const zeroTokenUsage = {
+		input: 0,
+		output: 0
+	};
+	try {
+		const steps = buildUxDesignSteps();
+		const result = await runSteps(steps, deps, runId, "ux-design", {});
+		if (!result.success) return {
+			result: "failed",
+			error: result.error ?? "ux_design_multi_step_failed",
+			details: result.error ?? "UX design multi-step execution failed",
+			tokenUsage: result.tokenUsage
+		};
+		const lastStep = result.steps[result.steps.length - 1];
+		const artifactId = lastStep?.artifactId;
+		if (!artifactId) {
+			const artifact = registerArtifact(deps.db, {
+				pipeline_run_id: runId,
+				phase: "ux-design",
+				type: "ux-design",
+				path: "decision-store://ux-design/ux-design",
+				summary: "UX design phase completed"
+			});
+			return {
+				result: "success",
+				artifact_id: artifact.id,
+				tokenUsage: result.tokenUsage
+			};
+		}
+		return {
+			result: "success",
+			artifact_id: artifactId,
+			tokenUsage: result.tokenUsage
+		};
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		return {
+			result: "failed",
+			error: message,
+			tokenUsage: zeroTokenUsage
+		};
+	}
+}
+
 //#endregion
 //#region src/modules/stop-after/types.ts
 /**
@@ -14659,7 +15991,7 @@ function mapInternalPhaseToEventPhase(internalPhase) {
 	}
 }
 async function runAutoRun(options) {
-	const { pack: packName, from: startPhase, stopAfter, concept: conceptArg, conceptFile, stories: storiesArg, concurrency, outputFormat, projectRoot, events: eventsFlag, verbose: verboseFlag, tui: tuiFlag } = options;
+	const { pack: packName, from: startPhase, stopAfter, concept: conceptArg, conceptFile, stories: storiesArg, concurrency, outputFormat, projectRoot, events: eventsFlag, verbose: verboseFlag, tui: tuiFlag, skipUx } = options;
 	if (startPhase !== void 0 && !VALID_PHASES.includes(startPhase)) {
 		const errorMsg = `Invalid phase '${startPhase}'. Valid phases: ${VALID_PHASES.join(", ")}`;
 		if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, errorMsg) + "\n");
@@ -14713,7 +16045,9 @@ async function runAutoRun(options) {
 		concept,
 		concurrency,
 		outputFormat,
-		projectRoot
+		projectRoot,
+		...eventsFlag === true ? { events: true } : {},
+		...skipUx === true ? { skipUx: true } : {}
 	});
 	let storyKeys = [];
 	if (storiesArg !== void 0 && storiesArg !== "") {
@@ -15071,6 +16405,29 @@ async function runAutoRun(options) {
 		else if (s.phase === "ESCALATED") if (s.error !== void 0) failedKeys.push(key);
 		else escalatedKeys.push(key);
 		else failedKeys.push(key);
+		try {
+			const runEndMs = Date.now();
+			const runStartMs = new Date(pipelineRun.created_at).getTime();
+			const tokenAgg = aggregateTokenUsageForRun(db, pipelineRun.id);
+			writeRunMetrics(db, {
+				run_id: pipelineRun.id,
+				methodology: pack.manifest.name,
+				status: failedKeys.length > 0 ? "failed" : "completed",
+				started_at: pipelineRun.created_at,
+				completed_at: new Date().toISOString(),
+				wall_clock_seconds: Math.round((runEndMs - runStartMs) / 1e3),
+				total_input_tokens: tokenAgg.input,
+				total_output_tokens: tokenAgg.output,
+				total_cost_usd: tokenAgg.cost,
+				stories_attempted: storyKeys.length,
+				stories_succeeded: succeededKeys.length,
+				stories_failed: failedKeys.length,
+				stories_escalated: escalatedKeys.length,
+				concurrency_setting: concurrency
+			});
+		} catch (metricsErr) {
+			logger$3.warn({ err: metricsErr }, "Failed to write run metrics (best-effort)");
+		}
 		if (progressRenderer !== void 0) progressRenderer.render({
 			type: "pipeline:complete",
 			ts: new Date().toISOString(),
@@ -15123,7 +16480,7 @@ async function runAutoRun(options) {
 	}
 }
 async function runFullPipeline(options) {
-	const { packName, packPath, dbDir, dbPath, startPhase, stopAfter, concept, concurrency, outputFormat, projectRoot } = options;
+	const { packName, packPath, dbDir, dbPath, startPhase, stopAfter, concept, concurrency, outputFormat, projectRoot, events: eventsFlag, skipUx } = options;
 	if (!existsSync(dbDir)) mkdirSync(dbDir, { recursive: true });
 	const dbWrapper = new DatabaseWrapper(dbPath);
 	try {
@@ -15163,9 +16520,16 @@ async function runFullPipeline(options) {
 			contextCompiler,
 			dispatcher
 		};
+		const packForOrchestrator = skipUx === true && pack.manifest.uxDesign === true ? {
+			...pack,
+			manifest: {
+				...pack.manifest,
+				uxDesign: false
+			}
+		} : pack;
 		const phaseOrchestrator = createPhaseOrchestrator({
 			db,
-			pack
+			pack: packForOrchestrator
 		});
 		const startedAt = Date.now();
 		const runId = await phaseOrchestrator.startRun(concept ?? "", startPhase);
@@ -15173,7 +16537,14 @@ async function runFullPipeline(options) {
 			process.stdout.write(`Starting full pipeline from phase: ${startPhase}\n`);
 			process.stdout.write(`Pipeline run ID: ${runId}\n`);
 		}
-		const phaseOrder = [
+		const uxEnabled = packForOrchestrator.manifest.uxDesign === true;
+		const phaseOrder = uxEnabled ? [
+			"analysis",
+			"planning",
+			"ux-design",
+			"solutioning",
+			"implementation"
+		] : [
 			"analysis",
 			"planning",
 			"solutioning",
@@ -15232,6 +16603,29 @@ async function runFullPipeline(options) {
 					process.stdout.write(`[PLANNING] Complete — ${result.requirements_count ?? 0} requirements, ${result.user_stories_count ?? 0} user stories\n`);
 					process.stdout.write(`  Tokens: ${result.tokenUsage.input.toLocaleString()} input / ${result.tokenUsage.output.toLocaleString()} output\n`);
 				}
+			} else if (currentPhase === "ux-design") {
+				const result = await runUxDesignPhase(phaseDeps, { runId });
+				if (result.tokenUsage.input > 0 || result.tokenUsage.output > 0) {
+					const costUsd = (result.tokenUsage.input * 3 + result.tokenUsage.output * 15) / 1e6;
+					addTokenUsage(db, runId, {
+						phase: "ux-design",
+						agent: "claude-code",
+						input_tokens: result.tokenUsage.input,
+						output_tokens: result.tokenUsage.output,
+						cost_usd: costUsd
+					});
+				}
+				if (result.result === "failed") {
+					updatePipelineRun(db, runId, { status: "failed" });
+					const errorMsg = `UX design phase failed: ${result.error ?? "unknown error"}${result.details ? ` — ${result.details}` : ""}`;
+					if (outputFormat === "human") process.stderr.write(`Error: ${errorMsg}\n`);
+					else process.stdout.write(formatOutput(null, "json", false, errorMsg) + "\n");
+					return 1;
+				}
+				if (outputFormat === "human") {
+					process.stdout.write(`[UX-DESIGN] Complete — UX design artifact registered (artifact: ${result.artifact_id ?? "n/a"})\n`);
+					process.stdout.write(`  Tokens: ${result.tokenUsage.input.toLocaleString()} input / ${result.tokenUsage.output.toLocaleString()} output\n`);
+				}
 			} else if (currentPhase === "solutioning") {
 				const result = await runSolutioningPhase(phaseDeps, { runId });
 				if (result.tokenUsage.input > 0 || result.tokenUsage.output > 0) {
@@ -15245,8 +16639,17 @@ async function runFullPipeline(options) {
 					});
 				}
 				if (result.result === "failed") {
-					updatePipelineRun(db, runId, { status: "failed" });
 					const errorMsg = `Solutioning phase failed: ${result.error ?? "unknown error"}${result.details ? ` — ${result.details}` : ""}`;
+					phaseOrchestrator.markPhaseFailed(runId, "solutioning", errorMsg);
+					if (eventsFlag === true) {
+						const ndjsonEmitter = createEventEmitter(process.stdout);
+						ndjsonEmitter.emit({
+							type: "story:warn",
+							ts: new Date().toISOString(),
+							key: "solutioning",
+							msg: errorMsg
+						});
+					}
 					if (outputFormat === "human") process.stderr.write(`Error: ${errorMsg}\n`);
 					else process.stdout.write(formatOutput(null, "json", false, errorMsg) + "\n");
 					return 1;
@@ -16430,6 +17833,90 @@ async function runAmendCommand(options) {
 		} catch {}
 	}
 }
+async function runAutoMetrics(options) {
+	const { outputFormat, projectRoot, limit = 10, compare, tagBaseline } = options;
+	const dbRoot = await resolveMainRepoRoot(projectRoot);
+	const dbPath = join(dbRoot, ".substrate", "substrate.db");
+	if (!existsSync(dbPath)) {
+		if (outputFormat === "json") process.stdout.write(formatOutput({
+			runs: [],
+			message: "No metrics yet — no pipeline database found."
+		}, "json", true) + "\n");
+		else process.stdout.write("No metrics yet — no pipeline database found.\n");
+		return 0;
+	}
+	const dbWrapper = new DatabaseWrapper(dbPath);
+	try {
+		dbWrapper.open();
+		runMigrations(dbWrapper.db);
+		const db = dbWrapper.db;
+		if (tagBaseline !== void 0) {
+			const row = getRunMetrics(db, tagBaseline);
+			if (!row) {
+				const msg = `Run '${tagBaseline}' not found in run_metrics.`;
+				if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, msg) + "\n");
+				else process.stderr.write(`Error: ${msg}\n`);
+				return 1;
+			}
+			tagRunAsBaseline(db, tagBaseline);
+			if (outputFormat === "json") process.stdout.write(formatOutput({ tagged_baseline: tagBaseline }, "json", true) + "\n");
+			else process.stdout.write(`Baseline tagged: ${tagBaseline}\n`);
+			return 0;
+		}
+		if (compare !== void 0) {
+			const [idA, idB] = compare;
+			const delta = compareRunMetrics(db, idA, idB);
+			if (delta === null) {
+				const msg = `One or both run IDs not found in metrics: ${idA}, ${idB}`;
+				if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, msg) + "\n");
+				else process.stderr.write(`Error: ${msg}\n`);
+				return 1;
+			}
+			if (outputFormat === "json") process.stdout.write(formatOutput(delta, "json", true) + "\n");
+			else {
+				const sign = (n) => n > 0 ? "+" : "";
+				process.stdout.write(`\nMetrics Comparison: ${idA.slice(0, 8)} vs ${idB.slice(0, 8)}\n`);
+				process.stdout.write(`  Input tokens:   ${sign(delta.token_input_delta)}${delta.token_input_delta.toLocaleString()} (${sign(delta.token_input_pct)}${delta.token_input_pct}%)\n`);
+				process.stdout.write(`  Output tokens:  ${sign(delta.token_output_delta)}${delta.token_output_delta.toLocaleString()} (${sign(delta.token_output_pct)}${delta.token_output_pct}%)\n`);
+				process.stdout.write(`  Wall clock:     ${sign(delta.wall_clock_delta_seconds)}${delta.wall_clock_delta_seconds}s (${sign(delta.wall_clock_pct)}${delta.wall_clock_pct}%)\n`);
+				process.stdout.write(`  Review cycles:  ${sign(delta.review_cycles_delta)}${delta.review_cycles_delta} (${sign(delta.review_cycles_pct)}${delta.review_cycles_pct}%)\n`);
+				process.stdout.write(`  Cost USD:       ${sign(delta.cost_delta)}$${Math.abs(delta.cost_delta).toFixed(4)} (${sign(delta.cost_pct)}${delta.cost_pct}%)\n`);
+			}
+			return 0;
+		}
+		const runs = listRunMetrics(db, limit);
+		if (outputFormat === "json") process.stdout.write(formatOutput({ runs }, "json", true) + "\n");
+		else {
+			if (runs.length === 0) {
+				process.stdout.write("No run metrics recorded yet. Run `substrate auto run` to generate metrics.\n");
+				return 0;
+			}
+			process.stdout.write(`\nPipeline Run Metrics (last ${runs.length} runs)\n`);
+			process.stdout.write("─".repeat(80) + "\n");
+			for (const run of runs) {
+				const isBaseline = run.is_baseline ? " [BASELINE]" : "";
+				process.stdout.write(`\nRun: ${run.run_id}${isBaseline}\n`);
+				process.stdout.write(`  Status:    ${run.status}  |  Methodology: ${run.methodology}\n`);
+				process.stdout.write(`  Started:   ${run.started_at}\n`);
+				if (run.completed_at) process.stdout.write(`  Completed: ${run.completed_at}  (${run.wall_clock_seconds}s)\n`);
+				process.stdout.write(`  Stories:   attempted=${run.stories_attempted} succeeded=${run.stories_succeeded} failed=${run.stories_failed} escalated=${run.stories_escalated}\n`);
+				process.stdout.write(`  Tokens:    ${(run.total_input_tokens ?? 0).toLocaleString()} in / ${(run.total_output_tokens ?? 0).toLocaleString()} out  $${(run.total_cost_usd ?? 0).toFixed(4)}\n`);
+				process.stdout.write(`  Cycles:    ${run.total_review_cycles}  |  Dispatches: ${run.total_dispatches}  |  Concurrency: ${run.concurrency_setting}\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 metrics failed");
+		return 1;
+	} finally {
+		try {
+			dbWrapper.close();
+		} catch {}
+	}
+}
 /**
 * Register the `substrate auto` command group with the CLI program.
 *
@@ -16451,7 +17938,7 @@ function registerAutoCommand(program, _version = "0.0.0", projectRoot = process.
 		});
 		process.exitCode = exitCode;
 	});
-	auto.command("run").description("Run the autonomous pipeline (use --from to start from a specific phase)").option("--pack <name>", "Methodology pack name", "bmad").option("--from <phase>", "Start from this phase: analysis, planning, solutioning, implementation").option("--stop-after <phase>", "Stop pipeline after this phase completes").option("--concept <text>", "Inline concept text (required when --from analysis)").option("--concept-file <path>", "Path to a file containing the concept text").option("--stories <keys>", "Comma-separated story keys (e.g., 10-1,10-2)").option("--concurrency <n>", "Maximum parallel conflict groups", (v) => parseInt(v, 10), 3).option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").option("--events", "Emit structured NDJSON events on stdout for programmatic consumption").option("--verbose", "Show detailed pino log output").option("--help-agent", "Print a machine-optimized prompt fragment for AI agents and exit").option("--tui", "Show TUI dashboard").action(async (opts) => {
+	auto.command("run").description("Run the autonomous pipeline (use --from to start from a specific phase)").option("--pack <name>", "Methodology pack name", "bmad").option("--from <phase>", "Start from this phase: analysis, planning, solutioning, implementation").option("--stop-after <phase>", "Stop pipeline after this phase completes").option("--concept <text>", "Inline concept text (required when --from analysis)").option("--concept-file <path>", "Path to a file containing the concept text").option("--stories <keys>", "Comma-separated story keys (e.g., 10-1,10-2)").option("--concurrency <n>", "Maximum parallel conflict groups", (v) => parseInt(v, 10), 3).option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").option("--events", "Emit structured NDJSON events on stdout for programmatic consumption").option("--verbose", "Show detailed pino log output").option("--help-agent", "Print a machine-optimized prompt fragment for AI agents and exit").option("--tui", "Show TUI dashboard").option("--skip-ux", "Skip the UX design phase even if enabled in the pack manifest").action(async (opts) => {
 		if (opts.helpAgent) {
 			process.exitCode = await runHelpAgent();
 			return;
@@ -16480,7 +17967,8 @@ function registerAutoCommand(program, _version = "0.0.0", projectRoot = process.
 			projectRoot: opts.projectRoot,
 			events: opts.events,
 			verbose: opts.verbose,
-			tui: opts.tui
+			tui: opts.tui,
+			skipUx: opts.skipUx
 		});
 		process.exitCode = exitCode;
 	});
@@ -16539,6 +18027,22 @@ function registerAutoCommand(program, _version = "0.0.0", projectRoot = process.
 		});
 		process.exitCode = exitCode;
 	});
+	auto.command("metrics").description("Show historical pipeline run metrics and cross-run comparison").option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").option("--limit <n>", "Number of runs to show (default: 10)", (v) => parseInt(v, 10), 10).option("--compare <run-id-a,run-id-b>", "Compare two runs side-by-side (comma-separated IDs, e.g. abc123,def456)").option("--tag-baseline <run-id>", "Mark a run as the performance baseline").action(async (opts) => {
+		const outputFormat = opts.outputFormat === "json" ? "json" : "human";
+		let compareIds;
+		if (opts.compare !== void 0) {
+			const parts = opts.compare.split(",").map((s) => s.trim());
+			if (parts.length === 2 && parts[0] && parts[1]) compareIds = [parts[0], parts[1]];
+		}
+		const exitCode = await runAutoMetrics({
+			outputFormat,
+			projectRoot: opts.projectRoot,
+			limit: opts.limit,
+			compare: compareIds,
+			tagBaseline: opts.tagBaseline
+		});
+		process.exitCode = exitCode;
+	});
 }
 
 //#endregion