substrate-ai 0.5.3 → 0.5.4

package/dist/{run-D7a-qzk9.js → run-BVqGAkUO.js}

@@ -704,7 +704,7 @@ function createDoltClient(options) {
 
 //#endregion
 //#region src/persistence/adapter.ts
-const logger$25 = createLogger("persistence:adapter");
+const logger$26 = createLogger("persistence:adapter");
 /** Type guard: check if a DatabaseAdapter also implements SyncAdapter. */
 function isSyncAdapter(adapter) {
 	return typeof adapter.querySync === "function";
@@ -730,20 +730,20 @@ function createDatabaseAdapter(config = { backend: "auto" }) {
 	const basePath = config.basePath ?? process.cwd();
 	const doltRepoPath = join$1(basePath, ".substrate", "state");
 	if (backend === "dolt") {
-		logger$25.debug("Using DoltDatabaseAdapter (explicit config)");
+		logger$26.debug("Using DoltDatabaseAdapter (explicit config)");
 		const client = new DoltClient({ repoPath: doltRepoPath });
 		return new DoltDatabaseAdapter(client);
 	}
 	if (backend === "memory") {
-		logger$25.debug("Using InMemoryDatabaseAdapter (explicit config)");
+		logger$26.debug("Using InMemoryDatabaseAdapter (explicit config)");
 		return new InMemoryDatabaseAdapter();
 	}
 	if (isDoltAvailable(basePath)) {
-		logger$25.debug("Dolt detected, using DoltDatabaseAdapter");
+		logger$26.debug("Dolt detected, using DoltDatabaseAdapter");
 		const client = new DoltClient({ repoPath: doltRepoPath });
 		return new DoltDatabaseAdapter(client);
 	}
-	logger$25.debug("Dolt not available, using InMemoryDatabaseAdapter");
+	logger$26.debug("Dolt not available, using InMemoryDatabaseAdapter");
 	return new InMemoryDatabaseAdapter();
 }
 
@@ -1101,10 +1101,20 @@ async function initSchema(adapter) {
       tool_name         VARCHAR(128),
       is_context_spike  BOOLEAN        NOT NULL DEFAULT 0,
       child_spans_json  TEXT           NOT NULL DEFAULT '[]',
+      task_type         VARCHAR(64),
+      phase             VARCHAR(64),
+      dispatch_id       VARCHAR(64),
       PRIMARY KEY (story_key, span_id)
     )
   `);
 	await adapter.exec("CREATE INDEX IF NOT EXISTS idx_turn_analysis_story ON turn_analysis (story_key, turn_number)");
+	for (const col of [
+		"task_type",
+		"phase",
+		"dispatch_id"
+	]) try {
+		await adapter.exec(`ALTER TABLE turn_analysis ADD COLUMN ${col} VARCHAR(64)`);
+	} catch {}
 	await adapter.exec(`
     CREATE TABLE IF NOT EXISTS efficiency_scores (
       story_key                     VARCHAR(64)  NOT NULL,
@@ -1119,9 +1129,19 @@ async function initSchema(adapter) {
       total_turns                   INTEGER      NOT NULL DEFAULT 0,
       per_model_json                TEXT         NOT NULL DEFAULT '[]',
       per_source_json               TEXT         NOT NULL DEFAULT '[]',
+      dispatch_id                   TEXT,
+      task_type                     TEXT,
+      phase                         TEXT,
       PRIMARY KEY (story_key, timestamp)
     )
   `);
+	for (const col of [
+		"dispatch_id",
+		"task_type",
+		"phase"
+	]) try {
+		await adapter.exec(`ALTER TABLE efficiency_scores ADD COLUMN ${col} TEXT`);
+	} catch {}
 	await adapter.exec(`
     CREATE TABLE IF NOT EXISTS recommendations (
       id                       VARCHAR(16)   NOT NULL,
@@ -2100,7 +2120,7 @@ function formatUnsupportedVersionError(formatType, version, supported) {
 
 //#endregion
 //#region src/modules/config/config-system-impl.ts
-const logger$24 = createLogger("config");
+const logger$25 = 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);
@@ -2145,7 +2165,7 @@ function readEnvOverrides() {
 	}
 	const parsed = PartialSubstrateConfigSchema.safeParse(overrides);
 	if (!parsed.success) {
-		logger$24.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
+		logger$25.warn({ errors: parsed.error.issues }, "Invalid environment variable overrides ignored");
 		return {};
 	}
 	return parsed.data;
@@ -2209,7 +2229,7 @@ var ConfigSystemImpl = class {
 			throw new ConfigError(`Configuration validation failed:\n${issues}`, { issues: result.error.issues });
 		}
 		this._config = result.data;
-		logger$24.debug("Configuration loaded successfully");
+		logger$25.debug("Configuration loaded successfully");
 	}
 	getConfig() {
 		if (this._config === null) throw new ConfigError("Configuration has not been loaded. Call load() before getConfig().", {});
@@ -2272,7 +2292,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$24.info({
+						logger$25.info({
 							from: version,
 							to: CURRENT_CONFIG_FORMAT_VERSION,
 							backup: migrationOutput.result.backupPath
@@ -3753,7 +3773,7 @@ function truncateToTokens(text, maxTokens) {
 
 //#endregion
 //#region src/modules/context-compiler/context-compiler-impl.ts
-const logger$23 = createLogger("context-compiler");
+const logger$24 = createLogger("context-compiler");
 /**
 * Fraction of the original token budget that must remain (after required +
 * important sections) before an optional section is included.
@@ -3844,7 +3864,7 @@ var ContextCompilerImpl = class {
 				includedParts.push(truncated);
 				remainingBudget -= truncatedTokens;
 				anyTruncated = true;
-				logger$23.warn({
+				logger$24.warn({
 					section: section.name,
 					originalTokens: tokens,
 					budgetTokens: truncatedTokens
@@ -3858,7 +3878,7 @@ var ContextCompilerImpl = class {
 				});
 			} else {
 				anyTruncated = true;
-				logger$23.warn({
+				logger$24.warn({
 					section: section.name,
 					tokens
 				}, "Context compiler: omitted \"important\" section — no budget remaining");
@@ -3885,7 +3905,7 @@ var ContextCompilerImpl = class {
 				} else {
 					if (tokens > 0) {
 						anyTruncated = true;
-						logger$23.warn({
+						logger$24.warn({
 							section: section.name,
 							tokens,
 							budgetFractionRemaining: budgetFractionRemaining.toFixed(2)
@@ -3979,8 +3999,8 @@ var GrammarLoader = class {
 	_extensionMap;
 	_cache = new Map();
 	_unavailable = false;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 		this._extensionMap = new Map([
 			[".ts", "tree-sitter-typescript/typescript"],
 			[".tsx", "tree-sitter-typescript/tsx"],
@@ -4066,9 +4086,9 @@ const ERR_REPO_MAP_GIT_FAILED = "ERR_REPO_MAP_GIT_FAILED";
 var SymbolParser = class {
 	_grammarLoader;
 	_logger;
-	constructor(grammarLoader, logger$26) {
+	constructor(grammarLoader, logger$27) {
 		this._grammarLoader = grammarLoader;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	async parseFile(filePath) {
 		const ext$1 = extname(filePath);
@@ -4213,9 +4233,9 @@ async function computeFileHash(filePath) {
 var DoltSymbolRepository = class {
 	_client;
 	_logger;
-	constructor(client, logger$26) {
+	constructor(client, logger$27) {
 		this._client = client;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Atomically replace all symbols for filePath.
@@ -4421,11 +4441,11 @@ var RepoMapStorage = class {
 	_metaRepo;
 	_gitClient;
 	_logger;
-	constructor(symbolRepo, metaRepo, gitClient, logger$26) {
+	constructor(symbolRepo, metaRepo, gitClient, logger$27) {
 		this._symbolRepo = symbolRepo;
 		this._metaRepo = metaRepo;
 		this._gitClient = gitClient;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Returns true if the file's current content hash differs from the stored hash.
@@ -4542,8 +4562,8 @@ function runGit(args, cwd) {
 */
 var GitClient = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Returns the current HEAD commit SHA.
@@ -5899,9 +5919,9 @@ var RepoMapQueryEngine = class {
 	repo;
 	logger;
 	telemetry;
-	constructor(repo, logger$26, telemetry) {
+	constructor(repo, logger$27, telemetry) {
 		this.repo = repo;
-		this.logger = logger$26;
+		this.logger = logger$27;
 		this.telemetry = telemetry;
 	}
 	async query(q) {
@@ -6121,9 +6141,9 @@ var RepoMapFormatter = class {
 var RepoMapTelemetry = class {
 	_telemetry;
 	_logger;
-	constructor(telemetry, logger$26) {
+	constructor(telemetry, logger$27) {
 		this._telemetry = telemetry;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Emit a `repo_map.query` span.
@@ -6148,9 +6168,9 @@ var RepoMapTelemetry = class {
 var RepoMapModule = class {
 	_metaRepo;
 	_logger;
-	constructor(metaRepo, logger$26) {
+	constructor(metaRepo, logger$27) {
 		this._metaRepo = metaRepo;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Check whether the stored repo-map is stale relative to the current HEAD commit.
@@ -6194,9 +6214,9 @@ var RepoMapModule = class {
 var RepoMapInjector = class {
 	_queryEngine;
 	_logger;
-	constructor(queryEngine, logger$26) {
+	constructor(queryEngine, logger$27) {
 		this._queryEngine = queryEngine;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Build repo-map context by extracting file references from the story content,
@@ -6489,7 +6509,7 @@ function sanitizeYamlEscapes(yamlText) {
 
 //#endregion
 //#region src/modules/agent-dispatch/dispatcher-impl.ts
-const logger$22 = createLogger("agent-dispatch");
+const logger$23 = createLogger("agent-dispatch");
 const SHUTDOWN_GRACE_MS = 1e4;
 const SHUTDOWN_MAX_WAIT_MS = 3e4;
 const CHARS_PER_TOKEN = 4;
@@ -6534,7 +6554,7 @@ function getAvailableMemory() {
 			}).trim(), 10);
 			_lastKnownPressureLevel = pressureLevel;
 			if (pressureLevel >= 4) {
-				logger$22.warn({ pressureLevel }, "macOS kernel reports critical memory pressure");
+				logger$23.warn({ pressureLevel }, "macOS kernel reports critical memory pressure");
 				return 0;
 			}
 		} catch {}
@@ -6549,7 +6569,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$22.warn({
+				logger$23.warn({
 					pressureLevel,
 					availableBeforeDiscount: available
 				}, "macOS kernel reports memory pressure — discounting estimate");
@@ -6631,7 +6651,7 @@ var DispatcherImpl = class {
 					resolve: typedResolve,
 					reject
 				});
-				logger$22.debug({
+				logger$23.debug({
 					id,
 					queueLength: this._queue.length
 				}, "Dispatch queued");
@@ -6662,7 +6682,7 @@ var DispatcherImpl = class {
 	async shutdown() {
 		this._shuttingDown = true;
 		this._stopMemoryPressureTimer();
-		logger$22.info({
+		logger$23.info({
 			running: this._running.size,
 			queued: this._queue.length
 		}, "Dispatcher shutting down");
@@ -6695,10 +6715,10 @@ var DispatcherImpl = class {
 				}
 			}, 50);
 		});
-		logger$22.info("Dispatcher shutdown complete");
+		logger$23.info("Dispatcher shutdown complete");
 	}
 	async _startDispatch(id, request, resolve$2) {
-		const { prompt, agent, taskType, timeout, outputSchema, workingDirectory, model, maxTurns, otlpEndpoint, storyKey } = request;
+		const { prompt, agent, taskType, timeout, outputSchema, workingDirectory, model, maxTurns, maxContextTokens, otlpEndpoint, storyKey, optimizationDirectives } = request;
 		let effectiveModel = model;
 		if (effectiveModel === void 0 && this._routingResolver !== null) {
 			const resolution = this._routingResolver.resolveModel(taskType);
@@ -6711,13 +6731,13 @@ var DispatcherImpl = class {
 					phase: resolution.phase,
 					source: resolution.source
 				});
-				logger$22.debug({
+				logger$23.debug({
 					id,
 					taskType,
 					model: resolution.model,
 					routingSource: resolution.source
 				}, "Routing resolved model");
-			} else logger$22.debug({
+			} else logger$23.debug({
 				id,
 				taskType,
 				routingSource: "fallback"
@@ -6725,7 +6745,7 @@ var DispatcherImpl = class {
 		}
 		const adapter = this._adapterRegistry.get(agent);
 		if (adapter === void 0) {
-			logger$22.warn({
+			logger$23.warn({
 				id,
 				agent
 			}, "No adapter found for agent");
@@ -6753,8 +6773,10 @@ var DispatcherImpl = class {
 			billingMode: "subscription",
 			...effectiveModel !== void 0 ? { model: effectiveModel } : {},
 			...resolvedMaxTurns !== void 0 ? { maxTurns: resolvedMaxTurns } : {},
+			...maxContextTokens !== void 0 ? { maxContextTokens } : {},
 			...otlpEndpoint !== void 0 ? { otlpEndpoint } : {},
-			...storyKey !== void 0 ? { storyKey } : {}
+			...storyKey !== void 0 ? { storyKey } : {},
+			...optimizationDirectives !== void 0 ? { optimizationDirectives } : {}
 		});
 		const timeoutMs = timeout ?? this._config.defaultTimeouts[taskType] ?? DEFAULT_TIMEOUTS[taskType] ?? 3e5;
 		const env = { ...process.env };
@@ -6773,7 +6795,7 @@ var DispatcherImpl = class {
 		});
 		const startedAt = Date.now();
 		proc.on("error", (err) => {
-			logger$22.error({
+			logger$23.error({
 				id,
 				binary: cmd.binary,
 				error: err.message
@@ -6781,7 +6803,7 @@ var DispatcherImpl = class {
 		});
 		if (proc.stdin !== null) {
 			proc.stdin.on("error", (err) => {
-				if (err.code !== "EPIPE") logger$22.warn({
+				if (err.code !== "EPIPE") logger$23.warn({
 					id,
 					error: err.message
 				}, "stdin write error");
@@ -6823,7 +6845,7 @@ var DispatcherImpl = class {
 			agent,
 			taskType
 		});
-		logger$22.debug({
+		logger$23.debug({
 			id,
 			agent,
 			taskType,
@@ -6840,7 +6862,7 @@ var DispatcherImpl = class {
 				dispatchId: id,
 				timeoutMs
 			});
-			logger$22.warn({
+			logger$23.warn({
 				id,
 				agent,
 				taskType,
@@ -6896,7 +6918,7 @@ var DispatcherImpl = class {
 					inputTokens,
 					outputTokens: Math.ceil(stdout.length / CHARS_PER_TOKEN)
 				});
-				logger$22.debug({
+				logger$23.debug({
 					id,
 					agent,
 					taskType,
@@ -6922,7 +6944,7 @@ var DispatcherImpl = class {
 					error: stderr || `Process exited with code ${String(code)}`,
 					exitCode: code
 				});
-				logger$22.debug({
+				logger$23.debug({
 					id,
 					agent,
 					taskType,
@@ -6981,7 +7003,7 @@ var DispatcherImpl = class {
 		const next = this._queue.shift();
 		if (next === void 0) return;
 		next.handle.status = "running";
-		logger$22.debug({
+		logger$23.debug({
 			id: next.id,
 			queueLength: this._queue.length
 		}, "Dequeued dispatch");
@@ -6994,7 +7016,7 @@ var DispatcherImpl = class {
 	_isMemoryPressured() {
 		const free = getAvailableMemory();
 		if (free < MIN_FREE_MEMORY_BYTES) {
-			logger$22.warn({
+			logger$23.warn({
 				freeMB: Math.round(free / 1024 / 1024),
 				thresholdMB: Math.round(MIN_FREE_MEMORY_BYTES / 1024 / 1024),
 				pressureLevel: _lastKnownPressureLevel
@@ -7110,7 +7132,7 @@ function runBuildVerification(options) {
 	let cmd;
 	if (verifyCommand === void 0) {
 		const detection = detectPackageManager(projectRoot);
-		logger$22.info({
+		logger$23.info({
 			packageManager: detection.packageManager,
 			lockfile: detection.lockfile,
 			resolvedCommand: detection.command
@@ -8206,7 +8228,7 @@ var DoltStateStore = class DoltStateStore {
 
 //#endregion
 //#region src/modules/state/index.ts
-const logger$21 = createLogger("state:factory");
+const logger$22 = createLogger("state:factory");
 /**
 * Synchronously check whether Dolt is available and a Dolt repo exists at the
 * canonical state path under `basePath`.
@@ -8253,14 +8275,14 @@ function createStateStore(config = {}) {
 		const repoPath = config.basePath ?? process.cwd();
 		const detection = detectDoltAvailableSync(repoPath);
 		if (detection.available) {
-			logger$21.debug(`Dolt detected, using DoltStateStore (state path: ${join$1(repoPath, ".substrate", "state")})`);
+			logger$22.debug(`Dolt detected, using DoltStateStore (state path: ${join$1(repoPath, ".substrate", "state")})`);
 			const client = new DoltClient({ repoPath });
 			return new DoltStateStore({
 				repoPath,
 				client
 			});
 		} else {
-			logger$21.debug(`Dolt not found, using FileStateStore (reason: ${detection.reason})`);
+			logger$22.debug(`Dolt not found, using FileStateStore (reason: ${detection.reason})`);
 			return new FileStateStore({ basePath: config.basePath });
 		}
 	}
@@ -8354,7 +8376,7 @@ function pickRecommendation(distribution, profile, totalIssues, reviewCycles, la
 
 //#endregion
 //#region src/modules/compiled-workflows/prompt-assembler.ts
-const logger$20 = createLogger("compiled-workflows:prompt-assembler");
+const logger$21 = createLogger("compiled-workflows:prompt-assembler");
 /**
 * Assemble a final prompt from a template and sections map.
 *
@@ -8379,7 +8401,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		tokenCount,
 		truncated: false
 	};
-	logger$20.warn({
+	logger$21.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Prompt exceeds token ceiling — truncating optional sections");
@@ -8395,10 +8417,10 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 			const targetSectionTokens = Math.max(0, currentSectionTokens - overBy);
 			if (targetSectionTokens === 0) {
 				contentMap[section.name] = "";
-				logger$20.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
+				logger$21.warn({ sectionName: section.name }, "Section eliminated to fit token budget");
 			} else {
 				contentMap[section.name] = truncateToTokens(section.content, targetSectionTokens);
-				logger$20.warn({
+				logger$21.warn({
 					sectionName: section.name,
 					targetSectionTokens
 				}, "Section truncated to fit token budget");
@@ -8409,7 +8431,7 @@ function assemblePrompt(template, sections, tokenCeiling = 2200) {
 		}
 		if (tokenCount <= tokenCeiling) break;
 	}
-	if (tokenCount > tokenCeiling) logger$20.warn({
+	if (tokenCount > tokenCeiling) logger$21.warn({
 		tokenCount,
 		ceiling: tokenCeiling
 	}, "Required sections alone exceed token ceiling — returning over-budget prompt");
@@ -8707,7 +8729,7 @@ function getTokenCeiling(workflowType, tokenCeilings) {
 
 //#endregion
 //#region src/modules/compiled-workflows/create-story.ts
-const logger$19 = createLogger("compiled-workflows:create-story");
+const logger$20 = createLogger("compiled-workflows:create-story");
 /**
 * Execute the compiled create-story workflow.
 *
@@ -8727,13 +8749,13 @@ const logger$19 = createLogger("compiled-workflows:create-story");
 */
 async function runCreateStory(deps, params) {
 	const { epicId, storyKey, pipelineRunId } = params;
-	logger$19.debug({
+	logger$20.debug({
 		epicId,
 		storyKey,
 		pipelineRunId
 	}, "Starting create-story workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("create-story", deps.tokenCeilings);
-	logger$19.info({
+	logger$20.info({
 		workflow: "create-story",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -8743,7 +8765,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$19.error({ error }, "Failed to retrieve create-story prompt template");
+		logger$20.error({ error }, "Failed to retrieve create-story prompt template");
 		return {
 			result: "failed",
 			error: `Failed to retrieve prompt template: ${error}`,
@@ -8785,7 +8807,7 @@ async function runCreateStory(deps, params) {
 			priority: "important"
 		}
 	], TOKEN_CEILING);
-	logger$19.debug({
+	logger$20.debug({
 		tokenCount,
 		truncated,
 		tokenCeiling: TOKEN_CEILING
@@ -8804,7 +8826,7 @@ async function runCreateStory(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$19.error({
+		logger$20.error({
 			epicId,
 			storyKey,
 			error
@@ -8825,7 +8847,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$19.warn({
+		logger$20.warn({
 			epicId,
 			storyKey,
 			exitCode: dispatchResult.exitCode
@@ -8837,7 +8859,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$19.warn({
+		logger$20.warn({
 			epicId,
 			storyKey
 		}, "Create-story dispatch timed out");
@@ -8850,7 +8872,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$19.warn({
+		logger$20.warn({
 			epicId,
 			storyKey,
 			details,
@@ -8866,7 +8888,7 @@ async function runCreateStory(deps, params) {
 	const parseResult = CreateStoryResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$19.warn({
+		logger$20.warn({
 			epicId,
 			storyKey,
 			details
@@ -8879,7 +8901,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	logger$19.info({
+	logger$20.info({
 		epicId,
 		storyKey,
 		storyFile: parsed.story_file,
@@ -8901,7 +8923,7 @@ async function getImplementationDecisions(deps) {
 	try {
 		return await getDecisionsByPhase(deps.db, "implementation");
 	} catch (err) {
-		logger$19.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
+		logger$20.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve implementation decisions");
 		return [];
 	}
 }
@@ -8944,13 +8966,13 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 			if (storyKey) {
 				const storySection = extractStorySection(shardContent, storyKey);
 				if (storySection) {
-					logger$19.debug({
+					logger$20.debug({
 						epicId,
 						storyKey
 					}, "Extracted per-story section from epic shard");
 					return storySection;
 				}
-				logger$19.debug({
+				logger$20.debug({
 					epicId,
 					storyKey
 				}, "No matching story section found — using full epic shard");
@@ -8960,11 +8982,11 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 		if (projectRoot) {
 			const fallback = readEpicShardFromFile(projectRoot, epicId);
 			if (fallback) {
-				logger$19.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
+				logger$20.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
 				if (storyKey) {
 					const storySection = extractStorySection(fallback, storyKey);
 					if (storySection) {
-						logger$19.debug({
+						logger$20.debug({
 							epicId,
 							storyKey
 						}, "Extracted per-story section from file-based epic shard");
@@ -8976,7 +8998,7 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 		}
 		return "";
 	} catch (err) {
-		logger$19.warn({
+		logger$20.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve epic shard");
@@ -8993,7 +9015,7 @@ function getPrevDevNotes(decisions, epicId) {
 		if (devNotes.length === 0) return "";
 		return devNotes[devNotes.length - 1].value;
 	} catch (err) {
-		logger$19.warn({
+		logger$20.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "Failed to retrieve prev dev notes");
@@ -9013,13 +9035,13 @@ async function getArchConstraints$3(deps) {
 		if (deps.projectRoot) {
 			const fallback = readArchConstraintsFromFile(deps.projectRoot);
 			if (fallback) {
-				logger$19.info("Using file-based fallback for architecture constraints (decisions table empty)");
+				logger$20.info("Using file-based fallback for architecture constraints (decisions table empty)");
 				return fallback;
 			}
 		}
 		return "";
 	} catch (err) {
-		logger$19.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$20.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -9039,7 +9061,7 @@ function readEpicShardFromFile(projectRoot, epicId) {
 		const match$1 = pattern.exec(content);
 		return match$1 ? match$1[0].trim() : "";
 	} catch (err) {
-		logger$19.warn({
+		logger$20.warn({
 			epicId,
 			error: err instanceof Error ? err.message : String(err)
 		}, "File-based epic shard fallback failed");
@@ -9062,7 +9084,7 @@ function readArchConstraintsFromFile(projectRoot) {
 		const content = readFileSync$1(archPath, "utf-8");
 		return content.slice(0, 1500);
 	} catch (err) {
-		logger$19.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
+		logger$20.warn({ error: err instanceof Error ? err.message : String(err) }, "File-based architecture fallback failed");
 		return "";
 	}
 }
@@ -9075,7 +9097,7 @@ async function getStoryTemplate(deps) {
 	try {
 		return await deps.pack.getTemplate("story");
 	} catch (err) {
-		logger$19.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
+		logger$20.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve story template from pack");
 		return "";
 	}
 }
@@ -9112,7 +9134,7 @@ async function isValidStoryFile(filePath) {
 
 //#endregion
 //#region src/modules/compiled-workflows/git-helpers.ts
-const logger$18 = createLogger("compiled-workflows:git-helpers");
+const logger$19 = createLogger("compiled-workflows:git-helpers");
 /**
 * Capture the full git diff for HEAD (working tree vs current commit).
 *
@@ -9208,7 +9230,7 @@ async function stageIntentToAdd(files, workingDirectory) {
 	if (files.length === 0) return;
 	const existing = files.filter((f) => {
 		const exists = existsSync$1(f);
-		if (!exists) logger$18.debug({ file: f }, "Skipping nonexistent file in stageIntentToAdd");
+		if (!exists) logger$19.debug({ file: f }, "Skipping nonexistent file in stageIntentToAdd");
 		return exists;
 	});
 	if (existing.length === 0) return;
@@ -9242,7 +9264,7 @@ async function runGitCommand(args, cwd, logLabel) {
 			stderr += chunk.toString("utf-8");
 		});
 		proc.on("error", (err) => {
-			logger$18.warn({
+			logger$19.warn({
 				label: logLabel,
 				cwd,
 				error: err.message
@@ -9251,7 +9273,7 @@ async function runGitCommand(args, cwd, logLabel) {
 		});
 		proc.on("close", (code) => {
 			if (code !== 0) {
-				logger$18.warn({
+				logger$19.warn({
 					label: logLabel,
 					cwd,
 					code,
@@ -9267,7 +9289,7 @@ async function runGitCommand(args, cwd, logLabel) {
 
 //#endregion
 //#region src/modules/implementation-orchestrator/project-findings.ts
-const logger$17 = createLogger("project-findings");
+const logger$18 = createLogger("project-findings");
 /** Maximum character length for the findings summary */
 const MAX_CHARS = 2e3;
 /**
@@ -9333,7 +9355,7 @@ async function getProjectFindings(db) {
 		if (summary.length > MAX_CHARS) summary = summary.slice(0, MAX_CHARS - 3) + "...";
 		return summary;
 	} catch (err) {
-		logger$17.warn({ err }, "Failed to query project findings (graceful fallback)");
+		logger$18.warn({ err }, "Failed to query project findings (graceful fallback)");
 		return "";
 	}
 }
@@ -9356,7 +9378,7 @@ function extractRecurringPatterns(outcomes) {
 
 //#endregion
 //#region src/modules/compiled-workflows/story-complexity.ts
-const logger$16 = createLogger("compiled-workflows:story-complexity");
+const logger$17 = createLogger("compiled-workflows:story-complexity");
 /**
 * Compute a complexity score from story markdown content.
 *
@@ -9408,7 +9430,7 @@ function resolveFixStoryMaxTurns(complexityScore) {
 * @param resolvedMaxTurns - Turn limit resolved for this dispatch
 */
 function logComplexityResult(storyKey, complexity, resolvedMaxTurns) {
-	logger$16.info({
+	logger$17.info({
 		storyKey,
 		taskCount: complexity.taskCount,
 		subtaskCount: complexity.subtaskCount,
@@ -9502,7 +9524,7 @@ function detectDeprecatedStatusField(content) {
 
 //#endregion
 //#region src/modules/compiled-workflows/dev-story.ts
-const logger$15 = createLogger("compiled-workflows:dev-story");
+const logger$16 = 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 */
@@ -9525,12 +9547,12 @@ const DEFAULT_VITEST_PATTERNS = `## Test Patterns (defaults)
 */
 async function runDevStory(deps, params) {
 	const { storyKey, storyFilePath, taskScope, priorFiles } = params;
-	logger$15.info({
+	logger$16.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled dev-story workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("dev-story", deps.tokenCeilings);
-	logger$15.info({
+	logger$16.info({
 		workflow: "dev-story",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -9573,10 +9595,10 @@ async function runDevStory(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("dev-story");
-		logger$15.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
+		logger$16.debug({ storyKey }, "Retrieved dev-story prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			error
 		}, "Failed to retrieve dev-story prompt template");
@@ -9587,14 +9609,14 @@ async function runDevStory(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$15.error({
+			logger$16.error({
 				storyKey,
 				storyFilePath
 			}, "Story file not found");
 			return makeFailureResult("story_file_not_found");
 		}
 		const error = err instanceof Error ? err.message : String(err);
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			storyFilePath,
 			error
@@ -9602,7 +9624,7 @@ async function runDevStory(deps, params) {
 		return makeFailureResult(`story_file_read_error: ${error}`);
 	}
 	if (storyContent.trim().length === 0) {
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			storyFilePath
 		}, "Story file is empty");
@@ -9610,7 +9632,7 @@ async function runDevStory(deps, params) {
 	}
 	const staleStatus = detectDeprecatedStatusField(storyContent);
 	if (staleStatus !== null) {
-		logger$15.warn({
+		logger$16.warn({
 			storyFilePath,
 			staleStatus
 		}, "Story spec contains deprecated Status field — stripped before dispatch (status is managed by Dolt work graph)");
@@ -9625,17 +9647,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$15.debug({
+			logger$16.debug({
 				storyKey,
 				count: testPatternDecisions.length
 			}, "Loaded test patterns from decision store");
 		} else {
 			testPatternsContent = DEFAULT_VITEST_PATTERNS;
-			logger$15.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
+			logger$16.debug({ storyKey }, "No test-pattern decisions found — using default Vitest patterns");
 		}
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$15.warn({
+		logger$16.warn({
 			storyKey,
 			error
 		}, "Failed to load test patterns — using defaults");
@@ -9649,7 +9671,7 @@ async function runDevStory(deps, params) {
 	if (deps.repoMapInjector !== void 0) {
 		const injection = await deps.repoMapInjector.buildContext(storyContent, deps.maxRepoMapTokens ?? 2e3);
 		repoContextContent = injection.text;
-		logger$15.info({
+		logger$16.info({
 			storyKey,
 			repoMapTokens: Math.ceil(injection.text.length / 4),
 			symbolCount: injection.symbolCount,
@@ -9661,7 +9683,7 @@ async function runDevStory(deps, params) {
 		const findings = await getProjectFindings(deps.db);
 		if (findings.length > 0) {
 			priorFindingsContent = "Previous pipeline runs encountered these issues — avoid repeating them:\n\n" + findings;
-			logger$15.debug({
+			logger$16.debug({
 				storyKey,
 				findingsLen: findings.length
 			}, "Injecting prior findings into dev-story prompt");
@@ -9681,7 +9703,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$15.debug({ storyKey }, "Injecting test plan into dev-story prompt");
+			logger$16.debug({ storyKey }, "Injecting test plan into dev-story prompt");
 		}
 	} catch {}
 	const sections = [
@@ -9732,7 +9754,7 @@ async function runDevStory(deps, params) {
 		}
 	];
 	const { prompt, tokenCount, truncated } = assemblePrompt(template, sections, TOKEN_CEILING);
-	logger$15.info({
+	logger$16.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING,
@@ -9749,12 +9771,14 @@ async function runDevStory(deps, params) {
 			maxTurns: resolvedMaxTurns,
 			...deps.projectRoot !== void 0 ? { workingDirectory: deps.projectRoot } : {},
 			...deps.otlpEndpoint !== void 0 ? { otlpEndpoint: deps.otlpEndpoint } : {},
+			...deps.maxContextTokens !== void 0 ? { maxContextTokens: deps.maxContextTokens } : {},
+			...deps.optimizationDirectives !== void 0 ? { optimizationDirectives: deps.optimizationDirectives } : {},
 			storyKey
 		});
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			error
 		}, "Dispatch threw an unexpected error");
@@ -9765,11 +9789,11 @@ async function runDevStory(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Dev-story dispatch timed out");
-		if (dispatchResult.output.length > 0) logger$15.info({
+		if (dispatchResult.output.length > 0) logger$16.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output before timeout");
@@ -9779,12 +9803,12 @@ async function runDevStory(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$15.error({
+		logger$16.error({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
 		}, "Dev-story dispatch failed");
-		if (dispatchResult.output.length > 0) logger$15.info({
+		if (dispatchResult.output.length > 0) logger$16.info({
 			storyKey,
 			partialOutput: dispatchResult.output.slice(0, 500)
 		}, "Partial output from failed dispatch");
@@ -9796,7 +9820,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$15.error({
+		logger$16.error({
 			storyKey,
 			parseError: details,
 			rawOutputSnippet: rawSnippet
@@ -9804,12 +9828,12 @@ async function runDevStory(deps, params) {
 		let filesModified = [];
 		try {
 			filesModified = await getGitChangedFiles(deps.projectRoot ?? process.cwd());
-			if (filesModified.length > 0) logger$15.info({
+			if (filesModified.length > 0) logger$16.info({
 				storyKey,
 				fileCount: filesModified.length
 			}, "Recovered files_modified from git status (YAML fallback)");
 		} catch (err) {
-			logger$15.warn({
+			logger$16.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to recover files_modified from git");
@@ -9826,7 +9850,7 @@ async function runDevStory(deps, params) {
 		};
 	}
 	const parsed = dispatchResult.parsed;
-	logger$15.info({
+	logger$16.info({
 		storyKey,
 		result: parsed.result,
 		acMet: parsed.ac_met.length
@@ -9965,7 +9989,7 @@ function extractFilesInScope(storyContent) {
 
 //#endregion
 //#region src/modules/compiled-workflows/code-review.ts
-const logger$14 = createLogger("compiled-workflows:code-review");
+const logger$15 = 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
@@ -10003,14 +10027,14 @@ function defaultFailResult(error, tokenUsage) {
 async function runCodeReview(deps, params) {
 	const { storyKey, storyFilePath, workingDirectory, pipelineRunId, filesModified, previousIssues } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$14.debug({
+	logger$15.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
 		pipelineRunId
 	}, "Starting code-review workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("code-review", deps.tokenCeilings);
-	logger$14.info({
+	logger$15.info({
 		workflow: "code-review",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -10020,7 +10044,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$14.error({ error }, "Failed to retrieve code-review prompt template");
+		logger$15.error({ error }, "Failed to retrieve code-review prompt template");
 		return defaultFailResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -10031,7 +10055,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$14.error({
+		logger$15.error({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -10051,12 +10075,12 @@ async function runCodeReview(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$14.debug({
+			logger$15.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$14.warn({
+			logger$15.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -10070,7 +10094,7 @@ async function runCodeReview(deps, params) {
 		const fullTotal = nonDiffTokens + countTokens(fullDiff);
 		if (fullTotal <= TOKEN_CEILING) gitDiffContent = fullDiff;
 		else {
-			logger$14.warn({
+			logger$15.warn({
 				estimatedTotal: fullTotal,
 				ceiling: TOKEN_CEILING
 			}, "Full git diff would exceed token ceiling — using stat-only summary");
@@ -10078,7 +10102,7 @@ async function runCodeReview(deps, params) {
 		}
 	}
 	if (gitDiffContent.trim().length === 0) {
-		logger$14.info({ storyKey }, "Empty git diff — skipping review with SHIP_IT");
+		logger$15.info({ storyKey }, "Empty git diff — skipping review with SHIP_IT");
 		return {
 			verdict: "SHIP_IT",
 			issues: 0,
@@ -10094,7 +10118,7 @@ async function runCodeReview(deps, params) {
 	if (deps.repoMapInjector !== void 0) {
 		const injection = await deps.repoMapInjector.buildContext(storyContent, deps.maxRepoMapTokens ?? 2e3);
 		repoContextContent = injection.text;
-		logger$14.info({
+		logger$15.info({
 			storyKey,
 			repoMapTokens: Math.ceil(injection.text.length / 4),
 			symbolCount: injection.symbolCount,
@@ -10114,7 +10138,7 @@ async function runCodeReview(deps, params) {
 		const findings = await getProjectFindings(deps.db);
 		if (findings.length > 0) {
 			priorFindingsContent = "Previous reviews found these recurring patterns — pay special attention:\n\n" + findings;
-			logger$14.debug({
+			logger$15.debug({
 				storyKey,
 				findingsLen: findings.length
 			}, "Injecting prior findings into code-review prompt");
@@ -10153,11 +10177,11 @@ async function runCodeReview(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$14.warn({
+	if (assembleResult.truncated) logger$15.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Code-review prompt truncated to fit token ceiling");
-	logger$14.debug({
+	logger$15.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -10170,6 +10194,7 @@ async function runCodeReview(deps, params) {
 		outputSchema: CodeReviewResultSchema,
 		workingDirectory: deps.projectRoot,
 		...deps.otlpEndpoint !== void 0 ? { otlpEndpoint: deps.otlpEndpoint } : {},
+		...deps.maxContextTokens !== void 0 ? { maxContextTokens: deps.maxContextTokens } : {},
 		storyKey
 	});
 	let dispatchResult;
@@ -10177,7 +10202,7 @@ async function runCodeReview(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$14.error({
+		logger$15.error({
 			storyKey,
 			error
 		}, "Code-review dispatch threw unexpected error");
@@ -10193,7 +10218,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$14.warn({
+		logger$15.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Code-review dispatch failed");
@@ -10203,7 +10228,7 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$14.warn({ storyKey }, "Code-review dispatch timed out");
+		logger$15.warn({ storyKey }, "Code-review dispatch timed out");
 		return {
 			...defaultFailResult("Dispatch status: timeout. The agent did not complete within the allowed time.", tokenUsage),
 			rawOutput
@@ -10211,7 +10236,7 @@ async function runCodeReview(deps, params) {
 	}
 	if (dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "No YAML block found in output";
-		logger$14.warn({
+		logger$15.warn({
 			storyKey,
 			details
 		}, "Code-review output schema validation failed");
@@ -10228,7 +10253,7 @@ async function runCodeReview(deps, params) {
 	const parseResult = CodeReviewResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$14.warn({
+		logger$15.warn({
 			storyKey,
 			details
 		}, "Code-review output failed schema validation");
@@ -10243,13 +10268,13 @@ async function runCodeReview(deps, params) {
 		};
 	}
 	const parsed = parseResult.data;
-	if (parsed.agentVerdict !== parsed.verdict) logger$14.info({
+	if (parsed.agentVerdict !== parsed.verdict) logger$15.info({
 		storyKey,
 		agentVerdict: parsed.agentVerdict,
 		pipelineVerdict: parsed.verdict,
 		issues: parsed.issues
 	}, "Pipeline overrode agent verdict based on issue severities");
-	logger$14.info({
+	logger$15.info({
 		storyKey,
 		verdict: parsed.verdict,
 		issues: parsed.issues
@@ -10274,14 +10299,14 @@ async function getArchConstraints$2(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$14.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$15.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$13 = createLogger("compiled-workflows:test-plan");
+const logger$14 = createLogger("compiled-workflows:test-plan");
 /** Default timeout for test-plan dispatches in milliseconds (5 min — lightweight call) */
 const DEFAULT_TIMEOUT_MS = 3e5;
 /**
@@ -10293,12 +10318,12 @@ const DEFAULT_TIMEOUT_MS = 3e5;
 */
 async function runTestPlan(deps, params) {
 	const { storyKey, storyFilePath, pipelineRunId } = params;
-	logger$13.info({
+	logger$14.info({
 		storyKey,
 		storyFilePath
 	}, "Starting compiled test-plan workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("test-plan", deps.tokenCeilings);
-	logger$13.info({
+	logger$14.info({
 		workflow: "test-plan",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -10306,10 +10331,10 @@ async function runTestPlan(deps, params) {
 	let template;
 	try {
 		template = await deps.pack.getPrompt("test-plan");
-		logger$13.debug({ storyKey }, "Retrieved test-plan prompt template from pack");
+		logger$14.debug({ storyKey }, "Retrieved test-plan prompt template from pack");
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$13.warn({
+		logger$14.warn({
 			storyKey,
 			error
 		}, "Failed to retrieve test-plan prompt template");
@@ -10320,14 +10345,14 @@ async function runTestPlan(deps, params) {
 		storyContent = await readFile$1(storyFilePath, "utf-8");
 	} catch (err) {
 		if (err.code === "ENOENT") {
-			logger$13.warn({
+			logger$14.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$13.warn({
+		logger$14.warn({
 			storyKey,
 			storyFilePath,
 			error
@@ -10344,7 +10369,7 @@ async function runTestPlan(deps, params) {
 		content: archConstraintsContent,
 		priority: "optional"
 	}], TOKEN_CEILING);
-	logger$13.info({
+	logger$14.info({
 		storyKey,
 		tokenCount,
 		ceiling: TOKEN_CEILING,
@@ -10365,7 +10390,7 @@ async function runTestPlan(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$13.warn({
+		logger$14.warn({
 			storyKey,
 			error
 		}, "Test-plan dispatch threw an unexpected error");
@@ -10376,7 +10401,7 @@ async function runTestPlan(deps, params) {
 		output: dispatchResult.tokenEstimate.output
 	};
 	if (dispatchResult.status === "timeout") {
-		logger$13.warn({
+		logger$14.warn({
 			storyKey,
 			durationMs: dispatchResult.durationMs
 		}, "Test-plan dispatch timed out");
@@ -10386,7 +10411,7 @@ async function runTestPlan(deps, params) {
 		};
 	}
 	if (dispatchResult.status === "failed" || dispatchResult.exitCode !== 0) {
-		logger$13.warn({
+		logger$14.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode,
 			status: dispatchResult.status
@@ -10398,7 +10423,7 @@ async function runTestPlan(deps, params) {
 	}
 	if (dispatchResult.parseError !== null || dispatchResult.parsed === null) {
 		const details = dispatchResult.parseError ?? "parsed result was null";
-		logger$13.warn({
+		logger$14.warn({
 			storyKey,
 			parseError: details
 		}, "Test-plan YAML schema validation failed");
@@ -10421,19 +10446,19 @@ async function runTestPlan(deps, params) {
 			}),
 			rationale: `Test plan for ${storyKey}: ${parsed.test_files.length} test files, categories: ${parsed.test_categories.join(", ")}`
 		});
-		logger$13.info({
+		logger$14.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$13.warn({
+		logger$14.warn({
 			storyKey,
 			error
 		}, "Failed to store test plan in decision store — proceeding anyway");
 	}
-	logger$13.info({
+	logger$14.info({
 		storyKey,
 		result: parsed.result
 	}, "Test-plan workflow completed");
@@ -10473,14 +10498,14 @@ async function getArchConstraints$1(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$13.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints for test-plan — proceeding without them");
+		logger$14.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$12 = createLogger("compiled-workflows:test-expansion");
+const logger$13 = createLogger("compiled-workflows:test-expansion");
 function defaultFallbackResult(error, tokenUsage) {
 	return {
 		expansion_priority: "low",
@@ -10510,14 +10535,14 @@ function defaultFallbackResult(error, tokenUsage) {
 async function runTestExpansion(deps, params) {
 	const { storyKey, storyFilePath, pipelineRunId, filesModified, workingDirectory } = params;
 	const cwd = workingDirectory ?? process.cwd();
-	logger$12.debug({
+	logger$13.debug({
 		storyKey,
 		storyFilePath,
 		cwd,
 		pipelineRunId
 	}, "Starting test-expansion workflow");
 	const { ceiling: TOKEN_CEILING, source: tokenCeilingSource } = getTokenCeiling("test-expansion", deps.tokenCeilings);
-	logger$12.info({
+	logger$13.info({
 		workflow: "test-expansion",
 		ceiling: TOKEN_CEILING,
 		source: tokenCeilingSource
@@ -10527,7 +10552,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$12.warn({ error }, "Failed to retrieve test-expansion prompt template");
+		logger$13.warn({ error }, "Failed to retrieve test-expansion prompt template");
 		return defaultFallbackResult(`Failed to retrieve prompt template: ${error}`, {
 			input: 0,
 			output: 0
@@ -10538,7 +10563,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$12.warn({
+		logger$13.warn({
 			storyFilePath,
 			error
 		}, "Failed to read story file");
@@ -10558,12 +10583,12 @@ async function runTestExpansion(deps, params) {
 		const scopedTotal = nonDiffTokens + countTokens(scopedDiff);
 		if (scopedTotal <= TOKEN_CEILING) {
 			gitDiffContent = scopedDiff;
-			logger$12.debug({
+			logger$13.debug({
 				fileCount: filesModified.length,
 				tokenCount: scopedTotal
 			}, "Using scoped file diff");
 		} else {
-			logger$12.warn({
+			logger$13.warn({
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
@@ -10571,7 +10596,7 @@ async function runTestExpansion(deps, params) {
 			gitDiffContent = await getGitDiffStatSummary(cwd);
 		}
 	} catch (err) {
-		logger$12.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to get git diff — proceeding with empty diff");
+		logger$13.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to get git diff — proceeding with empty diff");
 	}
 	const sections = [
 		{
@@ -10591,11 +10616,11 @@ async function runTestExpansion(deps, params) {
 		}
 	];
 	const assembleResult = assemblePrompt(template, sections, TOKEN_CEILING);
-	if (assembleResult.truncated) logger$12.warn({
+	if (assembleResult.truncated) logger$13.warn({
 		storyKey,
 		tokenCount: assembleResult.tokenCount
 	}, "Test-expansion prompt truncated to fit token ceiling");
-	logger$12.debug({
+	logger$13.debug({
 		storyKey,
 		tokenCount: assembleResult.tokenCount,
 		truncated: assembleResult.truncated
@@ -10615,7 +10640,7 @@ async function runTestExpansion(deps, params) {
 		dispatchResult = await handle.result;
 	} catch (err) {
 		const error = err instanceof Error ? err.message : String(err);
-		logger$12.warn({
+		logger$13.warn({
 			storyKey,
 			error
 		}, "Test-expansion dispatch threw unexpected error");
@@ -10630,19 +10655,19 @@ async function runTestExpansion(deps, params) {
 	};
 	if (dispatchResult.status === "failed") {
 		const errorMsg = `Dispatch status: failed. Exit code: ${dispatchResult.exitCode}. ${dispatchResult.parseError ?? ""}`.trim();
-		logger$12.warn({
+		logger$13.warn({
 			storyKey,
 			exitCode: dispatchResult.exitCode
 		}, "Test-expansion dispatch failed");
 		return defaultFallbackResult(errorMsg, tokenUsage);
 	}
 	if (dispatchResult.status === "timeout") {
-		logger$12.warn({ storyKey }, "Test-expansion dispatch timed out");
+		logger$13.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$12.warn({
+		logger$13.warn({
 			storyKey,
 			details
 		}, "Test-expansion output has no parseable YAML");
@@ -10651,14 +10676,14 @@ async function runTestExpansion(deps, params) {
 	const parseResult = TestExpansionResultSchema.safeParse(dispatchResult.parsed);
 	if (!parseResult.success) {
 		const details = parseResult.error.message;
-		logger$12.warn({
+		logger$13.warn({
 			storyKey,
 			details
 		}, "Test-expansion output failed schema validation");
 		return defaultFallbackResult(`schema_validation_failed: ${details}`, tokenUsage);
 	}
 	const parsed = parseResult.data;
-	logger$12.info({
+	logger$13.info({
 		storyKey,
 		expansion_priority: parsed.expansion_priority,
 		coverage_gaps: parsed.coverage_gaps.length,
@@ -10683,7 +10708,7 @@ async function getArchConstraints(deps) {
 		if (constraints.length === 0) return "";
 		return constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 	} catch (err) {
-		logger$12.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
+		logger$13.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to retrieve architecture constraints");
 		return "";
 	}
 }
@@ -11115,7 +11140,7 @@ function detectConflictGroupsWithContracts(storyKeys, config, declarations) {
 
 //#endregion
 //#region src/cli/commands/health.ts
-const logger$11 = createLogger("health-cmd");
+const logger$12 = createLogger("health-cmd");
 /** Default stall threshold in seconds — also used by supervisor default */
 const DEFAULT_STALL_THRESHOLD_SECONDS = 600;
 /**
@@ -11440,7 +11465,7 @@ async function runHealthAction(options) {
 		const msg = err instanceof Error ? err.message : String(err);
 		if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, msg) + "\n");
 		else process.stderr.write(`Error: ${msg}\n`);
-		logger$11.error({ err }, "health action failed");
+		logger$12.error({ err }, "health action failed");
 		return 1;
 	}
 }
@@ -11487,7 +11512,7 @@ function registerHealthCommand(program, _version = "0.0.0", projectRoot = proces
 
 //#endregion
 //#region src/modules/implementation-orchestrator/seed-methodology-context.ts
-const logger$10 = createLogger("implementation-orchestrator:seed");
+const logger$11 = createLogger("implementation-orchestrator:seed");
 /** Max chars for the architecture summary seeded into decisions */
 const MAX_ARCH_CHARS = 6e3;
 /** Max chars per epic shard (fallback when per-story extraction returns null) */
@@ -11521,12 +11546,12 @@ async function seedMethodologyContext(db, projectRoot) {
 		const testCount = await seedTestPatterns(db, projectRoot);
 		if (testCount === -1) result.skippedCategories.push("test-patterns");
 		else result.decisionsCreated += testCount;
-		logger$10.info({
+		logger$11.info({
 			decisionsCreated: result.decisionsCreated,
 			skippedCategories: result.skippedCategories
 		}, "Methodology context seeding complete");
 	} catch (err) {
-		logger$10.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
+		logger$11.warn({ error: err instanceof Error ? err.message : String(err) }, "Methodology context seeding failed (non-fatal)");
 	}
 	return result;
 }
@@ -11570,7 +11595,7 @@ async function seedArchitecture(db, projectRoot) {
 		});
 		count = 1;
 	}
-	logger$10.debug({ count }, "Seeded architecture decisions");
+	logger$11.debug({ count }, "Seeded architecture decisions");
 	return count;
 }
 /**
@@ -11594,11 +11619,11 @@ async function seedEpicShards(db, projectRoot) {
 	const storedHashDecision = implementationDecisions.find((d) => d.category === "epic-shard-hash" && d.key === "epics-file");
 	const storedHash = storedHashDecision?.value;
 	if (storedHash === currentHash) {
-		logger$10.debug({ hash: currentHash }, "Epic shards up-to-date (hash unchanged) — skipping re-seed");
+		logger$11.debug({ hash: currentHash }, "Epic shards up-to-date (hash unchanged) — skipping re-seed");
 		return -1;
 	}
 	if (implementationDecisions.some((d) => d.category === "epic-shard")) {
-		logger$10.debug({
+		logger$11.debug({
 			storedHash,
 			currentHash
 		}, "Epics file changed — deleting stale epic-shard decisions");
@@ -11626,7 +11651,7 @@ async function seedEpicShards(db, projectRoot) {
 		value: currentHash,
 		rationale: "SHA-256 hash of epics file content for change detection"
 	});
-	logger$10.debug({
+	logger$11.debug({
 		count,
 		hash: currentHash
 	}, "Seeded epic shard decisions");
@@ -11650,7 +11675,7 @@ async function seedTestPatterns(db, projectRoot) {
 		value: patterns.slice(0, MAX_TEST_PATTERNS_CHARS),
 		rationale: "Detected from project configuration at orchestrator startup"
 	});
-	logger$10.debug("Seeded test patterns decision");
+	logger$11.debug("Seeded test patterns decision");
 	return 1;
 }
 /**
@@ -11823,7 +11848,7 @@ function findArtifact(projectRoot, candidates) {
 
 //#endregion
 //#region src/modules/agent-dispatch/interface-change-detector.ts
-const logger$9 = createLogger("interface-change-detector");
+const logger$10 = createLogger("interface-change-detector");
 /**
 * Extract exported interface and type names from TypeScript source content.
 *
@@ -11870,7 +11895,7 @@ function detectInterfaceChanges(options) {
 				for (const name of names) allNames.add(name);
 				sourceDirs.push(dirname$1(relPath));
 			} catch {
-				logger$9.debug({
+				logger$10.debug({
 					absPath,
 					storyKey
 				}, "Could not read modified file for interface extraction");
@@ -11911,7 +11936,7 @@ function detectInterfaceChanges(options) {
 			potentiallyAffectedTests: Array.from(affectedTests)
 		};
 	} catch (err) {
-		logger$9.warn({
+		logger$10.warn({
 			err,
 			storyKey: options.storyKey
 		}, "Interface change detection failed — skipping");
@@ -12107,7 +12132,10 @@ const TurnAnalysisSchema = z.object({
 	contextDelta: z.number(),
 	toolName: z.string().optional(),
 	isContextSpike: z.boolean(),
-	childSpans: z.array(ChildSpanSummarySchema)
+	childSpans: z.array(ChildSpanSummarySchema),
+	taskType: z.string().optional(),
+	phase: z.string().optional(),
+	dispatchId: z.string().optional()
 });
 const SemanticCategorySchema = z.enum([
 	"tool_outputs",
@@ -12169,7 +12197,10 @@ const EfficiencyScoreSchema = z.object({
 	contextSpikeCount: z.number().int().nonnegative(),
 	totalTurns: z.number().int().nonnegative(),
 	perModelBreakdown: z.array(ModelEfficiencySchema),
-	perSourceBreakdown: z.array(SourceEfficiencySchema)
+	perSourceBreakdown: z.array(SourceEfficiencySchema),
+	dispatchId: z.string().optional(),
+	taskType: z.string().optional(),
+	phase: z.string().optional()
 });
 const RuleIdSchema = z.enum([
 	"biggest_consumers",
@@ -12179,7 +12210,8 @@ const RuleIdSchema = z.enum([
 	"context_growth_spike",
 	"growing_categories",
 	"cache_efficiency",
-	"per_model_comparison"
+	"per_model_comparison",
+	"cache_delta_regression"
 ]);
 const RecommendationSeveritySchema = z.enum([
 	"critical",
@@ -12202,7 +12234,7 @@ const RecommendationSchema = z.object({
 
 //#endregion
 //#region src/modules/telemetry/adapter-persistence.ts
-const logger$8 = createLogger("telemetry:adapter-persistence");
+const logger$9 = createLogger("telemetry:adapter-persistence");
 /**
 * Concrete DatabaseAdapter-backed telemetry persistence.
 *
@@ -12239,6 +12271,9 @@ var AdapterTelemetryPersistence = class {
         tool_name         VARCHAR(128),
         is_context_spike  BOOLEAN        NOT NULL DEFAULT 0,
         child_spans_json  TEXT           NOT NULL DEFAULT '[]',
+        task_type         VARCHAR(64),
+        phase             VARCHAR(64),
+        dispatch_id       VARCHAR(64),
         PRIMARY KEY (story_key, span_id)
       )
     `);
@@ -12260,6 +12295,9 @@ var AdapterTelemetryPersistence = class {
         total_turns                   INTEGER      NOT NULL DEFAULT 0,
         per_model_json                TEXT         NOT NULL DEFAULT '[]',
         per_source_json               TEXT         NOT NULL DEFAULT '[]',
+        dispatch_id                   TEXT,
+        task_type                     TEXT,
+        phase                         TEXT,
         PRIMARY KEY (story_key, timestamp)
       )
     `);
@@ -12329,11 +12367,13 @@ var AdapterTelemetryPersistence = class {
             story_key, span_id, turn_number, name, timestamp, source, model,
             input_tokens, output_tokens, cache_read_tokens, fresh_tokens,
             cache_hit_rate, cost_usd, duration_ms, context_size, context_delta,
-            tool_name, is_context_spike, child_spans_json
+            tool_name, is_context_spike, child_spans_json,
+            task_type, phase, dispatch_id
           ) VALUES (
             ?, ?, ?, ?, ?, ?, ?,
             ?, ?, ?, ?,
             ?, ?, ?, ?, ?,
+            ?, ?, ?,
             ?, ?, ?
           )`, [
 					storyKey,
@@ -12354,11 +12394,14 @@ var AdapterTelemetryPersistence = class {
 					turn.contextDelta,
 					turn.toolName ?? null,
 					turn.isContextSpike ? 1 : 0,
-					JSON.stringify(turn.childSpans)
+					JSON.stringify(turn.childSpans),
+					turn.taskType ?? null,
+					turn.phase ?? null,
+					turn.dispatchId ?? null
 				]);
 			}
 		});
-		logger$8.debug({
+		logger$9.debug({
 			storyKey,
 			count: turns.length
 		}, "Stored turn analysis");
@@ -12385,7 +12428,10 @@ var AdapterTelemetryPersistence = class {
 				contextDelta: row.context_delta,
 				toolName: row.tool_name ?? void 0,
 				isContextSpike: row.is_context_spike === 1,
-				childSpans: JSON.parse(row.child_spans_json)
+				childSpans: JSON.parse(row.child_spans_json),
+				taskType: row.task_type ?? void 0,
+				phase: row.phase ?? void 0,
+				dispatchId: row.dispatch_id ?? void 0
 			};
 			return TurnAnalysisSchema.parse(raw);
 		});
@@ -12396,12 +12442,14 @@ var AdapterTelemetryPersistence = class {
         story_key, timestamp, composite_score,
         cache_hit_sub_score, io_ratio_sub_score, context_management_sub_score,
         avg_cache_hit_rate, avg_io_ratio, context_spike_count, total_turns,
-        per_model_json, per_source_json
+        per_model_json, per_source_json,
+        dispatch_id, task_type, phase
       ) VALUES (
         ?, ?, ?,
         ?, ?, ?,
         ?, ?, ?, ?,
-        ?, ?
+        ?, ?,
+        ?, ?, ?
       )`, [
 			score.storyKey,
 			score.timestamp,
@@ -12414,17 +12462,17 @@ var AdapterTelemetryPersistence = class {
 			score.contextSpikeCount,
 			score.totalTurns,
 			JSON.stringify(score.perModelBreakdown),
-			JSON.stringify(score.perSourceBreakdown)
+			JSON.stringify(score.perSourceBreakdown),
+			score.dispatchId ?? null,
+			score.taskType ?? null,
+			score.phase ?? null
 		]);
-		logger$8.debug({
+		logger$9.debug({
 			storyKey: score.storyKey,
 			compositeScore: score.compositeScore
 		}, "Stored efficiency score");
 	}
-	async getEfficiencyScore(storyKey) {
-		const rows = await this._adapter.query(`SELECT * FROM efficiency_scores WHERE story_key = ? ORDER BY timestamp DESC LIMIT 1`, [storyKey]);
-		if (rows.length === 0) return null;
-		const row = rows[0];
+	_rowToEfficiencyScore(row) {
 		const raw = {
 			storyKey: row.story_key,
 			timestamp: row.timestamp,
@@ -12437,30 +12485,27 @@ var AdapterTelemetryPersistence = class {
 			contextSpikeCount: row.context_spike_count,
 			totalTurns: row.total_turns,
 			perModelBreakdown: JSON.parse(row.per_model_json),
-			perSourceBreakdown: JSON.parse(row.per_source_json)
+			perSourceBreakdown: JSON.parse(row.per_source_json),
+			...row.dispatch_id != null && { dispatchId: row.dispatch_id },
+			...row.task_type != null && { taskType: row.task_type },
+			...row.phase != null && { phase: row.phase }
 		};
 		return EfficiencyScoreSchema.parse(raw);
 	}
+	async getEfficiencyScore(storyKey) {
+		const rows = await this._adapter.query(`SELECT * FROM efficiency_scores WHERE story_key = ? AND dispatch_id IS NULL ORDER BY timestamp DESC LIMIT 1`, [storyKey]);
+		if (rows.length === 0) return null;
+		return this._rowToEfficiencyScore(rows[0]);
+	}
 	async getEfficiencyScores(limit = 20) {
-		const rows = await this._adapter.query(`SELECT * FROM efficiency_scores ORDER BY timestamp DESC LIMIT ?`, [limit]);
+		const rows = await this._adapter.query(`SELECT * FROM efficiency_scores WHERE dispatch_id IS NULL ORDER BY timestamp DESC LIMIT ?`, [limit]);
 		if (rows.length === 0) return [];
-		return rows.map((row) => {
-			const raw = {
-				storyKey: row.story_key,
-				timestamp: row.timestamp,
-				compositeScore: row.composite_score,
-				cacheHitSubScore: row.cache_hit_sub_score,
-				ioRatioSubScore: row.io_ratio_sub_score,
-				contextManagementSubScore: row.context_management_sub_score,
-				avgCacheHitRate: row.avg_cache_hit_rate,
-				avgIoRatio: row.avg_io_ratio,
-				contextSpikeCount: row.context_spike_count,
-				totalTurns: row.total_turns,
-				perModelBreakdown: JSON.parse(row.per_model_json),
-				perSourceBreakdown: JSON.parse(row.per_source_json)
-			};
-			return EfficiencyScoreSchema.parse(raw);
-		});
+		return rows.map((row) => this._rowToEfficiencyScore(row));
+	}
+	async getDispatchEfficiencyScores(storyKey) {
+		const rows = await this._adapter.query(`SELECT * FROM efficiency_scores WHERE story_key = ? AND dispatch_id IS NOT NULL ORDER BY timestamp ASC`, [storyKey]);
+		if (rows.length === 0) return [];
+		return rows.map((row) => this._rowToEfficiencyScore(row));
 	}
 	async saveRecommendations(storyKey, recs) {
 		if (recs.length === 0) return;
@@ -12488,7 +12533,7 @@ var AdapterTelemetryPersistence = class {
 				]);
 			}
 		});
-		logger$8.debug({
+		logger$9.debug({
 			storyKey,
 			count: recs.length
 		}, "Saved recommendations");
@@ -12567,7 +12612,7 @@ var AdapterTelemetryPersistence = class {
 				]);
 			} catch {}
 		});
-		logger$8.debug({
+		logger$9.debug({
 			storyKey,
 			count: stats.length
 		}, "Stored category stats");
@@ -12612,7 +12657,7 @@ var AdapterTelemetryPersistence = class {
 				]);
 			} catch {}
 		});
-		logger$8.debug({
+		logger$9.debug({
 			storyKey,
 			count: consumers.length
 		}, "Stored consumer stats");
@@ -12637,7 +12682,77 @@ var AdapterTelemetryPersistence = class {
 	* Currently logs the span at debug level; no DB persistence.
 	*/
 	recordSpan(span) {
-		logger$8.debug({ span }, "recordSpan");
+		logger$9.debug({ span }, "recordSpan");
+	}
+};
+
+//#endregion
+//#region src/modules/telemetry/persistence.ts
+/**
+* Concrete DatabaseAdapter-backed telemetry persistence.
+*
+* Accepts a DatabaseAdapter and delegates all operations to
+* AdapterTelemetryPersistence. Provides schema initialization via initSchema().
+*
+* Accepts a DatabaseAdapter and uses it for all persistence operations.
+*/
+var TelemetryPersistence = class {
+	_impl;
+	constructor(adapter) {
+		this._impl = new AdapterTelemetryPersistence(adapter);
+	}
+	/**
+	* Apply the telemetry schema DDL to the database.
+	* Idempotent — uses CREATE TABLE IF NOT EXISTS.
+	*/
+	async initSchema() {
+		await this._impl.initSchema();
+	}
+	async storeTurnAnalysis(storyKey, turns) {
+		return this._impl.storeTurnAnalysis(storyKey, turns);
+	}
+	async getTurnAnalysis(storyKey) {
+		return this._impl.getTurnAnalysis(storyKey);
+	}
+	async storeEfficiencyScore(score) {
+		return this._impl.storeEfficiencyScore(score);
+	}
+	async getEfficiencyScore(storyKey) {
+		return this._impl.getEfficiencyScore(storyKey);
+	}
+	async getEfficiencyScores(limit = 20) {
+		return this._impl.getEfficiencyScores(limit);
+	}
+	async getDispatchEfficiencyScores(storyKey) {
+		return this._impl.getDispatchEfficiencyScores(storyKey);
+	}
+	async saveRecommendations(storyKey, recs) {
+		return this._impl.saveRecommendations(storyKey, recs);
+	}
+	async getRecommendations(storyKey) {
+		return this._impl.getRecommendations(storyKey);
+	}
+	async getAllRecommendations(limit = 20) {
+		return this._impl.getAllRecommendations(limit);
+	}
+	async storeCategoryStats(storyKey, stats) {
+		return this._impl.storeCategoryStats(storyKey, stats);
+	}
+	async getCategoryStats(storyKey) {
+		return this._impl.getCategoryStats(storyKey);
+	}
+	async storeConsumerStats(storyKey, consumers) {
+		return this._impl.storeConsumerStats(storyKey, consumers);
+	}
+	async getConsumerStats(storyKey) {
+		return this._impl.getConsumerStats(storyKey);
+	}
+	/**
+	* Record a named span with arbitrary attributes.
+	* Currently logs the span at debug level; no DB persistence.
+	*/
+	recordSpan(span) {
+		this._impl.recordSpan(span);
 	}
 };
 
@@ -12671,6 +12786,14 @@ var BatchBuffer = class extends EventEmitter {
 		if (typeof this._timer.unref === "function") this._timer.unref();
 	}
 	/**
+	* Trigger an immediate flush of buffered items without stopping the interval timer.
+	* Use this to force-flush between pipeline phases while keeping the timer active.
+	* No-op when the buffer is empty.
+	*/
+	flush() {
+		this._flush();
+	}
+	/**
 	* Stop the interval timer and flush any remaining items.
 	* Safe to call multiple times — subsequent calls are ignored.
 	*/
@@ -12754,7 +12877,7 @@ function detectSource(body) {
 
 //#endregion
 //#region src/modules/telemetry/ingestion-server.ts
-const logger$7 = createLogger("telemetry:ingestion-server");
+const logger$8 = createLogger("telemetry:ingestion-server");
 /**
 * Error thrown by IngestionServer for server lifecycle violations.
 * Extends AppError to align with the project-standard error-handling pattern
@@ -12778,6 +12901,8 @@ var IngestionServer = class {
 	_flushIntervalMs;
 	_buffer;
 	_pendingBatches = new Set();
+	/** Map from storyKey → DispatchContext, tracking active dispatches. */
+	_activeDispatches = new Map();
 	constructor(options = {}) {
 		this._port = options.port ?? 4318;
 		this._batchSize = options.batchSize ?? 100;
@@ -12790,11 +12915,37 @@ var IngestionServer = class {
 	*/
 	setPipeline(pipeline) {
 		if (this._server !== null) {
-			logger$7.warn("IngestionServer.setPipeline() called after start() — ignoring");
+			logger$8.warn("IngestionServer.setPipeline() called after start() — ignoring");
 			return;
 		}
 		this._initPipeline(pipeline);
 	}
+	/**
+	* Register an active dispatch context for a story.
+	* All OTLP payloads received while this context is active will be stamped
+	* with the dispatch context so per-phase analysis is possible.
+	*
+	* @param storyKey - The story key being dispatched
+	* @param context - The dispatch context to associate with this story
+	*/
+	setActiveDispatch(storyKey, context) {
+		this._activeDispatches.set(storyKey, context);
+		logger$8.debug({
+			storyKey,
+			taskType: context.taskType,
+			phase: context.phase
+		}, "IngestionServer: active dispatch registered");
+	}
+	/**
+	* Clear the active dispatch context for a story.
+	* Should be called after the dispatch completes (success or failure).
+	*
+	* @param storyKey - The story key whose dispatch context should be cleared
+	*/
+	clearActiveDispatch(storyKey) {
+		this._activeDispatches.delete(storyKey);
+		logger$8.debug({ storyKey }, "IngestionServer: active dispatch cleared");
+	}
 	_initPipeline(pipeline) {
 		this._buffer = new BatchBuffer({
 			batchSize: this._batchSize,
@@ -12802,7 +12953,7 @@ var IngestionServer = class {
 		});
 		this._buffer.on("flush", (items) => {
 			const pending = pipeline.processBatch(items).catch((err) => {
-				logger$7.warn({ err }, "TelemetryPipeline.processBatch failed (batch flush)");
+				logger$8.warn({ err }, "TelemetryPipeline.processBatch failed (batch flush)");
 			});
 			this._pendingBatches.add(pending);
 			pending.then(() => {
@@ -12811,24 +12962,36 @@ var IngestionServer = class {
 		});
 	}
 	/**
+	* Force-flush buffered OTLP payloads and await all in-flight processBatch() calls.
+	* Call this between story dispatches to ensure story N's telemetry (including
+	* recommendations) is fully persisted before story N+1 begins.
+	*
+	* No-op when no TelemetryPipeline is wired.
+	*/
+	async flushAndAwait() {
+		if (this._buffer === void 0) return;
+		this._buffer.flush();
+		if (this._pendingBatches.size > 0) await Promise.all([...this._pendingBatches]);
+	}
+	/**
 	* Start the HTTP ingestion server.
 	* Resolves when the server is listening and ready to accept connections.
 	*/
 	async start() {
 		if (this._server !== null) {
-			logger$7.warn("IngestionServer.start() called while already started — ignoring");
+			logger$8.warn("IngestionServer.start() called while already started — ignoring");
 			return;
 		}
 		return new Promise((resolve$2, reject) => {
 			const server = createServer(this._handleRequest.bind(this));
 			server.on("error", (err) => {
-				logger$7.error({ err }, "IngestionServer failed to start");
+				logger$8.error({ err }, "IngestionServer failed to start");
 				reject(err);
 			});
 			server.listen(this._port, "127.0.0.1", () => {
 				this._server = server;
 				const addr = server.address();
-				logger$7.info({ port: addr.port }, "IngestionServer listening");
+				logger$8.info({ port: addr.port }, "IngestionServer listening");
 				this._buffer?.start();
 				resolve$2();
 			});
@@ -12849,7 +13012,7 @@ var IngestionServer = class {
 			server.close((err) => {
 				if (err !== void 0 && err !== null) reject(err);
 				else {
-					logger$7.info("IngestionServer stopped");
+					logger$8.info("IngestionServer stopped");
 					resolve$2();
 				}
 			});
@@ -12872,6 +13035,34 @@ var IngestionServer = class {
 			OTEL_EXPORTER_OTLP_ENDPOINT: endpoint
 		};
 	}
+	/**
+	* Extract the substrate.story_key attribute from a raw OTLP payload body.
+	* Looks in resourceSpans[].resource.attributes and resourceLogs[].resource.attributes.
+	*/
+	_extractStoryKeyFromPayload(body) {
+		if (!body || typeof body !== "object") return void 0;
+		const payload = body;
+		const extractFromResources = (resources) => {
+			if (!Array.isArray(resources)) return void 0;
+			for (const entry of resources) {
+				if (!entry || typeof entry !== "object") continue;
+				const resource = entry.resource;
+				if (!resource || typeof resource !== "object") continue;
+				const attrs = resource.attributes;
+				if (!Array.isArray(attrs)) continue;
+				for (const attr of attrs) {
+					if (!attr || typeof attr !== "object") continue;
+					const a = attr;
+					if (a.key === "substrate.story_key") {
+						const val = a.value;
+						if (val && typeof val.stringValue === "string") return val.stringValue;
+					}
+				}
+			}
+			return void 0;
+		};
+		return extractFromResources(payload.resourceSpans) ?? extractFromResources(payload.resourceLogs);
+	}
 	_handleRequest(req, res) {
 		if (req.url === "/health" && req.method === "GET") {
 			res.writeHead(200, { "Content-Type": "application/json" });
@@ -12887,21 +13078,24 @@ var IngestionServer = class {
 		});
 		stream.on("end", () => {
 			const bodyStr = Buffer.concat(chunks).toString("utf-8");
-			logger$7.trace({
+			logger$8.trace({
 				url: req.url,
 				bodyLength: bodyStr.length
 			}, "OTLP payload received");
 			if (this._buffer !== void 0) try {
 				const body = JSON.parse(bodyStr);
 				const source = detectSource(body);
+				const storyKey = this._extractStoryKeyFromPayload(body);
+				const dispatchContext = storyKey !== void 0 ? this._activeDispatches.get(storyKey) : void 0;
 				const payload = {
 					body,
 					source,
-					receivedAt: Date.now()
+					receivedAt: Date.now(),
+					...dispatchContext !== void 0 && { dispatchContext }
 				};
 				this._buffer.push(payload);
 			} catch (err) {
-				logger$7.warn({
+				logger$8.warn({
 					err,
 					url: req.url
 				}, "Failed to parse OTLP payload JSON — discarding");
@@ -12910,7 +13104,7 @@ var IngestionServer = class {
 			res.end("{}");
 		});
 		stream.on("error", (err) => {
-			logger$7.warn({ err }, "Error reading OTLP request body");
+			logger$8.warn({ err }, "Error reading OTLP request body");
 			if (!res.headersSent) {
 				res.writeHead(400);
 				res.end("Bad Request");
@@ -12923,8 +13117,8 @@ var IngestionServer = class {
 //#region src/modules/telemetry/efficiency-scorer.ts
 var EfficiencyScorer = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Compute an efficiency score for a story given its turn analyses.
@@ -13111,6 +13305,19 @@ var EfficiencyScorer = class {
 
 //#endregion
 //#region src/modules/telemetry/categorizer.ts
+/**
+* Tier 0: task-type to semantic category mapping.
+*
+* When a TurnAnalysis has a known taskType, the category is determined
+* directly from this map without consulting lower tiers.
+*/
+const TASK_TYPE_CATEGORY_MAP = new Map([
+	["create-story", "system_prompts"],
+	["dev-story", "tool_outputs"],
+	["code-review", "conversation_history"],
+	["test-plan", "system_prompts"],
+	["minor-fixes", "tool_outputs"]
+]);
 const EXACT_CATEGORY_MAP = new Map([
 	["read_file", "file_reads"],
 	["write_file", "tool_outputs"],
@@ -13171,16 +13378,21 @@ const ALL_CATEGORIES = [
 ];
 var Categorizer = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
-	* Classify an operation into a SemanticCategory using three-tier logic.
+	* Classify an operation into a SemanticCategory using tiered logic.
 	*
 	* @param operationName - Span operation name (e.g. 'read_file', 'bash')
 	* @param toolName      - Optional tool name; non-empty value overrides fallback to tool_outputs
+	* @param taskType      - Optional task type (e.g. 'dev-story', 'code-review'); acts as Tier 0 (highest priority)
 	*/
-	classify(operationName, toolName) {
+	classify(operationName, toolName, taskType) {
+		if (taskType !== void 0 && taskType.length > 0) {
+			const taskCategory = TASK_TYPE_CATEGORY_MAP.get(taskType);
+			if (taskCategory !== void 0) return taskCategory;
+		}
 		const exact = EXACT_CATEGORY_MAP.get(operationName);
 		if (exact !== void 0) return exact;
 		for (const { pattern, category } of PREFIX_PATTERNS) if (pattern.test(operationName)) return category;
@@ -13256,7 +13468,7 @@ var Categorizer = class {
 		const half = Math.floor(turns.length / 2);
 		for (let i = 0; i < turns.length; i++) {
 			const turn = turns[i];
-			const cat = this.classify(turn.name, turn.toolName);
+			const cat = this.classify(turn.name, turn.toolName, turn.taskType);
 			const bucket = buckets.get(cat);
 			const tokens = turn.inputTokens + turn.outputTokens;
 			bucket.total += tokens;
@@ -13368,9 +13580,9 @@ function extractToolNameFromSpan(span) {
 var ConsumerAnalyzer = class {
 	_categorizer;
 	_logger;
-	constructor(categorizer, logger$26) {
+	constructor(categorizer, logger$27) {
 		this._categorizer = categorizer;
-		this._logger = logger$26;
+		this._logger = logger$27;
 	}
 	/**
 	* Group spans by consumer key, rank by totalTokens descending, and return
@@ -13504,8 +13716,8 @@ var ConsumerAnalyzer = class {
 //#region src/modules/telemetry/recommender.ts
 var Recommender = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Run all 8 rules against the given context and return sorted recommendations.
@@ -13521,7 +13733,8 @@ var Recommender = class {
 			...this._runContextGrowthSpikes(context),
 			...this._runGrowingCategories(context),
 			...this._runCacheEfficiency(context),
-			...this._runModelComparison(context)
+			...this._runModelComparison(context),
+			...this._runCacheDeltaRegression(context)
 		];
 		const severityOrder = {
 			critical: 0,
@@ -13810,6 +14023,40 @@ var Recommender = class {
 			generatedAt
 		}];
 	}
+	/**
+	* Detect significant cache hit rate drops between consecutive dispatches.
+	* >30pp drop → warning; >50pp drop → critical.
+	* Requires dispatchScores with at least 2 entries; otherwise returns [].
+	*/
+	_runCacheDeltaRegression(ctx) {
+		const { dispatchScores, storyKey, sprintId, generatedAt } = ctx;
+		if (dispatchScores === void 0 || dispatchScores.length < 2) return [];
+		const sorted = [...dispatchScores].sort((a, b) => a.timestamp - b.timestamp);
+		const recs = [];
+		for (let i = 0; i < sorted.length - 1; i++) {
+			const prev = sorted[i];
+			const curr = sorted[i + 1];
+			const deltaPP = (prev.avgCacheHitRate - curr.avgCacheHitRate) * 100;
+			if (deltaPP <= 30) continue;
+			const severity = deltaPP > 50 ? "critical" : "warning";
+			const prevId = prev.dispatchId ?? `dispatch-${i}`;
+			const currId = curr.dispatchId ?? `dispatch-${i + 1}`;
+			const pairKey = `${prevId}→${currId}`;
+			const id = this._makeId("cache_delta_regression", storyKey, pairKey, i);
+			recs.push({
+				id,
+				storyKey,
+				sprintId,
+				ruleId: "cache_delta_regression",
+				severity,
+				title: `Cache regression between dispatches: ${pairKey}`,
+				description: `Cache hit rate dropped ${deltaPP.toFixed(1)} percentage points between dispatch "${prevId}" (${(prev.avgCacheHitRate * 100).toFixed(1)}%) and "${currId}" (${(curr.avgCacheHitRate * 100).toFixed(1)}%). This likely indicates a prompt prefix change broke cache alignment. Investigate whether the system prompt or context prefix was restructured between these dispatches.`,
+				actionTarget: pairKey,
+				generatedAt
+			});
+		}
+		return recs;
+	}
 	_isToolNameMatch(span) {
 		const toolName = span.attributes?.["tool.name"];
 		return toolName === "bash" || toolName === "execute_command" || span.name === "bash" || span.name === "execute_command" || span.operationName === "bash" || span.operationName === "execute_command";
@@ -13820,8 +14067,8 @@ var Recommender = class {
 //#region src/modules/telemetry/turn-analyzer.ts
 var TurnAnalyzer = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Analyze a list of NormalizedSpan records and produce TurnAnalysis[].
@@ -13890,8 +14137,8 @@ var TurnAnalyzer = class {
 //#region src/modules/telemetry/log-turn-analyzer.ts
 var LogTurnAnalyzer = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Analyze a list of NormalizedLog records and produce TurnAnalysis[].
@@ -13963,7 +14210,10 @@ var LogTurnAnalyzer = class {
 					contextDelta: runningContext - prevContext,
 					toolName: log$2.toolName,
 					isContextSpike: false,
-					childSpans: []
+					childSpans: [],
+					...log$2.taskType !== void 0 && { taskType: log$2.taskType },
+					...log$2.phase !== void 0 && { phase: log$2.phase },
+					...log$2.dispatchId !== void 0 && { dispatchId: log$2.dispatchId }
 				};
 			});
 			const avg = turns.reduce((sum, t) => sum + t.inputTokens, 0) / turns.length;
@@ -14373,8 +14623,8 @@ function generateLogId() {
 */
 var TelemetryNormalizer = class {
 	_logger;
-	constructor(logger$26) {
-		this._logger = logger$26;
+	constructor(logger$27) {
+		this._logger = logger$27;
 	}
 	/**
 	* Normalize a raw OTLP trace payload into an array of `NormalizedSpan`.
@@ -14464,17 +14714,18 @@ var TelemetryNormalizer = class {
 	* Normalize a raw OTLP log payload into an array of `NormalizedLog`.
 	*
 	* @param raw - Raw OTLP log payload (resourceLogs structure)
+	* @param dispatchContext - Optional dispatch context to stamp on each log (Story 30-1)
 	* @returns Array of normalized logs; empty on error or empty input
 	*/
-	normalizeLog(raw) {
+	normalizeLog(raw, dispatchContext) {
 		try {
-			return this._normalizeLogInternal(raw);
+			return this._normalizeLogInternal(raw, dispatchContext);
 		} catch (err) {
 			this._logger.warn({ err }, "TelemetryNormalizer.normalizeLog: unexpected error");
 			return [];
 		}
 	}
-	_normalizeLogInternal(raw) {
+	_normalizeLogInternal(raw, dispatchContext) {
 		if (!raw || typeof raw !== "object") return [];
 		const payload = raw;
 		if (!Array.isArray(payload.resourceLogs)) return [];
@@ -14488,7 +14739,7 @@ var TelemetryNormalizer = class {
 				for (const record of scopeLog.logRecords) {
 					if (!record) continue;
 					try {
-						const normalized = this._normalizeOneLog(record, resourceAttrs);
+						const normalized = this._normalizeOneLog(record, resourceAttrs, dispatchContext);
 						results.push(normalized);
 					} catch (err) {
 						this._logger.warn({ err }, "Failed to normalize log record — skipping");
@@ -14498,7 +14749,7 @@ var TelemetryNormalizer = class {
 		}
 		return results;
 	}
-	_normalizeOneLog(record, resourceAttrs) {
+	_normalizeOneLog(record, resourceAttrs, dispatchContext) {
 		const logId = record.logRecordId ?? generateLogId();
 		const timestamp = normalizeTimestamp(record.timeUnixNano);
 		const bodyStr = extractBodyString(record.body);
@@ -14526,14 +14777,19 @@ var TelemetryNormalizer = class {
 			cacheReadTokens: tokens.cacheRead,
 			costUsd,
 			model,
-			storyKey
+			storyKey,
+			...dispatchContext !== void 0 && {
+				taskType: dispatchContext.taskType,
+				phase: dispatchContext.phase,
+				dispatchId: dispatchContext.dispatchId
+			}
 		};
 	}
 };
 
 //#endregion
 //#region src/modules/telemetry/telemetry-pipeline.ts
-const logger$6 = createLogger("telemetry:pipeline");
+const logger$7 = createLogger("telemetry:pipeline");
 /**
 * Wires together the full OTLP analysis and persistence pipeline.
 *
@@ -14574,7 +14830,7 @@ var TelemetryPipeline = class {
 	*/
 	async processBatch(items) {
 		if (items.length === 0) return;
-		logger$6.debug({ count: items.length }, "TelemetryPipeline.processBatch start");
+		logger$7.debug({ count: items.length }, "TelemetryPipeline.processBatch start");
 		const allSpans = [];
 		const allLogs = [];
 		for (const item of items) {
@@ -14582,21 +14838,21 @@ var TelemetryPipeline = class {
 				const spans = this._normalizer.normalizeSpan(item.body);
 				allSpans.push(...spans);
 			} catch (err) {
-				logger$6.warn({ err }, "TelemetryPipeline: normalizeSpan failed — skipping payload");
+				logger$7.warn({ err }, "TelemetryPipeline: normalizeSpan failed — skipping payload");
 			}
 			try {
-				const logs = this._normalizer.normalizeLog(item.body);
+				const logs = this._normalizer.normalizeLog(item.body, item.dispatchContext);
 				allLogs.push(...logs);
 			} catch (err) {
-				logger$6.warn({ err }, "TelemetryPipeline: normalizeLog failed — skipping payload");
+				logger$7.warn({ err }, "TelemetryPipeline: normalizeLog failed — skipping payload");
 			}
 		}
-		logger$6.debug({
+		logger$7.debug({
 			spans: allSpans.length,
 			logs: allLogs.length
 		}, "TelemetryPipeline: normalized batch");
 		if (allSpans.length === 0 && allLogs.length === 0) {
-			logger$6.debug("TelemetryPipeline: no spans or logs normalized from batch");
+			logger$7.debug("TelemetryPipeline: no spans or logs normalized from batch");
 			return;
 		}
 		const unknownStoryKey = "__unknown__";
@@ -14621,7 +14877,7 @@ var TelemetryPipeline = class {
 			if (storyKey === unknownStoryKey) {
 				const spanCount = spansByStory.get(unknownStoryKey)?.length ?? 0;
 				const logCount = logsByStory.get(unknownStoryKey)?.length ?? 0;
-				logger$6.debug({
+				logger$7.debug({
 					spanCount,
 					logCount
 				}, "TelemetryPipeline: data without storyKey — skipping analysis");
@@ -14636,13 +14892,27 @@ var TelemetryPipeline = class {
 				if (spans.length > 0) await this._processStory(storyKey, spans, mergedTurns);
 				else await this._processStoryFromTurns(storyKey, mergedTurns);
 			} catch (err) {
-				logger$6.warn({
+				logger$7.warn({
 					err,
 					storyKey
 				}, "TelemetryPipeline: story processing failed — skipping");
 			}
 		}
-		logger$6.debug({ storyCount: allStoryKeys.size }, "TelemetryPipeline.processBatch complete");
+		logger$7.debug({ storyCount: allStoryKeys.size }, "TelemetryPipeline.processBatch complete");
+	}
+	/**
+	* Group turns by dispatchId for per-dispatch scoring.
+	* Only turns with a non-empty dispatchId are included.
+	*/
+	_groupTurnsByDispatchId(turns) {
+		const groups = new Map();
+		for (const turn of turns) {
+			if (turn.dispatchId === void 0 || turn.dispatchId === "") continue;
+			const existing = groups.get(turn.dispatchId);
+			if (existing !== void 0) existing.push(turn);
+			else groups.set(turn.dispatchId, [turn]);
+		}
+		return groups;
 	}
 	/**
 	* Merge span-derived and log-derived turns, deduplicating by spanId.
@@ -14667,7 +14937,24 @@ var TelemetryPipeline = class {
 		const turns = mergedTurns;
 		const categories = this._categorizer.computeCategoryStats(spans, turns);
 		const consumers = this._consumerAnalyzer.analyze(spans);
-		const efficiencyScore = this._efficiencyScorer.score(storyKey, turns);
+		const baseTimestamp = Date.now();
+		const storyScore = this._efficiencyScorer.score(storyKey, turns);
+		const efficiencyScore = {
+			...storyScore,
+			timestamp: baseTimestamp
+		};
+		const dispatchGroups = this._groupTurnsByDispatchId(turns);
+		const dispatchScores = Array.from(dispatchGroups.entries()).map(([dispatchId, dispatchTurns], idx) => {
+			const firstTurn = dispatchTurns[0];
+			const scored = this._efficiencyScorer.score(storyKey, dispatchTurns);
+			return {
+				...scored,
+				timestamp: baseTimestamp + 1 + idx,
+				dispatchId,
+				taskType: firstTurn?.taskType,
+				phase: firstTurn?.phase
+			};
+		});
 		const generatedAt = new Date().toISOString();
 		const context = {
 			storyKey,
@@ -14676,69 +14963,236 @@ var TelemetryPipeline = class {
 			categories,
 			consumers,
 			efficiencyScore,
-			allSpans: spans
+			allSpans: spans,
+			dispatchScores
 		};
 		const recommendations = this._recommender.analyze(context);
-		await Promise.all([
-			turns.length > 0 ? this._persistence.storeTurnAnalysis(storyKey, turns).catch((err) => logger$6.warn({
-				err,
-				storyKey
-			}, "Failed to store turn analysis")) : Promise.resolve(),
-			categories.length > 0 ? this._persistence.storeCategoryStats(storyKey, categories).catch((err) => logger$6.warn({
-				err,
-				storyKey
-			}, "Failed to store category stats")) : Promise.resolve(),
-			consumers.length > 0 ? this._persistence.storeConsumerStats(storyKey, consumers).catch((err) => logger$6.warn({
-				err,
-				storyKey
-			}, "Failed to store consumer stats")) : Promise.resolve(),
-			this._persistence.storeEfficiencyScore(efficiencyScore).catch((err) => logger$6.warn({
-				err,
-				storyKey
-			}, "Failed to store efficiency score")),
-			recommendations.length > 0 ? this._persistence.saveRecommendations(storyKey, recommendations).catch((err) => logger$6.warn({
-				err,
-				storyKey
-			}, "Failed to save recommendations")) : Promise.resolve()
-		]);
-		logger$6.info({
+		await this._persistStoryData(storyKey, {
+			turns,
+			efficiencyScore,
+			categoryStats: categories,
+			consumerStats: consumers,
+			recommendations,
+			dispatchScores
+		});
+		logger$7.info({
 			storyKey,
 			turns: turns.length,
 			compositeScore: efficiencyScore.compositeScore,
-			recommendations: recommendations.length
+			recommendations: recommendations.length,
+			dispatchScores: dispatchScores.length
 		}, "TelemetryPipeline: story analysis complete");
 	}
 	/**
-	* Log-only analysis path (AC3, AC6): processes turns from LogTurnAnalyzer
-	* through efficiency scoring, category stats, and persistence.
+	* Log-only analysis path: processes turns from LogTurnAnalyzer through full
+	* analysis and persistence — mirrors span path via _persistStoryData (Story 30-4).
 	*/
 	async _processStoryFromTurns(storyKey, turns) {
 		if (turns.length === 0) return;
-		const efficiencyScore = this._efficiencyScorer.score(storyKey, turns);
+		const baseTimestamp = Date.now();
+		const storyScore = this._efficiencyScorer.score(storyKey, turns);
+		const efficiencyScore = {
+			...storyScore,
+			timestamp: baseTimestamp
+		};
 		const categoryStats = this._categorizer.computeCategoryStatsFromTurns(turns);
+		const consumerStats = this._consumerAnalyzer.analyzeFromTurns(turns);
+		const dispatchGroups = this._groupTurnsByDispatchId(turns);
+		const dispatchScores = Array.from(dispatchGroups.entries()).map(([dispatchId, dispatchTurns], idx) => {
+			const firstTurn = dispatchTurns[0];
+			const scored = this._efficiencyScorer.score(storyKey, dispatchTurns);
+			return {
+				...scored,
+				timestamp: baseTimestamp + 1 + idx,
+				dispatchId,
+				taskType: firstTurn?.taskType,
+				phase: firstTurn?.phase
+			};
+		});
+		const generatedAt = new Date().toISOString();
+		const context = {
+			storyKey,
+			generatedAt,
+			turns,
+			categories: categoryStats,
+			consumers: consumerStats,
+			efficiencyScore,
+			allSpans: [],
+			dispatchScores
+		};
+		const recommendations = this._recommender.analyze(context);
+		await this._persistStoryData(storyKey, {
+			turns,
+			efficiencyScore,
+			categoryStats,
+			consumerStats,
+			recommendations,
+			dispatchScores
+		});
+		logger$7.info({
+			storyKey,
+			turns: turns.length,
+			compositeScore: efficiencyScore.compositeScore,
+			categories: categoryStats.length,
+			recommendations: recommendations.length,
+			dispatchScores: dispatchScores.length
+		}, "TelemetryPipeline: story analysis from turns complete");
+	}
+	/**
+	* Shared persistence helper — called by both _processStory and _processStoryFromTurns.
+	* All 5 persistence calls are made here with individual error guards so a single
+	* failure does not abort the others (AC5).
+	*/
+	async _persistStoryData(storyKey, data) {
+		const { turns, efficiencyScore, categoryStats, consumerStats, recommendations, dispatchScores } = data;
 		await Promise.all([
-			this._persistence.storeTurnAnalysis(storyKey, turns).catch((err) => logger$6.warn({
+			turns.length > 0 ? this._persistence.storeTurnAnalysis(storyKey, turns).catch((err) => logger$7.warn({
 				err,
 				storyKey
-			}, "Failed to store turn analysis")),
-			this._persistence.storeEfficiencyScore(efficiencyScore).catch((err) => logger$6.warn({
+			}, "Failed to store turn analysis")) : Promise.resolve(),
+			this._persistence.storeEfficiencyScore(efficiencyScore).catch((err) => logger$7.warn({
 				err,
 				storyKey
 			}, "Failed to store efficiency score")),
-			categoryStats.length > 0 ? this._persistence.storeCategoryStats(storyKey, categoryStats).catch((err) => logger$6.warn({
+			categoryStats.length > 0 ? this._persistence.storeCategoryStats(storyKey, categoryStats).catch((err) => logger$7.warn({
+				err,
+				storyKey
+			}, "Failed to store category stats")) : Promise.resolve(),
+			consumerStats.length > 0 ? this._persistence.storeConsumerStats(storyKey, consumerStats).catch((err) => logger$7.warn({
+				err,
+				storyKey
+			}, "Failed to store consumer stats")) : Promise.resolve(),
+			recommendations.length > 0 ? this._persistence.saveRecommendations(storyKey, recommendations).catch((err) => logger$7.warn({
 				err,
 				storyKey
-			}, "Failed to store category stats")) : Promise.resolve()
+			}, "Failed to save recommendations")) : Promise.resolve(),
+			...dispatchScores.map((ds) => this._persistence.storeEfficiencyScore(ds).catch((err) => logger$7.warn({
+				err,
+				storyKey,
+				dispatchId: ds.dispatchId
+			}, "Failed to store dispatch efficiency score")))
 		]);
-		logger$6.info({
-			storyKey,
-			turns: turns.length,
-			compositeScore: efficiencyScore.compositeScore,
-			categories: categoryStats.length
-		}, "TelemetryPipeline: story analysis from turns complete");
 	}
 };
 
+//#endregion
+//#region src/modules/telemetry/telemetry-advisor.ts
+const logger$6 = createLogger("telemetry-advisor");
+/**
+* Reads telemetry efficiency data to support retry gate decisions.
+*/
+var TelemetryAdvisor = class {
+	_persistence;
+	constructor(deps) {
+		this._persistence = new TelemetryPersistence(deps.db);
+	}
+	/**
+	* Retrieve the efficiency profile for a story.
+	*
+	* Returns null when no efficiency score has been persisted for the story
+	* (e.g. first run, telemetry disabled, or no turns recorded).
+	*
+	* @param storyKey - The story identifier (e.g. "30-5")
+	* @returns EfficiencyProfile or null
+	*/
+	async getEfficiencyProfile(storyKey) {
+		try {
+			const score = await this._persistence.getEfficiencyScore(storyKey);
+			if (score === null) {
+				logger$6.debug({ storyKey }, "No efficiency score found for story");
+				return null;
+			}
+			return {
+				storyKey: score.storyKey,
+				compositeScore: score.compositeScore,
+				cacheHitSubScore: score.cacheHitSubScore,
+				ioRatioSubScore: score.ioRatioSubScore,
+				contextManagementSubScore: score.contextManagementSubScore,
+				totalTurns: score.totalTurns,
+				contextSpikeCount: score.contextSpikeCount
+			};
+		} catch (err) {
+			logger$6.warn({
+				err,
+				storyKey
+			}, "Failed to retrieve efficiency score");
+			return null;
+		}
+	}
+	/**
+	* Aggregate recommendations across all completed stories in a run.
+	*
+	* Queries getRecommendations() for each storyKey in parallel, merges results,
+	* deduplicates by recommendation id (first occurrence wins), and sorts by
+	* severity: critical → warning → info.
+	*
+	* Returns an empty array when completedStoryKeys is empty or no recommendations exist.
+	*
+	* @param completedStoryKeys - Story keys that have already finished in this run
+	* @returns Merged, deduplicated, sorted recommendations
+	*/
+	async getRecommendationsForRun(completedStoryKeys) {
+		if (completedStoryKeys.length === 0) return [];
+		try {
+			const results = await Promise.all(completedStoryKeys.map((key) => this._persistence.getRecommendations(key)));
+			const seen = new Set();
+			const merged = [];
+			for (const recs of results) for (const rec of recs) if (!seen.has(rec.id)) {
+				seen.add(rec.id);
+				merged.push(rec);
+			}
+			const severityOrder = {
+				critical: 0,
+				warning: 1,
+				info: 2
+			};
+			merged.sort((a, b) => (severityOrder[a.severity] ?? 3) - (severityOrder[b.severity] ?? 3));
+			return merged;
+		} catch (err) {
+			logger$6.warn({ err }, "Failed to retrieve recommendations for run — returning empty");
+			return [];
+		}
+	}
+	/**
+	* Format a list of recommendations as optimization directives for prompt injection.
+	*
+	* Filters to only critical and warning items, formats each as a natural-language
+	* OPTIMIZATION line, and truncates to a maximum of 2000 characters at a word boundary.
+	*
+	* Returns an empty string when no critical or warning recommendations are present.
+	*
+	* @param recommendations - Recommendations to format (typically from getRecommendationsForRun)
+	* @returns Formatted directives string, or "" if nothing actionable
+	*/
+	formatOptimizationDirectives(recommendations) {
+		const MAX_CHARS$1 = 2e3;
+		const actionable = recommendations.filter((r) => r.severity === "critical" || r.severity === "warning");
+		if (actionable.length === 0) return "";
+		const lines = actionable.map((r) => `OPTIMIZATION (${r.severity}): ${r.title}. ${r.description}`);
+		const full = lines.join("\n");
+		if (full.length <= MAX_CHARS$1) {
+			logger$6.debug({
+				count: actionable.length,
+				chars: full.length
+			}, "Formatting optimization directives");
+			return full;
+		}
+		const cutAt = full.lastIndexOf(" ", MAX_CHARS$1);
+		const truncated = (cutAt > 0 ? full.slice(0, cutAt) : full.slice(0, MAX_CHARS$1)) + "…";
+		logger$6.debug({
+			count: actionable.length,
+			chars: truncated.length
+		}, "Optimization directives truncated to budget");
+		return truncated;
+	}
+};
+/**
+* Create a TelemetryAdvisor for the given database adapter.
+*/
+function createTelemetryAdvisor(deps) {
+	return new TelemetryAdvisor(deps);
+}
+
 //#endregion
 //#region src/modules/implementation-orchestrator/orchestrator-impl.ts
 function createPauseGate() {
@@ -14797,7 +15251,8 @@ function wgStatusForPhase(phase) {
 */
 function createImplementationOrchestrator(deps) {
 	const { db, pack, contextCompiler, dispatcher, eventBus, config, projectRoot, tokenCeilings, stateStore, telemetryPersistence, ingestionServer, repoMapInjector, maxRepoMapTokens } = deps;
-	const logger$26 = createLogger("implementation-orchestrator");
+	const logger$27 = createLogger("implementation-orchestrator");
+	const telemetryAdvisor = db !== void 0 ? createTelemetryAdvisor({ db }) : void 0;
 	const wgRepo = new WorkGraphRepository(db);
 	const _wgInProgressWritten = new Set();
 	let _state = "IDLE";
@@ -14845,7 +15300,7 @@ function createImplementationOrchestrator(deps) {
 		const nowMs = Date.now();
 		for (const [phase, startMs] of starts) {
 			const endMs = ends?.get(phase);
-			if (endMs === void 0) logger$26.warn({
+			if (endMs === void 0) logger$27.warn({
 				storyKey,
 				phase
 			}, "Phase has no end time — story may have errored mid-phase. Duration capped to now() and may be inflated.");
@@ -14892,7 +15347,7 @@ function createImplementationOrchestrator(deps) {
 				recordedAt: completedAt,
 				timestamp: completedAt
 			}).catch((storeErr) => {
-				logger$26.warn({
+				logger$27.warn({
 					err: storeErr,
 					storyKey
 				}, "Failed to record metric to StateStore (best-effort)");
@@ -14914,7 +15369,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$26.warn({
+				logger$27.warn({
 					err: decisionErr,
 					storyKey
 				}, "Failed to write story-metrics decision (best-effort)");
@@ -14942,13 +15397,13 @@ function createImplementationOrchestrator(deps) {
 					dispatches: _storyDispatches.get(storyKey) ?? 0
 				});
 			} catch (emitErr) {
-				logger$26.warn({
+				logger$27.warn({
 					err: emitErr,
 					storyKey
 				}, "Failed to emit story:metrics event (best-effort)");
 			}
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				err,
 				storyKey
 			}, "Failed to write story metrics (best-effort)");
@@ -14977,7 +15432,7 @@ function createImplementationOrchestrator(deps) {
 				rationale: `Story ${storyKey} ${outcome} after ${reviewCycles} review cycle(s).`
 			});
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				err,
 				storyKey
 			}, "Failed to write story-outcome decision (best-effort)");
@@ -15003,7 +15458,7 @@ function createImplementationOrchestrator(deps) {
 				rationale: `Escalation diagnosis for ${payload.storyKey}: ${diagnosis.recommendedAction} — ${diagnosis.rationale}`
 			});
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				err,
 				storyKey: payload.storyKey
 			}, "Failed to persist escalation diagnosis (best-effort)");
@@ -15052,7 +15507,7 @@ function createImplementationOrchestrator(deps) {
 		const existing = _stories.get(storyKey);
 		if (existing !== void 0) {
 			Object.assign(existing, updates);
-			persistStoryState(storyKey, existing).catch((err) => logger$26.warn({
+			persistStoryState(storyKey, existing).catch((err) => logger$27.warn({
 				err,
 				storyKey
 			}, "StateStore write failed after updateStory"));
@@ -15061,12 +15516,12 @@ function createImplementationOrchestrator(deps) {
 					storyKey,
 					conflict: err
 				});
-				else logger$26.warn({
+				else logger$27.warn({
 					err,
 					storyKey
 				}, "mergeStory failed");
 			});
-			else if (updates.phase === "ESCALATED") stateStore?.rollbackStory(storyKey).catch((err) => logger$26.warn({
+			else if (updates.phase === "ESCALATED") stateStore?.rollbackStory(storyKey).catch((err) => logger$27.warn({
 				err,
 				storyKey
 			}, "rollbackStory failed — branch may persist"));
@@ -15078,7 +15533,7 @@ function createImplementationOrchestrator(deps) {
 						...updates
 					};
 					const opts = targetStatus === "complete" || targetStatus === "escalated" ? { completedAt: fullUpdated.completedAt } : void 0;
-					wgRepo.updateStoryStatus(storyKey, targetStatus, opts).catch((err) => logger$26.warn({
+					wgRepo.updateStoryStatus(storyKey, targetStatus, opts).catch((err) => logger$27.warn({
 						err,
 						storyKey
 					}, "wg_stories status update failed (best-effort)"));
@@ -15108,7 +15563,7 @@ function createImplementationOrchestrator(deps) {
 			};
 			await stateStore.setStoryState(storyKey, record);
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				err,
 				storyKey
 			}, "StateStore.setStoryState failed (best-effort)");
@@ -15124,7 +15579,7 @@ function createImplementationOrchestrator(deps) {
 				token_usage_json: serialized
 			});
 		} catch (err) {
-			logger$26.warn({ err }, "Failed to persist orchestrator state");
+			logger$27.warn({ err }, "Failed to persist orchestrator state");
 		}
 	}
 	function recordProgress() {
@@ -15171,7 +15626,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (childActive) {
 					_lastProgressTs = Date.now();
-					logger$26.debug({
+					logger$27.debug({
 						storyKey: key,
 						phase: s.phase,
 						childPids
@@ -15180,7 +15635,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				_stalledStories.add(key);
 				_storiesWithStall.add(key);
-				logger$26.warn({
+				logger$27.warn({
 					storyKey: key,
 					phase: s.phase,
 					elapsedMs: elapsed,
@@ -15225,7 +15680,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$26.warn({
+			logger$27.warn({
 				storyKey,
 				freeMB: memState.freeMB,
 				thresholdMB: memState.thresholdMB,
@@ -15244,12 +15699,12 @@ function createImplementationOrchestrator(deps) {
 	* to maxReviewCycles). On SHIP_IT the story is marked COMPLETE. On
 	* exhausted retries the story is ESCALATED.
 	*/
-	async function processStory(storyKey) {
-		logger$26.info({ storyKey }, "Processing story");
+	async function processStory(storyKey, storyOptions) {
+		logger$27.info({ storyKey }, "Processing story");
 		{
 			const memoryOk = await checkMemoryPressure(storyKey);
 			if (!memoryOk) {
-				logger$26.warn({ storyKey }, "Memory pressure exhausted — escalating story without dispatch");
+				logger$27.warn({ storyKey }, "Memory pressure exhausted — escalating story without dispatch");
 				const memPressureState = {
 					phase: "ESCALATED",
 					reviewCycles: 0,
@@ -15258,7 +15713,7 @@ function createImplementationOrchestrator(deps) {
 					completedAt: new Date().toISOString()
 				};
 				_stories.set(storyKey, memPressureState);
-				persistStoryState(storyKey, memPressureState).catch((err) => logger$26.warn({
+				persistStoryState(storyKey, memPressureState).catch((err) => logger$27.warn({
 					err,
 					storyKey
 				}, "StateStore write failed after memory-pressure escalation"));
@@ -15275,7 +15730,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
-		stateStore?.branchForStory(storyKey).catch((err) => logger$26.warn({
+		stateStore?.branchForStory(storyKey).catch((err) => logger$27.warn({
 			err,
 			storyKey
 		}, "branchForStory failed — continuing without branch isolation"));
@@ -15292,14 +15747,14 @@ function createImplementationOrchestrator(deps) {
 			if (match$1) {
 				const candidatePath = join$1(artifactsDir, match$1);
 				const validation = await isValidStoryFile(candidatePath);
-				if (!validation.valid) logger$26.warn({
+				if (!validation.valid) logger$27.warn({
 					storyKey,
 					storyFilePath: candidatePath,
 					reason: validation.reason
 				}, `Existing story file for ${storyKey} is invalid (${validation.reason}) — re-creating`);
 				else {
 					storyFilePath = candidatePath;
-					logger$26.info({
+					logger$27.info({
 						storyKey,
 						storyFilePath
 					}, "Found existing story file — skipping create-story");
@@ -15348,7 +15803,7 @@ function createImplementationOrchestrator(deps) {
 					metadata: JSON.stringify({ storyKey })
 				});
 			} catch (tokenErr) {
-				logger$26.warn({
+				logger$27.warn({
 					storyKey,
 					err: tokenErr
 				}, "Failed to record create-story token usage");
@@ -15432,14 +15887,14 @@ function createImplementationOrchestrator(deps) {
 						...contract.transport !== void 0 ? { transport: contract.transport } : {}
 					})
 				});
-				logger$26.info({
+				logger$27.info({
 					storyKey,
 					contractCount: contracts.length,
 					contracts
 				}, "Stored interface contract declarations");
 			}
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				storyKey,
 				error: err instanceof Error ? err.message : String(err)
 			}, "Failed to parse interface contracts — continuing without contract declarations");
@@ -15467,10 +15922,10 @@ function createImplementationOrchestrator(deps) {
 			});
 			testPlanPhaseResult = testPlanResult.result;
 			testPlanTokenUsage = testPlanResult.tokenUsage;
-			if (testPlanResult.result === "success") logger$26.info({ storyKey }, "Test plan generated successfully");
-			else logger$26.warn({ storyKey }, "Test planning returned failed result — proceeding to dev-story without test plan");
+			if (testPlanResult.result === "success") logger$27.info({ storyKey }, "Test plan generated successfully");
+			else logger$27.warn({ storyKey }, "Test planning returned failed result — proceeding to dev-story without test plan");
 		} catch (err) {
-			logger$26.warn({
+			logger$27.warn({
 				storyKey,
 				err
 			}, "Test planning failed — proceeding to dev-story without test plan");
@@ -15486,7 +15941,7 @@ function createImplementationOrchestrator(deps) {
 				metadata: JSON.stringify({ storyKey })
 			});
 		} catch (tokenErr) {
-			logger$26.warn({
+			logger$27.warn({
 				storyKey,
 				err: tokenErr
 			}, "Failed to record test-plan token usage");
@@ -15509,7 +15964,7 @@ function createImplementationOrchestrator(deps) {
 			try {
 				storyContentForAnalysis = await readFile$1(storyFilePath ?? "", "utf-8");
 			} catch (err) {
-				logger$26.error({
+				logger$27.error({
 					storyKey,
 					storyFilePath,
 					error: err instanceof Error ? err.message : String(err)
@@ -15517,7 +15972,7 @@ function createImplementationOrchestrator(deps) {
 			}
 			const analysis = analyzeStoryComplexity(storyContentForAnalysis);
 			const batches = planTaskBatches(analysis);
-			logger$26.info({
+			logger$27.info({
 				storyKey,
 				estimatedScope: analysis.estimatedScope,
 				batchCount: batches.length,
@@ -15535,7 +15990,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$26.info({
+					logger$27.info({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						taskCount: batch.taskIds.length
@@ -15553,7 +16008,9 @@ function createImplementationOrchestrator(deps) {
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
-							maxRepoMapTokens
+							maxRepoMapTokens,
+							...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {},
+							...storyOptions?.optimizationDirectives !== void 0 ? { optimizationDirectives: storyOptions.optimizationDirectives } : {}
 						}, {
 							storyKey,
 							storyFilePath: storyFilePath ?? "",
@@ -15563,7 +16020,7 @@ function createImplementationOrchestrator(deps) {
 						});
 					} catch (batchErr) {
 						const errMsg = batchErr instanceof Error ? batchErr.message : String(batchErr);
-						logger$26.warn({
+						logger$27.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							error: errMsg
@@ -15583,7 +16040,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: batchFilesModified,
 						result: batchResult.result === "success" ? "success" : "failed"
 					};
-					logger$26.info(batchMetrics, "Batch dev-story metrics");
+					logger$27.info(batchMetrics, "Batch dev-story metrics");
 					for (const f of batchFilesModified) allFilesModified.add(f);
 					if (batchFilesModified.length > 0) batchFileGroups.push({
 						batchIndex: batch.batchIndex,
@@ -15605,13 +16062,13 @@ function createImplementationOrchestrator(deps) {
 							})
 						});
 					} catch (tokenErr) {
-						logger$26.warn({
+						logger$27.warn({
 							storyKey,
 							batchIndex: batch.batchIndex,
 							err: tokenErr
 						}, "Failed to record batch token usage");
 					}
-					if (batchResult.result === "failed") logger$26.warn({
+					if (batchResult.result === "failed") logger$27.warn({
 						storyKey,
 						batchIndex: batch.batchIndex,
 						error: batchResult.error
@@ -15636,7 +16093,9 @@ function createImplementationOrchestrator(deps) {
 					tokenCeilings,
 					otlpEndpoint: _otlpEndpoint,
 					repoMapInjector,
-					maxRepoMapTokens
+					maxRepoMapTokens,
+					...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {},
+					...storyOptions?.optimizationDirectives !== void 0 ? { optimizationDirectives: storyOptions.optimizationDirectives } : {}
 				}, {
 					storyKey,
 					storyFilePath: storyFilePath ?? "",
@@ -15653,7 +16112,7 @@ function createImplementationOrchestrator(deps) {
 						metadata: JSON.stringify({ storyKey })
 					});
 				} catch (tokenErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						err: tokenErr
 					}, "Failed to record dev-story token usage");
@@ -15665,7 +16124,7 @@ function createImplementationOrchestrator(deps) {
 				});
 				await persistState();
 				if (devResult.result === "success") devStoryWasSuccess = true;
-				else logger$26.warn({
+				else logger$27.warn({
 					storyKey,
 					error: devResult.error,
 					filesModified: devFilesModified.length
@@ -15693,7 +16152,7 @@ function createImplementationOrchestrator(deps) {
 		if (devStoryWasSuccess) {
 			gitDiffFiles = checkGitDiffFiles(projectRoot ?? process.cwd());
 			if (gitDiffFiles.length === 0) {
-				logger$26.warn({ storyKey }, "Zero-diff detected after COMPLETE dev-story — no file changes in git working tree");
+				logger$27.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"
@@ -15724,7 +16183,7 @@ function createImplementationOrchestrator(deps) {
 			});
 			if (buildVerifyResult.status === "passed") {
 				eventBus.emit("story:build-verification-passed", { storyKey });
-				logger$26.info({ storyKey }, "Build verification passed");
+				logger$27.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";
@@ -15733,7 +16192,7 @@ function createImplementationOrchestrator(deps) {
 					exitCode: buildVerifyResult.exitCode ?? 1,
 					output: truncatedOutput
 				});
-				logger$26.warn({
+				logger$27.warn({
 					storyKey,
 					reason,
 					exitCode: buildVerifyResult.exitCode
@@ -15763,7 +16222,7 @@ function createImplementationOrchestrator(deps) {
 					storyKey
 				});
 				if (icResult.potentiallyAffectedTests.length > 0) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						modifiedInterfaces: icResult.modifiedInterfaces,
 						potentiallyAffectedTests: icResult.potentiallyAffectedTests
@@ -15809,7 +16268,7 @@ function createImplementationOrchestrator(deps) {
 						"NEEDS_MAJOR_REWORK": 2
 					};
 					for (const group of batchFileGroups) {
-						logger$26.info({
+						logger$27.info({
 							storyKey,
 							batchIndex: group.batchIndex,
 							fileCount: group.files.length
@@ -15824,7 +16283,8 @@ function createImplementationOrchestrator(deps) {
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
-							maxRepoMapTokens
+							maxRepoMapTokens,
+							...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {}
 						}, {
 							storyKey,
 							storyFilePath: storyFilePath ?? "",
@@ -15850,7 +16310,7 @@ function createImplementationOrchestrator(deps) {
 						rawOutput: lastRawOutput,
 						tokenUsage: aggregateTokens
 					};
-					logger$26.info({
+					logger$27.info({
 						storyKey,
 						batchCount: batchFileGroups.length,
 						verdict: worstVerdict,
@@ -15867,7 +16327,8 @@ function createImplementationOrchestrator(deps) {
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						repoMapInjector,
-						maxRepoMapTokens
+						maxRepoMapTokens,
+						...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {}
 					}, {
 						storyKey,
 						storyFilePath: storyFilePath ?? "",
@@ -15890,7 +16351,7 @@ function createImplementationOrchestrator(deps) {
 						})
 					});
 				} catch (tokenErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						err: tokenErr
 					}, "Failed to record code-review token usage");
@@ -15898,7 +16359,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$26.warn({
+					logger$27.warn({
 						storyKey,
 						reviewCycles,
 						error: reviewResult.error
@@ -15908,7 +16369,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$26.info({
+					logger$27.info({
 						storyKey,
 						originalVerdict: verdict,
 						issuesBefore: previousIssueList.length,
@@ -15944,7 +16405,7 @@ function createImplementationOrchestrator(deps) {
 					if (_decomposition !== void 0) parts.push(`decomposed: ${_decomposition.batchCount} batches`);
 					parts.push(`${fileCount} files`);
 					parts.push(`${totalTokensK} tokens`);
-					logger$26.info({
+					logger$27.info({
 						storyKey,
 						verdict,
 						agentVerdict: reviewResult.agentVerdict
@@ -15993,9 +16454,9 @@ function createImplementationOrchestrator(deps) {
 						}),
 						rationale: `Advisory notes from LGTM_WITH_NOTES review of ${storyKey}`
 					});
-					logger$26.info({ storyKey }, "Advisory notes persisted to decision store");
+					logger$27.info({ storyKey }, "Advisory notes persisted to decision store");
 				} catch (advisoryErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						error: advisoryErr instanceof Error ? advisoryErr.message : String(advisoryErr)
 					}, "Failed to persist advisory notes (best-effort)");
@@ -16003,27 +16464,27 @@ function createImplementationOrchestrator(deps) {
 				if (telemetryPersistence !== void 0) try {
 					const turns = await telemetryPersistence.getTurnAnalysis(storyKey);
 					if (turns.length > 0) {
-						const scorer = new EfficiencyScorer(logger$26);
+						const scorer = new EfficiencyScorer(logger$27);
 						const effScore = scorer.score(storyKey, turns);
 						await telemetryPersistence.storeEfficiencyScore(effScore);
-						logger$26.info({
+						logger$27.info({
 							storyKey,
 							compositeScore: effScore.compositeScore,
 							modelCount: effScore.perModelBreakdown.length
 						}, "Efficiency score computed and persisted");
-					} else logger$26.debug({ storyKey }, "No turn analysis data available — skipping efficiency scoring");
+					} else logger$27.debug({ storyKey }, "No turn analysis data available — skipping efficiency scoring");
 				} catch (effErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						error: effErr instanceof Error ? effErr.message : String(effErr)
 					}, "Efficiency scoring failed — story verdict unchanged");
 				}
 				if (telemetryPersistence !== void 0) try {
 					const turns = await telemetryPersistence.getTurnAnalysis(storyKey);
-					if (turns.length === 0) logger$26.debug({ storyKey }, "No turn analysis data for telemetry categorization — skipping");
+					if (turns.length === 0) logger$27.debug({ storyKey }, "No turn analysis data for telemetry categorization — skipping");
 					else {
-						const categorizer = new Categorizer(logger$26);
-						const consumerAnalyzer = new ConsumerAnalyzer(categorizer, logger$26);
+						const categorizer = new Categorizer(logger$27);
+						const consumerAnalyzer = new ConsumerAnalyzer(categorizer, logger$27);
 						const categoryStats = categorizer.computeCategoryStatsFromTurns(turns);
 						const consumerStats = consumerAnalyzer.analyzeFromTurns(turns);
 						await telemetryPersistence.storeCategoryStats(storyKey, categoryStats);
@@ -16031,7 +16492,7 @@ function createImplementationOrchestrator(deps) {
 						const growingCount = categoryStats.filter((c) => c.trend === "growing").length;
 						const topCategory = categoryStats[0]?.category ?? "none";
 						const topConsumer = consumerStats[0]?.consumerKey ?? "none";
-						logger$26.info({
+						logger$27.info({
 							storyKey,
 							topCategory,
 							topConsumer,
@@ -16039,7 +16500,7 @@ function createImplementationOrchestrator(deps) {
 						}, "Semantic categorization and consumer analysis complete");
 					}
 				} catch (catErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						error: catErr instanceof Error ? catErr.message : String(catErr)
 					}, "Semantic categorization failed — story verdict unchanged");
@@ -16060,7 +16521,7 @@ function createImplementationOrchestrator(deps) {
 						filesModified: devFilesModified,
 						workingDirectory: projectRoot
 					});
-					logger$26.debug({
+					logger$27.debug({
 						storyKey,
 						expansion_priority: expansionResult.expansion_priority,
 						coverage_gaps: expansionResult.coverage_gaps.length
@@ -16073,7 +16534,7 @@ function createImplementationOrchestrator(deps) {
 						value: JSON.stringify(expansionResult)
 					});
 				} catch (expansionErr) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						error: expansionErr instanceof Error ? expansionErr.message : String(expansionErr)
 					}, "Test expansion failed — story verdict unchanged");
@@ -16100,7 +16561,7 @@ function createImplementationOrchestrator(deps) {
 					await persistState();
 					return;
 				}
-				logger$26.info({
+				logger$27.info({
 					storyKey,
 					reviewCycles: finalReviewCycles,
 					issueCount: issueList.length
@@ -16160,7 +16621,7 @@ function createImplementationOrchestrator(deps) {
 						fixPrompt = assembled.prompt;
 					} catch {
 						fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, minor fixes needed`;
-						logger$26.warn({ storyKey }, "Failed to assemble auto-approve fix prompt, using fallback");
+						logger$27.warn({ storyKey }, "Failed to assemble auto-approve fix prompt, using fallback");
 					}
 					const handle = dispatcher.dispatch({
 						prompt: fixPrompt,
@@ -16168,6 +16629,7 @@ function createImplementationOrchestrator(deps) {
 						taskType: "minor-fixes",
 						workingDirectory: projectRoot,
 						...autoApproveMaxTurns !== void 0 ? { maxTurns: autoApproveMaxTurns } : {},
+						...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {},
 						..._otlpEndpoint !== void 0 ? { otlpEndpoint: _otlpEndpoint } : {},
 						storyKey
 					});
@@ -16180,9 +16642,9 @@ function createImplementationOrchestrator(deps) {
 							output: fixResult.tokenEstimate.output
 						} : void 0 }
 					});
-					if (fixResult.status === "timeout") logger$26.warn({ storyKey }, "Auto-approve fix timed out — approving anyway (issues were minor)");
+					if (fixResult.status === "timeout") logger$27.warn({ storyKey }, "Auto-approve fix timed out — approving anyway (issues were minor)");
 				} catch (err) {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						err
 					}, "Auto-approve fix dispatch failed — approving anyway (issues were minor)");
@@ -16299,7 +16761,7 @@ function createImplementationOrchestrator(deps) {
 					fixPrompt = assembled.prompt;
 				} catch {
 					fixPrompt = `Fix story ${storyKey}: verdict=${verdict}, taskType=${taskType}`;
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						taskType
 					}, "Failed to assemble fix prompt, using fallback");
@@ -16312,6 +16774,7 @@ function createImplementationOrchestrator(deps) {
 					...fixModel !== void 0 ? { model: fixModel } : {},
 					outputSchema: DevStoryResultSchema,
 					...fixMaxTurns !== void 0 ? { maxTurns: fixMaxTurns } : {},
+					...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {},
 					...projectRoot !== void 0 ? { workingDirectory: projectRoot } : {},
 					..._otlpEndpoint !== void 0 ? { otlpEndpoint: _otlpEndpoint } : {}
 				}) : dispatcher.dispatch({
@@ -16320,6 +16783,7 @@ function createImplementationOrchestrator(deps) {
 					taskType,
 					...fixModel !== void 0 ? { model: fixModel } : {},
 					...fixMaxTurns !== void 0 ? { maxTurns: fixMaxTurns } : {},
+					...config.perStoryContextCeilings?.[storyKey] !== void 0 ? { maxContextTokens: config.perStoryContextCeilings[storyKey] } : {},
 					...projectRoot !== void 0 ? { workingDirectory: projectRoot } : {},
 					..._otlpEndpoint !== void 0 ? { otlpEndpoint: _otlpEndpoint } : {}
 				});
@@ -16333,7 +16797,7 @@ function createImplementationOrchestrator(deps) {
 					} : void 0 }
 				});
 				if (fixResult.status === "timeout") {
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						taskType
 					}, "Fix dispatch timed out — escalating story");
@@ -16355,7 +16819,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (fixResult.status === "failed") {
 					if (isMajorRework) {
-						logger$26.warn({
+						logger$27.warn({
 							storyKey,
 							exitCode: fixResult.exitCode
 						}, "Major rework dispatch failed — escalating story");
@@ -16375,14 +16839,14 @@ function createImplementationOrchestrator(deps) {
 						await persistState();
 						return;
 					}
-					logger$26.warn({
+					logger$27.warn({
 						storyKey,
 						taskType,
 						exitCode: fixResult.exitCode
 					}, "Fix dispatch failed");
 				}
 			} catch (err) {
-				logger$26.warn({
+				logger$27.warn({
 					storyKey,
 					taskType,
 					err
@@ -16408,8 +16872,27 @@ function createImplementationOrchestrator(deps) {
 	* story dispatch (Story 23-8, AC2).
 	*/
 	async function processConflictGroup(group) {
+		const completedStoryKeys = [];
 		for (const storyKey of group) {
-			await processStory(storyKey);
+			let optimizationDirectives;
+			if (telemetryAdvisor !== void 0 && completedStoryKeys.length > 0) try {
+				const recs = await telemetryAdvisor.getRecommendationsForRun(completedStoryKeys);
+				const directives = telemetryAdvisor.formatOptimizationDirectives(recs);
+				if (directives.length > 0) {
+					optimizationDirectives = directives;
+					logger$27.debug({
+						storyKey,
+						directiveCount: recs.filter((r) => r.severity !== "info").length
+					}, "Optimization directives ready for dispatch");
+				}
+			} catch (err) {
+				logger$27.debug({
+					err,
+					storyKey
+				}, "Failed to fetch optimization directives — proceeding without");
+			}
+			await processStory(storyKey, { optimizationDirectives });
+			completedStoryKeys.push(storyKey);
 			globalThis.gc?.();
 			const gcPauseMs = config.gcPauseMs ?? 2e3;
 			await sleep(gcPauseMs);
@@ -16445,11 +16928,11 @@ function createImplementationOrchestrator(deps) {
 	}
 	async function run(storyKeys) {
 		if (_state === "RUNNING" || _state === "PAUSED") {
-			logger$26.warn({ state: _state }, "run() called while orchestrator is already running or paused — ignoring");
+			logger$27.warn({ state: _state }, "run() called while orchestrator is already running or paused — ignoring");
 			return getStatus();
 		}
 		if (_state === "COMPLETE") {
-			logger$26.warn({ state: _state }, "run() called on a COMPLETE orchestrator — ignoring");
+			logger$27.warn({ state: _state }, "run() called on a COMPLETE orchestrator — ignoring");
 			return getStatus();
 		}
 		_state = "RUNNING";
@@ -16473,7 +16956,7 @@ function createImplementationOrchestrator(deps) {
 			const seedStart = Date.now();
 			const seedResult = await seedMethodologyContext(db, projectRoot);
 			_startupTimings.seedMethodologyMs = Date.now() - seedStart;
-			if (seedResult.decisionsCreated > 0) logger$26.info({
+			if (seedResult.decisionsCreated > 0) logger$27.info({
 				decisionsCreated: seedResult.decisionsCreated,
 				skippedCategories: seedResult.skippedCategories,
 				durationMs: _startupTimings.seedMethodologyMs
@@ -16486,7 +16969,7 @@ function createImplementationOrchestrator(deps) {
 				_startupTimings.stateStoreInitMs = Date.now() - stateStoreInitStart;
 				for (const key of storyKeys) {
 					const pendingState = _stories.get(key);
-					if (pendingState !== void 0) persistStoryState(key, pendingState).catch((err) => logger$26.warn({
+					if (pendingState !== void 0) persistStoryState(key, pendingState).catch((err) => logger$27.warn({
 						err,
 						storyKey: key
 					}, "StateStore write failed during PENDING init"));
@@ -16497,12 +16980,12 @@ function createImplementationOrchestrator(deps) {
 					_startupTimings.queryStoriesMs = Date.now() - queryStoriesStart;
 					for (const record of existingRecords) _stateStoreCache.set(record.storyKey, record);
 				} catch (err) {
-					logger$26.warn({ err }, "StateStore.queryStories() failed during init — status merge will be empty (best-effort)");
+					logger$27.warn({ err }, "StateStore.queryStories() failed during init — status merge will be empty (best-effort)");
 				}
 			}
 			if (ingestionServer !== void 0) {
 				if (telemetryPersistence !== void 0) try {
-					const pipelineLogger = logger$26;
+					const pipelineLogger = logger$27;
 					const telemetryPipeline = new TelemetryPipeline({
 						normalizer: new TelemetryNormalizer(pipelineLogger),
 						turnAnalyzer: new TurnAnalyzer(pipelineLogger),
@@ -16514,14 +16997,14 @@ function createImplementationOrchestrator(deps) {
 						persistence: telemetryPersistence
 					});
 					ingestionServer.setPipeline(telemetryPipeline);
-					logger$26.info("TelemetryPipeline wired to IngestionServer");
+					logger$27.info("TelemetryPipeline wired to IngestionServer");
 				} catch (pipelineErr) {
-					logger$26.warn({ err: pipelineErr }, "Failed to create TelemetryPipeline — continuing without analysis pipeline");
+					logger$27.warn({ err: pipelineErr }, "Failed to create TelemetryPipeline — continuing without analysis pipeline");
 				}
-				await ingestionServer.start().catch((err) => logger$26.warn({ err }, "IngestionServer.start() failed — continuing without telemetry (best-effort)"));
+				await ingestionServer.start().catch((err) => logger$27.warn({ err }, "IngestionServer.start() failed — continuing without telemetry (best-effort)"));
 				try {
 					_otlpEndpoint = ingestionServer.getOtlpEnvVars().OTEL_EXPORTER_OTLP_ENDPOINT;
-					logger$26.info({ otlpEndpoint: _otlpEndpoint }, "OTLP telemetry ingestion active");
+					logger$27.info({ otlpEndpoint: _otlpEndpoint }, "OTLP telemetry ingestion active");
 				} catch {}
 			}
 			let contractDeclarations = [];
@@ -16561,12 +17044,12 @@ function createImplementationOrchestrator(deps) {
 			const conflictDetectStart = Date.now();
 			const { batches, edges: contractEdges } = detectConflictGroupsWithContracts(storyKeys, { moduleMap: pack.manifest.conflictGroups }, contractDeclarations);
 			_startupTimings.conflictDetectMs = Date.now() - conflictDetectStart;
-			if (contractEdges.length > 0) logger$26.info({
+			if (contractEdges.length > 0) logger$27.info({
 				contractEdges,
 				edgeCount: contractEdges.length
 			}, "Contract dependency edges detected — applying contract-aware dispatch ordering");
-			wgRepo.addContractDependencies(contractEdges).catch((err) => logger$26.warn({ err }, "contract dep persistence failed (best-effort)"));
-			logger$26.info({
+			wgRepo.addContractDependencies(contractEdges).catch((err) => logger$27.warn({ err }, "contract dep persistence failed (best-effort)"));
+			logger$27.info({
 				storyCount: storyKeys.length,
 				groupCount: batches.reduce((sum, b) => sum + b.length, 0),
 				batchCount: batches.length,
@@ -16588,7 +17071,7 @@ function createImplementationOrchestrator(deps) {
 						exitCode,
 						output: truncatedOutput
 					});
-					logger$26.error({
+					logger$27.error({
 						exitCode,
 						reason: preFlightResult.reason
 					}, "Pre-flight build check failed — aborting pipeline before any story dispatch");
@@ -16597,9 +17080,9 @@ function createImplementationOrchestrator(deps) {
 					await persistState();
 					return getStatus();
 				}
-				if (preFlightResult.status !== "skipped") logger$26.info("Pre-flight build check passed");
+				if (preFlightResult.status !== "skipped") logger$27.info("Pre-flight build check passed");
 			}
-			logger$26.info(_startupTimings, "Orchestrator startup timings (ms)");
+			logger$27.info(_startupTimings, "Orchestrator startup timings (ms)");
 			try {
 				for (const batchGroups of batches) await runWithConcurrency(batchGroups, config.maxConcurrency);
 			} catch (err) {
@@ -16607,7 +17090,7 @@ function createImplementationOrchestrator(deps) {
 				_state = "FAILED";
 				_completedAt = new Date().toISOString();
 				await persistState();
-				logger$26.error({ err }, "Orchestrator failed with unhandled error");
+				logger$27.error({ err }, "Orchestrator failed with unhandled error");
 				return getStatus();
 			}
 			stopHeartbeat();
@@ -16617,7 +17100,7 @@ function createImplementationOrchestrator(deps) {
 				const totalDeclarations = contractDeclarations.length;
 				const currentSprintDeclarations = contractDeclarations.filter((d) => storyKeys.includes(d.storyKey));
 				const stalePruned = totalDeclarations - currentSprintDeclarations.length;
-				if (stalePruned > 0) logger$26.info({
+				if (stalePruned > 0) logger$27.info({
 					stalePruned,
 					remaining: currentSprintDeclarations.length
 				}, "Pruned stale contract declarations from previous epics");
@@ -16631,11 +17114,11 @@ function createImplementationOrchestrator(deps) {
 						contractName: mismatch.contractName,
 						mismatchDescription: mismatch.mismatchDescription
 					});
-					logger$26.warn({
+					logger$27.warn({
 						mismatchCount: mismatches.length,
 						mismatches
 					}, "Post-sprint contract verification found mismatches — manual review required");
-				} else if (currentSprintDeclarations.length > 0) logger$26.info("Post-sprint contract verification passed — all declared contracts satisfied");
+				} else if (currentSprintDeclarations.length > 0) logger$27.info("Post-sprint contract verification passed — all declared contracts satisfied");
 				eventBus.emit("pipeline:contract-verification-summary", {
 					verified: currentSprintDeclarations.length,
 					stalePruned,
@@ -16670,12 +17153,12 @@ function createImplementationOrchestrator(deps) {
 						});
 						await stateStore.setContractVerification(sk, records);
 					}
-					logger$26.info({ storyCount: contractsByStory.size }, "Contract verification results persisted to StateStore");
+					logger$27.info({ storyCount: contractsByStory.size }, "Contract verification results persisted to StateStore");
 				} catch (persistErr) {
-					logger$26.warn({ err: persistErr }, "Failed to persist contract verification results to StateStore");
+					logger$27.warn({ err: persistErr }, "Failed to persist contract verification results to StateStore");
 				}
 			} catch (err) {
-				logger$26.error({ err }, "Post-sprint contract verification threw an error — skipping");
+				logger$27.error({ err }, "Post-sprint contract verification threw an error — skipping");
 			}
 			let completed = 0;
 			let escalated = 0;
@@ -16692,8 +17175,8 @@ function createImplementationOrchestrator(deps) {
 			await persistState();
 			return getStatus();
 		} finally {
-			if (stateStore !== void 0) await stateStore.close().catch((err) => logger$26.warn({ err }, "StateStore.close() failed (best-effort)"));
-			if (ingestionServer !== void 0) await ingestionServer.stop().catch((err) => logger$26.warn({ err }, "IngestionServer.stop() failed (best-effort)"));
+			if (stateStore !== void 0) await stateStore.close().catch((err) => logger$27.warn({ err }, "StateStore.close() failed (best-effort)"));
+			if (ingestionServer !== void 0) await ingestionServer.stop().catch((err) => logger$27.warn({ err }, "IngestionServer.stop() failed (best-effort)"));
 		}
 	}
 	function pause() {
@@ -16702,7 +17185,7 @@ function createImplementationOrchestrator(deps) {
 		_pauseGate = createPauseGate();
 		_state = "PAUSED";
 		eventBus.emit("orchestrator:paused", {});
-		logger$26.info("Orchestrator paused");
+		logger$27.info("Orchestrator paused");
 	}
 	function resume() {
 		if (_state !== "PAUSED") return;
@@ -16713,7 +17196,7 @@ function createImplementationOrchestrator(deps) {
 		}
 		_state = "RUNNING";
 		eventBus.emit("orchestrator:resumed", {});
-		logger$26.info("Orchestrator resumed");
+		logger$27.info("Orchestrator resumed");
 	}
 	return {
 		run,
@@ -21163,7 +21646,8 @@ async function runRunAction(options) {
 			start_phase: "implementation",
 			config_json: JSON.stringify({
 				storyKeys,
-				concurrency
+				concurrency,
+				...parsedStoryKeys.length > 0 ? { explicitStories: parsedStoryKeys } : {}
 			})
 		});
 		const eventBus = createEventBus();
@@ -21814,6 +22298,16 @@ async function runFullPipeline(options) {
 		});
 		const startedAt = Date.now();
 		const runId = await phaseOrchestrator.startRun(concept ?? "", startPhase);
+		if (explicitStories !== void 0 && explicitStories.length > 0 || options.epic !== void 0) {
+			const existingRun = (await adapter.query("SELECT config_json FROM pipeline_runs WHERE id = ?", [runId]))[0];
+			const existing = JSON.parse(existingRun?.config_json ?? "{}");
+			const updated = {
+				...existing,
+				...explicitStories !== void 0 && explicitStories.length > 0 ? { explicitStories } : {},
+				...options.epic !== void 0 ? { epic: options.epic } : {}
+			};
+			await adapter.query("UPDATE pipeline_runs SET config_json = ? WHERE id = ?", [JSON.stringify(updated), runId]);
+		}
 		if (outputFormat === "human") {
 			process.stdout.write(`Starting full pipeline from phase: ${startPhase}\n`);
 			process.stdout.write(`Pipeline run ID: ${runId}\n`);
@@ -22120,5 +22614,5 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 }
 
 //#endregion
-export { AdapterTelemetryPersistence, AppError, DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DoltClient, DoltNotInstalled, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, FileStateStore, GitClient, GrammarLoader, IngestionServer, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SUBSTRATE_OWNED_SETTINGS_KEYS, SymbolParser, VALID_PHASES, WorkGraphRepository, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDatabaseAdapter, createDispatcher, createDoltClient, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, detectCycles, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initSchema, initializeDolt, isSyncAdapter, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
-//# sourceMappingURL=run-D7a-qzk9.js.map
+export { AdapterTelemetryPersistence, AppError, DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DoltClient, DoltNotInstalled, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, FileStateStore, GitClient, GrammarLoader, IngestionServer, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SUBSTRATE_OWNED_SETTINGS_KEYS, SymbolParser, VALID_PHASES, WorkGraphRepository, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDatabaseAdapter, createDispatcher, createDoltClient, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, createTelemetryAdvisor, detectCycles, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initSchema, initializeDolt, isSyncAdapter, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
+//# sourceMappingURL=run-BVqGAkUO.js.map