substrate-ai 0.20.20 → 0.20.22

package/dist/cli/index.js

@@ -4,7 +4,7 @@ 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, 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-CqtWS9wF.js";
 import "../adapter-registry-DXLMTmfD.js";
-import { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GitClient, GrammarLoader, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-BLObh_Ou.js";
+import { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GitClient, GrammarLoader, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-CzjafT8Q.js";
 import "../errors-1uLGqnvr.js";
 import "../routing-CcBOCuC9.js";
 import "../decisions-C0pz9Clx.js";
@@ -5198,7 +5198,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-DPhVpqrX.js"
+									"../run-CeqtVM7r.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{run-DPhVpqrX.js → run-CeqtVM7r.js}

@@ -2,7 +2,7 @@ import "./health-ZGa9E0D2.js";
 import "./logger-KeHncl-f.js";
 import "./helpers-CElYrONe.js";
 import "./dist-CqtWS9wF.js";
-import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, runRunAction, wireNdjsonEmitter } from "./run-BLObh_Ou.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, runRunAction, wireNdjsonEmitter } from "./run-CzjafT8Q.js";
 import "./routing-CcBOCuC9.js";
 import "./decisions-C0pz9Clx.js";
 

package/dist/{run-BLObh_Ou.js → run-CzjafT8Q.js}

@@ -5708,7 +5708,7 @@ function hashSourceAcSection(section) {
 * @returns Promise resolving to CreateStoryResult
 */
 async function runCreateStory(deps, params) {
-	const { epicId, storyKey, pipelineRunId, source_ac_hash } = params;
+	const { epicId, storyKey, pipelineRunId, source_ac_hash, priorDriftFeedback } = params;
 	logger$18.debug({
 		epicId,
 		storyKey,
@@ -5797,7 +5797,16 @@ async function runCreateStory(deps, params) {
 			name: "source_ac_hash",
 			content: effectiveSourceAcHash,
 			priority: "required"
-		}] : []
+		}] : [],
+		...priorDriftFeedback !== void 0 && priorDriftFeedback.length > 0 ? [{
+			name: "prior_drift_feedback",
+			content: priorDriftFeedback,
+			priority: "required"
+		}] : [{
+			name: "prior_drift_feedback",
+			content: "",
+			priority: "optional"
+		}]
 	], TOKEN_CEILING);
 	logger$18.debug({
 		tokenCount,
@@ -6021,6 +6030,95 @@ function computeStoryFileFidelity(storyFileContent, namedPaths) {
 		drift: missing.length / namedPaths.length
 	};
 }
+const WORD_TO_NUMBER = {
+	one: 1,
+	two: 2,
+	three: 3,
+	four: 4,
+	five: 5,
+	six: 6,
+	seven: 7,
+	eight: 8,
+	nine: 9,
+	ten: 10
+};
+function extractBehavioralAssertions(content) {
+	if (content.length === 0) return {
+		whenClauseCount: 0,
+		whenOrAcCount: 0,
+		numericQuantifiers: []
+	};
+	const whenMatches = content.match(/\*\*When\*\*/gi);
+	const whenClauseCount = whenMatches?.length ?? 0;
+	const acHeadings = content.match(/^#{2,4}\s+AC\d+\b/gim);
+	const acCount = acHeadings?.length ?? 0;
+	const whenOrAcCount = Math.max(whenClauseCount, acCount);
+	const numericQuantifiers = [];
+	const seen = new Set();
+	const wordNum = "(?:one|two|three|four|five|six|seven|eight|nine|ten)";
+	const pattern = new RegExp(`\\b(exactly|all|both)\\s+(?:(${wordNum}|\\d+)\\s+)?(?:[a-z][a-z_-]*\\s+){0,2}([a-z][a-z_-]+s)\\b`, "gi");
+	let match$2;
+	while ((match$2 = pattern.exec(content)) !== null) {
+		const determiner = match$2[1]?.toLowerCase() ?? "";
+		const numStr = match$2[2]?.toLowerCase() ?? "";
+		const noun = match$2[3]?.toLowerCase() ?? "";
+		let count;
+		if (numStr === "") if (determiner === "both") count = 2;
+		else continue;
+		else if (WORD_TO_NUMBER[numStr] !== void 0) count = WORD_TO_NUMBER[numStr];
+		else {
+			const parsed = Number.parseInt(numStr, 10);
+			if (Number.isNaN(parsed)) continue;
+			count = parsed;
+		}
+		if (noun.length < 3) continue;
+		const phrase = `${determiner} ${numStr || (determiner === "both" ? "" : "")} ${noun}`.trim().replace(/\s+/g, " ");
+		const dedupKey = `${count}|${noun}`;
+		if (seen.has(dedupKey)) continue;
+		seen.add(dedupKey);
+		numericQuantifiers.push({
+			phrase,
+			count,
+			noun
+		});
+	}
+	return {
+		whenClauseCount,
+		whenOrAcCount,
+		numericQuantifiers
+	};
+}
+function computeClauseFidelity(storyFileContent, sourceContent) {
+	const sourceSignals = extractBehavioralAssertions(sourceContent);
+	const renderedSignals = extractBehavioralAssertions(storyFileContent);
+	const sourceCount = sourceSignals.whenOrAcCount;
+	const renderedCount = renderedSignals.whenOrAcCount;
+	const clauseRatio = sourceCount === 0 ? 1 : Math.min(1, renderedCount / sourceCount);
+	const sourceNounCounts = new Map();
+	for (const q of sourceSignals.numericQuantifiers) sourceNounCounts.set(q.noun, Math.max(sourceNounCounts.get(q.noun) ?? 0, q.count));
+	const renderedNounCounts = new Map();
+	for (const q of renderedSignals.numericQuantifiers) renderedNounCounts.set(q.noun, Math.max(renderedNounCounts.get(q.noun) ?? 0, q.count));
+	const numericMismatches = [];
+	for (const [noun, sourceCnt] of sourceNounCounts.entries()) {
+		const renderedCnt = renderedNounCounts.get(noun) ?? 0;
+		if (renderedCnt < sourceCnt) numericMismatches.push({
+			noun,
+			sourceCount: sourceCnt,
+			renderedCount: renderedCnt
+		});
+	}
+	const numericDriftComponent = numericMismatches.length > 0 ? 1 : 0;
+	const CLAUSE_RATIO_FLOOR = .7;
+	const clauseDriftComponent = clauseRatio >= CLAUSE_RATIO_FLOOR ? 0 : Math.min(1, (CLAUSE_RATIO_FLOOR - clauseRatio) / CLAUSE_RATIO_FLOOR);
+	const drift = Math.max(numericDriftComponent, clauseDriftComponent);
+	return {
+		clauseRatio,
+		sourceClauseCount: sourceCount,
+		renderedClauseCount: renderedCount,
+		numericMismatches,
+		drift
+	};
+}
 /**
 * Retrieve the epic shard from the pre-fetched implementation decisions.
 *
@@ -8848,6 +8946,7 @@ async function seedEpicShards(db, projectRoot) {
 	}
 	const shards = parseEpicShards(content);
 	let count = 0;
+	const seenKeys = new Set();
 	for (const shard of shards) {
 		const subsections = parseStorySubsections(shard.epicId, shard.content);
 		for (const subsection of subsections) {
@@ -8858,6 +8957,15 @@ async function seedEpicShards(db, projectRoot) {
 				truncatedLength: MAX_EPIC_SHARD_CHARS,
 				droppedChars: subsection.content.length - MAX_EPIC_SHARD_CHARS
 			}, `Epic shard for ${subsection.key} exceeded ${MAX_EPIC_SHARD_CHARS}-char cap and was truncated; tail content lost from decisions store. Consider splitting the story or raising MAX_EPIC_SHARD_CHARS.`);
+			if (seenKeys.has(subsection.key)) {
+				logger$11.warn({
+					epicId: shard.epicId,
+					storyKey: subsection.key,
+					droppedContentLength: subsection.content.length
+				}, `Epic shard parser produced duplicate key '${subsection.key}' (parser regression?); skipping additional insert. First entry retained.`);
+				continue;
+			}
+			seenKeys.add(subsection.key);
 			await createDecision(db, {
 				pipeline_run_id: null,
 				phase: "implementation",
@@ -12246,6 +12354,7 @@ function createImplementationOrchestrator(deps) {
 			return;
 		}
 		let fidelityRetries = 0;
+		let priorDriftFeedback;
 		while (storyFilePath === void 0) {
 			try {
 				incrementDispatches(storyKey);
@@ -12263,7 +12372,8 @@ function createImplementationOrchestrator(deps) {
 					epicId: storyKey.split("-")[0] ?? storyKey,
 					storyKey,
 					pipelineRunId: config.pipelineRunId,
-					source_ac_hash: sourceAcHash
+					source_ac_hash: sourceAcHash,
+					...priorDriftFeedback !== void 0 ? { priorDriftFeedback } : {}
 				});
 				endPhase(storyKey, "create-story");
 				eventBus.emit("orchestrator:story-phase-complete", {
@@ -12499,67 +12609,114 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (fidelitySourceContent !== void 0) {
 					const namedPaths = extractNamedPathsFromSource(fidelitySourceContent);
-					if (namedPaths.length >= MIN_NAMED_PATHS_FOR_FIDELITY_GATE) {
-						const storyContentForFidelity = await readFile$1(storyFilePath, "utf-8");
-						const fidelity = computeStoryFileFidelity(storyContentForFidelity, namedPaths);
-						logger$24.debug({
-							storyKey,
-							drift: fidelity.drift,
-							missing: fidelity.missing,
-							presentCount: fidelity.present.length,
-							namedPathsCount: namedPaths.length
-						}, "create-story output fidelity check");
-						if (fidelity.drift > FIDELITY_DRIFT_THRESHOLD) {
-							fidelityRetries++;
-							if (fidelityRetries <= MAX_FIDELITY_RETRIES) {
-								const stalePath = storyFilePath.replace(/\.md$/, `.stale-${Date.now()}.md`);
-								try {
-									renameSync(storyFilePath, stalePath);
-									const driftPct = Math.round(fidelity.drift * 100);
-									logger$24.warn({
-										storyKey,
-										drift: fidelity.drift,
-										missing: fidelity.missing,
-										retries: fidelityRetries,
-										stalePath
-									}, `create-story output drifted from source AC (${driftPct}% of ${namedPaths.length} named paths missing); renamed to ${stalePath} and retrying (${fidelityRetries}/${MAX_FIDELITY_RETRIES})`);
-									eventBus.emit("orchestrator:story-warn", {
-										storyKey,
-										msg: `create-story drift detected (${fidelity.missing.length}/${namedPaths.length} named paths missing); retry ${fidelityRetries}/${MAX_FIDELITY_RETRIES}`
-									});
-									storyFilePath = void 0;
-									continue;
-								} catch (renameErr) {
-									logger$24.warn({
-										storyKey,
-										err: renameErr,
-										stalePath
-									}, "failed to rename drifting artifact for retry; proceeding with current artifact");
-								}
-							} else {
-								const errMsg = `create-story output drifted from source AC after ${MAX_FIDELITY_RETRIES} retries; ${fidelity.missing.length} of ${namedPaths.length} named paths missing: ` + fidelity.missing.join(", ");
-								logger$24.error({
+					const storyContentForFidelity = await readFile$1(storyFilePath, "utf-8");
+					const pathFidelity = namedPaths.length >= MIN_NAMED_PATHS_FOR_FIDELITY_GATE ? computeStoryFileFidelity(storyContentForFidelity, namedPaths) : null;
+					const clauseFidelity = computeClauseFidelity(storyContentForFidelity, fidelitySourceContent);
+					const pathDrift = pathFidelity?.drift ?? 0;
+					const clauseDrift = clauseFidelity.drift;
+					const overallDrift = Math.max(pathDrift, clauseDrift);
+					logger$24.debug({
+						storyKey,
+						pathDrift,
+						clauseDrift,
+						overallDrift,
+						pathMissing: pathFidelity?.missing ?? [],
+						numericMismatches: clauseFidelity.numericMismatches,
+						clauseRatio: clauseFidelity.clauseRatio
+					}, "create-story output fidelity check (path + clause)");
+					if (overallDrift > FIDELITY_DRIFT_THRESHOLD) {
+						fidelityRetries++;
+						if (fidelityRetries <= MAX_FIDELITY_RETRIES) {
+							const stalePath = storyFilePath.replace(/\.md$/, `.stale-${Date.now()}.md`);
+							try {
+								renameSync(storyFilePath, stalePath);
+								const driftPct = Math.round(overallDrift * 100);
+								const pathMissing = pathFidelity?.missing ?? [];
+								const numericMismatches = clauseFidelity.numericMismatches;
+								const reasons = [];
+								if (pathMissing.length > 0) reasons.push(`${pathMissing.length} named path(s) missing`);
+								if (numericMismatches.length > 0) reasons.push(`${numericMismatches.length} numeric quantifier mismatch(es) (e.g., "${numericMismatches[0].noun}" source=${numericMismatches[0].sourceCount} rendered=${numericMismatches[0].renderedCount})`);
+								if (clauseFidelity.clauseRatio < .7) reasons.push(`clause shortfall (rendered ${clauseFidelity.renderedClauseCount}/${clauseFidelity.sourceClauseCount} = ${Math.round(clauseFidelity.clauseRatio * 100)}%)`);
+								logger$24.warn({
 									storyKey,
-									drift: fidelity.drift,
-									missing: fidelity.missing,
-									namedPaths
-								}, errMsg);
-								endPhase(storyKey, "create-story");
-								updateStory(storyKey, {
-									phase: "ESCALATED",
-									error: errMsg,
-									completedAt: new Date().toISOString()
-								});
-								await writeStoryMetricsBestEffort(storyKey, "failed", 0);
-								await emitEscalation({
+									pathDrift,
+									clauseDrift,
+									pathMissing,
+									numericMismatches,
+									clauseRatio: clauseFidelity.clauseRatio,
+									retries: fidelityRetries,
+									stalePath
+								}, `create-story output drifted from source AC (${driftPct}% drift, ${reasons.join("; ")}); renamed to ${stalePath} and retrying (${fidelityRetries}/${MAX_FIDELITY_RETRIES})`);
+								eventBus.emit("orchestrator:story-warn", {
 									storyKey,
-									lastVerdict: "create-story-source-ac-drift",
-									reviewCycles: 0,
-									issues: [errMsg]
+									msg: `create-story drift detected (${reasons.join("; ")}); retry ${fidelityRetries}/${MAX_FIDELITY_RETRIES}`
 								});
-								await persistState();
-								return;
+								const feedbackParts = [
+									`### Prior Dispatch Drift Detected (retry ${fidelityRetries}/${MAX_FIDELITY_RETRIES})`,
+									"",
+									`A previous create-story dispatch produced an artifact that drifted from the source AC. The previous artifact has been moved to \`${stalePath}\`.`,
+									"",
+									"**Specific drift findings:**",
+									""
+								];
+								if (pathMissing.length > 0) {
+									feedbackParts.push("Named paths/files from source AC that were missing in the prior dispatch:");
+									feedbackParts.push("");
+									feedbackParts.push(...pathMissing.map((p) => `- \`${p}\``));
+									feedbackParts.push("");
+								}
+								if (numericMismatches.length > 0) {
+									feedbackParts.push("Numeric quantifiers from source AC that were reduced in the prior dispatch:");
+									feedbackParts.push("");
+									feedbackParts.push(...numericMismatches.map((m) => `- source AC says "**${m.sourceCount}** ${m.noun}"; rendered artifact says "${m.renderedCount}" — restore the original count and the named items`));
+									feedbackParts.push("");
+								}
+								if (clauseFidelity.clauseRatio < .7) {
+									feedbackParts.push(`The source AC has ${clauseFidelity.sourceClauseCount} behavioral clauses (Given/When/Then triples or numbered ACs); the prior rendered artifact had only ${clauseFidelity.renderedClauseCount}. You dropped clauses without authorization. Either preserve all source clauses verbatim, OR if the scope is genuinely too large for a single story, emit \`result: failure, error: source scope exceeds single-story capacity — split upstream\` per the prompt's Scope Cap Guidance — silently reducing scope is forbidden.`);
+									feedbackParts.push("");
+								}
+								feedbackParts.push("Preserve the source AC contract verbatim: every named file/path, every numeric quantifier (`exactly N`, `all N`, `both`), and every behavioral clause. Do not substitute names from training priors. Do not silently reduce scope. If the scope cannot fit, emit `result: failure, error: source scope exceeds single-story capacity — split upstream` instead of partially rendering.");
+								priorDriftFeedback = feedbackParts.join("\n");
+								storyFilePath = void 0;
+								continue;
+							} catch (renameErr) {
+								logger$24.warn({
+									storyKey,
+									err: renameErr,
+									stalePath
+								}, "failed to rename drifting artifact for retry; proceeding with current artifact");
 							}
+						} else {
+							const pathMissing = pathFidelity?.missing ?? [];
+							const numericMismatches = clauseFidelity.numericMismatches;
+							const reasons = [];
+							if (pathMissing.length > 0) reasons.push(`paths missing: ${pathMissing.join(", ")}`);
+							if (numericMismatches.length > 0) reasons.push(`numeric mismatches: ${numericMismatches.map((m) => `${m.noun} (source=${m.sourceCount}, rendered=${m.renderedCount})`).join("; ")}`);
+							if (clauseFidelity.clauseRatio < .7) reasons.push(`clause shortfall: source=${clauseFidelity.sourceClauseCount}, rendered=${clauseFidelity.renderedClauseCount}`);
+							const errMsg = `create-story output drifted from source AC after ${MAX_FIDELITY_RETRIES} retries; ` + reasons.join("; ");
+							logger$24.error({
+								storyKey,
+								pathDrift,
+								clauseDrift,
+								pathMissing,
+								numericMismatches,
+								clauseRatio: clauseFidelity.clauseRatio
+							}, errMsg);
+							endPhase(storyKey, "create-story");
+							updateStory(storyKey, {
+								phase: "ESCALATED",
+								error: errMsg,
+								completedAt: new Date().toISOString()
+							});
+							await writeStoryMetricsBestEffort(storyKey, "failed", 0);
+							await emitEscalation({
+								storyKey,
+								lastVerdict: "create-story-source-ac-drift",
+								reviewCycles: 0,
+								issues: [errMsg]
+							});
+							await persistState();
+							return;
 						}
 					}
 				}
@@ -44299,4 +44456,4 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 
 //#endregion
 export { AdapterTelemetryPersistence, AppError, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, EpicIngester, GitClient, GrammarLoader, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SymbolParser, createContextCompiler, createDispatcher, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, normalizeGraphSummaryToStatus, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveMaxReviewCycles, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict, wireNdjsonEmitter };
-//# sourceMappingURL=run-BLObh_Ou.js.map
+//# sourceMappingURL=run-CzjafT8Q.js.map

package/package.json

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

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

@@ -19,6 +19,8 @@
 ### Story Definition (from Solutioning Phase)
 {{story_definition}}
 
+{{prior_drift_feedback}}
+
 ---
 
 ## Mission