substrate-ai 0.20.58 → 0.20.59

package/dist/cli/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { FileStateStore, RunManifest, SUBSTRATE_OWNED_SETTINGS_KEYS, SupervisorLock, VALID_PHASES, WorkGraphRepository, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, aggregateProbeAuthorMetrics, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, parseRuntimeProbes, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics } from "../health-CNqQFdaT.js";
+import { FileStateStore, RunManifest, SUBSTRATE_OWNED_SETTINGS_KEYS, SupervisorLock, VALID_PHASES, WorkGraphRepository, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, aggregateProbeAuthorMetrics, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, parseRuntimeProbes, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics } from "../health-CzYD6ghE.js";
 import { createLogger } from "../logger-KeHncl-f.js";
 import { createEventBus } from "../helpers-CElYrONe.js";
 import { AdapterRegistry, BudgetConfigSchema, CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, ConfigError, CostTrackerConfigSchema, DEFAULT_CONFIG, DoltClient, DoltNotInstalled, GlobalSettingsSchema, InMemoryDatabaseAdapter, IngestionServer, MonitorDatabaseImpl, OPERATIONAL_FINDING, PartialGlobalSettingsSchema, PartialProviderConfigSchema, ProvidersSchema, RoutingRecommender, STORY_METRICS, TelemetryConfigSchema, addTokenUsage, aggregateTokenUsageForRun, checkDoltInstalled, compareRunMetrics, createAmendmentRun, createConfigSystem, createDecision, createDoltClient, createPipelineRun, getActiveDecisions, getAllCostEntriesFiltered, getBaselineRunMetrics, getDecisionsByCategory, getDecisionsByPhaseForRun, getLatestCompletedRun, getLatestRun, getPipelineRunById, getPlanningCostTotal, getRetryableEscalations, getRunMetrics, getRunningPipelineRuns, getSessionCostSummary, getSessionCostSummaryFiltered, getStoryMetricsForRun, getTokenUsageSummary, incrementRunRestarts, initSchema, initializeDolt, listRunMetrics, loadParentRunDecisions, supersedeDecision, tagRunAsBaseline, updatePipelineRun } from "../dist-W2emvN3F.js";
 import "../adapter-registry-DXLMTmfD.js";
-import { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GLOBSTAR, GitClient, GrammarLoader, Minimatch, Minipass, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runSolutioningPhase, unescape, validateStopAfterFromConflict } from "../run-DE5xoB9U.js";
+import { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GLOBSTAR, GitClient, GrammarLoader, Minimatch, Minipass, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runSolutioningPhase, unescape, validateStopAfterFromConflict } from "../run-BGXvVIwO.js";
 import "../errors-CKFu8YI9.js";
 import "../routing-CcBOCuC9.js";
 import "../decisions-C0pz9Clx.js";
@@ -7484,7 +7484,7 @@ async function runStatusAction(options) {
 			logger$13.debug({ err }, "Work graph query failed, continuing without work graph data");
 		}
 		if (run === void 0) {
-			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-BX84L5Qe.js");
+			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-CsE9INpp.js");
 			const substrateDirPath = join(projectRoot, ".substrate");
 			const processInfo = inspectProcessTree$1({
 				projectRoot,
@@ -9030,7 +9030,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-ChqBlPYZ.js"
+									"../run-BupqUzci.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{health-BX84L5Qe.js → health-CsE9INpp.js}

@@ -1,4 +1,4 @@
-import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-CNqQFdaT.js";
+import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-CzYD6ghE.js";
 import "./logger-KeHncl-f.js";
 import "./dist-W2emvN3F.js";
 import "./decisions-C0pz9Clx.js";

package/dist/{health-CNqQFdaT.js → health-CzYD6ghE.js}

@@ -2941,6 +2941,22 @@ const SEVERITY_PREFIX = {
 */
 const CATEGORY_SHELLOUT_NPX_FALLBACK = "source-ac-shellout-npx-fallback";
 /**
+* cross-story-concurrent-modification — Story 68-1, Epic 66/67 cross-story-interaction fix.
+*
+* Severity: warn (defensive rollout per Story 60-16 pattern). Emitted by
+* CrossStoryConsistencyCheck (Layer 2) when post-completion analysis shows two
+* concurrent stories modified the same file AND interface signatures differ
+* between their commits.
+*
+* Motivating incidents: Epic 66 run a832487a (66-1+66-2+66-7 concurrent dispatch)
+* + Epic 67 run a59e4c96 (67-1+67-2 methodology-pack.test.ts budget constant race).
+*
+* NOTE: Promotion to 'error' is deferred pending empirical low-false-positive
+* validation across multiple substrate-on-substrate dispatch runs. Do NOT change
+* severity to 'error' until at least 3 consecutive runs with zero false positives.
+*/
+const CATEGORY_CROSS_STORY_CONCURRENT_MODIFICATION = "cross-story-concurrent-modification";
+/**
 * Render a list of findings into the multi-line human-readable string that
 * populates VerificationResult.details. One line per finding:
 *
@@ -5253,6 +5269,152 @@ var SourceAcShelloutCheck = class {
 	}
 };
 
+//#endregion
+//#region packages/sdlc/dist/verification/checks/cross-story-consistency-check.js
+/**
+* Matches added/removed export interface or type declarations.
+* Example: `+export interface Foo {` or `-export type Bar =`
+*/
+const INTERFACE_CHANGE_PATTERN = /^[+-]\s*(export\s+(?:interface|type)\s+\w+)/;
+/**
+* Matches added/removed constant assignments.
+* Example: `+const BUDGET_LIMIT = 32000` or `-const BUDGET_LIMIT = 30000`
+* Also matches `export const`, `let`, `var`.
+*/
+const CONST_CHANGE_PATTERN = /^[+-]\s*(?:export\s+)?(?:const|let|var)\s+\w+\s*=/;
+/**
+* Compute the set of file paths that collide between the current story's
+* modified files and the prior stories' modified files.
+*
+* Uses `context._crossStoryConflictingFiles` as a direct override when
+* supplied (test-hook / runtime-probe path). Otherwise computes the
+* intersection of `devStoryResult.files_modified` ∩ `priorStoryFiles`.
+*/
+function computeCollisionPaths(context) {
+	if (context._crossStoryConflictingFiles !== void 0 && context._crossStoryConflictingFiles.length > 0) return context._crossStoryConflictingFiles;
+	const currentFiles = context.devStoryResult?.files_modified ?? [];
+	const priorFiles = context.priorStoryFiles ?? [];
+	if (currentFiles.length === 0 || priorFiles.length === 0) return [];
+	const priorSet = new Set(priorFiles);
+	return currentFiles.filter((f) => priorSet.has(f));
+}
+/**
+* Parse a unified diff text for type signature changes or constant reassignments.
+*
+* Returns `true` when the diff contains any added or removed export
+* interface/type declaration OR any added/removed constant assignment —
+* indicating a potential interface-level change that concurrent story authors
+* should review.
+*/
+function diffContainsInterfaceOrConstChange(diffText) {
+	const lines = diffText.split("\n");
+	for (const line of lines) {
+		if (INTERFACE_CHANGE_PATTERN.test(line)) return true;
+		if (CONST_CHANGE_PATTERN.test(line)) return true;
+	}
+	return false;
+}
+/**
+* Run `git diff --no-renames <commitSha>^...<commitSha> -- <file>` to get
+* the per-file diff for the story's commit.
+*
+* Returns `null` when git is unavailable or the file wasn't part of the commit.
+*/
+function getDiffForFile(workingDir, commitSha, filePath) {
+	try {
+		return execSync$1(`git diff --no-renames ${commitSha}~1 ${commitSha} -- ${filePath}`, {
+			cwd: workingDir,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+	} catch {
+		return null;
+	}
+}
+/**
+* Get numstat diff for a story commit to confirm a file was modified.
+* Returns lines like: `5\t3\tsrc/foo.ts`
+*/
+function getNumstatDiff(workingDir, commitSha) {
+	try {
+		return execSync$1(`git diff --no-renames --numstat ${commitSha}~1 ${commitSha}`, {
+			cwd: workingDir,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+	} catch {
+		return null;
+	}
+}
+/**
+* Standalone function implementing the cross-story consistency check logic.
+* Exported separately so tests can call it directly without instantiating the class.
+*/
+async function runCrossStoryConsistencyCheck(context) {
+	const start = Date.now();
+	const findings = [];
+	if ((context.priorStoryFiles === void 0 || context.priorStoryFiles.length === 0) && (context._crossStoryConflictingFiles === void 0 || context._crossStoryConflictingFiles.length === 0)) return {
+		status: "pass",
+		details: "cross-story-consistency: no Tier B context (priorStoryFiles absent) — skipping check",
+		duration_ms: Date.now() - start,
+		findings: []
+	};
+	const collisionPaths = computeCollisionPaths(context);
+	if (collisionPaths.length > 0) findings.push({
+		category: "cross-story-file-collision",
+		severity: "warn",
+		message: `Layer 1 collision: story "${context.storyKey}" shares ${collisionPaths.length} file(s) with concurrent stories: ${collisionPaths.join(", ")}. Recommended action: serialize these stories to avoid race conditions. Motivating incidents: Epic 66 (a832487a), Epic 67 (a59e4c96).`
+	});
+	const shouldRunLayer2 = context.buildCheckPassed !== false && collisionPaths.length > 0;
+	if (shouldRunLayer2) {
+		const numstat = getNumstatDiff(context.workingDir, context.commitSha);
+		const binaryFiles = new Set();
+		if (numstat !== null) for (const line of numstat.split("\n")) {
+			const binMatch = /^-\t-\t(.+)$/.exec(line.trim());
+			if (binMatch?.[1]) binaryFiles.add(binMatch[1]);
+		}
+		for (const filePath of collisionPaths) {
+			if (binaryFiles.has(filePath)) continue;
+			const normalizedPath = filePath.replace(/\\/g, "/");
+			const diffText = getDiffForFile(context.workingDir, context.commitSha, normalizedPath);
+			if (diffText === null) continue;
+			if (diffContainsInterfaceOrConstChange(diffText)) findings.push({
+				category: CATEGORY_CROSS_STORY_CONCURRENT_MODIFICATION,
+				severity: "warn",
+				message: `Layer 2 interface/constant change in shared file "${filePath}": this story's commit modified export signatures or constants that may conflict with concurrent story changes. Manual review recommended. (Epic 66/67 reconciliation pattern: verify working-tree coherence via build + tests before treating pipeline outcome as definitive.)`
+			});
+		}
+	}
+	const status = findings.some((f) => f.severity === "error") ? "fail" : findings.some((f) => f.severity === "warn") ? "warn" : "pass";
+	return {
+		status,
+		details: findings.length > 0 ? renderFindings(findings) : "cross-story-consistency: no file collisions detected between concurrent stories",
+		duration_ms: Date.now() - start,
+		findings
+	};
+}
+/**
+* VerificationCheck class for cross-story consistency analysis.
+*
+* name  = 'cross-story-consistency'
+* tier  = 'B' (requires cross-story context; skipped for single-story runs)
+*/
+var CrossStoryConsistencyCheck = class {
+	name = "cross-story-consistency";
+	tier = "B";
+	async run(context) {
+		return runCrossStoryConsistencyCheck(context);
+	}
+};
+
 //#endregion
 //#region packages/sdlc/dist/verification/verification-pipeline.js
 /**
@@ -5380,7 +5542,8 @@ function createDefaultVerificationPipeline(bus, config) {
 		new BuildCheck(),
 		new RuntimeProbeCheck(),
 		new SourceAcFidelityCheck(),
-		new SourceAcShelloutCheck()
+		new SourceAcShelloutCheck(),
+		new CrossStoryConsistencyCheck()
 	];
 	return new VerificationPipeline(bus, checks);
 }
@@ -7178,4 +7341,4 @@ function registerHealthCommand(program, _version = "0.0.0", projectRoot = proces
 
 //#endregion
 export { BMAD_BASELINE_TOKENS_FULL, DEFAULT_STALL_THRESHOLD_SECONDS, DoltMergeConflict, FileStateStore, FindingsInjector, RunManifest, RuntimeProbeListSchema, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN$1 as STORY_KEY_PATTERN, SUBSTRATE_OWNED_SETTINGS_KEYS, SupervisorLock, VALID_PHASES, WorkGraphRepository, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, __commonJS, __require, __toESM, aggregateProbeAuthorMetrics, applyConfigToGraph, buildPipelineStatusOutput, createDatabaseAdapter$1 as createDatabaseAdapter, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, createStateStore, detectCycles, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, isOrchestratorProcessLine, parseDbTimestampAsUtc, parseRuntimeProbes, registerHealthCommand, renderFindings, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveGraphPath, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics, runHealthAction, validateStoryKey };
-//# sourceMappingURL=health-CNqQFdaT.js.map
+//# sourceMappingURL=health-CzYD6ghE.js.map

package/dist/index.d.ts

@@ -2263,6 +2263,16 @@ interface OrchestratorEvents {
     /** Tail of subprocess stdout captured at kill time (~64KB max, UTF-8) */
     stdoutTail?: string;
   };
+  /**
+   * Two or more concurrent stories have overlapping target file paths.
+   * Story 68-1: closes Epic 66 (a832487a) + Epic 67 (a59e4c96) cross-story-interaction class.
+   * Mirror of CoreEvents['dispatch:cross-story-file-collision']; both must stay in sync.
+   */
+  'dispatch:cross-story-file-collision': {
+    storyKeys: string[];
+    collisionPaths: string[];
+    recommendedAction: 'serialize' | 'warn';
+  };
   /** Watchdog detected no progress for an extended period */
   'orchestrator:stall': {
     runId: string;

package/dist/{run-DE5xoB9U.js → run-BGXvVIwO.js}

@@ -1,4 +1,4 @@
-import { BMAD_BASELINE_TOKENS_FULL, DoltMergeConflict, FileStateStore, FindingsInjector, RunManifest, RuntimeProbeListSchema, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN, VALID_PHASES, WorkGraphRepository, __commonJS, __require, __toESM, applyConfigToGraph, buildPipelineStatusOutput, createDatabaseAdapter, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, detectCycles, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, renderFindings, resolveGraphPath, resolveMainRepoRoot, validateStoryKey } from "./health-CNqQFdaT.js";
+import { BMAD_BASELINE_TOKENS_FULL, DoltMergeConflict, FileStateStore, FindingsInjector, RunManifest, RuntimeProbeListSchema, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN, VALID_PHASES, WorkGraphRepository, __commonJS, __require, __toESM, applyConfigToGraph, buildPipelineStatusOutput, createDatabaseAdapter, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, detectCycles, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, renderFindings, resolveGraphPath, resolveMainRepoRoot, validateStoryKey } from "./health-CzYD6ghE.js";
 import { createLogger } from "./logger-KeHncl-f.js";
 import { TypedEventBusImpl, createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning, sleep } from "./helpers-CElYrONe.js";
 import { ADVISORY_NOTES, Categorizer, ConsumerAnalyzer, DEFAULT_GLOBAL_SETTINGS, DispatcherImpl, DoltClient, ESCALATION_DIAGNOSIS, EXPERIMENT_RESULT, EfficiencyScorer, IngestionServer, LogTurnAnalyzer, OPERATIONAL_FINDING, Recommender, RoutingRecommender, RoutingResolver, RoutingTelemetry, RoutingTokenAccumulator, RoutingTuner, STORY_METRICS, STORY_OUTCOME, SubstrateConfigSchema, TEST_EXPANSION_FINDING, TEST_PLAN, TelemetryNormalizer, TelemetryPipeline, TurnAnalyzer, addTokenUsage, aggregateTokenUsageForRun, aggregateTokenUsageForStory, callLLM, createConfigSystem, createDatabaseAdapter$1, createDecision, createPipelineRun, createRequirement, detectInterfaceChanges, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunMetrics, getRunningPipelineRuns, getStoryMetricsForRun, getTokenUsageSummary, initSchema, listRequirements, loadModelRoutingConfig, registerArtifact, updatePipelineRun, updatePipelineRunConfig, upsertDecision, writeRunMetrics, writeStoryMetrics } from "./dist-W2emvN3F.js";
@@ -15326,6 +15326,132 @@ function createImplementationOrchestrator(deps) {
 			await sleep(gcPauseMs);
 		}
 	}
+	function extractFilePathsFromStoryContent(content) {
+		const paths = new Set();
+		const atPattern = /@\s+([a-zA-Z][^\s`()\n]+\.[a-zA-Z0-9]+)/g;
+		let m;
+		while ((m = atPattern.exec(content)) !== null) {
+			const p = m[1]?.trim();
+			if (p !== void 0 && p.includes("/") && !p.startsWith("http")) paths.add(p.replace(/[.)]+$/, ""));
+		}
+		const backtickPattern = /`([a-zA-Z][^`\n ]+\.[a-zA-Z0-9]{1,6})`/g;
+		while ((m = backtickPattern.exec(content)) !== null) {
+			const p = m[1]?.trim();
+			if (p !== void 0 && p.includes("/") && !p.includes(" ") && !p.startsWith("http")) paths.add(p);
+		}
+		return paths;
+	}
+	/**
+	* Story 68-1: Pre-dispatch cross-story file collision detection.
+	*
+	* Before dispatching a batch with multiple concurrent groups, checks whether
+	* any two stories from different groups share file paths in their story specs.
+	* When collisions are found:
+	*   1. Emits `dispatch:cross-story-file-collision` event for operator visibility.
+	*   2. Merges colliding groups so they execute sequentially.
+	*
+	* Best-effort: if story files are missing, unreadable, or contain no parseable
+	* paths, the original groups are returned unchanged.
+	*/
+	function detectAndSerializeConcurrentFileCollisions(batchGroups) {
+		if (batchGroups.length <= 1) return batchGroups;
+		const root = projectRoot ?? process.cwd();
+		const artifactsDir = join$1(root, "_bmad-output", "implementation-artifacts");
+		if (!existsSync(artifactsDir)) return batchGroups;
+		const storyFileMap = new Map();
+		const allStoryKeys = batchGroups.flat();
+		let artifactFiles;
+		try {
+			artifactFiles = readdirSync(artifactsDir);
+		} catch {
+			return batchGroups;
+		}
+		const STALE_SUFFIX = /\.stale-\d+\.md$/;
+		for (const storyKey of allStoryKeys) try {
+			const match$2 = artifactFiles.find((f$1) => f$1.startsWith(`${storyKey}-`) && f$1.endsWith(".md") && !STALE_SUFFIX.test(f$1));
+			if (!match$2) continue;
+			const content = readFileSync(join$1(artifactsDir, match$2), "utf-8");
+			const paths = extractFilePathsFromStoryContent(content);
+			if (paths.size > 0) storyFileMap.set(storyKey, paths);
+		} catch {}
+		if (storyFileMap.size === 0) return batchGroups;
+		const parent = Array.from({ length: batchGroups.length }, (_, i) => i);
+		function find(x) {
+			while (parent[x] !== x) {
+				parent[x] = parent[parent[x]];
+				x = parent[x];
+			}
+			return x;
+		}
+		function union(x, y) {
+			const rx = find(x);
+			const ry = find(y);
+			if (rx !== ry) parent[rx] = ry;
+		}
+		let collisionCount = 0;
+		const collisionEvents = [];
+		for (let i = 0; i < batchGroups.length; i++) for (let j$1 = i + 1; j$1 < batchGroups.length; j$1++) {
+			if (find(i) === find(j$1)) continue;
+			const groupA = batchGroups[i] ?? [];
+			const groupB = batchGroups[j$1] ?? [];
+			const filesA = new Set();
+			const filesB = new Set();
+			const keysA = [];
+			const keysB = [];
+			for (const key of groupA) {
+				const files = storyFileMap.get(key);
+				if (files !== void 0) {
+					keysA.push(key);
+					for (const f$1 of files) filesA.add(f$1);
+				}
+			}
+			for (const key of groupB) {
+				const files = storyFileMap.get(key);
+				if (files !== void 0) {
+					keysB.push(key);
+					for (const f$1 of files) filesB.add(f$1);
+				}
+			}
+			if (keysA.length === 0 || keysB.length === 0) continue;
+			const collisionPaths = [...filesA].filter((f$1) => filesB.has(f$1));
+			if (collisionPaths.length > 0) {
+				union(i, j$1);
+				collisionCount++;
+				collisionEvents.push({
+					storyKeys: [...keysA, ...keysB],
+					collisionPaths
+				});
+			}
+		}
+		if (collisionCount === 0) return batchGroups;
+		for (const evt of collisionEvents) {
+			try {
+				eventBus.emit("dispatch:cross-story-file-collision", {
+					storyKeys: evt.storyKeys,
+					collisionPaths: evt.collisionPaths,
+					recommendedAction: "serialize"
+				});
+			} catch {}
+			logger$26.info({
+				storyKeys: evt.storyKeys,
+				collisionPaths: evt.collisionPaths
+			}, "Cross-story file collision detected — serializing affected groups to prevent race conditions");
+		}
+		const mergedGroupMap = new Map();
+		for (let i = 0; i < batchGroups.length; i++) {
+			const group = batchGroups[i] ?? [];
+			const root2 = find(i);
+			const existing = mergedGroupMap.get(root2) ?? [];
+			mergedGroupMap.set(root2, [...existing, ...group]);
+		}
+		const result = [...mergedGroupMap.values()];
+		logger$26.info({
+			originalGroupCount: batchGroups.length,
+			mergedGroupCount: result.length,
+			collisionCount
+		}, "Story groups re-arranged after cross-story collision detection");
+		return result;
+	}
 	/**
 	* Promise pool: run up to maxConcurrency groups at a time.
 	*
@@ -15617,7 +15743,10 @@ function createImplementationOrchestrator(deps) {
 				logger$26.warn({ err: snapErr }, "Failed to capture package snapshot — continuing without protection");
 			}
 			try {
-				for (const batchGroups of batches) await runWithConcurrency(batchGroups, config.maxConcurrency);
+				for (const rawBatchGroups of batches) {
+					const batchGroups = detectAndSerializeConcurrentFileCollisions(rawBatchGroups);
+					await runWithConcurrency(batchGroups, config.maxConcurrency);
+				}
 			} catch (err) {
 				stopHeartbeat();
 				_state = "FAILED";
@@ -45472,4 +45601,4 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 
 //#endregion
 export { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GLOBSTAR$1 as GLOBSTAR, GitClient, GrammarLoader, Minimatch$1 as Minimatch, Minipass, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape$1 as escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, normalizeGraphSummaryToStatus, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runRunAction, runSolutioningPhase, unescape$1 as unescape, validateStopAfterFromConflict, wireNdjsonEmitter };
-//# sourceMappingURL=run-DE5xoB9U.js.map
+//# sourceMappingURL=run-BGXvVIwO.js.map

package/dist/{run-ChqBlPYZ.js → run-BupqUzci.js}

@@ -1,8 +1,8 @@
-import "./health-CNqQFdaT.js";
+import "./health-CzYD6ghE.js";
 import "./logger-KeHncl-f.js";
 import "./helpers-CElYrONe.js";
 import "./dist-W2emvN3F.js";
-import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-DE5xoB9U.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-BGXvVIwO.js";
 import "./routing-CcBOCuC9.js";
 import "./decisions-C0pz9Clx.js";
 

package/package.json

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