substrate-ai 0.2.23 → 0.2.24

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { 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, runSolutioningPhase, validateStopAfterFromConflict } from "../run-BaAws8IQ.js";
+import { 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, runSolutioningPhase, validateStopAfterFromConflict } from "../run-CT8B9gG9.js";
 import { createLogger, deepMask } from "../logger-D2fS2ccL.js";
 import { AdapterRegistry, ConfigError, ConfigIncompatibleFormatError } from "../errors-CswS7Mzg.js";
 import { CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, PartialSubstrateConfigSchema, SUPPORTED_CONFIG_FORMAT_VERSIONS, SubstrateConfigSchema, defaultConfigMigrator } from "../version-manager-impl-CZ6KF1Ds.js";
@@ -2842,7 +2842,7 @@ async function runSupervisorAction(options, deps = {}) {
 								const expDb = expDbWrapper.db;
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-BenC8JuM.js"
+									"../run-DoxsPIlD.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

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

@@ -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",
@@ -5806,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
@@ -5840,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;
@@ -5855,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);
@@ -7148,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,
@@ -7199,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", {
@@ -7236,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,
@@ -7323,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,
@@ -12525,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-BaAws8IQ.js.map
+//# sourceMappingURL=run-CT8B9gG9.js.map

package/dist/{run-BenC8JuM.js → run-DoxsPIlD.js}

@@ -1,4 +1,4 @@
-import { registerRunCommand, runRunAction } from "./run-BaAws8IQ.js";
+import { registerRunCommand, runRunAction } from "./run-CT8B9gG9.js";
 import "./logger-D2fS2ccL.js";
 import "./event-bus-CAvDMst7.js";
 import "./decisions-Dq4cAA2L.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "substrate-ai",
-  "version": "0.2.23",
+  "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

package/packs/bmad/prompts/rework-story.md

@@ -0,0 +1,93 @@
+# BMAD Compiled Rework-Story Agent
+
+## Context (pre-assembled by pipeline)
+
+### Story File Content
+{{story_content}}
+
+### Issues from Previous Review that MUST be Addressed
+{{review_findings}}
+
+### Architecture Constraints
+{{arch_constraints}}
+
+### Previous Implementation Diff
+{{git_diff}}
+
+---
+
+## Mission
+
+This is a FULL re-implementation. The previous implementation had fundamental issues identified in a code review. You must address ALL review findings above while implementing the story from scratch.
+
+Do NOT patch the existing implementation. Re-implement the story completely, using the review findings as guidance on what went wrong previously.
+
+## Instructions
+
+1. **Parse the review findings** to understand:
+   - Each issue's severity (blocker, major, minor)
+   - Each issue's description, file, and line number (if provided)
+   - The root causes that led to the previous implementation's failure
+
+2. **Re-read the story file** to understand:
+   - Acceptance Criteria (AC1, AC2, etc.)
+   - Tasks/Subtasks (ordered list with `[ ]` checkboxes)
+   - Dev Notes (file paths, import patterns, test requirements)
+
+3. **Re-implement each task in order** (Red-Green-Refactor):
+   - Write failing tests first
+   - Make tests pass with minimal code
+   - Refactor while keeping tests green
+   - Ensure each review finding is addressed
+
+4. **After each task**:
+   - Verify tests pass
+   - Run the full test suite to check for regressions
+   - Mark the task `[x]` in the story file
+   - Update the story File List with all new/modified files
+
+5. **After all tasks complete**:
+   - Run the full test suite one final time
+   - Verify ALL review findings have been addressed
+   - Update story Status to `review`
+
+## CRITICAL: Output Contract Emission
+
+**You MUST emit the YAML output block (see Output Contract below) as the very last thing you produce.** The downstream pipeline depends on `files_modified` to generate scoped code-review diffs. If you exhaust your turns without emitting the YAML block, the pipeline cannot review your work properly.
+
+- If you are running low on turns, **stop implementation and emit the YAML block immediately** with whatever progress you have made. A partial `files_modified` list is far more valuable than none at all.
+- The YAML block must be the final output — no summary text, no explanation after it.
+
+## HALT Conditions (stop and report as failed)
+
+- New dependency required beyond story spec
+- 3 consecutive implementation failures with no progress
+- Story requirements are ambiguous with no way to resolve
+- Review findings contradict the story requirements
+
+## Output Contract
+
+After completing all tasks (or hitting a HALT condition), emit ONLY this YAML block — no other text:
+
+```yaml
+result: success
+ac_met:
+  - AC1
+  - AC2
+ac_failures: []
+files_modified:
+  - <absolute path to modified file>
+tests: pass
+```
+
+If a HALT condition was hit:
+
+```yaml
+result: failed
+ac_met: []
+ac_failures:
+  - <which AC could not be met>
+files_modified: []
+tests: fail
+notes: <reason for failure>
+```