substrate-ai 0.20.84 → 0.20.86

package/dist/cli/index.js

@@ -3,7 +3,7 @@ import { FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipel
 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, swallowDebug, tagRunAsBaseline, updatePipelineRun } from "../dist-DCBSXUiX.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, createGitWorktreeManager, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runSolutioningPhase, unescape, validateStopAfterFromConflict } from "../run-DsiQdegK.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, createGitWorktreeManager, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runSolutioningPhase, unescape, validateStopAfterFromConflict } from "../run-DtkAIssJ.js";
 import "../adapter-registry-DIcrxjH8.js";
 import { RunManifest, SupervisorLock, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, aggregateProbeAuthorMetrics, parseRuntimeProbes, readCurrentRunId, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics, runAcTraceabilityCheck } from "../manifest-read-Boipz5aP.js";
 import "../errors-D7xD-utp.js";
@@ -8436,7 +8436,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-C3XJLgze.js"
+									"../run-DmnPDKr3.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{run-C3XJLgze.js → run-DmnPDKr3.js}

@@ -2,7 +2,7 @@ import "./health-CuKzY0Fn.js";
 import "./logger-KeHncl-f.js";
 import "./helpers-CElYrONe.js";
 import "./dist-DCBSXUiX.js";
-import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-DsiQdegK.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-DtkAIssJ.js";
 import "./manifest-read-Boipz5aP.js";
 import "./routing-DFxoKHDt.js";
 import "./work-graph-repository-DZyJv5pV.js";

package/dist/{run-DsiQdegK.js → run-DtkAIssJ.js}

@@ -17,7 +17,7 @@ import { exec, execFile, execFileSync, execSync, spawn } from "node:child_proces
 import * as path$5 from "node:path";
 import * as path$4 from "node:path";
 import * as path$2 from "node:path";
-import path, { basename as basename$1, dirname as dirname$1, extname as extname$1, isAbsolute, join as join$1, posix, resolve as resolve$1, win32 } from "node:path";
+import path, { basename as basename$1, dirname as dirname$1, extname as extname$1, isAbsolute, join as join$1, posix, relative, resolve as resolve$1, win32 } from "node:path";
 import { tmpdir } from "node:os";
 import { createHash, randomUUID } from "node:crypto";
 import { z } from "zod";
@@ -6542,7 +6542,7 @@ async function runCreateStory(deps, params) {
 		};
 	}
 	const implementationDecisions = await getImplementationDecisions(deps, pipelineRunId);
-	const epicShardContent = getEpicShard(implementationDecisions, epicId, deps.projectRoot, storyKey);
+	const epicShardContent = getEpicShard(implementationDecisions, epicId, deps.parentProjectRoot ?? deps.projectRoot, storyKey);
 	let effectiveSourceAcHash = source_ac_hash;
 	if (epicShardContent.length > 0) {
 		const storySection = extractStorySection(epicShardContent, storyKey);
@@ -7053,7 +7053,7 @@ function getEpicShard(decisions, epicId, projectRoot, storyKey) {
 			}, "Story section absent in decisions-store shard — attempting file-based fallback before returning stale shard");
 		}
 		if (projectRoot) {
-			const fallback = readEpicShardFromFile(projectRoot, epicId);
+			const fallback = readEpicShardFromFile(projectRoot, epicId, storyKey);
 			if (fallback) {
 				logger$21.info({ epicId }, "Using file-based fallback for epic shard");
 				if (storyKey) {
@@ -7129,8 +7129,9 @@ async function getArchConstraints$3(deps) {
 			}, "Architecture constraints summarized to fit create-story budget");
 			return summarized.slice(0, ARCH_CONSTRAINT_MAX_CHARS);
 		}
-		if (deps.projectRoot) {
-			const fallback = readArchConstraintsFromFile(deps.projectRoot);
+		const archRoot = deps.parentProjectRoot ?? deps.projectRoot;
+		if (archRoot) {
+			const fallback = readArchConstraintsFromFile(archRoot);
 			if (fallback) {
 				logger$21.info("Using file-based fallback for architecture constraints (decisions table empty)");
 				return fallback.length > ARCH_CONSTRAINT_MAX_CHARS ? fallback.slice(0, ARCH_CONSTRAINT_MAX_CHARS) + "\n\n[truncated for token budget]" : fallback;
@@ -7158,7 +7159,7 @@ async function getArchConstraints$3(deps) {
 *
 * Returns the matched section content, or empty string if no path matches.
 */
-function readEpicShardFromFile(projectRoot, epicId) {
+function readEpicShardFromFile(projectRoot, epicId, storyKey) {
 	try {
 		const candidates = [join$1(projectRoot, "_bmad-output", "planning-artifacts", "epics.md"), join$1(projectRoot, "_bmad-output", "epics.md")];
 		const epicsPath = candidates.find((p) => existsSync(p));
@@ -7184,7 +7185,15 @@ function readEpicShardFromFile(projectRoot, epicId) {
 			const perEpicPattern = new RegExp(`^epic-${epicNum}-.*\\.md$`);
 			const matches = entries.filter((e) => perEpicPattern.test(e)).sort();
 			if (matches.length > 0) {
-				const perEpicPath = join$1(planningDir, matches[0]);
+				let chosenIdx = 0;
+				if (storyKey !== void 0 && matches.length > 1) for (let i = 0; i < matches.length; i++) {
+					const candidateContent = readFileSync(join$1(planningDir, matches[i]), "utf-8");
+					if (extractStorySection(candidateContent, storyKey) !== null) {
+						chosenIdx = i;
+						break;
+					}
+				}
+				const perEpicPath = join$1(planningDir, matches[chosenIdx]);
 				const content = readFileSync(perEpicPath, "utf-8");
 				return content.trim();
 			}
@@ -7266,6 +7275,137 @@ async function isValidStoryFile(filePath) {
 //#region src/modules/compiled-workflows/git-helpers.ts
 const logger$20 = createLogger("compiled-workflows:git-helpers");
 /**
+* Commit the agent's working-tree output for a dev-story dispatch.
+*
+* Path E Bug #5 (post-v0.20.85): substrate's per-story worktree flow assumed
+* the dispatched agent would run `git commit` itself. Empirical audit across
+* substrate + 4 consumer projects (strata, agent-mesh, boardgame-sandbox,
+* lucky-numbers) found 1 `feat(story-X-Y)` commit total in 2 months — agents
+* don't reliably commit. Path E's merge-to-main has been a silent no-op
+* since v0.20.79 because the branch never advanced past the orchestrator's
+* start commit. Result: pipelines reported succeeded, work was lost on
+* worktree cleanup.
+*
+* Fix: substrate commits programmatically before merge-to-main fires. The
+* commit captures every uncommitted file under the worktree that isn't
+* `.gitignored` (git add respects ignore rules) and isn't outside the
+* worktree boundary (absolute paths to /tmp/... are filtered out so they
+* don't trip 'fatal: outside repository'). Pre-commit hooks are NOT
+* bypassed — they exist in the operator's repo for a reason and should
+* gate substrate-generated commits too. A hook failure surfaces as a
+* dev-story-no-commit escalation with the hook output as evidence.
+*
+* @param storyKey      Story key (e.g. "10-2") for the canonical commit-msg pattern
+* @param storyTitle    Title from create-story result (or fallback string)
+* @param filesModified Files the agent declared (or recovered via git-status fallback)
+* @param workingDir    The worktree path (or projectRoot when --no-worktree)
+* @returns Structured result for the orchestrator to inspect
+*/
+async function commitDevStoryOutput(storyKey, storyTitle, filesModified, workingDir) {
+	const insideWorktree = [];
+	for (const p of filesModified) {
+		const abs = isAbsolute(p) ? p : resolve$1(workingDir, p);
+		const rel = relative(workingDir, abs);
+		if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) {
+			logger$20.debug({
+				path: p,
+				abs,
+				workingDir
+			}, "commitDevStoryOutput: filtered out path outside worktree");
+			continue;
+		}
+		insideWorktree.push(rel);
+	}
+	if (insideWorktree.length === 0) return {
+		status: "no-changes",
+		reason: "no-files-inside-worktree"
+	};
+	try {
+		execSync(`git add ${insideWorktree.map((p) => JSON.stringify(p)).join(" ")}`, {
+			cwd: workingDir,
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			timeout: 3e4
+		});
+	} catch (err) {
+		const stderr = err instanceof Error && "stderr" in err ? String(err.stderr ?? err.message) : err instanceof Error ? err.message : String(err);
+		return {
+			status: "failed",
+			stderr: `git add failed: ${stderr}`
+		};
+	}
+	const cachedCheck = spawn("git", [
+		"diff",
+		"--cached",
+		"--quiet"
+	], {
+		cwd: workingDir,
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	const cachedStatus = await new Promise((res) => {
+		cachedCheck.on("close", (code) => res(code ?? 0));
+		cachedCheck.on("error", () => res(0));
+	});
+	if (cachedStatus === 0) return {
+		status: "no-changes",
+		reason: "staging-produced-no-diff"
+	};
+	const title = storyTitle ?? "implementation";
+	const message = `feat(story-${storyKey}): ${title}`;
+	try {
+		execSync(`git commit -m ${JSON.stringify(message)}`, {
+			cwd: workingDir,
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			timeout: 12e4
+		});
+	} catch (err) {
+		const stderr = err instanceof Error && "stderr" in err ? String(err.stderr ?? err.message) : err instanceof Error ? err.message : String(err);
+		return {
+			status: "failed",
+			stderr: `git commit failed: ${stderr}`
+		};
+	}
+	let sha = "";
+	try {
+		sha = execSync("git rev-parse HEAD", {
+			cwd: workingDir,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			timeout: 5e3
+		}).trim();
+	} catch (err) {
+		logger$20.warn({
+			storyKey,
+			err
+		}, "commitDevStoryOutput: commit succeeded but rev-parse HEAD failed");
+	}
+	logger$20.info({
+		storyKey,
+		sha,
+		fileCount: insideWorktree.length
+	}, "commitDevStoryOutput: committed dev-story output");
+	return {
+		status: "committed",
+		sha,
+		filesStaged: insideWorktree
+	};
+}
+/**
 * Check whether the repo at `cwd` has at least one commit (HEAD resolves).
 * Returns false for fresh repos with no commits, avoiding `fatal: bad revision 'HEAD'`.
 * Synchronous (execSync) to keep it simple — this is a fast local check.
@@ -13986,6 +14126,7 @@ function createImplementationOrchestrator(deps) {
 			const wt = await _worktreeManager.createWorktree(storyKey);
 			effectiveProjectRoot = wt.worktreePath;
 		}
+		let _capturedStoryTitle;
 		await waitIfPaused();
 		if (_state !== "RUNNING") return;
 		stateStore?.branchForStory(storyKey).catch((err) => logger$27.warn({
@@ -14107,6 +14248,7 @@ function createImplementationOrchestrator(deps) {
 					contextCompiler,
 					dispatcher,
 					projectRoot: effectiveProjectRoot,
+					parentProjectRoot: projectRoot,
 					tokenCeilings,
 					otlpEndpoint: _otlpEndpoint,
 					agentId
@@ -14281,6 +14423,7 @@ function createImplementationOrchestrator(deps) {
 					}
 				}
 				storyFilePath = createResult.story_file;
+				_capturedStoryTitle = createResult.story_title;
 				if (createResult.story_title) try {
 					const epicId = storyKey.split("-")[0] ?? storyKey;
 					const implDecisions = await getDecisionsByPhase(db, "implementation");
@@ -14535,6 +14678,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						agentId
@@ -14591,6 +14735,7 @@ function createImplementationOrchestrator(deps) {
 				contextCompiler,
 				dispatcher,
 				projectRoot: effectiveProjectRoot,
+				parentProjectRoot: projectRoot,
 				tokenCeilings,
 				otlpEndpoint: _otlpEndpoint,
 				agentId
@@ -14726,6 +14871,7 @@ function createImplementationOrchestrator(deps) {
 							contextCompiler,
 							dispatcher,
 							projectRoot: effectiveProjectRoot,
+							parentProjectRoot: projectRoot,
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
@@ -14810,6 +14956,7 @@ function createImplementationOrchestrator(deps) {
 					contextCompiler,
 					dispatcher,
 					projectRoot: effectiveProjectRoot,
+					parentProjectRoot: projectRoot,
 					tokenCeilings,
 					otlpEndpoint: _otlpEndpoint,
 					repoMapInjector,
@@ -15490,6 +15637,7 @@ function createImplementationOrchestrator(deps) {
 									contextCompiler,
 									dispatcher,
 									projectRoot: effectiveProjectRoot,
+									parentProjectRoot: projectRoot,
 									tokenCeilings,
 									otlpEndpoint: _otlpEndpoint,
 									repoMapInjector,
@@ -15701,6 +15849,7 @@ function createImplementationOrchestrator(deps) {
 							contextCompiler,
 							dispatcher,
 							projectRoot: effectiveProjectRoot,
+							parentProjectRoot: projectRoot,
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
@@ -15748,6 +15897,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						repoMapInjector,
@@ -15997,6 +16147,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						agentId
@@ -16027,6 +16178,101 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (!noWorktree && _worktreeManager !== void 0 && _orchestratorStartBranch !== void 0 && projectRoot !== void 0) {
 					const branchName = `${BRANCH_PREFIX}${storyKey}`;
+					if (effectiveProjectRoot !== void 0) {
+						const dirty = await getGitChangedFiles(effectiveProjectRoot);
+						const commitResult = await commitDevStoryOutput(storyKey, _capturedStoryTitle, dirty, effectiveProjectRoot);
+						if (commitResult.status === "no-changes") {
+							logger$27.warn({
+								storyKey,
+								reason: commitResult.reason
+							}, "dev-story produced no committable changes — escalating instead of running merge-to-main on an unchanged branch");
+							updateStory(storyKey, {
+								phase: "ESCALATED",
+								error: `dev-story-no-commit: ${commitResult.reason}`,
+								completedAt: new Date().toISOString()
+							});
+							await emitEscalation({
+								storyKey,
+								lastVerdict: "dev-story-no-commit",
+								reviewCycles: completedReviewCycles,
+								issues: [`dev-story phase completed with verdict ${reviewVerdict} but produced no committable changes (reason: ${commitResult.reason})`]
+							});
+							await persistState();
+							return;
+						}
+						if (commitResult.status === "failed") {
+							logger$27.error({
+								storyKey,
+								stderr: commitResult.stderr
+							}, "substrate auto-commit failed — escalating story");
+							updateStory(storyKey, {
+								phase: "ESCALATED",
+								error: "dev-story-commit-failed",
+								completedAt: new Date().toISOString()
+							});
+							await emitEscalation({
+								storyKey,
+								lastVerdict: "dev-story-commit-failed",
+								reviewCycles: completedReviewCycles,
+								issues: [`substrate auto-commit failed: ${commitResult.stderr}`]
+							});
+							await persistState();
+							return;
+						}
+						logger$27.info({
+							storyKey,
+							sha: commitResult.sha,
+							fileCount: commitResult.filesStaged.length
+						}, "substrate auto-committed dev-story output before merge-to-main");
+					}
+					try {
+						const branchSha = execSync(`git rev-parse ${branchName}`, {
+							cwd: effectiveProjectRoot ?? projectRoot,
+							encoding: "utf-8",
+							stdio: [
+								"ignore",
+								"pipe",
+								"pipe"
+							],
+							timeout: 5e3
+						}).trim();
+						const startSha = execSync(`git rev-parse ${_orchestratorStartBranch}`, {
+							cwd: projectRoot,
+							encoding: "utf-8",
+							stdio: [
+								"ignore",
+								"pipe",
+								"pipe"
+							],
+							timeout: 5e3
+						}).trim();
+						if (branchSha === startSha) {
+							logger$27.warn({
+								storyKey,
+								branchSha,
+								startSha,
+								branchName
+							}, "merge-to-main gate: branch did not advance from start commit — escalating instead of running a no-op merge");
+							updateStory(storyKey, {
+								phase: "ESCALATED",
+								error: "dev-story-no-commit",
+								completedAt: new Date().toISOString()
+							});
+							await emitEscalation({
+								storyKey,
+								lastVerdict: "dev-story-no-commit",
+								reviewCycles: completedReviewCycles,
+								issues: [`branch ${branchName} did not advance past start commit ${startSha} — merge-to-main would be a no-op`]
+							});
+							await persistState();
+							return;
+						}
+					} catch (gateErr) {
+						logger$27.warn({
+							storyKey,
+							err: gateErr instanceof Error ? gateErr.message : String(gateErr)
+						}, "merge-to-main pre-flight verification failed — proceeding with merge phase");
+					}
 					logger$27.info({
 						storyKey,
 						branchName,
@@ -47136,4 +47382,4 @@ function registerRunCommand(program, version = "0.0.0", projectRoot = process.cw
 
 //#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, createGitWorktreeManager, 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-DsiQdegK.js.map
+//# sourceMappingURL=run-DtkAIssJ.js.map

package/package.json

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