substrate-ai 0.2.21 → 0.2.24

package/dist/index.js

@@ -1,6 +1,6 @@
 import { childLogger, createLogger, logger } from "./logger-D2fS2ccL.js";
-import { AdapterRegistry, ClaudeCodeAdapter, CodexCLIAdapter, GeminiCLIAdapter, createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning } from "./event-bus-BMxhfxfT.js";
-import { AdtError, BudgetExceededError, ConfigError, ConfigIncompatibleFormatError, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError } from "./errors-BPqtzQ4U.js";
+import { AdapterRegistry, AdtError, BudgetExceededError, ClaudeCodeAdapter, CodexCLIAdapter, ConfigError, ConfigIncompatibleFormatError, GeminiCLIAdapter, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError } from "./errors-CswS7Mzg.js";
+import { createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning } from "./event-bus-CAvDMst7.js";
 import { randomUUID } from "crypto";
 
 //#region src/utils/helpers.ts

package/dist/{run-BLIgARum.js → run-CT8B9gG9.js}

@@ -1,5 +1,5 @@
 import { createLogger } from "./logger-D2fS2ccL.js";
-import { AdapterRegistry, createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning } from "./event-bus-BMxhfxfT.js";
+import { createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning } from "./event-bus-CAvDMst7.js";
 import { addTokenUsage, createDecision, createPipelineRun, createRequirement, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunningPipelineRuns, getTokenUsageSummary, registerArtifact, updatePipelineRun, updatePipelineRunConfig, upsertDecision } from "./decisions-Dq4cAA2L.js";
 import { ESCALATION_DIAGNOSIS, OPERATIONAL_FINDING, STORY_METRICS, STORY_OUTCOME, TEST_EXPANSION_FINDING, TEST_PLAN, aggregateTokenUsageForRun, aggregateTokenUsageForStory, getStoryMetricsForRun, writeRunMetrics, writeStoryMetrics } from "./operational-CnMlvWqc.js";
 import { createRequire } from "module";
@@ -15,7 +15,7 @@ import BetterSqlite3 from "better-sqlite3";
 import { fileURLToPath } from "node:url";
 import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "node:fs";
 import { freemem, platform } from "node:os";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { readFile as readFile$1, stat as stat$1 } from "node:fs/promises";
 
 //#region rolldown:runtime
@@ -676,7 +676,8 @@ const PackManifestSchema = z.object({
 	phases: z.array(PhaseDefinitionSchema),
 	prompts: z.record(z.string(), z.string()),
 	constraints: z.record(z.string(), z.string()),
-	templates: z.record(z.string(), z.string())
+	templates: z.record(z.string(), z.string()),
+	conflictGroups: z.record(z.string(), z.string()).optional()
 });
 const ConstraintSeveritySchema = z.enum([
 	"required",
@@ -3868,7 +3869,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const implementationDecisions = getImplementationDecisions(deps);
-	const epicShardContent = getEpicShard(implementationDecisions, epicId, deps.projectRoot);
+	const epicShardContent = getEpicShard(implementationDecisions, epicId, deps.projectRoot, storyKey);
 	const prevDevNotesContent = getPrevDevNotes(implementationDecisions, epicId);
 	const archConstraintsContent = getArchConstraints$2(deps);
 	const storyTemplateContent = await getStoryTemplate(deps);
@@ -4018,18 +4019,71 @@ function getImplementationDecisions(deps) {
 	}
 }
 /**
+* Extract the section for a specific story key from a full epic shard.
+*
+* Matches patterns like:
+*   - "Story 23-1:" / "### Story 23-1" / "#### Story 23-1"
+*   - "23-1:" / "**23-1**"
+*
+* Returns the matched section content (from heading to next story heading or end),
+* or null if no matching section is found (caller falls back to full shard).
+*/
+function extractStorySection(shardContent, storyKey) {
+	if (!shardContent || !storyKey) return null;
+	const escaped = storyKey.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const headingPattern = new RegExp(`(?:^#{2,4}\\s+Story\\s+${escaped}\\b|^Story\\s+${escaped}:|^\\*\\*${escaped}\\*\\*|^${escaped}:)`, "mi");
+	const match = headingPattern.exec(shardContent);
+	if (!match) return null;
+	const startIdx = match.index;
+	const rest = shardContent.slice(startIdx + match[0].length);
+	const nextStoryPattern = new RegExp(`(?:^#{2,4}\\s+Story\\s+[\\d]|^Story\\s+[\\d][\\d-]*:|^\\*\\*[\\d][\\d-]*\\*\\*|^[\\d][\\d-]*:)`, "mi");
+	const nextMatch = nextStoryPattern.exec(rest);
+	const endIdx = nextMatch !== null ? startIdx + match[0].length + nextMatch.index : shardContent.length;
+	const section = shardContent.slice(startIdx, endIdx).trim();
+	return section.length > 0 ? section : null;
+}
+/**
 * Retrieve the epic shard from the pre-fetched implementation decisions.
 * Looks for decisions with category='epic-shard', key=epicId.
 * Falls back to reading _bmad-output/epics.md on disk if decisions are empty.
+*
+* When storyKey is provided, extracts only the section for that story (AC3).
 */
-function getEpicShard(decisions, epicId, projectRoot) {
+function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 	try {
 		const epicShard = decisions.find((d) => d.category === "epic-shard" && d.key === epicId);
-		if (epicShard?.value) return epicShard.value;
+		const shardContent = epicShard?.value;
+		if (shardContent) {
+			if (storyKey) {
+				const storySection = extractStorySection(shardContent, storyKey);
+				if (storySection) {
+					logger$14.debug({
+						epicId,
+						storyKey
+					}, "Extracted per-story section from epic shard");
+					return storySection;
+				}
+				logger$14.debug({
+					epicId,
+					storyKey
+				}, "No matching story section found — using full epic shard");
+			}
+			return shardContent;
+		}
 		if (projectRoot) {
 			const fallback = readEpicShardFromFile(projectRoot, epicId);
 			if (fallback) {
 				logger$14.info({ epicId }, "Using file-based fallback for epic shard (decisions table empty)");
+				if (storyKey) {
+					const storySection = extractStorySection(fallback, storyKey);
+					if (storySection) {
+						logger$14.debug({
+							epicId,
+							storyKey
+						}, "Extracted per-story section from file-based epic shard");
+						return storySection;
+					}
+				}
 				return fallback;
 			}
 		}
@@ -4094,7 +4148,7 @@ function readEpicShardFromFile(projectRoot, epicId) {
 		if (!epicsPath) return "";
 		const content = readFileSync$1(epicsPath, "utf-8");
 		const epicNum = epicId.replace(/^epic-/i, "");
-		const pattern = new RegExp(`^## (?:Epic\\s+)?${epicNum}[.:\\s].*?(?=\\n## |$)`, "ms");
+		const pattern = new RegExp(`^#{2,4}\\s+(?:Epic\\s+)?${epicNum}[.:\\s].*?(?=\\n#{2,4}\\s|$)`, "ms");
 		const match = pattern.exec(content);
 		return match ? match[0].trim() : "";
 	} catch (err) {
@@ -4138,6 +4192,36 @@ async function getStoryTemplate(deps) {
 		return "";
 	}
 }
+/**
+* Validate that an existing story file is non-empty and structurally valid.
+*
+* A valid story file must:
+* 1. Be non-empty (> 0 bytes after trim)
+* 2. Contain at least one heading (`#`) AND either "Acceptance Criteria" or "AC1"
+*
+* @returns `{ valid: true }` or `{ valid: false, reason: 'empty' | 'missing_structure' }`
+*/
+async function isValidStoryFile(filePath) {
+	try {
+		const content = await readFile$1(filePath, "utf-8");
+		if (content.trim().length === 0) return {
+			valid: false,
+			reason: "empty"
+		};
+		const hasHeading = content.includes("#");
+		const hasAC = /acceptance criteria|AC1/i.test(content);
+		if (!hasHeading || !hasAC) return {
+			valid: false,
+			reason: "missing_structure"
+		};
+		return { valid: true };
+	} catch {
+		return {
+			valid: false,
+			reason: "empty"
+		};
+	}
+}
 
 //#endregion
 //#region src/modules/compiled-workflows/git-helpers.ts
@@ -4235,11 +4319,17 @@ async function getGitChangedFiles(workingDirectory = process.cwd()) {
 */
 async function stageIntentToAdd(files, workingDirectory) {
 	if (files.length === 0) return;
+	const existing = files.filter((f) => {
+		const exists = existsSync$1(f);
+		if (!exists) logger$13.debug({ file: f }, "Skipping nonexistent file in stageIntentToAdd");
+		return exists;
+	});
+	if (existing.length === 0) return;
 	await runGitCommand([
 		"add",
 		"-N",
 		"--",
-		...files
+		...existing
 	], workingDirectory, "git-add-intent");
 }
 /**
@@ -4816,6 +4906,7 @@ function defaultFailResult(error, tokenUsage) {
 		issues: 0,
 		issue_list: [],
 		error,
+		dispatchFailed: true,
 		tokenUsage
 	};
 }
@@ -4908,6 +4999,19 @@ async function runCodeReview(deps, params) {
 			gitDiffContent = await getGitDiffStatSummary(cwd);
 		}
 	}
+	if (gitDiffContent.trim().length === 0) {
+		logger$10.info({ storyKey }, "Empty git diff — skipping review with SHIP_IT");
+		return {
+			verdict: "SHIP_IT",
+			issues: 0,
+			issue_list: [],
+			notes: "no_changes_to_review",
+			tokenUsage: {
+				input: 0,
+				output: 0
+			}
+		};
+	}
 	let previousFindingsContent = "";
 	if (previousIssues !== void 0 && previousIssues.length > 0) previousFindingsContent = [
 		"The previous code review found these issues. A fix agent has attempted to resolve them.",
@@ -5703,33 +5807,6 @@ function makeBatch(batchIndex, tasks) {
 //#endregion
 //#region src/modules/implementation-orchestrator/conflict-detector.ts
 /**
-* Maps story key prefix patterns to module directory names.
-*
-* The heuristic: stories whose numeric prefix belongs to the same epic
-* (same first digit) and whose known mapping points to the same module are
-* considered conflicting. Unknown prefixes default to the story key itself
-* (each unknown story is in its own group).
-*
-* Format: prefix (e.g. "10-") → module name
-*/
-const STORY_PREFIX_TO_MODULE = {
-	"1-": "core",
-	"2-": "core",
-	"3-": "core",
-	"4-": "core",
-	"5-": "core",
-	"6-": "task-graph",
-	"7-": "worker-pool",
-	"8-": "monitor",
-	"9-": "bmad-context-engine",
-	"10-1": "compiled-workflows",
-	"10-2": "compiled-workflows",
-	"10-3": "compiled-workflows",
-	"10-4": "implementation-orchestrator",
-	"10-5": "cli",
-	"11-": "pipeline-phases"
-};
-/**
 * Determine the module prefix for a story key.
 *
 * Checks most-specific prefix first (e.g., "10-1" before "10-"), then falls
@@ -5737,10 +5814,11 @@ const STORY_PREFIX_TO_MODULE = {
 * itself for unknown stories so each gets its own group.
 *
 * @param storyKey - e.g. "10-1", "10-2-dev-story", "5-3-something"
-* @param effectiveMap - The resolved prefix-to-module map (built-in + any extras)
+* @param effectiveMap - The resolved prefix-to-module map
 * @returns module name string used for conflict grouping
 */
 function resolveModulePrefix(storyKey, effectiveMap) {
+	if (Object.keys(effectiveMap).length === 0) return storyKey;
 	const sortedKeys = Object.keys(effectiveMap).sort((a, b) => b.length - a.length);
 	for (const prefix of sortedKeys) if (storyKey.startsWith(prefix)) return effectiveMap[prefix];
 	return storyKey;
@@ -5752,26 +5830,33 @@ function resolveModulePrefix(storyKey, effectiveMap) {
 * group and will be serialized. Stories with different prefixes can run in
 * parallel.
 *
+* When no `moduleMap` is configured, every story key is placed in its own
+* conflict group (maximum parallelism). This is the default for cross-project
+* runs where the story key prefixes are not known in advance.
+*
 * @param storyKeys - Array of story key strings
-* @param config - Optional configuration; supply `moduleMap` to extend the
-*                 built-in prefix-to-module mappings (additional entries are
-*                 merged on top of the defaults, allowing overrides).
+* @param config - Optional configuration; supply `moduleMap` to define
+*                 prefix-to-module mappings. Without this config, each story
+*                 gets its own group (maximum parallelism).
 * @returns Array of conflict groups; each inner array is a list of story keys
 *          that must be processed sequentially
 *
 * @example
-* detectConflictGroups(['10-1', '10-2', '10-4', '10-5'])
-* // => [['10-1', '10-2'], ['10-4'], ['10-5']]
+* // Without a moduleMap, all stories run in parallel
+* detectConflictGroups(['4-1', '4-2', '4-3'])
+* // => [['4-1'], ['4-2'], ['4-3']]
+*
+* @example
+* // With a moduleMap, matching stories are serialized
+* detectConflictGroups(['10-1', '10-2', '10-4'], { moduleMap: { '10-1': 'compiled-workflows', '10-2': 'compiled-workflows', '10-4': 'implementation-orchestrator' } })
+* // => [['10-1', '10-2'], ['10-4']]
 *
 * @example
 * detectConflictGroups(['12-1', '12-2'], { moduleMap: { '12-': 'my-module' } })
 * // => [['12-1', '12-2']]
 */
 function detectConflictGroups(storyKeys, config) {
-	const effectiveMap = {
-		...STORY_PREFIX_TO_MODULE,
-		...config?.moduleMap ?? {}
-	};
+	const effectiveMap = { ...config?.moduleMap ?? {} };
 	const moduleToStories = new Map();
 	for (const key of storyKeys) {
 		const module = resolveModulePrefix(key, effectiveMap);
@@ -5787,8 +5872,8 @@ function detectConflictGroups(storyKeys, config) {
 const logger$7 = createLogger("implementation-orchestrator:seed");
 /** Max chars for the architecture summary seeded into decisions */
 const MAX_ARCH_CHARS = 6e3;
-/** Max chars per epic shard */
-const MAX_EPIC_SHARD_CHARS = 4e3;
+/** Max chars per epic shard (fallback when per-story extraction returns null) */
+const MAX_EPIC_SHARD_CHARS = 12e3;
 /** Max chars for test patterns */
 const MAX_TEST_PATTERNS_CHARS = 2e3;
 /**
@@ -5872,16 +5957,35 @@ function seedArchitecture(db, projectRoot) {
 }
 /**
 * Seed epic shards from epics.md.
-* Parses each "## Epic N" section and creates an implementation/epic-shard decision.
-* Returns number of decisions created, or -1 if skipped (already seeded).
+* Parses each epic section and creates an implementation/epic-shard decision.
+*
+* Uses content-hash comparison (AC1, AC2, AC6):
+* - Computes SHA-256 of the epics file and compares to the stored `epic-shard-hash` decision.
+* - If hashes match: skip re-seeding (unchanged file).
+* - If hash differs or no hash stored: delete existing epic-shard decisions and re-seed.
+*
+* Returns number of decisions created, or -1 if skipped (hash unchanged).
 */
 function seedEpicShards(db, projectRoot) {
-	const existing = getDecisionsByPhase(db, "implementation");
-	if (existing.some((d) => d.category === "epic-shard")) return -1;
 	const epicsPath = findArtifact(projectRoot, ["_bmad-output/planning-artifacts/epics.md", "_bmad-output/epics.md"]);
 	if (epicsPath === void 0) return 0;
 	const content = readFileSync$1(epicsPath, "utf-8");
 	if (content.length === 0) return 0;
+	const currentHash = createHash("sha256").update(content).digest("hex");
+	const implementationDecisions = getDecisionsByPhase(db, "implementation");
+	const storedHashDecision = implementationDecisions.find((d) => d.category === "epic-shard-hash" && d.key === "epics-file");
+	const storedHash = storedHashDecision?.value;
+	if (storedHash === currentHash) {
+		logger$7.debug({ hash: currentHash }, "Epic shards up-to-date (hash unchanged) — skipping re-seed");
+		return -1;
+	}
+	if (implementationDecisions.some((d) => d.category === "epic-shard")) {
+		logger$7.debug({
+			storedHash,
+			currentHash
+		}, "Epics file changed — deleting stale epic-shard decisions");
+		db.prepare("DELETE FROM decisions WHERE phase = 'implementation' AND category = 'epic-shard'").run();
+	}
 	const shards = parseEpicShards(content);
 	let count = 0;
 	for (const shard of shards) {
@@ -5895,7 +5999,19 @@ function seedEpicShards(db, projectRoot) {
 		});
 		count++;
 	}
-	logger$7.debug({ count }, "Seeded epic shard decisions");
+	db.prepare("DELETE FROM decisions WHERE phase = 'implementation' AND category = 'epic-shard-hash' AND key = 'epics-file'").run();
+	createDecision(db, {
+		pipeline_run_id: null,
+		phase: "implementation",
+		category: "epic-shard-hash",
+		key: "epics-file",
+		value: currentHash,
+		rationale: "SHA-256 hash of epics file content for change detection"
+	});
+	logger$7.debug({
+		count,
+		hash: currentHash
+	}, "Seeded epic shard decisions");
 	return count;
 }
 /**
@@ -5962,11 +6078,11 @@ function extractSection(content, headingPattern) {
 }
 /**
 * Parse epics.md into individual epic shards.
-* Matches "## Epic N" or "## N." or "## N:" section headings.
+* Matches "## Epic N", "### Epic N", "#### Epic N", or depth-2 to depth-4 numeric headings.
 */
 function parseEpicShards(content) {
 	const shards = [];
-	const epicPattern = /^## (?:Epic\s+)?(\d+)[.:\s]/gm;
+	const epicPattern = /^#{2,4}\s+(?:Epic\s+)?(\d+)[.:\s]/gm;
 	let match;
 	const matches = [];
 	while ((match = epicPattern.exec(content)) !== null) {
@@ -6384,22 +6500,31 @@ function createImplementationOrchestrator(deps) {
 			const files = readdirSync$1(artifactsDir);
 			const match = files.find((f) => f.startsWith(`${storyKey}-`) && f.endsWith(".md"));
 			if (match) {
-				storyFilePath = join$1(artifactsDir, match);
-				logger$20.info({
+				const candidatePath = join$1(artifactsDir, match);
+				const validation = await isValidStoryFile(candidatePath);
+				if (!validation.valid) logger$20.warn({
 					storyKey,
-					storyFilePath
-				}, "Found existing story file — skipping create-story");
-				endPhase(storyKey, "create-story");
-				eventBus.emit("orchestrator:story-phase-complete", {
-					storyKey,
-					phase: "IN_STORY_CREATION",
-					result: {
-						result: "success",
-						story_file: storyFilePath,
-						story_key: storyKey
-					}
-				});
-				persistState();
+					storyFilePath: candidatePath,
+					reason: validation.reason
+				}, `Existing story file for ${storyKey} is invalid (${validation.reason}) — re-creating`);
+				else {
+					storyFilePath = candidatePath;
+					logger$20.info({
+						storyKey,
+						storyFilePath
+					}, "Found existing story file — skipping create-story");
+					endPhase(storyKey, "create-story");
+					eventBus.emit("orchestrator:story-phase-complete", {
+						storyKey,
+						phase: "IN_STORY_CREATION",
+						result: {
+							result: "success",
+							story_file: storyFilePath,
+							story_key: storyKey
+						}
+					});
+					persistState();
+				}
 			}
 		} catch {}
 		if (storyFilePath === void 0) try {
@@ -6768,7 +6893,7 @@ function createImplementationOrchestrator(deps) {
 						...previousIssueList.length > 0 ? { previousIssues: previousIssueList } : {}
 					});
 				}
-				const isPhantomReview = reviewResult.verdict !== "SHIP_IT" && (reviewResult.issue_list === void 0 || reviewResult.issue_list.length === 0) && reviewResult.error !== void 0;
+				const isPhantomReview = reviewResult.dispatchFailed === true || reviewResult.verdict !== "SHIP_IT" && (reviewResult.issue_list === void 0 || reviewResult.issue_list.length === 0) && reviewResult.error !== void 0;
 				if (isPhantomReview && !timeoutRetried) {
 					timeoutRetried = true;
 					logger$20.warn({
@@ -7005,31 +7130,61 @@ function createImplementationOrchestrator(deps) {
 			const fixModel = taskType === "major-rework" ? "claude-opus-4-6" : void 0;
 			try {
 				let fixPrompt;
+				const isMajorRework = taskType === "major-rework";
+				const templateName = isMajorRework ? "rework-story" : "fix-story";
 				try {
-					const fixTemplate = await pack.getPrompt("fix-story");
+					const fixTemplate = await pack.getPrompt(templateName);
 					const storyContent = await readFile$1(storyFilePath ?? "", "utf-8");
 					let reviewFeedback;
-					if (issueList.length === 0) reviewFeedback = [
+					if (issueList.length === 0) reviewFeedback = isMajorRework ? [
+						`Verdict: ${verdict}`,
+						"Issues: The reviewer flagged fundamental issues but did not provide specifics.",
+						"Instructions: Re-read the story file carefully, re-implement from scratch addressing all acceptance criteria."
+					].join("\n") : [
 						`Verdict: ${verdict}`,
 						"Issues: The reviewer flagged this as needing work but did not provide specific issues.",
 						"Instructions: Re-read the story file carefully, compare each acceptance criterion against the current implementation, and fix any gaps you find.",
 						"Focus on: unimplemented ACs, missing tests, incorrect behavior, and incomplete task checkboxes."
 					].join("\n");
-					else reviewFeedback = [
-						`Verdict: ${verdict}`,
-						`Issues (${issueList.length}):`,
-						...issueList.map((issue, i) => {
-							const iss = issue;
-							return `  ${i + 1}. [${iss.severity ?? "unknown"}] ${iss.description ?? "no description"}${iss.file ? ` (${iss.file}${iss.line ? `:${iss.line}` : ""})` : ""}`;
-						})
-					].join("\n");
+					else {
+						const issueHeader = isMajorRework ? "Issues from previous review that MUST be addressed" : "Issues";
+						reviewFeedback = [
+							`Verdict: ${verdict}`,
+							`${issueHeader} (${issueList.length}):`,
+							...issueList.map((issue, i) => {
+								const iss = issue;
+								return `  ${i + 1}. [${iss.severity ?? "unknown"}] ${iss.description ?? "no description"}${iss.file ? ` (${iss.file}${iss.line ? `:${iss.line}` : ""})` : ""}`;
+							})
+						].join("\n");
+					}
 					let archConstraints = "";
 					try {
 						const decisions = getDecisionsByPhase(db, "solutioning");
 						const constraints = decisions.filter((d) => d.category === "architecture");
 						archConstraints = constraints.map((d) => `${d.key}: ${d.value}`).join("\n");
 					} catch {}
-					const sections = [
+					const sections = isMajorRework ? [
+						{
+							name: "story_content",
+							content: storyContent,
+							priority: "required"
+						},
+						{
+							name: "review_findings",
+							content: reviewFeedback,
+							priority: "required"
+						},
+						{
+							name: "arch_constraints",
+							content: archConstraints,
+							priority: "optional"
+						},
+						{
+							name: "git_diff",
+							content: "",
+							priority: "optional"
+						}
+					] : [
 						{
 							name: "story_content",
 							content: storyContent,
@@ -7056,12 +7211,19 @@ function createImplementationOrchestrator(deps) {
 					});
 				}
 				incrementDispatches(storyKey);
-				const handle = dispatcher.dispatch({
+				const handle = isMajorRework ? dispatcher.dispatch({
+					prompt: fixPrompt,
+					agent: "claude-code",
+					taskType,
+					...fixModel !== void 0 ? { model: fixModel } : {},
+					outputSchema: DevStoryResultSchema,
+					...projectRoot !== void 0 ? { workingDirectory: projectRoot } : {}
+				}) : dispatcher.dispatch({
 					prompt: fixPrompt,
 					agent: "claude-code",
 					taskType,
 					...fixModel !== void 0 ? { model: fixModel } : {},
-					workingDirectory: projectRoot
+					...projectRoot !== void 0 ? { workingDirectory: projectRoot } : {}
 				});
 				const fixResult = await handle.result;
 				eventBus.emit("orchestrator:story-phase-complete", {
@@ -7093,11 +7255,34 @@ function createImplementationOrchestrator(deps) {
 					persistState();
 					return;
 				}
-				if (fixResult.status === "failed") logger$20.warn("Fix dispatch failed", {
-					storyKey,
-					taskType,
-					exitCode: fixResult.exitCode
-				});
+				if (fixResult.status === "failed") {
+					if (isMajorRework) {
+						logger$20.warn("Major rework dispatch failed — escalating story", {
+							storyKey,
+							exitCode: fixResult.exitCode
+						});
+						endPhase(storyKey, "code-review");
+						updateStory(storyKey, {
+							phase: "ESCALATED",
+							error: "major-rework-dispatch-failed",
+							completedAt: new Date().toISOString()
+						});
+						writeStoryMetricsBestEffort(storyKey, "escalated", reviewCycles + 1);
+						emitEscalation({
+							storyKey,
+							lastVerdict: verdict,
+							reviewCycles: reviewCycles + 1,
+							issues: issueList
+						});
+						persistState();
+						return;
+					}
+					logger$20.warn("Fix dispatch failed", {
+						storyKey,
+						taskType,
+						exitCode: fixResult.exitCode
+					});
+				}
 			} catch (err) {
 				logger$20.warn("Fix dispatch failed, continuing to next review", {
 					storyKey,
@@ -7180,7 +7365,7 @@ function createImplementationOrchestrator(deps) {
 				skippedCategories: seedResult.skippedCategories
 			}, "Methodology context seeded from planning artifacts");
 		}
-		const groups = detectConflictGroups(storyKeys);
+		const groups = detectConflictGroups(storyKeys, { moduleMap: pack.manifest.conflictGroups });
 		logger$20.info("Orchestrator starting", {
 			storyCount: storyKeys.length,
 			groupCount: groups.length,
@@ -11674,11 +11859,10 @@ async function runRunAction(options) {
 		});
 		const eventBus = createEventBus();
 		const contextCompiler = createContextCompiler({ db });
-		const adapterRegistry = injectedRegistry ?? new AdapterRegistry();
-		if (injectedRegistry === void 0) await adapterRegistry.discoverAndRegister();
+		if (!injectedRegistry) throw new Error("AdapterRegistry is required — must be initialized at CLI startup");
 		const dispatcher = createDispatcher({
 			eventBus,
-			adapterRegistry
+			adapterRegistry: injectedRegistry
 		});
 		eventBus.on("orchestrator:story-phase-complete", (payload) => {
 			try {
@@ -12066,11 +12250,10 @@ async function runFullPipeline(options) {
 		}
 		const eventBus = createEventBus();
 		const contextCompiler = createContextCompiler({ db });
-		const adapterRegistry = injectedRegistry ?? new AdapterRegistry();
-		if (injectedRegistry === void 0) await adapterRegistry.discoverAndRegister();
+		if (!injectedRegistry) throw new Error("AdapterRegistry is required — must be initialized at CLI startup");
 		const dispatcher = createDispatcher({
 			eventBus,
-			adapterRegistry
+			adapterRegistry: injectedRegistry
 		});
 		const phaseDeps = {
 			db,
@@ -12384,4 +12567,4 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 
 //#endregion
 export { DatabaseWrapper, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createContextCompiler, createDispatcher, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, runAnalysisPhase, runMigrations, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
-//# sourceMappingURL=run-BLIgARum.js.map
+//# sourceMappingURL=run-CT8B9gG9.js.map

package/dist/run-DoxsPIlD.js

@@ -0,0 +1,7 @@
+import { registerRunCommand, runRunAction } from "./run-CT8B9gG9.js";
+import "./logger-D2fS2ccL.js";
+import "./event-bus-CAvDMst7.js";
+import "./decisions-Dq4cAA2L.js";
+import "./operational-CnMlvWqc.js";
+
+export { runRunAction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "substrate-ai",
-  "version": "0.2.21",
+  "version": "0.2.24",
   "description": "Substrate — multi-agent orchestration daemon for AI coding agents",
   "type": "module",
   "license": "MIT",

package/packs/bmad/manifest.yaml

@@ -191,6 +191,7 @@ prompts:
   dev-story: prompts/dev-story.md
   code-review: prompts/code-review.md
   fix-story: prompts/fix-story.md
+  rework-story: prompts/rework-story.md
   # Multi-step phase decomposition prompts
   analysis-step-1-vision: prompts/analysis-step-1-vision.md
   analysis-step-2-scope: prompts/analysis-step-2-scope.md
@@ -228,3 +229,25 @@ constraints:
 
 templates:
   story: templates/story.md
+
+# Conflict group mappings for the implementation orchestrator.
+# Stories whose prefixes map to the same module name are serialized within
+# a conflict group. This map covers substrate's own epic numbering so that
+# self-pipeline runs preserve correct serialization (e.g., epics 1-5 share
+# 'core', stories 10-1/10-2/10-3 share 'compiled-workflows').
+conflictGroups:
+  '1-': core
+  '2-': core
+  '3-': core
+  '4-': core
+  '5-': core
+  '6-': task-graph
+  '7-': worker-pool
+  '8-': monitor
+  '9-': bmad-context-engine
+  '10-1': compiled-workflows
+  '10-2': compiled-workflows
+  '10-3': compiled-workflows
+  '10-4': implementation-orchestrator
+  '10-5': cli
+  '11-': pipeline-phases