substrate-ai 0.2.39 → 0.3.0

package/dist/{run-RJ0EHbfM.js → run-DO9n3cwy.js}

@@ -10,15 +10,15 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "
 import yaml from "js-yaml";
 import { createRequire as createRequire$1 } from "node:module";
 import { z } from "zod";
-import { execSync, spawn } from "node:child_process";
+import { execFile, execSync, spawn, spawnSync } from "node:child_process";
 import { dirname as dirname$1, join as join$1, resolve as resolve$1 } from "node:path";
-import BetterSqlite3 from "better-sqlite3";
+import Database from "better-sqlite3";
+import { access as access$1, mkdir as mkdir$1, readFile as readFile$1, stat as stat$1, writeFile as writeFile$1 } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "node:fs";
 import { homedir } from "os";
 import { freemem, platform } from "node:os";
 import { createHash, randomUUID } from "node:crypto";
-import { readFile as readFile$1, stat as stat$1 } from "node:fs/promises";
 
 //#region rolldown:runtime
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -605,7 +605,7 @@ const migration010RunMetrics = {
 
 //#endregion
 //#region src/persistence/migrations/index.ts
-const logger$22 = createLogger("persistence:migrations");
+const logger$23 = createLogger("persistence:migrations");
 const MIGRATIONS = [
 	initialSchemaMigration,
 	costTrackerSchemaMigration,
@@ -623,7 +623,7 @@ const MIGRATIONS = [
 * Safe to call multiple times — already-applied migrations are skipped.
 */
 function runMigrations(db) {
-	logger$22.info("Starting migration runner");
+	logger$23.info("Starting migration runner");
 	db.exec(`
     CREATE TABLE IF NOT EXISTS schema_migrations (
       version   INTEGER PRIMARY KEY,
@@ -634,12 +634,12 @@ function runMigrations(db) {
 	const appliedVersions = new Set(db.prepare("SELECT version FROM schema_migrations").all().map((row) => row.version));
 	const pending = MIGRATIONS.filter((m) => !appliedVersions.has(m.version)).sort((a, b) => a.version - b.version);
 	if (pending.length === 0) {
-		logger$22.info("No pending migrations");
+		logger$23.info("No pending migrations");
 		return;
 	}
 	const insertMigration = db.prepare("INSERT INTO schema_migrations (version, name) VALUES (?, ?)");
 	for (const migration of pending) {
-		logger$22.info({
+		logger$23.info({
 			version: migration.version,
 			name: migration.name
 		}, "Applying migration");
@@ -653,14 +653,14 @@ function runMigrations(db) {
 			});
 			applyMigration();
 		}
-		logger$22.info({ version: migration.version }, "Migration applied successfully");
+		logger$23.info({ version: migration.version }, "Migration applied successfully");
 	}
-	logger$22.info({ count: pending.length }, "All pending migrations applied");
+	logger$23.info({ count: pending.length }, "All pending migrations applied");
 }
 
 //#endregion
 //#region src/persistence/database.ts
-const logger$21 = createLogger("persistence:database");
+const logger$22 = createLogger("persistence:database");
 /**
 * Thin wrapper that opens a SQLite database, applies required PRAGMAs,
 * and exposes the raw BetterSqlite3 instance.
@@ -677,14 +677,14 @@ var DatabaseWrapper = class {
 	*/
 	open() {
 		if (this._db !== null) return;
-		logger$21.info({ path: this._path }, "Opening SQLite database");
-		this._db = new BetterSqlite3(this._path);
+		logger$22.info({ path: this._path }, "Opening SQLite database");
+		this._db = new Database(this._path);
 		const walResult = this._db.pragma("journal_mode = WAL");
-		if (walResult?.[0]?.journal_mode !== "wal") logger$21.warn({ result: walResult?.[0]?.journal_mode }, "WAL pragma did not return expected \"wal\" — journal_mode may be \"memory\" or unsupported");
+		if (walResult?.[0]?.journal_mode !== "wal") logger$22.warn({ result: walResult?.[0]?.journal_mode }, "WAL pragma did not return expected \"wal\" — journal_mode may be \"memory\" or unsupported");
 		this._db.pragma("busy_timeout = 5000");
 		this._db.pragma("synchronous = NORMAL");
 		this._db.pragma("foreign_keys = ON");
-		logger$21.info({ path: this._path }, "SQLite database opened with WAL mode");
+		logger$22.info({ path: this._path }, "SQLite database opened with WAL mode");
 	}
 	/**
 	* Close the database. Idempotent — calling close() when already closed is a no-op.
@@ -693,7 +693,7 @@ var DatabaseWrapper = class {
 		if (this._db === null) return;
 		this._db.close();
 		this._db = null;
-		logger$21.info({ path: this._path }, "SQLite database closed");
+		logger$22.info({ path: this._path }, "SQLite database closed");
 	}
 	/**
 	* Return the raw BetterSqlite3 instance.
@@ -938,6 +938,161 @@ function createPackLoader() {
 	return new PackLoaderImpl();
 }
 
+//#endregion
+//#region src/modules/state/dolt-init.ts
+/**
+* Thrown when the `dolt` binary cannot be found in PATH.
+*/
+var DoltNotInstalled = class extends Error {
+	constructor() {
+		super("Dolt CLI not found in PATH. Install Dolt from https://docs.dolthub.com/introduction/installation");
+		this.name = "DoltNotInstalled";
+	}
+};
+/**
+* Thrown when a Dolt CLI command exits with a non-zero status code.
+*/
+var DoltInitError = class extends Error {
+	constructor(args, exitCode, stderr) {
+		super(`Dolt command "dolt ${args.join(" ")}" failed with exit code ${exitCode}${stderr ? `: ${stderr}` : ""}`);
+		this.name = "DoltInitError";
+	}
+};
+/**
+* Verify that the `dolt` binary is installed and accessible.
+*
+* @throws {DoltNotInstalled} If the binary is not found in PATH.
+*/
+async function checkDoltInstalled() {
+	return new Promise((resolve$2, reject) => {
+		let child;
+		try {
+			child = spawn("dolt", ["version"], { stdio: "ignore" });
+		} catch (err) {
+			const nodeErr = err;
+			if (nodeErr.code === "ENOENT") reject(new DoltNotInstalled());
+			else reject(err);
+			return;
+		}
+		child.on("error", (err) => {
+			if (err.code === "ENOENT") reject(new DoltNotInstalled());
+			else reject(err);
+		});
+		child.on("close", (code) => {
+			if (code === 0) resolve$2();
+			else resolve$2();
+		});
+	});
+}
+/**
+* Run a Dolt CLI command in the given working directory.
+*
+* @param args - Arguments to pass to `dolt` (e.g. `['init']`).
+* @param cwd  - Working directory for the command.
+* @throws {DoltInitError} If the command exits with a non-zero code.
+*/
+async function runDoltCommand(args, cwd) {
+	return new Promise((resolve$2, reject) => {
+		const stderrChunks = [];
+		const child = spawn("dolt", args, {
+			cwd,
+			stdio: [
+				"ignore",
+				"ignore",
+				"pipe"
+			]
+		});
+		child.stderr?.on("data", (chunk) => {
+			stderrChunks.push(chunk);
+		});
+		child.on("error", (err) => {
+			reject(err);
+		});
+		child.on("close", (code) => {
+			if (code === 0) resolve$2();
+			else {
+				const stderr = Buffer.concat(stderrChunks).toString("utf8").trim();
+				reject(new DoltInitError(args, code ?? -1, stderr));
+			}
+		});
+	});
+}
+/**
+* Initialize a Dolt repository for Substrate state storage.
+*
+* This function is idempotent: running it a second time on an already-
+* initialized repository is safe — `dolt init` is skipped, existing tables
+* are not re-created (IF NOT EXISTS guards), and the schema version row is
+* not duplicated (INSERT IGNORE).
+*
+* @param config - Initialization configuration.
+* @throws {DoltNotInstalled} If the `dolt` binary is not in PATH.
+* @throws {DoltInitError} If any Dolt CLI command fails.
+*/
+async function initializeDolt(config) {
+	const statePath = config.statePath ?? join$1(config.projectRoot, ".substrate", "state");
+	const schemaPath = config.schemaPath ?? fileURLToPath(new URL("./schema.sql", import.meta.url));
+	await checkDoltInstalled();
+	await mkdir$1(statePath, { recursive: true });
+	const doltDir = join$1(statePath, ".dolt");
+	let doltDirExists = false;
+	try {
+		await access$1(doltDir);
+		doltDirExists = true;
+	} catch {
+		doltDirExists = false;
+	}
+	if (!doltDirExists) await runDoltCommand(["init"], statePath);
+	await runDoltCommand([
+		"sql",
+		"-f",
+		schemaPath
+	], statePath);
+	let hasCommits = false;
+	try {
+		await runDoltCommand(["log", "--oneline"], statePath);
+		hasCommits = await doltLogHasCommits(statePath);
+	} catch {
+		hasCommits = false;
+	}
+	if (!hasCommits) {
+		await runDoltCommand(["add", "-A"], statePath);
+		await runDoltCommand([
+			"commit",
+			"-m",
+			"Initialize substrate state schema v1"
+		], statePath);
+	}
+}
+/**
+* Returns `true` if there is at least one commit in the Dolt repo.
+*/
+async function doltLogHasCommits(cwd) {
+	return new Promise((resolve$2) => {
+		const stdoutChunks = [];
+		const child = spawn("dolt", ["log", "--oneline"], {
+			cwd,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		});
+		child.stdout?.on("data", (chunk) => {
+			stdoutChunks.push(chunk);
+		});
+		child.on("error", () => resolve$2(false));
+		child.on("close", (code) => {
+			if (code !== 0) {
+				resolve$2(false);
+				return;
+			}
+			const output = Buffer.concat(stdoutChunks).toString("utf8").trim();
+			resolve$2(output.length > 0);
+		});
+	});
+}
+
 //#endregion
 //#region src/modules/stop-after/types.ts
 /**
@@ -1165,7 +1320,7 @@ const BMAD_BASELINE_TOKENS_FULL = 56800;
 /** BMAD baseline token total for create+dev+review comparison */
 const BMAD_BASELINE_TOKENS = 23800;
 /** Story key pattern: <epic>-<story> e.g. "10-1" */
-const STORY_KEY_PATTERN = /^\d+-\d+$/;
+const STORY_KEY_PATTERN$1 = /^\d+-\d+$/;
 /**
 * Top-level keys in .claude/settings.json that substrate owns.
 * On init, these are set/updated unconditionally.
@@ -1225,7 +1380,7 @@ function formatTokenTelemetry(summary, baselineTokens = BMAD_BASELINE_TOKENS) {
 * Validate a story key has the expected format: <epic>-<story> (e.g., "10-1").
 */
 function validateStoryKey(key) {
-	return STORY_KEY_PATTERN.test(key);
+	return STORY_KEY_PATTERN$1.test(key);
 }
 /**
 * Build the AC5 JSON status schema for a pipeline run.
@@ -1455,7 +1610,7 @@ function formatUnsupportedVersionError(formatType, version, supported) {
 
 //#endregion
 //#region src/modules/config/config-system-impl.ts
-const logger$20 = createLogger("config");
+const logger$21 = 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);
@@ -1500,7 +1655,7 @@ function readEnvOverrides() {
 	}
 	const parsed = PartialSubstrateConfigSchema.safeParse(overrides);
 	if (!parsed.success) {
-		logger$20.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
+		logger$21.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
 		return {};
 	}
 	return parsed.data;
@@ -1564,7 +1719,7 @@ var ConfigSystemImpl = class {
 			throw new ConfigError(`Configuration validation failed:\n${issues}`, { issues: result.error.issues });
 		}
 		this._config = result.data;
-		logger$20.debug("Configuration loaded successfully");
+		logger$21.debug("Configuration loaded successfully");
 	}
 	getConfig() {
 		if (this._config === null) throw new ConfigError("Configuration has not been loaded. Call load() before getConfig().", {});
@@ -1627,7 +1782,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$20.info({
+						logger$21.info({
 							from: version,
 							to: CURRENT_CONFIG_FORMAT_VERSION,
 							backup: migrationOutput.result.backupPath
@@ -3036,7 +3191,7 @@ function truncateToTokens(text, maxTokens) {
 
 //#endregion
 //#region src/modules/context-compiler/context-compiler-impl.ts
-const logger$19 = createLogger("context-compiler");
+const logger$20 = createLogger("context-compiler");
 /**
 * Fraction of the original token budget that must remain (after required +
 * important sections) before an optional section is included.
@@ -3128,7 +3283,7 @@ var ContextCompilerImpl = class {
 				includedParts.push(truncated);
 				remainingBudget -= truncatedTokens;
 				anyTruncated = true;
-				logger$19.warn({
+				logger$20.warn({
 					section: section.name,
 					originalTokens: tokens,
 					budgetTokens: truncatedTokens
@@ -3142,7 +3297,7 @@ var ContextCompilerImpl = class {
 				});
 			} else {
 				anyTruncated = true;
-				logger$19.warn({
+				logger$20.warn({
 					section: section.name,
 					tokens
 				}, "Context compiler: omitted \"important\" section — no budget remaining");
@@ -3169,7 +3324,7 @@ var ContextCompilerImpl = class {
 				} else {
 					if (tokens > 0) {
 						anyTruncated = true;
-						logger$19.warn({
+						logger$20.warn({
 							section: section.name,
 							tokens,
 							budgetFractionRemaining: budgetFractionRemaining.toFixed(2)
@@ -3454,7 +3609,7 @@ function parseYamlResult(yamlText, schema) {
 
 //#endregion
 //#region src/modules/agent-dispatch/dispatcher-impl.ts
-const logger$18 = createLogger("agent-dispatch");
+const logger$19 = createLogger("agent-dispatch");
 const SHUTDOWN_GRACE_MS = 1e4;
 const SHUTDOWN_MAX_WAIT_MS = 3e4;
 const CHARS_PER_TOKEN = 4;
@@ -3499,7 +3654,7 @@ function getAvailableMemory() {
 			}).trim(), 10);
 			_lastKnownPressureLevel = pressureLevel;
 			if (pressureLevel >= 4) {
-				logger$18.warn({ pressureLevel }, "macOS kernel reports critical memory pressure");
+				logger$19.warn({ pressureLevel }, "macOS kernel reports critical memory pressure");
 				return 0;
 			}
 		} catch {}
@@ -3514,7 +3669,7 @@ function getAvailableMemory() {
 			const speculative = parseInt(vmstat.match(/Pages speculative:\s+(\d+)/)?.[1] ?? "0", 10);
 			const available = (free + purgeable + speculative) * pageSize;
 			if (pressureLevel >= 2) {
-				logger$18.warn({
+				logger$19.warn({
 					pressureLevel,
 					availableBeforeDiscount: available
 				}, "macOS kernel reports memory pressure — discounting estimate");
@@ -3594,7 +3749,7 @@ var DispatcherImpl = class {
 					resolve: typedResolve,
 					reject
 				});
-				logger$18.debug({
+				logger$19.debug({
 					id,
 					queueLength: this._queue.length
 				}, "Dispatch queued");
@@ -3625,7 +3780,7 @@ var DispatcherImpl = class {
 	async shutdown() {
 		this._shuttingDown = true;
 		this._stopMemoryPressureTimer();
-		logger$18.info({
+		logger$19.info({
 			running: this._running.size,
 			queued: this._queue.length
 		}, "Dispatcher shutting down");
@@ -3658,13 +3813,13 @@ var DispatcherImpl = class {
 				}
 			}, 50);
 		});
-		logger$18.info("Dispatcher shutdown complete");
+		logger$19.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$18.warn({
+			logger$19.warn({
 				id,
 				agent
 			}, "No adapter found for agent");
@@ -3710,7 +3865,7 @@ var DispatcherImpl = class {
 		});
 		const startedAt = Date.now();
 		proc.on("error", (err) => {
-			logger$18.error({
+			logger$19.error({
 				id,
 				binary: cmd.binary,
 				error: err.message
@@ -3718,7 +3873,7 @@ var DispatcherImpl = class {
 		});
 		if (proc.stdin !== null) {
 			proc.stdin.on("error", (err) => {
-				if (err.code !== "EPIPE") logger$18.warn({
+				if (err.code !== "EPIPE") logger$19.warn({
 					id,
 					error: err.message
 				}, "stdin write error");
@@ -3760,7 +3915,7 @@ var DispatcherImpl = class {
 			agent,
 			taskType
 		});
-		logger$18.debug({
+		logger$19.debug({
 			id,
 			agent,
 			taskType,
@@ -3777,7 +3932,7 @@ var DispatcherImpl = class {
 				dispatchId: id,
 				timeoutMs
 			});
-			logger$18.warn({
+			logger$19.warn({
 				id,
 				agent,
 				taskType,
@@ -3831,7 +3986,7 @@ var DispatcherImpl = class {
 					exitCode: code,
 					output: stdout
 				});
-				logger$18.debug({
+				logger$19.debug({
 					id,
 					agent,
 					taskType,
@@ -3857,7 +4012,7 @@ var DispatcherImpl = class {
 					error: stderr || `Process exited with code ${String(code)}`,
 					exitCode: code
 				});
-				logger$18.debug({
+				logger$19.debug({
 					id,
 					agent,
 					taskType,
@@ -3916,7 +4071,7 @@ var DispatcherImpl = class {
 		const next = this._queue.shift();
 		if (next === void 0) return;
 		next.handle.status = "running";
-		logger$18.debug({
+		logger$19.debug({
 			id: next.id,
 			queueLength: this._queue.length
 		}, "Dequeued dispatch");
@@ -3929,7 +4084,7 @@ var DispatcherImpl = class {
 	_isMemoryPressured() {
 		const free = getAvailableMemory();
 		if (free < MIN_FREE_MEMORY_BYTES) {
-			logger$18.warn({
+			logger$19.warn({
 				freeMB: Math.round(free / 1024 / 1024),
 				thresholdMB: Math.round(MIN_FREE_MEMORY_BYTES / 1024 / 1024),
 				pressureLevel: _lastKnownPressureLevel
@@ -4045,7 +4200,7 @@ function runBuildVerification(options) {
 	let cmd;
 	if (verifyCommand === void 0) {
 		const detection = detectPackageManager(projectRoot);
-		logger$18.info({
+		logger$19.info({
 			packageManager: detection.packageManager,
 			lockfile: detection.lockfile,
 			resolvedCommand: detection.command
@@ -4244,7 +4399,7 @@ function pickRecommendation(distribution, profile, totalIssues, reviewCycles, la
 
 //#endregion
 //#region src/modules/compiled-workflows/prompt-assembler.ts
-const logger$17 = createLogger("compiled-workflows:prompt-assembler");
+const logger$18 = createLogger("compiled-workflows:prompt-assembler");
 /**
 * Assemble a final prompt from a template and sections map.
 *
@@ -4269,7 +4424,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		tokenCount,
 		truncated: false
 	};
-	logger$17.warn({
+	logger$18.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Prompt exceeds token ceiling — truncating optional sections");
@@ -4285,10 +4440,10 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 			const targetSectionTokens = Math.max(0, currentSectionTokens - overBy);
 			if (targetSectionTokens === 0) {
 				contentMap[section.name] = "";
-				logger$17.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
+				logger$18.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
 			} else {
 				contentMap[section.name] = truncateToTokens(section.content, targetSectionTokens);
-				logger$17.warn({
+				logger$18.warn({
 					sectionName: section.name,
 					targetSectionTokens
 				}, "Section truncated to fit token budget");
@@ -4299,7 +4454,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		}
 		if (tokenCount <= tokenCeiling) break;
 	}
-	if (tokenCount > tokenCeiling) logger$17.warn({
+	if (tokenCount > tokenCeiling) logger$18.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Required sections alone exceed token ceiling — returning over-budget prompt");
@@ -4597,7 +4752,7 @@ function getTokenCeiling(workflowType, tokenCeilings) {
 
 //#endregion
 //#region src/modules/compiled-workflows/create-story.ts
-const logger$16 = createLogger("compiled-workflows:create-story");
+const logger$17 = createLogger("compiled-workflows:create-story");
 /**
 * Execute the compiled create-story workflow.
 *
@@ -4617,13 +4772,13 @@ const logger$16 = createLogger("compiled-workflows:create-story");
 */
 async function runCreateStory(deps, params) {
 	const { epicId, storyKey, pipelineRunId } = params;
-	logger$16.debug({
+	logger$17.debug({
 		epicId,
 		storyKey,
 		pipelineRunId
 	}, "Starting create-story workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("create-story", deps.tokenCeilings);
-	logger$16.info({
+	logger$17.info({
 		workflow: "create-story",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -4633,7 +4788,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$16.error({ error }, "Failed to retrieve create-story prompt template");
+		logger$17.error({ error }, "Failed to retrieve create-story prompt template");
 		return {
 			result: "failed",
 			error: `Failed to retrieve prompt template: ${error}`,
@@ -4675,7 +4830,7 @@ async function runCreateStory(deps, params) {
 			priority: "important"
 		}
 	], TOKEN_CEILING);
-	logger$16.debug({
+	logger$17.debug({
 		tokenCount,
 		truncated,
 		tokenCeiling: TOKEN_CEILING
@@ -4692,7 +4847,7 @@ async function runCreateStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$16.error({
+		logger$17.error({
 			epicId,
 			storyKey,
 			error
@@ -4713,7 +4868,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$16.warn({
+		logger$17.warn({
 			epicId,
 			storyKey,
 			exitCode: dispatchResult.exitCode
@@ -4725,7 +4880,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$16.warn({
+		logger$17.warn({
 			epicId,
 			storyKey
 		}, "Create-story dispatch timed out");
@@ -4738,7 +4893,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$16.warn({
+		logger$17.warn({
 			epicId,
 			storyKey,
 			details,
@@ -4754,7 +4909,7 @@ async function runCreateStory(deps, params) {
 	const parseResult = CreateStoryResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$16.warn({
+		logger$17.warn({
 			epicId,
 			storyKey,
 			details
@@ -4767,7 +4922,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	logger$16.info({
+	logger$17.info({
 		epicId,
 		storyKey,
 		storyFile: parsed.story_file,
@@ -4789,7 +4944,7 @@ function getImplementationDecisions(deps) {
 	try {
 		return getDecisionsByPhase(deps.db, "implementation");
 	} catch (err) {
-		logger$16.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
+		logger$17.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
 		return [];
 	}
 }
@@ -4832,13 +4987,13 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 			if (storyKey) {
 				const storySection = extractStorySection(shardContent, storyKey);
 				if (storySection) {
-					logger$16.debug({
+					logger$17.debug({
 						epicId,
 						storyKey
 					}, "Extracted per-story section from epic shard");
 					return storySection;
 				}
-				logger$16.debug({
+				logger$17.debug({
 					epicId,
 					storyKey
 				}, "No matching story section found — using full epic shard");
@@ -4848,11 +5003,11 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 		if (projectRoot) {
 			const fallback = readEpicShardFromFile(projectRoot, epicId);
 			if (fallback) {
-				logger$16.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
+				logger$17.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
 				if (storyKey) {
 					const storySection = extractStorySection(fallback, storyKey);
 					if (storySection) {
-						logger$16.debug({
+						logger$17.debug({
 							epicId,
 							storyKey
 						}, "Extracted per-story section from file-based epic shard");
@@ -4864,7 +5019,7 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 		}
 		return "";
 	} catch (err) {
-		logger$16.warn({
+		logger$17.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve epic shard");
@@ -4881,7 +5036,7 @@ function getPrevDevNotes(decisions, epicId) {
 		if (devNotes.length === 0) return "";
 		return devNotes[devNotes.length - 1].value;
 	} catch (err) {
-		logger$16.warn({
+		logger$17.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve prev dev notes");
@@ -4901,13 +5056,13 @@ function getArchConstraints$3(deps) {
 		if (deps.projectRoot) {
 			const fallback = readArchConstraintsFromFile(deps.projectRoot);
 			if (fallback) {
-				logger$16.info("Using file-based fallback for architecture constraints (decisions table empty)");
+				logger$17.info("Using file-based fallback for architecture constraints (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$16.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$17.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -4927,7 +5082,7 @@ function readEpicShardFromFile(projectRoot, epicId) {
 		const match = pattern.exec(content);
 		return match ? match[0].trim() : "";
 	} catch (err) {
-		logger$16.warn({
+		logger$17.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "File-based epic shard fallback failed");
@@ -4950,7 +5105,7 @@ function readArchConstraintsFromFile(projectRoot) {
 		const content = readFileSync$1(archPath, "utf-8");
 		return content.slice(0, 1500);
 	} catch (err) {
-		logger$16.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
+		logger$17.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
 		return "";
 	}
 }
@@ -4963,7 +5118,7 @@ async function getStoryTemplate(deps) {
 	try {
 		return await deps.pack.getTemplate("story");
 	} catch (err) {
-		logger$16.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
+		logger$17.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
 		return "";
 	}
 }
@@ -5000,7 +5155,7 @@ async function isValidStoryFile(filePath) {
 
 //#endregion
 //#region src/modules/compiled-workflows/git-helpers.ts
-const logger$15 = createLogger("compiled-workflows:git-helpers");
+const logger$16 = createLogger("compiled-workflows:git-helpers");
 /**
 * Capture the full git diff for HEAD (working tree vs current commit).
 *
@@ -5096,7 +5251,7 @@ async function stageIntentToAdd(files, workingDirectory) {
 	if (files.length === 0) return;
 	const existing = files.filter((f) => {
 		const exists = existsSync$1(f);
-		if (!exists) logger$15.debug({ file: f }, "Skipping nonexistent file in stageIntentToAdd");
+		if (!exists) logger$16.debug({ file: f }, "Skipping nonexistent file in stageIntentToAdd");
 		return exists;
 	});
 	if (existing.length === 0) return;
@@ -5130,7 +5285,7 @@ async function runGitCommand(args, cwd, logLabel) {
 			stderr += chunk.toString("utf-8");
 		});
 		proc.on("error", (err) => {
-			logger$15.warn({
+			logger$16.warn({
 				label: logLabel,
 				cwd,
 				error: err.message
@@ -5139,7 +5294,7 @@ async function runGitCommand(args, cwd, logLabel) {
 		});
 		proc.on("close", (code) => {
 			if (code !== 0) {
-				logger$15.warn({
+				logger$16.warn({
 					label: logLabel,
 					cwd,
 					code,
@@ -5155,7 +5310,7 @@ async function runGitCommand(args, cwd, logLabel) {
 
 //#endregion
 //#region src/modules/implementation-orchestrator/project-findings.ts
-const logger$14 = createLogger("project-findings");
+const logger$15 = createLogger("project-findings");
 /** Maximum character length for the findings summary */
 const MAX_CHARS = 2e3;
 /**
@@ -5221,7 +5376,7 @@ function getProjectFindings(db) {
 		if (summary.length > MAX_CHARS) summary = summary.slice(0, MAX_CHARS - 3) + "...";
 		return summary;
 	} catch (err) {
-		logger$14.warn({ err }, "Failed to query project findings (graceful fallback)");
+		logger$15.warn({ err }, "Failed to query project findings (graceful fallback)");
 		return "";
 	}
 }
@@ -5244,7 +5399,7 @@ function extractRecurringPatterns(outcomes) {
 
 //#endregion
 //#region src/modules/compiled-workflows/story-complexity.ts
-const logger$13 = createLogger("compiled-workflows:story-complexity");
+const logger$14 = createLogger("compiled-workflows:story-complexity");
 /**
 * Compute a complexity score from story markdown content.
 *
@@ -5296,7 +5451,7 @@ function resolveFixStoryMaxTurns(complexityScore) {
 * @param resolvedMaxTurns - Turn limit resolved for this dispatch
 */
 function logComplexityResult(storyKey, complexity, resolvedMaxTurns) {
-	logger$13.info({
+	logger$14.info({
 		storyKey,
 		taskCount: complexity.taskCount,
 		subtaskCount: complexity.subtaskCount,
@@ -5354,7 +5509,7 @@ function countFilesInLayout(content) {
 
 //#endregion
 //#region src/modules/compiled-workflows/dev-story.ts
-const logger$12 = createLogger("compiled-workflows:dev-story");
+const logger$13 = createLogger("compiled-workflows:dev-story");
 /** Default timeout for dev-story dispatches in milliseconds (30 min) */
 const DEFAULT_TIMEOUT_MS$1 = 18e5;
 /** Default Vitest test patterns injected when no test-pattern decisions exist */
@@ -5377,12 +5532,12 @@ const DEFAULT_VITEST_PATTERNS = `## Test Patterns (defaults)
 */
 async function runDevStory(deps, params) {
 	const { storyKey, storyFilePath, taskScope, priorFiles } = params;
-	logger$12.info({
+	logger$13.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled dev-story workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("dev-story", deps.tokenCeilings);
-	logger$12.info({
+	logger$13.info({
 		workflow: "dev-story",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -5425,10 +5580,10 @@ async function runDevStory(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("dev-story");
-		logger$12.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
+		logger$13.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			error
 		}, "Failed to retrieve dev-story prompt template");
@@ -5439,14 +5594,14 @@ async function runDevStory(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$12.error({
+			logger$13.error({
 				storyKey,
 				storyFilePath
 			}, "Story file not found");
 			return makeFailureResult("story_file_not_found");
 		}
 		const error = err instanceof Error ? err.message : String(err);
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			storyFilePath,
 			error
@@ -5454,7 +5609,7 @@ async function runDevStory(deps, params) {
 		return makeFailureResult(`story_file_read_error: ${error}`);
 	}
 	if (storyContent.trim().length === 0) {
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			storyFilePath
 		}, "Story file is empty");
@@ -5469,17 +5624,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$12.debug({
+			logger$13.debug({
 				storyKey,
 				count: testPatternDecisions.length
 			}, "Loaded test patterns from decision store");
 		} else {
 			testPatternsContent = DEFAULT_VITEST_PATTERNS;
-			logger$12.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
+			logger$13.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
 		}
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$12.warn({
+		logger$13.warn({
 			storyKey,
 			error
 		}, "Failed to load test patterns — using defaults");
@@ -5494,7 +5649,7 @@ async function runDevStory(deps, params) {
 		const findings = getProjectFindings(deps.db);
 		if (findings.length > 0) {
 			priorFindingsContent = "Previous pipeline runs encountered these issues — avoid repeating them:\n\n" + findings;
-			logger$12.debug({
+			logger$13.debug({
 				storyKey,
 				findingsLen: findings.length
 			}, "Injecting prior findings into dev-story prompt");
@@ -5514,7 +5669,7 @@ async function runDevStory(deps, params) {
 			if (plan.test_categories && plan.test_categories.length > 0) parts.push(`\n### Categories: ${plan.test_categories.join(", ")}`);
 			if (plan.coverage_notes) parts.push(`\n### Coverage Notes\n${plan.coverage_notes}`);
 			testPlanContent = parts.join("\n");
-			logger$12.debug({ storyKey }, "Injecting test plan into dev-story prompt");
+			logger$13.debug({ storyKey }, "Injecting test plan into dev-story prompt");
 		}
 	} catch {}
 	const sections = [
@@ -5560,7 +5715,7 @@ async function runDevStory(deps, params) {
 		}
 	];
 	const { prompt, tokenCount, truncated } = assemblePrompt(template, sections, TOKEN_CEILING);
-	logger$12.info({
+	logger$13.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING,
@@ -5580,7 +5735,7 @@ async function runDevStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			error
 		}, "Dispatch threw an unexpected error");
@@ -5591,11 +5746,11 @@ async function runDevStory(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Dev-story dispatch timed out");
-		if (dispatchResult.output.length > 0) logger$12.info({
+		if (dispatchResult.output.length > 0) logger$13.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output before timeout");
@@ -5605,12 +5760,12 @@ async function runDevStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$12.error({
+		logger$13.error({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
 		}, "Dev-story dispatch failed");
-		if (dispatchResult.output.length > 0) logger$12.info({
+		if (dispatchResult.output.length > 0) logger$13.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output from failed dispatch");
@@ -5622,7 +5777,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$12.error({
+		logger$13.error({
 			storyKey,
 			parseError: details,
 			rawOutputSnippet: rawSnippet
@@ -5630,12 +5785,12 @@ async function runDevStory(deps, params) {
 		let filesModified = [];
 		try {
 			filesModified = await getGitChangedFiles(deps.projectRoot ?? process.cwd());
-			if (filesModified.length > 0) logger$12.info({
+			if (filesModified.length > 0) logger$13.info({
 				storyKey,
 				fileCount: filesModified.length
 			}, "Recovered files_modified from git status (YAML fallback)");
 		} catch (err) {
-			logger$12.warn({
+			logger$13.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to recover files_modified from git");
@@ -5652,7 +5807,7 @@ async function runDevStory(deps, params) {
 		};
 	}
 	const parsed = dispatchResult.parsed;
-	logger$12.info({
+	logger$13.info({
 		storyKey,
 		result: parsed.result,
 		acMet: parsed.ac_met.length
@@ -5791,7 +5946,7 @@ function extractFilesInScope(storyContent) {
 
 //#endregion
 //#region src/modules/compiled-workflows/code-review.ts
-const logger$11 = createLogger("compiled-workflows:code-review");
+const logger$12 = createLogger("compiled-workflows:code-review");
 /**
 * Default fallback result when dispatch fails or times out.
 * Uses NEEDS_MINOR_FIXES (not NEEDS_MAJOR_REWORK) so a parse/schema failure
@@ -5829,14 +5984,14 @@ function defaultFailResult(error, tokenUsage) {
 async function runCodeReview(deps, params) {
 	const { storyKey, storyFilePath, workingDirectory, pipelineRunId, filesModified, previousIssues } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$11.debug({
+	logger$12.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
 		pipelineRunId
 	}, "Starting code-review workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("code-review", deps.tokenCeilings);
-	logger$11.info({
+	logger$12.info({
 		workflow: "code-review",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -5846,7 +6001,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$11.error({ error }, "Failed to retrieve code-review prompt template");
+		logger$12.error({ error }, "Failed to retrieve code-review prompt template");
 		return defaultFailResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -5857,7 +6012,7 @@ async function runCodeReview(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$11.error({
+		logger$12.error({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -5877,12 +6032,12 @@ async function runCodeReview(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$11.debug({
+			logger$12.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$11.warn({
+			logger$12.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -5896,7 +6051,7 @@ async function runCodeReview(deps, params) {
 		const fullTotal = nonDiffTokens + countTokens(fullDiff);
 		if (fullTotal <= TOKEN_CEILING) gitDiffContent = fullDiff;
 		else {
-			logger$11.warn({
+			logger$12.warn({
 				estimatedTotal: fullTotal,
 				ceiling: TOKEN_CEILING
 			}, "Full git diff would exceed token ceiling — using stat-only summary");
@@ -5904,7 +6059,7 @@ async function runCodeReview(deps, params) {
 		}
 	}
 	if (gitDiffContent.trim().length === 0) {
-		logger$11.info({ storyKey }, "Empty git diff — skipping review with SHIP_IT");
+		logger$12.info({ storyKey }, "Empty git diff — skipping review with SHIP_IT");
 		return {
 			verdict: "SHIP_IT",
 			issues: 0,
@@ -5929,7 +6084,7 @@ async function runCodeReview(deps, params) {
 		const findings = getProjectFindings(deps.db);
 		if (findings.length > 0) {
 			priorFindingsContent = "Previous reviews found these recurring patterns — pay special attention:\n\n" + findings;
-			logger$11.debug({
+			logger$12.debug({
 				storyKey,
 				findingsLen: findings.length
 			}, "Injecting prior findings into code-review prompt");
@@ -5963,11 +6118,11 @@ async function runCodeReview(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$11.warn({
+	if (assembleResult.truncated) logger$12.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Code-review prompt truncated to fit token ceiling");
-	logger$11.debug({
+	logger$12.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -5985,7 +6140,7 @@ async function runCodeReview(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$11.error({
+		logger$12.error({
 			storyKey,
 			error
 		}, "Code-review dispatch threw unexpected error");
@@ -6001,7 +6156,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$11.warn({
+		logger$12.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Code-review dispatch failed");
@@ -6011,7 +6166,7 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$11.warn({ storyKey }, "Code-review dispatch timed out");
+		logger$12.warn({ storyKey }, "Code-review dispatch timed out");
 		return {
 			...defaultFailResult("Dispatch status: timeout. The agent did not complete within the allowed time.", tokenUsage),
 			rawOutput
@@ -6019,7 +6174,7 @@ async function runCodeReview(deps, params) {
 	}
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
-		logger$11.warn({
+		logger$12.warn({
 			storyKey,
 			details
 		}, "Code-review output schema validation failed");
@@ -6036,7 +6191,7 @@ async function runCodeReview(deps, params) {
 	const parseResult = CodeReviewResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$11.warn({
+		logger$12.warn({
 			storyKey,
 			details
 		}, "Code-review output failed schema validation");
@@ -6051,13 +6206,13 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	if (parsed.agentVerdict !== parsed.verdict) logger$11.info({
+	if (parsed.agentVerdict !== parsed.verdict) logger$12.info({
 		storyKey,
 		agentVerdict: parsed.agentVerdict,
 		pipelineVerdict: parsed.verdict,
 		issues: parsed.issues
 	}, "Pipeline overrode agent verdict based on issue severities");
-	logger$11.info({
+	logger$12.info({
 		storyKey,
 		verdict: parsed.verdict,
 		issues: parsed.issues
@@ -6082,14 +6237,14 @@ function getArchConstraints$2(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$11.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 "";
 	}
 }
 
 //#endregion
 //#region src/modules/compiled-workflows/test-plan.ts
-const logger$10 = createLogger("compiled-workflows:test-plan");
+const logger$11 = createLogger("compiled-workflows:test-plan");
 /** Default timeout for test-plan dispatches in milliseconds (5 min — lightweight call) */
 const DEFAULT_TIMEOUT_MS = 3e5;
 /**
@@ -6101,12 +6256,12 @@ const DEFAULT_TIMEOUT_MS = 3e5;
 */
 async function runTestPlan(deps, params) {
 	const { storyKey, storyFilePath, pipelineRunId } = params;
-	logger$10.info({
+	logger$11.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled test-plan workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("test-plan", deps.tokenCeilings);
-	logger$10.info({
+	logger$11.info({
 		workflow: "test-plan",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -6114,10 +6269,10 @@ async function runTestPlan(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("test-plan");
-		logger$10.debug({ storyKey }, "Retrieved test-plan prompt template from pack");
+		logger$11.debug({ storyKey }, "Retrieved test-plan prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			error
 		}, "Failed to retrieve test-plan prompt template");
@@ -6128,14 +6283,14 @@ async function runTestPlan(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$10.warn({
+			logger$11.warn({
 				storyKey,
 				storyFilePath
 			}, "Story file not found for test planning");
 			return makeTestPlanFailureResult("story_file_not_found");
 		}
 		const error = err instanceof Error ? err.message : String(err);
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			storyFilePath,
 			error
@@ -6152,7 +6307,7 @@ async function runTestPlan(deps, params) {
 		content: archConstraintsContent,
 		priority: "optional"
 	}], TOKEN_CEILING);
-	logger$10.info({
+	logger$11.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING,
@@ -6171,7 +6326,7 @@ async function runTestPlan(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			error
 		}, "Test-plan dispatch threw an unexpected error");
@@ -6182,7 +6337,7 @@ async function runTestPlan(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Test-plan dispatch timed out");
@@ -6192,7 +6347,7 @@ async function runTestPlan(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
@@ -6204,7 +6359,7 @@ async function runTestPlan(deps, params) {
 	}
 	if (dispatchResult.parseError !== null || dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "parsed result was null";
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			parseError: details
 		}, "Test-plan YAML schema validation failed");
@@ -6227,19 +6382,19 @@ async function runTestPlan(deps, params) {
 			}),
 			rationale: `Test plan for ${storyKey}: ${parsed.test_files.length} test files, categories: ${parsed.test_categories.join(", ")}`
 		});
-		logger$10.info({
+		logger$11.info({
 			storyKey,
 			fileCount: parsed.test_files.length,
 			categories: parsed.test_categories
 		}, "Test plan stored in decision store");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$10.warn({
+		logger$11.warn({
 			storyKey,
 			error
 		}, "Failed to store test plan in decision store — proceeding anyway");
 	}
-	logger$10.info({
+	logger$11.info({
 		storyKey,
 		result: parsed.result
 	}, "Test-plan workflow completed");
@@ -6279,14 +6434,14 @@ function getArchConstraints$1(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints for test-plan — proceeding without them");
+		logger$11.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints for test-plan — proceeding without them");
 		return "";
 	}
 }
 
 //#endregion
 //#region src/modules/compiled-workflows/test-expansion.ts
-const logger$9 = createLogger("compiled-workflows:test-expansion");
+const logger$10 = createLogger("compiled-workflows:test-expansion");
 function defaultFallbackResult(error, tokenUsage) {
 	return {
 		expansion_priority: "low",
@@ -6316,14 +6471,14 @@ function defaultFallbackResult(error, tokenUsage) {
 async function runTestExpansion(deps, params) {
 	const { storyKey, storyFilePath, pipelineRunId, filesModified, workingDirectory } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$9.debug({
+	logger$10.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
 		pipelineRunId
 	}, "Starting test-expansion workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("test-expansion", deps.tokenCeilings);
-	logger$9.info({
+	logger$10.info({
 		workflow: "test-expansion",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -6333,7 +6488,7 @@ async function runTestExpansion(deps, params) {
 		template = await deps.pack.getPrompt("test-expansion");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$9.warn({ error }, "Failed to retrieve test-expansion prompt template");
+		logger$10.warn({ error }, "Failed to retrieve test-expansion prompt template");
 		return defaultFallbackResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -6344,7 +6499,7 @@ async function runTestExpansion(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$9.warn({
+		logger$10.warn({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -6364,12 +6519,12 @@ async function runTestExpansion(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$9.debug({
+			logger$10.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$9.warn({
+			logger$10.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -6377,7 +6532,7 @@ async function runTestExpansion(deps, params) {
 			gitDiffContent = await getGitDiffStatSummary(cwd);
 		}
 	} catch (err) {
-		logger$9.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to get git diff — proceeding with empty diff");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to get git diff — proceeding with empty diff");
 	}
 	const sections = [
 		{
@@ -6397,11 +6552,11 @@ async function runTestExpansion(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$9.warn({
+	if (assembleResult.truncated) logger$10.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Test-expansion prompt truncated to fit token ceiling");
-	logger$9.debug({
+	logger$10.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -6419,7 +6574,7 @@ async function runTestExpansion(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$9.warn({
+		logger$10.warn({
 			storyKey,
 			error
 		}, "Test-expansion dispatch threw unexpected error");
@@ -6434,19 +6589,19 @@ async function runTestExpansion(deps, params) {
 	};
 	if (dispatchResult.status === "failed") {
 		const errorMsg = `Dispatch status: failed. Exit code: ${dispatchResult.exitCode}. ${dispatchResult.parseError ?? ""}`.trim();
-		logger$9.warn({
+		logger$10.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Test-expansion dispatch failed");
 		return defaultFallbackResult(errorMsg, tokenUsage);
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$9.warn({ storyKey }, "Test-expansion dispatch timed out");
+		logger$10.warn({ storyKey }, "Test-expansion dispatch timed out");
 		return defaultFallbackResult("Dispatch status: timeout. The agent did not complete within the allowed time.", tokenUsage);
 	}
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
-		logger$9.warn({
+		logger$10.warn({
 			storyKey,
 			details
 		}, "Test-expansion output has no parseable YAML");
@@ -6455,14 +6610,14 @@ async function runTestExpansion(deps, params) {
 	const parseResult = TestExpansionResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$9.warn({
+		logger$10.warn({
 			storyKey,
 			details
 		}, "Test-expansion output failed schema validation");
 		return defaultFallbackResult(`schema_validation_failed: ${details}`, tokenUsage);
 	}
 	const parsed = parseResult.data;
-	logger$9.info({
+	logger$10.info({
 		storyKey,
 		expansion_priority: parsed.expansion_priority,
 		coverage_gaps: parsed.coverage_gaps.length,
@@ -6487,7 +6642,7 @@ function getArchConstraints(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$9.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -6917,6 +7072,924 @@ function detectConflictGroupsWithContracts(storyKeys, config, declarations) {
 	};
 }
 
+//#endregion
+//#region src/modules/state/file-store.ts
+/**
+* In-memory / file-backed StateStore implementation.
+*
+* Suitable for the current pipeline where orchestrator state is ephemeral and
+* metrics can optionally be flushed to SQLite. Replace with DoltStateStore
+* (story 26-3) to gain branch-per-story isolation and versioned history.
+*/
+var FileStateStore = class {
+	_db;
+	_basePath;
+	_stories = new Map();
+	_metrics = [];
+	_contracts = new Map();
+	_contractVerifications = new Map();
+	constructor(options = {}) {
+		this._db = options.db;
+		this._basePath = options.basePath;
+	}
+	async initialize() {}
+	async close() {}
+	async getStoryState(storyKey) {
+		return this._stories.get(storyKey);
+	}
+	async setStoryState(storyKey, state) {
+		this._stories.set(storyKey, {
+			...state,
+			storyKey
+		});
+	}
+	async queryStories(filter) {
+		const all = Array.from(this._stories.values());
+		return all.filter((record) => {
+			if (filter.phase !== void 0) {
+				const phases = Array.isArray(filter.phase) ? filter.phase : [filter.phase];
+				if (!phases.includes(record.phase)) return false;
+			}
+			if (filter.sprint !== void 0 && record.sprint !== filter.sprint) return false;
+			if (filter.storyKey !== void 0 && record.storyKey !== filter.storyKey) return false;
+			return true;
+		});
+	}
+	async recordMetric(metric) {
+		const record = {
+			...metric,
+			recordedAt: metric.recordedAt ?? new Date().toISOString()
+		};
+		this._metrics.push(record);
+		if (this._db) writeStoryMetrics(this._db, {
+			run_id: "default",
+			story_key: metric.storyKey,
+			result: metric.result ?? "unknown",
+			wall_clock_seconds: metric.wallClockMs !== void 0 ? metric.wallClockMs / 1e3 : void 0,
+			input_tokens: metric.tokensIn,
+			output_tokens: metric.tokensOut,
+			cost_usd: metric.costUsd,
+			review_cycles: metric.reviewCycles
+		});
+	}
+	async queryMetrics(filter) {
+		const storyKey = filter.storyKey ?? filter.story_key;
+		const taskType = filter.taskType ?? filter.task_type;
+		return this._metrics.filter((m) => {
+			if (storyKey !== void 0 && m.storyKey !== storyKey) return false;
+			if (taskType !== void 0 && m.taskType !== taskType) return false;
+			if (filter.sprint !== void 0 && m.sprint !== filter.sprint) return false;
+			if (filter.dateFrom !== void 0 && m.recordedAt !== void 0 && m.recordedAt < filter.dateFrom) return false;
+			if (filter.dateTo !== void 0 && m.recordedAt !== void 0 && m.recordedAt > filter.dateTo) return false;
+			if (filter.since !== void 0 && m.recordedAt !== void 0 && m.recordedAt < filter.since) return false;
+			return true;
+		});
+	}
+	async getContracts(storyKey) {
+		return this._contracts.get(storyKey) ?? [];
+	}
+	async setContracts(storyKey, contracts) {
+		this._contracts.set(storyKey, contracts.map((c) => ({ ...c })));
+	}
+	async queryContracts(filter) {
+		const all = [];
+		for (const records of this._contracts.values()) for (const r of records) all.push(r);
+		return all.filter((r) => {
+			if (filter?.storyKey !== void 0 && r.storyKey !== filter.storyKey) return false;
+			if (filter?.direction !== void 0 && r.direction !== filter.direction) return false;
+			return true;
+		});
+	}
+	async setContractVerification(storyKey, results) {
+		this._contractVerifications.set(storyKey, results.map((r) => ({ ...r })));
+		if (this._basePath !== void 0) {
+			const serialized = {};
+			for (const [key, records] of this._contractVerifications) serialized[key] = records;
+			const filePath = join$1(this._basePath, "contract-verifications.json");
+			await writeFile$1(filePath, JSON.stringify(serialized, null, 2), "utf-8");
+		}
+	}
+	async getContractVerification(storyKey) {
+		return this._contractVerifications.get(storyKey) ?? [];
+	}
+	async branchForStory(_storyKey) {}
+	async mergeStory(_storyKey) {}
+	async rollbackStory(_storyKey) {}
+	async diffStory(storyKey) {
+		return {
+			storyKey,
+			tables: []
+		};
+	}
+	async getHistory(_limit) {
+		return [];
+	}
+};
+
+//#endregion
+//#region src/modules/state/errors.ts
+/**
+* Typed error classes for the Dolt state store.
+*/
+var StateStoreError = class extends Error {
+	code;
+	constructor(code, message) {
+		super(message);
+		this.name = "StateStoreError";
+		this.code = code;
+	}
+};
+var DoltQueryError = class extends StateStoreError {
+	sql;
+	detail;
+	constructor(sql, detail) {
+		super("DOLT_QUERY_ERROR", `Dolt query failed: ${detail}`);
+		this.name = "DoltQueryError";
+		this.sql = sql;
+		this.detail = detail;
+	}
+};
+var DoltMergeConflictError = class extends StateStoreError {
+	table;
+	conflictingKeys;
+	rowKey;
+	ourValue;
+	theirValue;
+	constructor(table, conflictingKeys, options) {
+		super("DOLT_MERGE_CONFLICT", `Merge conflict in table '${table}' on keys: ${conflictingKeys.join(", ")}`);
+		this.name = "DoltMergeConflictError";
+		this.table = table;
+		this.conflictingKeys = conflictingKeys;
+		if (options) {
+			this.rowKey = options.rowKey;
+			this.ourValue = options.ourValue;
+			this.theirValue = options.theirValue;
+		}
+	}
+};
+/** Alias for DoltMergeConflictError — used by orchestrator branch lifecycle. */
+const DoltMergeConflict = DoltMergeConflictError;
+
+//#endregion
+//#region src/modules/state/dolt-store.ts
+const log$1 = createLogger("modules:state:dolt");
+/**
+* Validate that a story key matches the expected pattern (e.g. "26-7").
+* Prevents SQL injection via string-interpolated identifiers.
+*/
+const STORY_KEY_PATTERN = /^[0-9]+-[0-9]+$/;
+function assertValidStoryKey(storyKey) {
+	if (!STORY_KEY_PATTERN.test(storyKey)) throw new DoltQueryError("assertValidStoryKey", `Invalid story key: '${storyKey}'. Must match pattern <number>-<number>.`);
+}
+/**
+* Dolt-backed implementation of the StateStore interface.
+*
+* Constructor accepts a deps object for DI: `{ repoPath, client }`.
+* Call `initialize()` before any CRUD operations.
+*/
+var DoltStateStore = class DoltStateStore {
+	_repoPath;
+	_client;
+	_storyBranches = new Map();
+	constructor(options) {
+		this._repoPath = options.repoPath;
+		this._client = options.client;
+	}
+	/**
+	* Return the branch name for a story if one has been created via branchForStory(),
+	* or undefined to use the default (main) branch.
+	*/
+	_branchFor(storyKey) {
+		return this._storyBranches.get(storyKey);
+	}
+	async initialize() {
+		await this._client.connect();
+		await this._runMigrations();
+		await this.flush("substrate: schema migrations");
+		log$1.debug("DoltStateStore initialized at %s", this._repoPath);
+	}
+	async close() {
+		await this._client.close();
+	}
+	async _runMigrations() {
+		const ddl = [
+			`CREATE TABLE IF NOT EXISTS stories (
+        story_key     VARCHAR(100) NOT NULL,
+        phase         VARCHAR(30)  NOT NULL DEFAULT 'PENDING',
+        review_cycles INT          NOT NULL DEFAULT 0,
+        last_verdict  VARCHAR(64)  NULL,
+        error         TEXT         NULL,
+        started_at    VARCHAR(64)  NULL,
+        completed_at  VARCHAR(64)  NULL,
+        sprint        VARCHAR(50)  NULL,
+        PRIMARY KEY (story_key)
+      )`,
+			`CREATE TABLE IF NOT EXISTS metrics (
+        id              BIGINT       NOT NULL AUTO_INCREMENT,
+        story_key       VARCHAR(100) NOT NULL,
+        task_type       VARCHAR(100) NOT NULL,
+        model           VARCHAR(100) NULL,
+        tokens_in       BIGINT       NULL,
+        tokens_out      BIGINT       NULL,
+        cache_read_tokens BIGINT     NULL,
+        cost_usd        DOUBLE       NULL,
+        wall_clock_ms   BIGINT       NULL,
+        review_cycles   INT          NULL,
+        stall_count     INT          NULL,
+        result          VARCHAR(30)  NULL,
+        recorded_at     VARCHAR(64)  NULL,
+        sprint          VARCHAR(50)  NULL,
+        PRIMARY KEY (id)
+      )`,
+			`CREATE TABLE IF NOT EXISTS contracts (
+        story_key     VARCHAR(100) NOT NULL,
+        contract_name VARCHAR(200) NOT NULL,
+        direction     VARCHAR(20)  NOT NULL,
+        schema_path   VARCHAR(500) NULL,
+        transport     VARCHAR(200) NULL,
+        PRIMARY KEY (story_key, contract_name, direction)
+      )`,
+			`CREATE TABLE IF NOT EXISTS review_verdicts (
+        id            BIGINT       NOT NULL AUTO_INCREMENT,
+        story_key     VARCHAR(100) NOT NULL,
+        task_type     VARCHAR(100) NOT NULL,
+        verdict       VARCHAR(64)  NOT NULL,
+        issues_count  INT          NULL,
+        notes         TEXT         NULL,
+        timestamp     VARCHAR(64)  NULL,
+        PRIMARY KEY (id)
+      )`
+		];
+		for (const sql of ddl) await this._client.query(sql);
+		log$1.debug("Schema migrations applied");
+	}
+	/**
+	* Commit pending Dolt changes on the current branch.
+	* Callers can invoke this after a batch of writes for explicit durability.
+	*/
+	async flush(message = "substrate: auto-commit") {
+		try {
+			await this._client.execArgs(["add", "."]);
+			await this._client.execArgs([
+				"commit",
+				"--allow-empty",
+				"-m",
+				message
+			]);
+			log$1.debug("Dolt flush committed: %s", message);
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			log$1.warn({ detail }, "Dolt flush failed (non-fatal)");
+		}
+	}
+	async getStoryState(storyKey) {
+		const rows = await this._client.query("SELECT * FROM stories WHERE story_key = ?", [storyKey]);
+		if (rows.length === 0) return void 0;
+		return this._rowToStory(rows[0]);
+	}
+	async setStoryState(storyKey, state) {
+		const branch = this._branchFor(storyKey);
+		const sql = `REPLACE INTO stories
+      (story_key, phase, review_cycles, last_verdict, error, started_at, completed_at, sprint)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)`;
+		await this._client.query(sql, [
+			storyKey,
+			state.phase,
+			state.reviewCycles,
+			state.lastVerdict ?? null,
+			state.error ?? null,
+			state.startedAt ?? null,
+			state.completedAt ?? null,
+			state.sprint ?? null
+		], branch);
+	}
+	async queryStories(filter) {
+		const conditions = [];
+		const params = [];
+		if (filter.phase !== void 0) {
+			const phases = Array.isArray(filter.phase) ? filter.phase : [filter.phase];
+			const placeholders = phases.map(() => "?").join(", ");
+			conditions.push(`phase IN (${placeholders})`);
+			params.push(...phases);
+		}
+		if (filter.sprint !== void 0) {
+			conditions.push("sprint = ?");
+			params.push(filter.sprint);
+		}
+		if (filter.storyKey !== void 0) {
+			conditions.push("story_key = ?");
+			params.push(filter.storyKey);
+		}
+		const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+		const sql = `SELECT * FROM stories ${where} ORDER BY story_key`;
+		const rows = await this._client.query(sql, params);
+		return rows.map((r) => this._rowToStory(r));
+	}
+	_rowToStory(row) {
+		return {
+			storyKey: row.story_key,
+			phase: row.phase,
+			reviewCycles: Number(row.review_cycles),
+			lastVerdict: row.last_verdict ?? void 0,
+			error: row.error ?? void 0,
+			startedAt: row.started_at ?? void 0,
+			completedAt: row.completed_at ?? void 0,
+			sprint: row.sprint ?? void 0
+		};
+	}
+	async recordMetric(metric) {
+		const branch = this._branchFor(metric.storyKey);
+		const recordedAt = metric.recordedAt ?? metric.timestamp ?? new Date().toISOString();
+		const sql = `INSERT INTO metrics
+      (story_key, task_type, model, tokens_in, tokens_out, cache_read_tokens,
+       cost_usd, wall_clock_ms, review_cycles, stall_count, result, recorded_at, sprint)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+		await this._client.query(sql, [
+			metric.storyKey,
+			metric.taskType,
+			metric.model ?? null,
+			metric.tokensIn ?? null,
+			metric.tokensOut ?? null,
+			metric.cacheReadTokens ?? null,
+			metric.costUsd ?? null,
+			metric.wallClockMs ?? null,
+			metric.reviewCycles ?? null,
+			metric.stallCount ?? null,
+			metric.result ?? null,
+			recordedAt,
+			metric.sprint ?? null
+		], branch);
+	}
+	async queryMetrics(filter) {
+		const conditions = [];
+		const params = [];
+		const storyKey = filter.storyKey ?? filter.story_key;
+		const taskType = filter.taskType ?? filter.task_type;
+		if (storyKey !== void 0) {
+			conditions.push("story_key = ?");
+			params.push(storyKey);
+		}
+		if (taskType !== void 0) {
+			conditions.push("task_type = ?");
+			params.push(taskType);
+		}
+		if (filter.sprint !== void 0) {
+			conditions.push("sprint = ?");
+			params.push(filter.sprint);
+		}
+		if (filter.dateFrom !== void 0) {
+			conditions.push("recorded_at >= ?");
+			params.push(filter.dateFrom);
+		}
+		if (filter.dateTo !== void 0) {
+			conditions.push("recorded_at <= ?");
+			params.push(filter.dateTo);
+		}
+		if (filter.since !== void 0) {
+			conditions.push("recorded_at >= ?");
+			params.push(filter.since);
+		}
+		const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+		if (filter.aggregate) {
+			const sql$1 = `SELECT task_type,
+        AVG(cost_usd) AS avg_cost_usd,
+        SUM(tokens_in) AS sum_tokens_in,
+        SUM(tokens_out) AS sum_tokens_out,
+        COUNT(*) AS count
+        FROM metrics ${where} GROUP BY task_type ORDER BY task_type`;
+			const aggRows = await this._client.query(sql$1, params);
+			return aggRows.map((r) => this._aggregateRowToMetric(r));
+		}
+		const sql = `SELECT * FROM metrics ${where} ORDER BY id`;
+		const rows = await this._client.query(sql, params);
+		return rows.map((r) => this._rowToMetric(r));
+	}
+	_aggregateRowToMetric(row) {
+		return {
+			storyKey: "",
+			taskType: row.task_type,
+			costUsd: row.avg_cost_usd ?? void 0,
+			tokensIn: row.sum_tokens_in ?? void 0,
+			tokensOut: row.sum_tokens_out ?? void 0,
+			count: row.count,
+			result: "aggregate"
+		};
+	}
+	_rowToMetric(row) {
+		return {
+			storyKey: row.story_key,
+			taskType: row.task_type,
+			model: row.model ?? void 0,
+			tokensIn: row.tokens_in ?? void 0,
+			tokensOut: row.tokens_out ?? void 0,
+			cacheReadTokens: row.cache_read_tokens ?? void 0,
+			costUsd: row.cost_usd ?? void 0,
+			wallClockMs: row.wall_clock_ms ?? void 0,
+			reviewCycles: row.review_cycles ?? void 0,
+			stallCount: row.stall_count ?? void 0,
+			result: row.result ?? void 0,
+			recordedAt: row.recorded_at ?? void 0,
+			sprint: row.sprint ?? void 0,
+			timestamp: row.timestamp ?? row.recorded_at ?? void 0
+		};
+	}
+	async getContracts(storyKey) {
+		const rows = await this._client.query("SELECT * FROM contracts WHERE story_key = ? ORDER BY contract_name", [storyKey]);
+		return rows.map((r) => this._rowToContract(r));
+	}
+	async setContracts(storyKey, contracts) {
+		const branch = this._branchFor(storyKey);
+		await this._client.query("DELETE FROM contracts WHERE story_key = ?", [storyKey], branch);
+		for (const c of contracts) await this._client.query(`INSERT INTO contracts (story_key, contract_name, direction, schema_path, transport)
+         VALUES (?, ?, ?, ?, ?)`, [
+			c.storyKey,
+			c.contractName,
+			c.direction,
+			c.schemaPath,
+			c.transport ?? null
+		], branch);
+	}
+	_rowToContract(row) {
+		return {
+			storyKey: row.story_key,
+			contractName: row.contract_name,
+			direction: row.direction,
+			schemaPath: row.schema_path,
+			transport: row.transport ?? void 0
+		};
+	}
+	async queryContracts(filter) {
+		const conditions = [];
+		const params = [];
+		if (filter?.storyKey !== void 0) {
+			conditions.push("story_key = ?");
+			params.push(filter.storyKey);
+		}
+		if (filter?.direction !== void 0) {
+			conditions.push("direction = ?");
+			params.push(filter.direction);
+		}
+		const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+		const sql = `SELECT * FROM contracts ${where} ORDER BY story_key, contract_name`;
+		const rows = await this._client.query(sql, params);
+		return rows.map((r) => this._rowToContract(r));
+	}
+	async setContractVerification(storyKey, results) {
+		const branch = this._branchFor(storyKey);
+		await this._client.query(`DELETE FROM review_verdicts WHERE story_key = ? AND task_type = 'contract-verification'`, [storyKey], branch);
+		const failCount = results.filter((r) => r.verdict === "fail").length;
+		for (const r of results) await this._client.query(`INSERT INTO review_verdicts (story_key, task_type, verdict, issues_count, notes, timestamp)
+         VALUES (?, 'contract-verification', ?, ?, ?, ?)`, [
+			storyKey,
+			r.verdict,
+			failCount,
+			JSON.stringify({
+				contractName: r.contractName,
+				mismatchDescription: r.mismatchDescription
+			}),
+			r.verifiedAt
+		], branch);
+	}
+	async getContractVerification(storyKey) {
+		const rows = await this._client.query(`SELECT * FROM review_verdicts WHERE story_key = ? AND task_type = 'contract-verification' ORDER BY timestamp DESC`, [storyKey]);
+		return rows.map((row) => {
+			let contractName = "";
+			let mismatchDescription;
+			if (row.notes !== null) try {
+				const parsed = JSON.parse(row.notes);
+				if (typeof parsed.contractName === "string") contractName = parsed.contractName;
+				if (typeof parsed.mismatchDescription === "string") mismatchDescription = parsed.mismatchDescription;
+			} catch {}
+			return {
+				storyKey: row.story_key,
+				contractName,
+				verdict: row.verdict,
+				...mismatchDescription !== void 0 ? { mismatchDescription } : {},
+				verifiedAt: row.timestamp ?? new Date().toISOString()
+			};
+		});
+	}
+	async branchForStory(storyKey) {
+		assertValidStoryKey(storyKey);
+		const branchName = `story/${storyKey}`;
+		try {
+			await this._client.query(`CALL DOLT_BRANCH('${branchName}')`, [], "main");
+			this._storyBranches.set(storyKey, branchName);
+			log$1.debug("Created Dolt branch %s for story %s", branchName, storyKey);
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError(`CALL DOLT_BRANCH('${branchName}')`, detail);
+		}
+	}
+	async mergeStory(storyKey) {
+		assertValidStoryKey(storyKey);
+		const branchName = this._storyBranches.get(storyKey);
+		if (branchName === void 0) {
+			log$1.warn({ storyKey }, "mergeStory called but no branch registered — no-op");
+			return;
+		}
+		try {
+			try {
+				await this._client.query(`CALL DOLT_ADD('-A')`, [], branchName);
+				await this._client.query(`CALL DOLT_COMMIT('-m', 'Story ${storyKey}: pre-merge commit', '--allow-empty')`, [], branchName);
+			} catch {}
+			try {
+				await this._client.query(`CALL DOLT_ADD('-A')`, [], "main");
+				await this._client.query(`CALL DOLT_COMMIT('-m', 'substrate: pre-merge auto-commit', '--allow-empty')`, [], "main");
+			} catch {}
+			const mergeRows = await this._client.query(`CALL DOLT_MERGE('${branchName}')`, [], "main");
+			const mergeResult = mergeRows[0];
+			if (mergeResult && (mergeResult.conflicts ?? 0) > 0) {
+				let table = "stories";
+				let rowKey = "unknown";
+				let ourValue;
+				let theirValue;
+				try {
+					const conflictRows = await this._client.query(`SELECT * FROM dolt_conflicts_stories LIMIT 1`, [], "main");
+					if (conflictRows.length > 0) {
+						const row = conflictRows[0];
+						rowKey = String(row["base_story_key"] ?? row["our_story_key"] ?? "unknown");
+						ourValue = JSON.stringify(row["our_status"] ?? row);
+						theirValue = JSON.stringify(row["their_status"] ?? row);
+					}
+				} catch {}
+				this._storyBranches.delete(storyKey);
+				throw new DoltMergeConflictError(table, [rowKey], {
+					rowKey,
+					ourValue,
+					theirValue
+				});
+			}
+			try {
+				await this._client.query(`CALL DOLT_COMMIT('-m', 'Merge story ${storyKey}: COMPLETE')`, [], "main");
+			} catch (commitErr) {
+				const msg = commitErr instanceof Error ? commitErr.message : String(commitErr);
+				if (!msg.includes("nothing to commit")) throw commitErr;
+			}
+			this._storyBranches.delete(storyKey);
+			log$1.debug("Merged branch %s into main for story %s", branchName, storyKey);
+		} catch (err) {
+			if (err instanceof DoltMergeConflictError) throw err;
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError(`CALL DOLT_MERGE('${branchName}')`, detail);
+		}
+	}
+	async rollbackStory(storyKey) {
+		assertValidStoryKey(storyKey);
+		const branchName = this._storyBranches.get(storyKey);
+		if (branchName === void 0) {
+			log$1.warn({ storyKey }, "rollbackStory called but no branch registered — no-op");
+			return;
+		}
+		try {
+			await this._client.query(`CALL DOLT_BRANCH('-D', '${branchName}')`, [], "main");
+			this._storyBranches.delete(storyKey);
+			log$1.debug("Rolled back (deleted) branch %s for story %s", branchName, storyKey);
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			log$1.warn({
+				detail,
+				storyKey,
+				branchName
+			}, "rollbackStory failed (non-fatal)");
+			this._storyBranches.delete(storyKey);
+		}
+	}
+	/**
+	* Tables queried by diffStory(). Each table is checked for row-level changes
+	* via SELECT * FROM DOLT_DIFF('main', branchName, tableName).
+	*/
+	static DIFF_TABLES = [
+		"stories",
+		"contracts",
+		"metrics",
+		"dispatch_log",
+		"build_results",
+		"review_verdicts"
+	];
+	async diffStory(storyKey) {
+		assertValidStoryKey(storyKey);
+		const branchName = this._storyBranches.get(storyKey);
+		if (branchName === void 0) return this._diffMergedStory(storyKey);
+		try {
+			await this._client.query(`CALL DOLT_ADD('-A')`, [], branchName);
+			await this._client.query(`CALL DOLT_COMMIT('-m', 'Story ${storyKey}: pre-diff snapshot', '--allow-empty')`, [], branchName);
+		} catch {}
+		return this._diffRange("main", branchName, storyKey);
+	}
+	/**
+	* Diff a merged story by finding its merge commit in the Dolt log.
+	* Queries the `dolt_log` system table for commits referencing the story,
+	* then diffs `<hash>~1` vs `<hash>` for row-level changes.
+	*/
+	async _diffMergedStory(storyKey) {
+		try {
+			const rows = await this._client.query(`SELECT commit_hash FROM dolt_log WHERE message LIKE ? LIMIT 1`, [`%${storyKey}%`]);
+			if (rows.length === 0) return {
+				storyKey,
+				tables: []
+			};
+			const hash = String(rows[0].commit_hash);
+			if (!hash) return {
+				storyKey,
+				tables: []
+			};
+			return this._diffRange(`${hash}~1`, hash, storyKey);
+		} catch {
+			return {
+				storyKey,
+				tables: []
+			};
+		}
+	}
+	/**
+	* Compute row-level diffs between two Dolt revisions (branches or commit hashes)
+	* across all tracked tables.
+	*/
+	async _diffRange(fromRef, toRef, storyKey) {
+		const tableDiffs = [];
+		for (const table of DoltStateStore.DIFF_TABLES) try {
+			const rows = await this._client.query(`SELECT * FROM DOLT_DIFF('${fromRef}', '${toRef}', '${table}')`, [], "main");
+			if (rows.length === 0) continue;
+			const added = [];
+			const modified = [];
+			const deleted = [];
+			for (const row of rows) {
+				const diffType = row["diff_type"];
+				const rowKey = this._extractRowKey(row);
+				const before = this._extractPrefixedFields(row, "before_");
+				const after = this._extractPrefixedFields(row, "after_");
+				const diffRow = {
+					rowKey,
+					...before !== void 0 && { before },
+					...after !== void 0 && { after }
+				};
+				if (diffType === "added") added.push(diffRow);
+				else if (diffType === "modified") modified.push(diffRow);
+				else if (diffType === "removed") deleted.push(diffRow);
+			}
+			if (added.length > 0 || modified.length > 0 || deleted.length > 0) tableDiffs.push({
+				table,
+				added,
+				modified,
+				deleted
+			});
+		} catch {}
+		return {
+			storyKey,
+			tables: tableDiffs
+		};
+	}
+	/**
+	* Extract a human-readable row key from a DOLT_DIFF result row.
+	* Tries after_ fields first (for added/modified rows), then before_ fields
+	* (for removed rows). Skips commit_hash pseudo-columns.
+	*/
+	_extractRowKey(row) {
+		for (const prefix of ["after_", "before_"]) for (const [key, val] of Object.entries(row)) if (key.startsWith(prefix) && !key.endsWith("_commit_hash") && val !== null && val !== void 0) return String(val);
+		return "unknown";
+	}
+	/**
+	* Extract all fields with a given prefix from a DOLT_DIFF result row,
+	* stripping the prefix from the key names. Returns undefined if no matching
+	* fields are found.
+	*/
+	_extractPrefixedFields(row, prefix) {
+		const result = {};
+		for (const [key, val] of Object.entries(row)) if (key.startsWith(prefix)) result[key.slice(prefix.length)] = val;
+		return Object.keys(result).length > 0 ? result : void 0;
+	}
+	async getHistory(limit) {
+		const effectiveLimit = limit ?? 20;
+		try {
+			const rows = await this._client.query(`SELECT commit_hash, date, message, committer FROM dolt_log LIMIT ?`, [effectiveLimit]);
+			const entries = [];
+			for (const row of rows) {
+				const hash = String(row.commit_hash ?? "");
+				const timestamp = row.date instanceof Date ? row.date.toISOString() : String(row.date ?? "");
+				const message = String(row.message ?? "");
+				const author = row.committer ? String(row.committer) : void 0;
+				const storyKeyMatch = /story\/([0-9]+-[0-9]+)/i.exec(message);
+				entries.push({
+					hash,
+					timestamp,
+					storyKey: storyKeyMatch ? storyKeyMatch[1] : null,
+					message,
+					author
+				});
+			}
+			return entries;
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError("getHistory", detail);
+		}
+	}
+};
+
+//#endregion
+//#region src/modules/state/dolt-client.ts
+/**
+* Promise-wrapper around execFile that always resolves to { stdout, stderr }.
+* Using an explicit wrapper rather than promisify() avoids the util.promisify.custom
+* symbol complexity when mocking in tests.
+*/
+function runExecFile(cmd, args, opts) {
+	return new Promise((resolve$2, reject) => {
+		execFile(cmd, args, opts, (err, stdout, stderr) => {
+			if (err) reject(err);
+			else resolve$2({
+				stdout,
+				stderr
+			});
+		});
+	});
+}
+const log = createLogger("modules:state:dolt");
+var DoltClient = class {
+	repoPath;
+	socketPath;
+	_pool = null;
+	_useCliMode = false;
+	_connected = false;
+	constructor(options) {
+		this.repoPath = options.repoPath;
+		this.socketPath = options.socketPath ?? `${options.repoPath}/.dolt/dolt.sock`;
+	}
+	async connect() {
+		try {
+			await access$1(this.socketPath);
+			const mysql = await import("mysql2/promise");
+			this._pool = mysql.createPool({
+				socketPath: this.socketPath,
+				user: "root",
+				database: "doltdb",
+				waitForConnections: true,
+				connectionLimit: 5
+			});
+			this._useCliMode = false;
+			log.debug("Connected via unix socket: %s", this.socketPath);
+		} catch {
+			this._useCliMode = true;
+			log.debug("Unix socket not available, using CLI fallback for %s", this.repoPath);
+		}
+		this._connected = true;
+	}
+	async query(sql, params, branch) {
+		if (!this._connected) await this.connect();
+		if (this._useCliMode) return this._queryCli(sql, params, branch);
+		return this._queryPool(sql, params, branch);
+	}
+	async _queryPool(sql, params, branch) {
+		try {
+			if (branch !== void 0 && branch !== "main") {
+				const conn = await this._pool.getConnection();
+				try {
+					await conn.execute(`USE \`substrate/${branch}\``);
+					const [rows$1] = await conn.execute(sql, params);
+					return rows$1;
+				} finally {
+					conn.release();
+				}
+			}
+			const [rows] = await this._pool.execute(sql, params);
+			return rows;
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError(sql, detail);
+		}
+	}
+	async _queryCli(sql, params, branch) {
+		let resolvedSql = sql;
+		if (params && params.length > 0) {
+			let i = 0;
+			resolvedSql = sql.replace(/\?/g, () => {
+				const val = params[i++];
+				if (val === null || val === void 0) return "NULL";
+				if (typeof val === "number") return String(val);
+				return `'${String(val).replace(/'/g, "''")}'`;
+			});
+		}
+		try {
+			const branchPrefix = branch ? `CALL DOLT_CHECKOUT('${branch.replace(/'/g, "''")}'); ` : "";
+			const args = [
+				"sql",
+				"-q",
+				branchPrefix + resolvedSql,
+				"--result-format",
+				"json"
+			];
+			const { stdout } = await runExecFile("dolt", args, { cwd: this.repoPath });
+			const lines = (stdout || "").trim().split("\n").filter(Boolean);
+			const lastLine = lines.length > 0 ? lines[lines.length - 1] : "{\"rows\":[]}";
+			const parsed = JSON.parse(lastLine);
+			return parsed.rows ?? [];
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError(resolvedSql, detail);
+		}
+	}
+	/**
+	* Execute a raw Dolt CLI command (e.g. `dolt diff main...story/26-1 --stat`)
+	* and return the stdout as a string.
+	*
+	* This is distinct from `query()` which runs SQL. Use `exec()` for Dolt
+	* sub-commands like `diff`, `log`, `branch`, etc.
+	*/
+	async exec(command) {
+		const parts = command.trim().split(/\s+/);
+		const cmdArgs = parts[0] === "dolt" ? parts.slice(1) : parts;
+		return this.execArgs(cmdArgs);
+	}
+	/**
+	* Execute a Dolt CLI command with pre-split arguments.
+	*
+	* Use this instead of `exec()` when arguments contain spaces (e.g. commit
+	* messages) to avoid whitespace-splitting issues.
+	*/
+	async execArgs(args) {
+		try {
+			const { stdout } = await runExecFile("dolt", args, { cwd: this.repoPath });
+			return stdout;
+		} catch (err) {
+			const detail = err instanceof Error ? err.message : String(err);
+			throw new DoltQueryError(args.join(" "), detail);
+		}
+	}
+	async close() {
+		if (this._pool) {
+			await this._pool.end();
+			this._pool = null;
+		}
+		this._connected = false;
+	}
+};
+function createDoltClient(options) {
+	return new DoltClient(options);
+}
+
+//#endregion
+//#region src/modules/state/index.ts
+const logger$9 = createLogger("state:factory");
+/**
+* Synchronously check whether Dolt is available and a Dolt repo exists at the
+* canonical state path under `basePath`.
+*
+* @param basePath - Project root to check (e.g. `process.cwd()`).
+* @returns `{ available: true, reason: '...' }` when both probes pass,
+*          `{ available: false, reason: '...' }` otherwise.
+*/
+function detectDoltAvailableSync(basePath) {
+	const result = spawnSync("dolt", ["version"], { stdio: "ignore" });
+	const binaryFound = result.error == null && result.status === 0;
+	if (!binaryFound) return {
+		available: false,
+		reason: "dolt binary not found on PATH"
+	};
+	const stateDoltDir = join$1(basePath, ".substrate", "state", ".dolt");
+	const repoExists = existsSync$1(stateDoltDir);
+	if (!repoExists) return {
+		available: false,
+		reason: `Dolt repo not initialised at ${stateDoltDir}`
+	};
+	return {
+		available: true,
+		reason: "dolt binary found and repo initialised"
+	};
+}
+/**
+* Create a StateStore backed by the specified backend.
+*
+* @param config - Optional configuration. Defaults to `{ backend: 'file' }`.
+* @returns A StateStore instance. Call `initialize()` before use.
+*/
+function createStateStore(config = {}) {
+	const backend = config.backend ?? "file";
+	if (backend === "dolt") {
+		const repoPath = config.basePath ?? process.cwd();
+		const client = new DoltClient({ repoPath });
+		return new DoltStateStore({
+			repoPath,
+			client
+		});
+	}
+	if (backend === "auto") {
+		const repoPath = config.basePath ?? process.cwd();
+		const detection = detectDoltAvailableSync(repoPath);
+		if (detection.available) {
+			logger$9.debug(`Dolt detected, using DoltStateStore (state path: ${join$1(repoPath, ".substrate", "state")})`);
+			const client = new DoltClient({ repoPath });
+			return new DoltStateStore({
+				repoPath,
+				client
+			});
+		} else {
+			logger$9.debug(`Dolt not found, using FileStateStore (reason: ${detection.reason})`);
+			return new FileStateStore({ basePath: config.basePath });
+		}
+	}
+	return new FileStateStore({ basePath: config.basePath });
+}
+
 //#endregion
 //#region src/cli/commands/health.ts
 const logger$8 = createLogger("health-cmd");
@@ -7064,9 +8137,36 @@ function getAllDescendantPids(rootPids, execFileSyncOverride) {
 * (missing DB, missing run, terminal run status). Throws only on unexpected errors.
 */
 async function getAutoHealthData(options) {
-	const { runId, projectRoot } = options;
+	const { runId, projectRoot, stateStore, stateStoreConfig } = options;
 	const dbRoot = await resolveMainRepoRoot(projectRoot);
 	const dbPath = join(dbRoot, ".substrate", "substrate.db");
+	let doltStateInfo;
+	if (stateStoreConfig?.backend === "dolt" && stateStore) {
+		const repoPath = stateStoreConfig.basePath ?? projectRoot;
+		const doltDirPath = join(repoPath, ".dolt");
+		const initialized = existsSync$1(doltDirPath);
+		let responsive = false;
+		let version;
+		try {
+			await stateStore.getHistory(1);
+			responsive = true;
+			try {
+				const { execFile: ef } = await import("node:child_process");
+				const { promisify: p } = await import("node:util");
+				const execFileAsync = p(ef);
+				const { stdout } = await execFileAsync("dolt", ["version"]);
+				const match = stdout.match(/dolt version (\S+)/);
+				if (match) version = match[1];
+			} catch {}
+		} catch {
+			responsive = false;
+		}
+		doltStateInfo = {
+			initialized,
+			responsive,
+			...version !== void 0 ? { version } : {}
+		};
+	}
 	const NO_PIPELINE = {
 		verdict: "NO_PIPELINE_RUNNING",
 		run_id: null,
@@ -7084,7 +8184,8 @@ async function getAutoHealthData(options) {
 			completed: 0,
 			escalated: 0,
 			details: {}
-		}
+		},
+		...doltStateInfo !== void 0 ? { dolt_state: doltStateInfo } : {}
 	};
 	if (!existsSync$1(dbPath)) return NO_PIPELINE;
 	const dbWrapper = new DatabaseWrapper(dbPath);
@@ -7129,7 +8230,7 @@ async function getAutoHealthData(options) {
 		else if (processInfo.orchestrator_pid !== null && processInfo.child_pids.length === 0 && active > 0) verdict = "STALLED";
 		else verdict = "HEALTHY";
 		else if (run.status === "completed" || run.status === "failed" || run.status === "stopped") verdict = "NO_PIPELINE_RUNNING";
-		return {
+		const healthOutput = {
 			verdict,
 			run_id: run.id,
 			status: run.status,
@@ -7143,8 +8244,10 @@ async function getAutoHealthData(options) {
 				escalated,
 				pending,
 				details: storyDetails
-			}
+			},
+			...doltStateInfo !== void 0 ? { dolt_state: doltStateInfo } : {}
 		};
+		return healthOutput;
 	} finally {
 		try {
 			dbWrapper.close();
@@ -7178,6 +8281,13 @@ async function runHealthAction(options) {
 					process.stdout.write(`\n  Summary: ${health.stories.active} active, ${health.stories.completed} completed, ${health.stories.escalated} escalated\n`);
 				}
 			}
+			if (health.dolt_state !== void 0) {
+				const ds = health.dolt_state;
+				const initStr = ds.initialized ? "yes" : "no";
+				const respStr = ds.responsive ? "yes" : "no";
+				const verStr = ds.version !== void 0 ? ` (v${ds.version})` : "";
+				process.stdout.write(`\n  Dolt State:   initialized=${initStr} responsive=${respStr}${verStr}\n`);
+			}
 		}
 		return 0;
 	} catch (err) {
@@ -7191,12 +8301,41 @@ async function runHealthAction(options) {
 function registerHealthCommand(program, _version = "0.0.0", projectRoot = process.cwd()) {
 	program.command("health").description("Check pipeline health: process status, stall detection, and verdict").option("--run-id <id>", "Pipeline run ID to query (defaults to latest)").option("--project-root <path>", "Project root directory", projectRoot).option("--output-format <format>", "Output format: human (default) or json", "human").action(async (opts) => {
 		const outputFormat = opts.outputFormat === "json" ? "json" : "human";
-		const exitCode = await runHealthAction({
-			outputFormat,
-			runId: opts.runId,
-			projectRoot: opts.projectRoot
-		});
-		process.exitCode = exitCode;
+		const root = opts.projectRoot;
+		let stateStore;
+		let stateStoreConfig;
+		const doltStatePath = join(root, ".substrate", "state", ".dolt");
+		if (existsSync$1(doltStatePath)) {
+			const basePath = join(root, ".substrate", "state");
+			stateStoreConfig = {
+				backend: "dolt",
+				basePath
+			};
+			try {
+				stateStore = createStateStore({
+					backend: "dolt",
+					basePath
+				});
+				await stateStore.initialize();
+			} catch {
+				stateStore = void 0;
+				stateStoreConfig = void 0;
+			}
+		}
+		try {
+			const exitCode = await runHealthAction({
+				outputFormat,
+				runId: opts.runId,
+				projectRoot: root,
+				stateStore,
+				stateStoreConfig
+			});
+			process.exitCode = exitCode;
+		} finally {
+			try {
+				await stateStore?.close();
+			} catch {}
+		}
 	});
 }
 
@@ -7835,8 +8974,8 @@ function buildTargetedFilesContent(issueList) {
 * @returns A fully-configured ImplementationOrchestrator ready to call run()
 */
 function createImplementationOrchestrator(deps) {
-	const { db, pack, contextCompiler, dispatcher, eventBus, config, projectRoot, tokenCeilings } = deps;
-	const logger$23 = createLogger("implementation-orchestrator");
+	const { db, pack, contextCompiler, dispatcher, eventBus, config, projectRoot, tokenCeilings, stateStore } = deps;
+	const logger$24 = createLogger("implementation-orchestrator");
 	let _state = "IDLE";
 	let _startedAt;
 	let _completedAt;
@@ -7856,6 +8995,7 @@ function createImplementationOrchestrator(deps) {
 	const _storyDispatches = new Map();
 	let _maxConcurrentActual = 0;
 	let _contractMismatches;
+	const _stateStoreCache = new Map();
 	const MEMORY_PRESSURE_BACKOFF_MS = [
 		3e4,
 		6e4,
@@ -7880,7 +9020,7 @@ function createImplementationOrchestrator(deps) {
 		const nowMs = Date.now();
 		for (const [phase, startMs] of starts) {
 			const endMs = ends?.get(phase);
-			if (endMs === void 0) logger$23.warn({
+			if (endMs === void 0) logger$24.warn({
 				storyKey,
 				phase
 			}, "Phase has no end time — story may have errored mid-phase. Duration capped to now() and may be inflated.");
@@ -7912,6 +9052,26 @@ function createImplementationOrchestrator(deps) {
 				review_cycles: reviewCycles,
 				dispatches: _storyDispatches.get(storyKey) ?? 0
 			});
+			if (stateStore !== void 0) stateStore.recordMetric({
+				storyKey,
+				taskType: "dev-story",
+				model: void 0,
+				tokensIn: tokenAgg.input,
+				tokensOut: tokenAgg.output,
+				cacheReadTokens: void 0,
+				costUsd: tokenAgg.cost,
+				wallClockMs,
+				reviewCycles,
+				stallCount: _storiesWithStall.has(storyKey) ? 1 : 0,
+				result,
+				recordedAt: completedAt,
+				timestamp: completedAt
+			}).catch((storeErr) => {
+				logger$24.warn({
+					err: storeErr,
+					storyKey
+				}, "Failed to record metric to StateStore (best-effort)");
+			});
 			try {
 				const runId = config.pipelineRunId ?? "unknown";
 				createDecision(db, {
@@ -7929,7 +9089,7 @@ function createImplementationOrchestrator(deps) {
 					rationale: `Story ${storyKey} completed with result=${result} in ${wallClockSeconds}s. Tokens: ${tokenAgg.input}+${tokenAgg.output}. Review cycles: ${reviewCycles}.`
 				});
 			} catch (decisionErr) {
-				logger$23.warn({
+				logger$24.warn({
 					err: decisionErr,
 					storyKey
 				}, "Failed to write story-metrics decision (best-effort)");
@@ -7957,13 +9117,13 @@ function createImplementationOrchestrator(deps) {
 					dispatches: _storyDispatches.get(storyKey) ?? 0
 				});
 			} catch (emitErr) {
-				logger$23.warn({
+				logger$24.warn({
 					err: emitErr,
 					storyKey
 				}, "Failed to emit story:metrics event (best-effort)");
 			}
 		} catch (err) {
-			logger$23.warn({
+			logger$24.warn({
 				err,
 				storyKey
 			}, "Failed to write story metrics (best-effort)");
@@ -7992,7 +9152,7 @@ function createImplementationOrchestrator(deps) {
 				rationale: `Story ${storyKey} ${outcome} after ${reviewCycles} review cycle(s).`
 			});
 		} catch (err) {
-			logger$23.warn({
+			logger$24.warn({
 				err,
 				storyKey
 			}, "Failed to write story-outcome decision (best-effort)");
@@ -8018,7 +9178,7 @@ function createImplementationOrchestrator(deps) {
 				rationale: `Escalation diagnosis for ${payload.storyKey}: ${diagnosis.recommendedAction} — ${diagnosis.rationale}`
 			});
 		} catch (err) {
-			logger$23.warn({
+			logger$24.warn({
 				err,
 				storyKey: payload.storyKey
 			}, "Failed to persist escalation diagnosis (best-effort)");
@@ -8040,6 +9200,14 @@ function createImplementationOrchestrator(deps) {
 	}
 	function getStatus() {
 		const stories = {};
+		for (const [key, record] of _stateStoreCache) if (!_stories.has(key)) stories[key] = {
+			phase: record.phase,
+			reviewCycles: record.reviewCycles,
+			lastVerdict: record.lastVerdict,
+			error: record.error,
+			startedAt: record.startedAt,
+			completedAt: record.completedAt
+		};
 		for (const [key, s] of _stories) stories[key] = { ...s };
 		const status = {
 			state: _state,
@@ -8057,7 +9225,54 @@ function createImplementationOrchestrator(deps) {
 	}
 	function updateStory(storyKey, updates) {
 		const existing = _stories.get(storyKey);
-		if (existing !== void 0) Object.assign(existing, updates);
+		if (existing !== void 0) {
+			Object.assign(existing, updates);
+			persistStoryState(storyKey, existing).catch((err) => logger$24.warn({
+				err,
+				storyKey
+			}, "StateStore write failed after updateStory"));
+			if (updates.phase === "COMPLETE") stateStore?.mergeStory(storyKey).catch((err) => {
+				if (err instanceof DoltMergeConflict) eventBus.emit("pipeline:state-conflict", {
+					storyKey,
+					conflict: err
+				});
+				else logger$24.warn({
+					err,
+					storyKey
+				}, "mergeStory failed");
+			});
+			else if (updates.phase === "ESCALATED" || updates.phase === "FAILED") stateStore?.rollbackStory(storyKey).catch((err) => logger$24.warn({
+				err,
+				storyKey
+			}, "rollbackStory failed — branch may persist"));
+		}
+	}
+	/**
+	* Persist a single story's state to the StateStore (Story 26-4, AC2).
+	*
+	* Best-effort: callers should `.catch()` on the returned promise.
+	* Never throws — errors are swallowed so the pipeline is never blocked.
+	*/
+	async function persistStoryState(storyKey, state) {
+		if (stateStore === void 0) return;
+		try {
+			const record = {
+				storyKey,
+				phase: state.phase,
+				reviewCycles: state.reviewCycles,
+				lastVerdict: state.lastVerdict,
+				error: state.error,
+				startedAt: state.startedAt,
+				completedAt: state.completedAt,
+				sprint: config.sprint
+			};
+			await stateStore.setStoryState(storyKey, record);
+		} catch (err) {
+			logger$24.warn({
+				err,
+				storyKey
+			}, "StateStore.setStoryState failed (best-effort)");
+		}
 	}
 	function persistState() {
 		if (config.pipelineRunId === void 0) return;
@@ -8069,7 +9284,7 @@ function createImplementationOrchestrator(deps) {
 				token_usage_json: serialized
 			});
 		} catch (err) {
-			logger$23.warn({ err }, "Failed to persist orchestrator state");
+			logger$24.warn({ err }, "Failed to persist orchestrator state");
 		}
 	}
 	function recordProgress() {
@@ -8116,7 +9331,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (childActive) {
 					_lastProgressTs = Date.now();
-					logger$23.debug({
+					logger$24.debug({
 						storyKey: key,
 						phase: s.phase,
 						childPids
@@ -8125,7 +9340,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				_stalledStories.add(key);
 				_storiesWithStall.add(key);
-				logger$23.warn({
+				logger$24.warn({
 					storyKey: key,
 					phase: s.phase,
 					elapsedMs: elapsed,
@@ -8170,7 +9385,7 @@ function createImplementationOrchestrator(deps) {
 		for (let attempt = 0; attempt < MEMORY_PRESSURE_BACKOFF_MS.length; attempt++) {
 			const memState = dispatcher.getMemoryState();
 			if (!memState.isPressured) return true;
-			logger$23.warn({
+			logger$24.warn({
 				storyKey,
 				freeMB: memState.freeMB,
 				thresholdMB: memState.thresholdMB,
@@ -8190,18 +9405,23 @@ function createImplementationOrchestrator(deps) {
 	* exhausted retries the story is ESCALATED.
 	*/
 	async function processStory(storyKey) {
-		logger$23.info({ storyKey }, "Processing story");
+		logger$24.info({ storyKey }, "Processing story");
 		{
 			const memoryOk = await checkMemoryPressure(storyKey);
 			if (!memoryOk) {
-				logger$23.warn({ storyKey }, "Memory pressure exhausted — escalating story without dispatch");
-				_stories.set(storyKey, {
+				logger$24.warn({ storyKey }, "Memory pressure exhausted — escalating story without dispatch");
+				const memPressureState = {
 					phase: "ESCALATED",
 					reviewCycles: 0,
 					error: "memory_pressure_exhausted",
 					startedAt: new Date().toISOString(),
 					completedAt: new Date().toISOString()
-				});
+				};
+				_stories.set(storyKey, memPressureState);
+				persistStoryState(storyKey, memPressureState).catch((err) => logger$24.warn({
+					err,
+					storyKey
+				}, "StateStore write failed after memory-pressure escalation"));
 				writeStoryMetricsBestEffort(storyKey, "escalated", 0);
 				emitEscalation({
 					storyKey,
@@ -8215,6 +9435,10 @@ function createImplementationOrchestrator(deps) {
 		}
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
+		stateStore?.branchForStory(storyKey).catch((err) => logger$24.warn({
+			err,
+			storyKey
+		}, "branchForStory failed — continuing without branch isolation"));
 		startPhase(storyKey, "create-story");
 		updateStory(storyKey, {
 			phase: "IN_STORY_CREATION",
@@ -8228,14 +9452,14 @@ function createImplementationOrchestrator(deps) {
 			if (match) {
 				const candidatePath = join$1(artifactsDir, match);
 				const validation = await isValidStoryFile(candidatePath);
-				if (!validation.valid) logger$23.warn({
+				if (!validation.valid) logger$24.warn({
 					storyKey,
 					storyFilePath: candidatePath,
 					reason: validation.reason
 				}, `Existing story file for ${storyKey} is invalid (${validation.reason}) — re-creating`);
 				else {
 					storyFilePath = candidatePath;
-					logger$23.info({
+					logger$24.info({
 						storyKey,
 						storyFilePath
 					}, "Found existing story file — skipping create-story");
@@ -8331,7 +9555,15 @@ function createImplementationOrchestrator(deps) {
 			const storyContent = await readFile$1(storyFilePath, "utf-8");
 			const contracts = parseInterfaceContracts(storyContent, storyKey);
 			if (contracts.length > 0) {
-				for (const contract of contracts) createDecision(db, {
+				const contractRecords = contracts.map((d) => ({
+					storyKey: d.storyKey,
+					contractName: d.contractName,
+					direction: d.direction,
+					schemaPath: d.filePath,
+					...d.transport !== void 0 ? { transport: d.transport } : {}
+				}));
+				if (stateStore !== void 0) await stateStore.setContracts(storyKey, contractRecords);
+				else for (const contract of contracts) createDecision(db, {
 					pipeline_run_id: config.pipelineRunId ?? null,
 					phase: "implementation",
 					category: "interface-contract",
@@ -8344,14 +9576,14 @@ function createImplementationOrchestrator(deps) {
 						...contract.transport !== void 0 ? { transport: contract.transport } : {}
 					})
 				});
-				logger$23.info({
+				logger$24.info({
 					storyKey,
 					contractCount: contracts.length,
 					contracts
-				}, "Stored interface contract declarations in decision store");
+				}, "Stored interface contract declarations");
 			}
 		} catch (err) {
-			logger$23.warn({
+			logger$24.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to parse interface contracts — continuing without contract declarations");
@@ -8376,10 +9608,10 @@ function createImplementationOrchestrator(deps) {
 				pipelineRunId: config.pipelineRunId ?? ""
 			});
 			testPlanPhaseResult = testPlanResult.result;
-			if (testPlanResult.result === "success") logger$23.info({ storyKey }, "Test plan generated successfully");
-			else logger$23.warn({ storyKey }, "Test planning returned failed result — proceeding to dev-story without test plan");
+			if (testPlanResult.result === "success") logger$24.info({ storyKey }, "Test plan generated successfully");
+			else logger$24.warn({ storyKey }, "Test planning returned failed result — proceeding to dev-story without test plan");
 		} catch (err) {
-			logger$23.warn({
+			logger$24.warn({
 				storyKey,
 				err
 			}, "Test planning failed — proceeding to dev-story without test plan");
@@ -8403,7 +9635,7 @@ function createImplementationOrchestrator(deps) {
 			try {
 				storyContentForAnalysis = await readFile$1(storyFilePath ?? "", "utf-8");
 			} catch (err) {
-				logger$23.error({
+				logger$24.error({
 					storyKey,
 					storyFilePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -8411,7 +9643,7 @@ function createImplementationOrchestrator(deps) {
 			}
 			const analysis = analyzeStoryComplexity(storyContentForAnalysis);
 			const batches = planTaskBatches(analysis);
-			logger$23.info({
+			logger$24.info({
 				storyKey,
 				estimatedScope: analysis.estimatedScope,
 				batchCount: batches.length,
@@ -8429,7 +9661,7 @@ function createImplementationOrchestrator(deps) {
 					if (_state !== "RUNNING") break;
 					const taskScope = batch.taskIds.map((id, i) => `T${id}: ${batch.taskTitles[i] ?? ""}`).join("\n");
 					const priorFiles = allFilesModified.size > 0 ? Array.from(allFilesModified) : void 0;
-					logger$23.info({
+					logger$24.info({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						taskCount: batch.taskIds.length
@@ -8454,7 +9686,7 @@ function createImplementationOrchestrator(deps) {
 						});
 					} catch (batchErr) {
 						const errMsg = batchErr instanceof Error ? batchErr.message : String(batchErr);
-						logger$23.warn({
+						logger$24.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							error: errMsg
@@ -8474,7 +9706,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: batchFilesModified,
 						result: batchResult.result === "success" ? "success" : "failed"
 					};
-					logger$23.info(batchMetrics, "Batch dev-story metrics");
+					logger$24.info(batchMetrics, "Batch dev-story metrics");
 					for (const f of batchFilesModified) allFilesModified.add(f);
 					if (batchFilesModified.length > 0) batchFileGroups.push({
 						batchIndex: batch.batchIndex,
@@ -8496,13 +9728,13 @@ function createImplementationOrchestrator(deps) {
 							})
 						});
 					} catch (tokenErr) {
-						logger$23.warn({
+						logger$24.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							err: tokenErr
 						}, "Failed to record batch token usage");
 					}
-					if (batchResult.result === "failed") logger$23.warn({
+					if (batchResult.result === "failed") logger$24.warn({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						error: batchResult.error
@@ -8538,7 +9770,7 @@ function createImplementationOrchestrator(deps) {
 				});
 				persistState();
 				if (devResult.result === "success") devStoryWasSuccess = true;
-				else logger$23.warn({
+				else logger$24.warn({
 					storyKey,
 					error: devResult.error,
 					filesModified: devFilesModified.length
@@ -8566,7 +9798,7 @@ function createImplementationOrchestrator(deps) {
 		if (devStoryWasSuccess) {
 			gitDiffFiles = checkGitDiffFiles(projectRoot ?? process.cwd());
 			if (gitDiffFiles.length === 0) {
-				logger$23.warn({ storyKey }, "Zero-diff detected after COMPLETE dev-story — no file changes in git working tree");
+				logger$24.warn({ storyKey }, "Zero-diff detected after COMPLETE dev-story — no file changes in git working tree");
 				eventBus.emit("orchestrator:zero-diff-escalation", {
 					storyKey,
 					reason: "zero-diff-on-complete"
@@ -8597,7 +9829,7 @@ function createImplementationOrchestrator(deps) {
 			});
 			if (buildVerifyResult.status === "passed") {
 				eventBus.emit("story:build-verification-passed", { storyKey });
-				logger$23.info({ storyKey }, "Build verification passed");
+				logger$24.info({ storyKey }, "Build verification passed");
 			} else if (buildVerifyResult.status === "failed" || buildVerifyResult.status === "timeout") {
 				const truncatedOutput = (buildVerifyResult.output ?? "").slice(0, 2e3);
 				const reason = buildVerifyResult.reason ?? "build-verification-failed";
@@ -8606,7 +9838,7 @@ function createImplementationOrchestrator(deps) {
 					exitCode: buildVerifyResult.exitCode ?? 1,
 					output: truncatedOutput
 				});
-				logger$23.warn({
+				logger$24.warn({
 					storyKey,
 					reason,
 					exitCode: buildVerifyResult.exitCode
@@ -8636,7 +9868,7 @@ function createImplementationOrchestrator(deps) {
 					storyKey
 				});
 				if (icResult.potentiallyAffectedTests.length > 0) {
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						modifiedInterfaces: icResult.modifiedInterfaces,
 						potentiallyAffectedTests: icResult.potentiallyAffectedTests
@@ -8682,7 +9914,7 @@ function createImplementationOrchestrator(deps) {
 						"NEEDS_MAJOR_REWORK": 2
 					};
 					for (const group of batchFileGroups) {
-						logger$23.info({
+						logger$24.info({
 							storyKey,
 							batchIndex: group.batchIndex,
 							fileCount: group.files.length
@@ -8720,7 +9952,7 @@ function createImplementationOrchestrator(deps) {
 						rawOutput: lastRawOutput,
 						tokenUsage: aggregateTokens
 					};
-					logger$23.info({
+					logger$24.info({
 						storyKey,
 						batchCount: batchFileGroups.length,
 						verdict: worstVerdict,
@@ -8747,7 +9979,7 @@ function createImplementationOrchestrator(deps) {
 				const isPhantomReview = reviewResult.dispatchFailed === true || reviewResult.verdict !== "SHIP_IT" && reviewResult.verdict !== "LGTM_WITH_NOTES" && (reviewResult.issue_list === void 0 || reviewResult.issue_list.length === 0) && reviewResult.error !== void 0;
 				if (isPhantomReview && !timeoutRetried) {
 					timeoutRetried = true;
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						reviewCycles,
 						error: reviewResult.error
@@ -8757,7 +9989,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$23.info({
+					logger$24.info({
 						storyKey,
 						originalVerdict: verdict,
 						issuesBefore: previousIssueList.length,
@@ -8793,7 +10025,7 @@ function createImplementationOrchestrator(deps) {
 					if (_decomposition !== void 0) parts.push(`decomposed: ${_decomposition.batchCount} batches`);
 					parts.push(`${fileCount} files`);
 					parts.push(`${totalTokensK} tokens`);
-					logger$23.info({
+					logger$24.info({
 						storyKey,
 						verdict,
 						agentVerdict: reviewResult.agentVerdict
@@ -8842,9 +10074,9 @@ function createImplementationOrchestrator(deps) {
 						}),
 						rationale: `Advisory notes from LGTM_WITH_NOTES review of ${storyKey}`
 					});
-					logger$23.info({ storyKey }, "Advisory notes persisted to decision store");
+					logger$24.info({ storyKey }, "Advisory notes persisted to decision store");
 				} catch (advisoryErr) {
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						error: advisoryErr instanceof Error ? advisoryErr.message : String(advisoryErr)
 					}, "Failed to persist advisory notes (best-effort)");
@@ -8864,7 +10096,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: devFilesModified,
 						workingDirectory: projectRoot
 					});
-					logger$23.debug({
+					logger$24.debug({
 						storyKey,
 						expansion_priority: expansionResult.expansion_priority,
 						coverage_gaps: expansionResult.coverage_gaps.length
@@ -8877,7 +10109,7 @@ function createImplementationOrchestrator(deps) {
 						value: JSON.stringify(expansionResult)
 					});
 				} catch (expansionErr) {
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						error: expansionErr instanceof Error ? expansionErr.message : String(expansionErr)
 					}, "Test expansion failed — story verdict unchanged");
@@ -8904,7 +10136,7 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				logger$23.info({
+				logger$24.info({
 					storyKey,
 					reviewCycles: finalReviewCycles,
 					issueCount: issueList.length
@@ -8964,7 +10196,7 @@ function createImplementationOrchestrator(deps) {
 						fixPrompt = assembled.prompt;
 					} catch {
 						fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, minor fixes needed`;
-						logger$23.warn({ storyKey }, "Failed to assemble auto-approve fix prompt, using fallback");
+						logger$24.warn({ storyKey }, "Failed to assemble auto-approve fix prompt, using fallback");
 					}
 					const handle = dispatcher.dispatch({
 						prompt: fixPrompt,
@@ -8982,9 +10214,9 @@ function createImplementationOrchestrator(deps) {
 							output: fixResult.tokenEstimate.output
 						} : void 0 }
 					});
-					if (fixResult.status === "timeout") logger$23.warn({ storyKey }, "Auto-approve fix timed out — approving anyway (issues were minor)");
+					if (fixResult.status === "timeout") logger$24.warn({ storyKey }, "Auto-approve fix timed out — approving anyway (issues were minor)");
 				} catch (err) {
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						err
 					}, "Auto-approve fix dispatch failed — approving anyway (issues were minor)");
@@ -9101,7 +10333,7 @@ function createImplementationOrchestrator(deps) {
 					fixPrompt = assembled.prompt;
 				} catch {
 					fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, taskType=${taskType}`;
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						taskType
 					}, "Failed to assemble fix prompt, using fallback");
@@ -9133,7 +10365,7 @@ function createImplementationOrchestrator(deps) {
 					} : void 0 }
 				});
 				if (fixResult.status === "timeout") {
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						taskType
 					}, "Fix dispatch timed out — escalating story");
@@ -9155,7 +10387,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (fixResult.status === "failed") {
 					if (isMajorRework) {
-						logger$23.warn({
+						logger$24.warn({
 							storyKey,
 							exitCode: fixResult.exitCode
 						}, "Major rework dispatch failed — escalating story");
@@ -9175,14 +10407,14 @@ function createImplementationOrchestrator(deps) {
 						persistState();
 						return;
 					}
-					logger$23.warn({
+					logger$24.warn({
 						storyKey,
 						taskType,
 						exitCode: fixResult.exitCode
 					}, "Fix dispatch failed");
 				}
 			} catch (err) {
-				logger$23.warn({
+				logger$24.warn({
 					storyKey,
 					taskType,
 					err
@@ -9245,19 +10477,22 @@ function createImplementationOrchestrator(deps) {
 	}
 	async function run(storyKeys) {
 		if (_state === "RUNNING" || _state === "PAUSED") {
-			logger$23.warn({ state: _state }, "run() called while orchestrator is already running or paused — ignoring");
+			logger$24.warn({ state: _state }, "run() called while orchestrator is already running or paused — ignoring");
 			return getStatus();
 		}
 		if (_state === "COMPLETE") {
-			logger$23.warn({ state: _state }, "run() called on a COMPLETE orchestrator — ignoring");
+			logger$24.warn({ state: _state }, "run() called on a COMPLETE orchestrator — ignoring");
 			return getStatus();
 		}
 		_state = "RUNNING";
 		_startedAt = new Date().toISOString();
-		for (const key of storyKeys) _stories.set(key, {
-			phase: "PENDING",
-			reviewCycles: 0
-		});
+		for (const key of storyKeys) {
+			const pendingState = {
+				phase: "PENDING",
+				reviewCycles: 0
+			};
+			_stories.set(key, pendingState);
+		}
 		eventBus.emit("orchestrator:started", {
 			storyKeys,
 			pipelineRunId: config.pipelineRunId
@@ -9267,112 +10502,176 @@ function createImplementationOrchestrator(deps) {
 		if (config.enableHeartbeat) startHeartbeat();
 		if (projectRoot !== void 0) {
 			const seedResult = seedMethodologyContext(db, projectRoot);
-			if (seedResult.decisionsCreated > 0) logger$23.info({
+			if (seedResult.decisionsCreated > 0) logger$24.info({
 				decisionsCreated: seedResult.decisionsCreated,
 				skippedCategories: seedResult.skippedCategories
 			}, "Methodology context seeded from planning artifacts");
 		}
-		const interfaceContractDecisions = getDecisionsByCategory(db, "interface-contract");
-		const contractDeclarations = interfaceContractDecisions.map((d) => {
+		try {
+			if (stateStore !== void 0) {
+				await stateStore.initialize();
+				for (const key of storyKeys) {
+					const pendingState = _stories.get(key);
+					if (pendingState !== void 0) persistStoryState(key, pendingState).catch((err) => logger$24.warn({
+						err,
+						storyKey: key
+					}, "StateStore write failed during PENDING init"));
+				}
+				try {
+					const existingRecords = await stateStore.queryStories({});
+					for (const record of existingRecords) _stateStoreCache.set(record.storyKey, record);
+				} catch (err) {
+					logger$24.warn({ err }, "StateStore.queryStories() failed during init — status merge will be empty (best-effort)");
+				}
+			}
+			let contractDeclarations = [];
+			if (stateStore !== void 0) {
+				const allContractRecords = await stateStore.queryContracts();
+				contractDeclarations = allContractRecords.map((r) => ({
+					storyKey: r.storyKey,
+					contractName: r.contractName,
+					direction: r.direction,
+					filePath: r.schemaPath,
+					...r.transport !== void 0 ? { transport: r.transport } : {}
+				}));
+			} else {
+				const interfaceContractDecisions = getDecisionsByCategory(db, "interface-contract");
+				contractDeclarations = interfaceContractDecisions.map((d) => {
+					try {
+						const parsed = JSON.parse(d.value);
+						const storyKey = typeof parsed.storyKey === "string" ? parsed.storyKey : "";
+						const contractName = typeof parsed.schemaName === "string" ? parsed.schemaName : "";
+						const direction = parsed.direction === "export" ? "export" : "import";
+						const filePath = typeof parsed.filePath === "string" ? parsed.filePath : "";
+						if (!storyKey || !contractName) return null;
+						return {
+							storyKey,
+							contractName,
+							direction,
+							filePath,
+							...typeof parsed.transport === "string" ? { transport: parsed.transport } : {}
+						};
+					} catch {
+						return null;
+					}
+				}).filter((d) => d !== null);
+			}
+			const { batches, edges: contractEdges } = detectConflictGroupsWithContracts(storyKeys, { moduleMap: pack.manifest.conflictGroups }, contractDeclarations);
+			if (contractEdges.length > 0) logger$24.info({
+				contractEdges,
+				edgeCount: contractEdges.length
+			}, "Contract dependency edges detected — applying contract-aware dispatch ordering");
+			logger$24.info({
+				storyCount: storyKeys.length,
+				groupCount: batches.reduce((sum, b) => sum + b.length, 0),
+				batchCount: batches.length,
+				maxConcurrency: config.maxConcurrency
+			}, "Orchestrator starting");
+			if (config.skipPreflight !== true) {
+				const preFlightResult = runBuildVerification({
+					verifyCommand: pack.manifest.verifyCommand,
+					verifyTimeoutMs: pack.manifest.verifyTimeoutMs,
+					projectRoot: projectRoot ?? process.cwd()
+				});
+				if (preFlightResult.status === "failed" || preFlightResult.status === "timeout") {
+					stopHeartbeat();
+					const truncatedOutput = (preFlightResult.output ?? "").slice(0, 2e3);
+					const exitCode = preFlightResult.exitCode ?? 1;
+					eventBus.emit("pipeline:pre-flight-failure", {
+						exitCode,
+						output: truncatedOutput
+					});
+					logger$24.error({
+						exitCode,
+						reason: preFlightResult.reason
+					}, "Pre-flight build check failed — aborting pipeline before any story dispatch");
+					_state = "FAILED";
+					_completedAt = new Date().toISOString();
+					persistState();
+					return getStatus();
+				}
+				if (preFlightResult.status !== "skipped") logger$24.info("Pre-flight build check passed");
+			}
 			try {
-				const parsed = JSON.parse(d.value);
-				const storyKey = typeof parsed.storyKey === "string" ? parsed.storyKey : "";
-				const contractName = typeof parsed.schemaName === "string" ? parsed.schemaName : "";
-				const direction = parsed.direction === "export" ? "export" : "import";
-				const filePath = typeof parsed.filePath === "string" ? parsed.filePath : "";
-				if (!storyKey || !contractName) return null;
-				return {
-					storyKey,
-					contractName,
-					direction,
-					filePath,
-					...typeof parsed.transport === "string" ? { transport: parsed.transport } : {}
-				};
-			} catch {
-				return null;
-			}
-		}).filter((d) => d !== null);
-		const { batches, edges: contractEdges } = detectConflictGroupsWithContracts(storyKeys, { moduleMap: pack.manifest.conflictGroups }, contractDeclarations);
-		if (contractEdges.length > 0) logger$23.info({
-			contractEdges,
-			edgeCount: contractEdges.length
-		}, "Contract dependency edges detected — applying contract-aware dispatch ordering");
-		logger$23.info({
-			storyCount: storyKeys.length,
-			groupCount: batches.reduce((sum, b) => sum + b.length, 0),
-			batchCount: batches.length,
-			maxConcurrency: config.maxConcurrency
-		}, "Orchestrator starting");
-		if (config.skipPreflight !== true) {
-			const preFlightResult = runBuildVerification({
-				verifyCommand: pack.manifest.verifyCommand,
-				verifyTimeoutMs: pack.manifest.verifyTimeoutMs,
-				projectRoot: projectRoot ?? process.cwd()
-			});
-			if (preFlightResult.status === "failed" || preFlightResult.status === "timeout") {
+				for (const batchGroups of batches) await runWithConcurrency(batchGroups, config.maxConcurrency);
+			} catch (err) {
 				stopHeartbeat();
-				const truncatedOutput = (preFlightResult.output ?? "").slice(0, 2e3);
-				const exitCode = preFlightResult.exitCode ?? 1;
-				eventBus.emit("pipeline:pre-flight-failure", {
-					exitCode,
-					output: truncatedOutput
-				});
-				logger$23.error({
-					exitCode,
-					reason: preFlightResult.reason
-				}, "Pre-flight build check failed — aborting pipeline before any story dispatch");
 				_state = "FAILED";
 				_completedAt = new Date().toISOString();
 				persistState();
+				logger$24.error({ err }, "Orchestrator failed with unhandled error");
 				return getStatus();
 			}
-			if (preFlightResult.status !== "skipped") logger$23.info("Pre-flight build check passed");
-		}
-		try {
-			for (const batchGroups of batches) await runWithConcurrency(batchGroups, config.maxConcurrency);
-		} catch (err) {
 			stopHeartbeat();
-			_state = "FAILED";
+			_state = "COMPLETE";
 			_completedAt = new Date().toISOString();
+			if (projectRoot !== void 0 && contractDeclarations.length > 0) try {
+				const mismatches = verifyContracts(contractDeclarations, projectRoot);
+				if (mismatches.length > 0) {
+					_contractMismatches = mismatches;
+					for (const mismatch of mismatches) eventBus.emit("pipeline:contract-mismatch", {
+						exporter: mismatch.exporter,
+						importer: mismatch.importer,
+						contractName: mismatch.contractName,
+						mismatchDescription: mismatch.mismatchDescription
+					});
+					logger$24.warn({
+						mismatchCount: mismatches.length,
+						mismatches
+					}, "Post-sprint contract verification found mismatches — manual review required");
+				} else logger$24.info("Post-sprint contract verification passed — all declared contracts satisfied");
+				if (stateStore !== void 0) try {
+					const allContractsForVerification = await stateStore.queryContracts();
+					const verifiedAt = new Date().toISOString();
+					const contractsByStory = new Map();
+					for (const cr of allContractsForVerification) {
+						const existing = contractsByStory.get(cr.storyKey) ?? [];
+						existing.push(cr);
+						contractsByStory.set(cr.storyKey, existing);
+					}
+					for (const [sk, contracts] of contractsByStory) {
+						const records = contracts.map((cr) => {
+							const contractMismatches = (_contractMismatches ?? []).filter((m) => (m.exporter === sk || m.importer === sk) && m.contractName === cr.contractName);
+							if (contractMismatches.length > 0) return {
+								storyKey: sk,
+								contractName: cr.contractName,
+								verdict: "fail",
+								mismatchDescription: contractMismatches[0].mismatchDescription,
+								verifiedAt
+							};
+							return {
+								storyKey: sk,
+								contractName: cr.contractName,
+								verdict: "pass",
+								verifiedAt
+							};
+						});
+						await stateStore.setContractVerification(sk, records);
+					}
+					logger$24.info({ storyCount: contractsByStory.size }, "Contract verification results persisted to StateStore");
+				} catch (persistErr) {
+					logger$24.warn({ err: persistErr }, "Failed to persist contract verification results to StateStore");
+				}
+			} catch (err) {
+				logger$24.error({ err }, "Post-sprint contract verification threw an error — skipping");
+			}
+			let completed = 0;
+			let escalated = 0;
+			let failed = 0;
+			for (const s of _stories.values()) if (s.phase === "COMPLETE") completed++;
+			else if (s.phase === "ESCALATED") if (s.error !== void 0) failed++;
+			else escalated++;
+			eventBus.emit("orchestrator:complete", {
+				totalStories: storyKeys.length,
+				completed,
+				escalated,
+				failed
+			});
 			persistState();
-			logger$23.error({ err }, "Orchestrator failed with unhandled error");
 			return getStatus();
+		} finally {
+			if (stateStore !== void 0) await stateStore.close().catch((err) => logger$24.warn({ err }, "StateStore.close() failed (best-effort)"));
 		}
-		stopHeartbeat();
-		_state = "COMPLETE";
-		_completedAt = new Date().toISOString();
-		if (projectRoot !== void 0 && contractDeclarations.length > 0) try {
-			const mismatches = verifyContracts(contractDeclarations, projectRoot);
-			if (mismatches.length > 0) {
-				_contractMismatches = mismatches;
-				for (const mismatch of mismatches) eventBus.emit("pipeline:contract-mismatch", {
-					exporter: mismatch.exporter,
-					importer: mismatch.importer,
-					contractName: mismatch.contractName,
-					mismatchDescription: mismatch.mismatchDescription
-				});
-				logger$23.warn({
-					mismatchCount: mismatches.length,
-					mismatches
-				}, "Post-sprint contract verification found mismatches — manual review required");
-			} else logger$23.info("Post-sprint contract verification passed — all declared contracts satisfied");
-		} catch (err) {
-			logger$23.error({ err }, "Post-sprint contract verification threw an error — skipping");
-		}
-		let completed = 0;
-		let escalated = 0;
-		let failed = 0;
-		for (const s of _stories.values()) if (s.phase === "COMPLETE") completed++;
-		else if (s.phase === "ESCALATED") if (s.error !== void 0) failed++;
-		else escalated++;
-		eventBus.emit("orchestrator:complete", {
-			totalStories: storyKeys.length,
-			completed,
-			escalated,
-			failed
-		});
-		persistState();
-		return getStatus();
 	}
 	function pause() {
 		if (_state !== "RUNNING") return;
@@ -9380,7 +10679,7 @@ function createImplementationOrchestrator(deps) {
 		_pauseGate = createPauseGate();
 		_state = "PAUSED";
 		eventBus.emit("orchestrator:paused", {});
-		logger$23.info("Orchestrator paused");
+		logger$24.info("Orchestrator paused");
 	}
 	function resume() {
 		if (_state !== "PAUSED") return;
@@ -9391,7 +10690,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		_state = "RUNNING";
 		eventBus.emit("orchestrator:resumed", {});
-		logger$23.info("Orchestrator resumed");
+		logger$24.info("Orchestrator resumed");
 	}
 	return {
 		run,
@@ -9460,8 +10759,10 @@ function parseStoryKeysFromEpics(content) {
 	const explicitKeyPattern = /\*\*Story key:\*\*\s*`?(\d+-\d+)(?:-[^`\s]*)?`?/g;
 	let match;
 	while ((match = explicitKeyPattern.exec(content)) !== null) if (match[1] !== void 0) keys.add(match[1]);
-	const headingPattern = /^###\s+Story\s+(\d+)\.(\d+)/gm;
+	const headingPattern = /^###\s+Story\s+(\d+)[.\-](\d+)/gm;
 	while ((match = headingPattern.exec(content)) !== null) if (match[1] !== void 0 && match[2] !== void 0) keys.add(`${match[1]}-${match[2]}`);
+	const inlineStoryPattern = /Story\s+(\d+)-(\d+)[:\s]/g;
+	while ((match = inlineStoryPattern.exec(content)) !== null) if (match[1] !== void 0 && match[2] !== void 0) keys.add(`${match[1]}-${match[2]}`);
 	const filePathPattern = /_bmad-output\/implementation-artifacts\/(\d+-\d+)-/g;
 	while ((match = filePathPattern.exec(content)) !== null) if (match[1] !== void 0) keys.add(match[1]);
 	return sortStoryKeys(Array.from(keys));
@@ -9481,21 +10782,34 @@ function parseStoryKeysFromEpics(content) {
 * @returns Sorted array of pending story keys in "N-M" format
 */
 function discoverPendingStoryKeys(projectRoot) {
+	let allKeys = [];
 	const epicsPath = findEpicsFile(projectRoot);
-	if (epicsPath === void 0) return [];
-	let content;
-	try {
-		content = readFileSync$1(epicsPath, "utf-8");
-	} catch {
-		return [];
+	if (epicsPath !== void 0) try {
+		const content = readFileSync$1(epicsPath, "utf-8");
+		allKeys = parseStoryKeysFromEpics(content);
+	} catch {}
+	if (allKeys.length === 0) {
+		const epicFiles = findEpicFiles(projectRoot);
+		for (const epicFile of epicFiles) try {
+			const content = readFileSync$1(epicFile, "utf-8");
+			const keys = parseStoryKeysFromEpics(content);
+			allKeys.push(...keys);
+		} catch {}
+		allKeys = sortStoryKeys([...new Set(allKeys)]);
 	}
-	const allKeys = parseStoryKeysFromEpics(content);
 	if (allKeys.length === 0) return [];
 	const existingKeys = collectExistingStoryKeys(projectRoot);
 	return allKeys.filter((k) => !existingKeys.has(k));
 }
 /**
-* Find epics.md from known candidate paths relative to projectRoot.
+* Find epic files from known candidate paths relative to projectRoot.
+*
+* Checks for:
+*   1. epics.md (consolidated epic file)
+*   2. Individual epic-*.md files in planning-artifacts/
+*
+* Returns a single path for epics.md, or undefined if not found.
+* For individual epic files, use findEpicFiles() instead.
 */
 function findEpicsFile(projectRoot) {
 	const candidates = ["_bmad-output/planning-artifacts/epics.md", "_bmad-output/epics.md"];
@@ -9506,6 +10820,20 @@ function findEpicsFile(projectRoot) {
 	return void 0;
 }
 /**
+* Find individual epic-*.md files in the planning artifacts directory.
+* Returns paths sorted alphabetically.
+*/
+function findEpicFiles(projectRoot) {
+	const planningDir = join$1(projectRoot, "_bmad-output", "planning-artifacts");
+	if (!existsSync$1(planningDir)) return [];
+	try {
+		const entries = readdirSync$1(planningDir, { encoding: "utf-8" });
+		return entries.filter((e) => /^epic-\d+.*\.md$/.test(e)).sort().map((e) => join$1(planningDir, e));
+	} catch {
+		return [];
+	}
+}
+/**
 * Collect story keys that already have implementation artifact files.
 * Scans _bmad-output/implementation-artifacts/ for files matching N-M-*.md.
 */
@@ -13711,7 +15039,7 @@ async function runRunAction(options) {
 		if (storyKeys.length === 0) {
 			const activeReqs = db.prepare(`SELECT description FROM requirements WHERE status = 'active' AND type = 'story'`).all();
 			for (const req of activeReqs) {
-				const match = STORY_KEY_PATTERN.exec(req.description.trim());
+				const match = STORY_KEY_PATTERN$1.exec(req.description.trim());
 				if (match !== null) storyKeys.push(match[0]);
 			}
 			if (storyKeys.length > 0) {
@@ -14532,5 +15860,5 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 }
 
 //#endregion
-export { DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DatabaseWrapper, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createConfigSystem, createContextCompiler, createDispatcher, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runMigrations, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
-//# sourceMappingURL=run-RJ0EHbfM.js.map
+export { DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DatabaseWrapper, DoltNotInstalled, FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDispatcher, createDoltClient, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initializeDolt, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runMigrations, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
+//# sourceMappingURL=run-DO9n3cwy.js.map