substrate-ai 0.20.33 → 0.20.35

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_FINDING_COUNTS, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts } from "../health-Cz4RTHNh.js";
+import { FileStateStore, RunManifest, SUBSTRATE_OWNED_SETTINGS_KEYS, SupervisorLock, VALID_PHASES, WorkGraphRepository, ZERO_FINDING_COUNTS, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts } from "../health-CnV6ndAb.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, 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-BnMsd9hC.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-BLaHTh1C.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-B7O3HgSR.js";
 import "../errors-DSGhhrgv.js";
 import "../routing-CcBOCuC9.js";
 import "../decisions-C0pz9Clx.js";
@@ -3667,7 +3667,7 @@ async function runStatusAction(options) {
 			logger$12.debug({ err }, "Work graph query failed, continuing without work graph data");
 		}
 		if (run === void 0) {
-			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-B6AMpmJB.js");
+			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-Bqzqu6zC.js");
 			const substrateDirPath = join(projectRoot, ".substrate");
 			const processInfo = inspectProcessTree$1({
 				projectRoot,
@@ -5198,7 +5198,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-C-mxCkwh.js"
+									"../run-VgLqFM7X.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{health-B6AMpmJB.js → health-Bqzqu6zC.js}

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

package/dist/{health-Cz4RTHNh.js → health-CnV6ndAb.js}

@@ -3831,6 +3831,40 @@ function tail(text, bytes = PROBE_TAIL_BYTES) {
 * way a typo in one author's probe surfaces as a deterministic finding,
 * not a pipeline crash that masks the rest of the run.
 */
+/**
+* Story 63-2: canonical error-envelope shapes that signal the tool
+* responded with a structured error despite exiting 0. Detected
+* regardless of whether the author declared an assertion — defense-in-depth
+* against under-test probes that count tool advertisement but don't check
+* response shape (the obs_012 REOPENED class).
+*
+* Patterns are matched against the FULL captured stdout (not the tailed
+* excerpt) so error envelopes deeper than `PROBE_TAIL_BYTES` aren't
+* missed when a probe runs multiple sub-commands and the error surfaces
+* partway through.
+*
+* Match keys are JSON-shape only (case-sensitive); we do not try to
+* detect prose-form errors ("ERROR:" log lines) because those produce
+* far too many false positives — many tools log informational warnings
+* to stdout that contain the word "error".
+*/
+const ERROR_SHAPE_PATTERNS = [{
+	pattern: /"isError"\s*:\s*true\b/,
+	description: "\"isError\": true (MCP / Anthropic tool error envelope)"
+}, {
+	pattern: /"status"\s*:\s*"error"/,
+	description: "\"status\": \"error\" (REST / RPC error envelope)"
+}];
+/**
+* Story 63-2: scan stdout for canonical error-envelope shapes. Returns
+* an array of human-readable descriptions of detected patterns; empty
+* array when the response shape looks clean.
+*/
+function detectErrorShapeIndicators(stdout) {
+	const indicators = [];
+	for (const { pattern, description } of ERROR_SHAPE_PATTERNS) if (pattern.test(stdout)) indicators.push(description);
+	return indicators;
+}
 function evaluateStdoutAssertions(probe, stdout) {
 	const failures = [];
 	for (const pattern of probe.expect_stdout_no_regex ?? []) {
@@ -3931,11 +3965,18 @@ function executeProbeOnHost(probe, options = {}) {
 			const duration = Date.now() - start;
 			let outcome = code === 0 ? "pass" : "fail";
 			let assertionFailures;
+			let errorShapeIndicators;
 			if (outcome === "pass") {
 				const failures = evaluateStdoutAssertions(probe, stdout);
 				if (failures.length > 0) {
 					outcome = "fail";
 					assertionFailures = failures;
+				} else {
+					const indicators = detectErrorShapeIndicators(stdout);
+					if (indicators.length > 0) {
+						outcome = "fail";
+						errorShapeIndicators = indicators;
+					}
 				}
 			}
 			finalize({
@@ -3945,7 +3986,8 @@ function executeProbeOnHost(probe, options = {}) {
 				stdoutTail: tail(stdout),
 				stderrTail: tail(stderr),
 				durationMs: duration,
-				...assertionFailures !== void 0 ? { assertionFailures } : {}
+				...assertionFailures !== void 0 ? { assertionFailures } : {},
+				...errorShapeIndicators !== void 0 ? { errorShapeIndicators } : {}
 			});
 		});
 	});
@@ -3966,6 +4008,16 @@ const CATEGORY_TIMEOUT = "runtime-probe-timeout";
 */
 const CATEGORY_ASSERTION_FAIL = "runtime-probe-assertion-fail";
 /**
+* Story 63-2: command exited 0 and no author-declared assertion tripped,
+* but the captured stdout contains a canonical error-envelope shape
+* (`"isError": true`, `"status": "error"`). Defense-in-depth against
+* under-test probes that count tool advertisement without checking
+* response shape — the structural fix for obs_2026-04-25_012 (REOPENED).
+* Distinct from CATEGORY_ASSERTION_FAIL because the author DIDN'T declare
+* an assertion; the executor caught the error envelope automatically.
+*/
+const CATEGORY_ERROR_RESPONSE = "runtime-probe-error-response";
+/**
 * Story 60-11: source AC describes an event-driven mechanism (hook, timer,
 * signal, webhook) but no probe's command invokes a known production-trigger
 * pattern. Strata Run 13 (Story 1-12, 2026-04-26): vault conflict hook
@@ -4103,11 +4155,12 @@ var RuntimeProbeCheck = class {
 			}
 			const result = await this._executors.host(probe);
 			if (result.outcome === "pass") continue;
-			const category = result.outcome === "timeout" ? CATEGORY_TIMEOUT : result.assertionFailures !== void 0 ? CATEGORY_ASSERTION_FAIL : CATEGORY_FAIL;
+			const category = result.outcome === "timeout" ? CATEGORY_TIMEOUT : result.assertionFailures !== void 0 ? CATEGORY_ASSERTION_FAIL : result.errorShapeIndicators !== void 0 ? CATEGORY_ERROR_RESPONSE : CATEGORY_FAIL;
 			const descriptor = probe.description ? ` (${probe.description})` : "";
 			let message;
 			if (result.outcome === "timeout") message = `probe "${probe.name}"${descriptor} timed out after ${result.durationMs}ms`;
 			else if (result.assertionFailures !== void 0) message = `probe "${probe.name}"${descriptor} exit 0 but stdout assertion failed: ` + result.assertionFailures.join("; ");
+			else if (result.errorShapeIndicators !== void 0) message = `probe "${probe.name}"${descriptor} exit 0 but response contained error envelope: ` + result.errorShapeIndicators.join("; ") + " — the tool returned an error-shaped JSON response despite a clean exit code. This is structural evidence the implementation didn't actually work; add an explicit `expect_stdout_no_regex` assertion to make the failure surface earlier in author-controlled form.";
 			else message = `probe "${probe.name}"${descriptor} failed with exit ${result.exitCode ?? "unknown"}`;
 			findings.push({
 				category,
@@ -6291,4 +6344,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_FINDING_COUNTS, __commonJS, __require, __toESM, applyConfigToGraph, buildPipelineStatusOutput, createDatabaseAdapter$1 as createDatabaseAdapter, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, createStateStore, detectCycles, detectsEventDrivenAC, extractTargetFilesFromStoryContent, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, isOrchestratorProcessLine, parseDbTimestampAsUtc, registerHealthCommand, renderFindings, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveGraphPath, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, runHealthAction, validateStoryKey };
-//# sourceMappingURL=health-Cz4RTHNh.js.map
+//# sourceMappingURL=health-CnV6ndAb.js.map

package/dist/{run-BLaHTh1C.js → run-B7O3HgSR.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, extractTargetFilesFromStoryContent, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, renderFindings, resolveGraphPath, resolveMainRepoRoot, validateStoryKey } from "./health-Cz4RTHNh.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, extractTargetFilesFromStoryContent, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, renderFindings, resolveGraphPath, resolveMainRepoRoot, validateStoryKey } from "./health-CnV6ndAb.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-BnMsd9hC.js";
@@ -14171,6 +14171,79 @@ function createImplementationOrchestrator(deps) {
 		let schemaValidationRetries = 0;
 		let previousIterationWasMalformed = false;
 		const MAX_SCHEMA_VALIDATION_RETRIES = 3;
+		async function runVerificationAndComplete(args) {
+			const { recordedVerdict, finalReviewCycles, reviewResult, autoApprove } = args;
+			endPhase(storyKey, "code-review");
+			if (config.skipVerification !== true) {
+				const latestReviewSignals = reviewResult != null ? {
+					dispatchFailed: reviewResult.dispatchFailed,
+					error: reviewResult.error,
+					rawOutput: reviewResult.rawOutput
+				} : void 0;
+				let sourceEpicContent;
+				const epicsPath = findEpicFileForStory(projectRoot ?? process.cwd(), storyKey);
+				if (epicsPath) try {
+					const epicFull = readFileSync(epicsPath, "utf-8");
+					const section = extractStorySection(epicFull, storyKey);
+					if (section) sourceEpicContent = section;
+				} catch {}
+				await persistDevStorySignals(storyKey, devStorySignals, runManifest);
+				const verifContext = assembleVerificationContext({
+					storyKey,
+					workingDir: projectRoot ?? process.cwd(),
+					reviewResult: latestReviewSignals,
+					storyContent: storyContentForVerification,
+					devStoryResult: devStorySignals,
+					outputTokenCount: devOutputTokenCount,
+					sourceEpicContent
+				});
+				const verifSummary = await verificationPipeline.run(verifContext, "A");
+				verificationStore.set(storyKey, verifSummary);
+				await persistVerificationResult(storyKey, verifSummary, runManifest);
+				if (verifSummary.status === "fail") {
+					updateStory(storyKey, {
+						phase: "VERIFICATION_FAILED",
+						completedAt: new Date().toISOString()
+					});
+					persistStoryState(storyKey, _stories.get(storyKey)).catch((err) => logger$26.warn({
+						err,
+						storyKey
+					}, "StateStore write failed after verification-failed"));
+					await writeStoryMetricsBestEffort(storyKey, "verification-failed", finalReviewCycles);
+					await persistState();
+					return "verification-failed";
+				}
+			}
+			if (autoApprove !== void 0) eventBus.emit("story:auto-approved", {
+				storyKey,
+				verdict: recordedVerdict,
+				reviewCycles: finalReviewCycles,
+				maxReviewCycles: config.maxReviewCycles,
+				issueCount: autoApprove.issueCount,
+				reason: autoApprove.reason
+			});
+			const completeUpdate = {
+				phase: "COMPLETE",
+				completedAt: new Date().toISOString()
+			};
+			if (autoApprove !== void 0) completeUpdate.reviewCycles = finalReviewCycles;
+			if (autoApprove?.downgradeLastVerdict !== void 0) completeUpdate.lastVerdict = autoApprove.downgradeLastVerdict;
+			updateStory(storyKey, completeUpdate);
+			if (config.skipVerification !== true && runManifest != null) Promise.resolve().then(() => runManifest.read()).then((manifest) => {
+				if (manifest?.per_story_state?.[storyKey]?.verification_result == null) logger$26.warn({
+					storyKey,
+					category: "verification-result-missing"
+				}, "post-COMPLETE invariant: verification_result absent in manifest");
+			}).catch(() => {});
+			await writeStoryMetricsBestEffort(storyKey, recordedVerdict, finalReviewCycles);
+			await writeStoryOutcomeBestEffort(storyKey, "complete", finalReviewCycles);
+			eventBus.emit("orchestrator:story-complete", {
+				storyKey,
+				reviewCycles: finalReviewCycles
+			});
+			await persistState();
+			return "completed";
+		}
 		while (keepReviewing) {
 			await waitIfPaused();
 			if (_state !== "RUNNING") return;
@@ -14457,65 +14530,13 @@ function createImplementationOrchestrator(deps) {
 				return;
 			}
 			if (verdict === "SHIP_IT" || verdict === "LGTM_WITH_NOTES") {
-				endPhase(storyKey, "code-review");
-				if (config.skipVerification !== true) {
-					const latestReviewSignals = reviewResult != null ? {
-						dispatchFailed: reviewResult.dispatchFailed,
-						error: reviewResult.error,
-						rawOutput: reviewResult.rawOutput
-					} : void 0;
-					let sourceEpicContent;
-					const epicsPath1 = findEpicFileForStory(projectRoot ?? process.cwd(), storyKey);
-					if (epicsPath1) try {
-						const epicFull = readFileSync(epicsPath1, "utf-8");
-						const section = extractStorySection(epicFull, storyKey);
-						if (section) sourceEpicContent = section;
-					} catch {}
-					await persistDevStorySignals(storyKey, devStorySignals, runManifest);
-					const verifContext = assembleVerificationContext({
-						storyKey,
-						workingDir: projectRoot ?? process.cwd(),
-						reviewResult: latestReviewSignals,
-						storyContent: storyContentForVerification,
-						devStoryResult: devStorySignals,
-						outputTokenCount: devOutputTokenCount,
-						sourceEpicContent
-					});
-					const verifSummary = await verificationPipeline.run(verifContext, "A");
-					verificationStore.set(storyKey, verifSummary);
-					await persistVerificationResult(storyKey, verifSummary, runManifest);
-					if (verifSummary.status === "fail") {
-						updateStory(storyKey, {
-							phase: "VERIFICATION_FAILED",
-							completedAt: new Date().toISOString()
-						});
-						persistStoryState(storyKey, _stories.get(storyKey)).catch((err) => logger$26.warn({
-							err,
-							storyKey
-						}, "StateStore write failed after verification-failed"));
-						await writeStoryMetricsBestEffort(storyKey, "verification-failed", reviewCycles);
-						await persistState();
-						return;
-					}
-				}
-				updateStory(storyKey, {
-					phase: "COMPLETE",
-					completedAt: new Date().toISOString()
-				});
-				if (config.skipVerification !== true && runManifest != null) Promise.resolve().then(() => runManifest.read()).then((manifest) => {
-					if (manifest?.per_story_state?.[storyKey]?.verification_result == null) logger$26.warn({
-						storyKey,
-						category: "verification-result-missing"
-					}, "post-COMPLETE invariant: verification_result absent in manifest");
-				}).catch(() => {});
 				const completedReviewCycles = reviewCycles + 1;
-				await writeStoryMetricsBestEffort(storyKey, verdict, completedReviewCycles);
-				await writeStoryOutcomeBestEffort(storyKey, "complete", completedReviewCycles);
-				eventBus.emit("orchestrator:story-complete", {
-					storyKey,
-					reviewCycles: completedReviewCycles
+				const outcome = await runVerificationAndComplete({
+					recordedVerdict: verdict,
+					finalReviewCycles: completedReviewCycles,
+					reviewResult
 				});
-				await persistState();
+				if (outcome === "verification-failed") return;
 				if (verdict === "LGTM_WITH_NOTES" && reviewResult.notes && config.pipelineRunId) try {
 					await createDecision(db, {
 						pipeline_run_id: config.pipelineRunId,
@@ -14730,73 +14751,16 @@ function createImplementationOrchestrator(deps) {
 						err
 					}, "Auto-approve fix dispatch failed — approving anyway (issues were minor)");
 				}
-				endPhase(storyKey, "code-review");
-				if (config.skipVerification !== true) {
-					const latestReviewSignals = reviewResult != null ? {
-						dispatchFailed: reviewResult.dispatchFailed,
-						error: reviewResult.error,
-						rawOutput: reviewResult.rawOutput
-					} : void 0;
-					let sourceEpicContent2;
-					const epicsPath2 = findEpicFileForStory(projectRoot ?? process.cwd(), storyKey);
-					if (epicsPath2) try {
-						const epicFull2 = readFileSync(epicsPath2, "utf-8");
-						const section2 = extractStorySection(epicFull2, storyKey);
-						if (section2) sourceEpicContent2 = section2;
-					} catch {}
-					await persistDevStorySignals(storyKey, devStorySignals, runManifest);
-					const verifContext = assembleVerificationContext({
-						storyKey,
-						workingDir: projectRoot ?? process.cwd(),
-						reviewResult: latestReviewSignals,
-						storyContent: storyContentForVerification,
-						devStoryResult: devStorySignals,
-						outputTokenCount: devOutputTokenCount,
-						sourceEpicContent: sourceEpicContent2
-					});
-					const verifSummary = await verificationPipeline.run(verifContext, "A");
-					verificationStore.set(storyKey, verifSummary);
-					await persistVerificationResult(storyKey, verifSummary, runManifest);
-					if (verifSummary.status === "fail") {
-						updateStory(storyKey, {
-							phase: "VERIFICATION_FAILED",
-							completedAt: new Date().toISOString()
-						});
-						persistStoryState(storyKey, _stories.get(storyKey)).catch((err) => logger$26.warn({
-							err,
-							storyKey
-						}, "StateStore write failed after verification-failed"));
-						await writeStoryMetricsBestEffort(storyKey, "verification-failed", finalReviewCycles);
-						await persistState();
-						return;
+				const outcome = await runVerificationAndComplete({
+					recordedVerdict: verdict,
+					finalReviewCycles,
+					reviewResult,
+					autoApprove: {
+						issueCount: issueList.length,
+						reason: `Review cycles exhausted (${finalReviewCycles}/${config.maxReviewCycles}) with only minor issues — auto-approving`
 					}
-				}
-				eventBus.emit("story:auto-approved", {
-					storyKey,
-					verdict,
-					reviewCycles: finalReviewCycles,
-					maxReviewCycles: config.maxReviewCycles,
-					issueCount: issueList.length,
-					reason: `Review cycles exhausted (${finalReviewCycles}/${config.maxReviewCycles}) with only minor issues — auto-approving`
-				});
-				updateStory(storyKey, {
-					phase: "COMPLETE",
-					reviewCycles: finalReviewCycles,
-					completedAt: new Date().toISOString()
-				});
-				if (config.skipVerification !== true && runManifest != null) Promise.resolve().then(() => runManifest.read()).then((manifest) => {
-					if (manifest?.per_story_state?.[storyKey]?.verification_result == null) logger$26.warn({
-						storyKey,
-						category: "verification-result-missing"
-					}, "post-COMPLETE invariant: verification_result absent in manifest");
-				}).catch(() => {});
-				await writeStoryMetricsBestEffort(storyKey, verdict, finalReviewCycles);
-				await writeStoryOutcomeBestEffort(storyKey, "complete", finalReviewCycles);
-				eventBus.emit("orchestrator:story-complete", {
-					storyKey,
-					reviewCycles: finalReviewCycles
 				});
-				await persistState();
+				if (outcome === "verification-failed") return;
 				keepReviewing = false;
 				return;
 			}
@@ -14995,74 +14959,17 @@ function createImplementationOrchestrator(deps) {
 							reviewCycles: finalReviewCycles,
 							issueCount: issueList.length
 						}, "Minor-fixes dispatch timed out — auto-approving as LGTM_WITH_NOTES (original findings retained as warnings)");
-						endPhase(storyKey, "code-review");
-						if (config.skipVerification !== true) {
-							const latestReviewSignals = reviewResult != null ? {
-								dispatchFailed: reviewResult.dispatchFailed,
-								error: reviewResult.error,
-								rawOutput: reviewResult.rawOutput
-							} : void 0;
-							let sourceEpicContent3;
-							const epicsPath3 = findEpicFileForStory(projectRoot ?? process.cwd(), storyKey);
-							if (epicsPath3) try {
-								const epicFull3 = readFileSync(epicsPath3, "utf-8");
-								const section3 = extractStorySection(epicFull3, storyKey);
-								if (section3) sourceEpicContent3 = section3;
-							} catch {}
-							await persistDevStorySignals(storyKey, devStorySignals, runManifest);
-							const verifContext = assembleVerificationContext({
-								storyKey,
-								workingDir: projectRoot ?? process.cwd(),
-								reviewResult: latestReviewSignals,
-								storyContent: storyContentForVerification,
-								devStoryResult: devStorySignals,
-								outputTokenCount: devOutputTokenCount,
-								sourceEpicContent: sourceEpicContent3
-							});
-							const verifSummary = await verificationPipeline.run(verifContext, "A");
-							verificationStore.set(storyKey, verifSummary);
-							await persistVerificationResult(storyKey, verifSummary, runManifest);
-							if (verifSummary.status === "fail") {
-								updateStory(storyKey, {
-									phase: "VERIFICATION_FAILED",
-									completedAt: new Date().toISOString()
-								});
-								persistStoryState(storyKey, _stories.get(storyKey)).catch((err) => logger$26.warn({
-									err,
-									storyKey
-								}, "StateStore write failed after verification-failed"));
-								await writeStoryMetricsBestEffort(storyKey, "verification-failed", finalReviewCycles);
-								await persistState();
-								return;
+						const outcome = await runVerificationAndComplete({
+							recordedVerdict: downgradedVerdict,
+							finalReviewCycles,
+							reviewResult,
+							autoApprove: {
+								issueCount: issueList.length,
+								reason: `Minor-fixes dispatch timed out (cycle ${finalReviewCycles}) — auto-approving as LGTM_WITH_NOTES with original findings retained as warnings`,
+								downgradeLastVerdict: downgradedVerdict
 							}
-						}
-						eventBus.emit("story:auto-approved", {
-							storyKey,
-							verdict: downgradedVerdict,
-							reviewCycles: finalReviewCycles,
-							maxReviewCycles: config.maxReviewCycles,
-							issueCount: issueList.length,
-							reason: `Minor-fixes dispatch timed out (cycle ${finalReviewCycles}) — auto-approving as LGTM_WITH_NOTES with original findings retained as warnings`
-						});
-						updateStory(storyKey, {
-							phase: "COMPLETE",
-							reviewCycles: finalReviewCycles,
-							lastVerdict: downgradedVerdict,
-							completedAt: new Date().toISOString()
 						});
-						if (config.skipVerification !== true && runManifest != null) Promise.resolve().then(() => runManifest.read()).then((manifest) => {
-							if (manifest?.per_story_state?.[storyKey]?.verification_result == null) logger$26.warn({
-								storyKey,
-								category: "verification-result-missing"
-							}, "post-COMPLETE invariant: verification_result absent in manifest");
-						}).catch(() => {});
-						await writeStoryMetricsBestEffort(storyKey, downgradedVerdict, finalReviewCycles);
-						await writeStoryOutcomeBestEffort(storyKey, "complete", finalReviewCycles);
-						eventBus.emit("orchestrator:story-complete", {
-							storyKey,
-							reviewCycles: finalReviewCycles
-						});
-						await persistState();
+						if (outcome === "verification-failed") return;
 						keepReviewing = false;
 						return;
 					}
@@ -45201,4 +45108,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-BLaHTh1C.js.map
+//# sourceMappingURL=run-B7O3HgSR.js.map

package/dist/{run-C-mxCkwh.js → run-VgLqFM7X.js}

@@ -1,8 +1,8 @@
-import "./health-Cz4RTHNh.js";
+import "./health-CnV6ndAb.js";
 import "./logger-KeHncl-f.js";
 import "./helpers-CElYrONe.js";
 import "./dist-BnMsd9hC.js";
-import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, runRunAction, wireNdjsonEmitter } from "./run-BLaHTh1C.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, runRunAction, wireNdjsonEmitter } from "./run-B7O3HgSR.js";
 import "./routing-CcBOCuC9.js";
 import "./decisions-C0pz9Clx.js";
 

package/package.json

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