substrate-ai 0.20.83 → 0.20.85

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-Eqv7UsGH.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-B_B7Jr_K.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-DXazb9CF.js"
+									"../run-PzGF_iNE.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{run-Eqv7UsGH.js → run-B_B7Jr_K.js}

@@ -339,6 +339,17 @@ async function getMergedFiles(cwd) {
 
 //#endregion
 //#region packages/core/dist/git/git-worktree-manager-impl.js
+/**
+* Branch name prefix for substrate per-story branches.
+*
+* Exported as the canonical source of truth so consumers (orchestrator,
+* integration tests, tooling) can compose branch names without
+* independently encoding the prefix. v0.20.82 production bug:
+* `orchestrator-impl.ts:4290` hardcoded `substrate/story-${storyKey}`
+* while this module created `substrate/task-${taskId}` — the resulting
+* merge-to-main looked at a non-existent branch. Recurrence prevention:
+* all branch-name construction MUST import this constant.
+*/
 const BRANCH_PREFIX = "substrate/story-";
 const DEFAULT_WORKTREE_BASE = ".substrate-worktrees";
 var GitWorktreeManagerImpl = class {
@@ -6531,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);
@@ -7042,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) {
@@ -7118,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;
@@ -7147,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));
@@ -7173,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();
 			}
@@ -14096,6 +14116,7 @@ function createImplementationOrchestrator(deps) {
 					contextCompiler,
 					dispatcher,
 					projectRoot: effectiveProjectRoot,
+					parentProjectRoot: projectRoot,
 					tokenCeilings,
 					otlpEndpoint: _otlpEndpoint,
 					agentId
@@ -14524,6 +14545,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						agentId
@@ -14580,6 +14602,7 @@ function createImplementationOrchestrator(deps) {
 				contextCompiler,
 				dispatcher,
 				projectRoot: effectiveProjectRoot,
+				parentProjectRoot: projectRoot,
 				tokenCeilings,
 				otlpEndpoint: _otlpEndpoint,
 				agentId
@@ -14715,6 +14738,7 @@ function createImplementationOrchestrator(deps) {
 							contextCompiler,
 							dispatcher,
 							projectRoot: effectiveProjectRoot,
+							parentProjectRoot: projectRoot,
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
@@ -14799,6 +14823,7 @@ function createImplementationOrchestrator(deps) {
 					contextCompiler,
 					dispatcher,
 					projectRoot: effectiveProjectRoot,
+					parentProjectRoot: projectRoot,
 					tokenCeilings,
 					otlpEndpoint: _otlpEndpoint,
 					repoMapInjector,
@@ -15479,6 +15504,7 @@ function createImplementationOrchestrator(deps) {
 									contextCompiler,
 									dispatcher,
 									projectRoot: effectiveProjectRoot,
+									parentProjectRoot: projectRoot,
 									tokenCeilings,
 									otlpEndpoint: _otlpEndpoint,
 									repoMapInjector,
@@ -15690,6 +15716,7 @@ function createImplementationOrchestrator(deps) {
 							contextCompiler,
 							dispatcher,
 							projectRoot: effectiveProjectRoot,
+							parentProjectRoot: projectRoot,
 							tokenCeilings,
 							otlpEndpoint: _otlpEndpoint,
 							repoMapInjector,
@@ -15737,6 +15764,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						repoMapInjector,
@@ -15986,6 +16014,7 @@ function createImplementationOrchestrator(deps) {
 						contextCompiler,
 						dispatcher,
 						projectRoot: effectiveProjectRoot,
+						parentProjectRoot: projectRoot,
 						tokenCeilings,
 						otlpEndpoint: _otlpEndpoint,
 						agentId
@@ -16015,7 +16044,7 @@ function createImplementationOrchestrator(deps) {
 					}, "Test expansion failed — story verdict unchanged");
 				}
 				if (!noWorktree && _worktreeManager !== void 0 && _orchestratorStartBranch !== void 0 && projectRoot !== void 0) {
-					const branchName = `substrate/story-${storyKey}`;
+					const branchName = `${BRANCH_PREFIX}${storyKey}`;
 					logger$27.info({
 						storyKey,
 						branchName,
@@ -47125,4 +47154,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-Eqv7UsGH.js.map
+//# sourceMappingURL=run-B_B7Jr_K.js.map

package/dist/{run-DXazb9CF.js → run-PzGF_iNE.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-Eqv7UsGH.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-B_B7Jr_K.js";
 import "./manifest-read-Boipz5aP.js";
 import "./routing-DFxoKHDt.js";
 import "./work-graph-repository-DZyJv5pV.js";

package/package.json

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