substrate-ai 0.3.2 → 0.3.3

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DatabaseWrapper, DoltNotInstalled, FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, TelemetryPersistence, VALID_PHASES, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDispatcher, createDoltClient, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initializeDolt, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runMigrations, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-Fzhz3-mv.js";
+import { DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DatabaseWrapper, DoltNotInstalled, FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, TelemetryPersistence, VALID_PHASES, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDispatcher, createDoltClient, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initializeDolt, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runMigrations, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-DI9s014E.js";
 import { createLogger } from "../logger-D2fS2ccL.js";
 import { AdapterRegistry } from "../adapter-registry-DHl0W-YB.js";
 import { CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, PartialSubstrateConfigSchema } from "../config-migrator-CQmBdKeG.js";
@@ -2554,6 +2554,7 @@ async function runSupervisorAction(options, deps = {}) {
 		runId,
 		restartCount: 0
 	};
+	let maxRestartsExhausted = false;
 	const startTime = Date.now();
 	function emitEvent(event) {
 		if (outputFormat === "json") {
@@ -2664,7 +2665,7 @@ async function runSupervisorAction(options, deps = {}) {
 								const expDb = expDbWrapper.db;
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-BJ5z_b2J.js"
+									"../run-33J0SBp1.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({
@@ -2729,6 +2730,7 @@ async function runSupervisorAction(options, deps = {}) {
 			}
 			return summary.failed.length > 0 || summary.escalated.length > 0 ? 1 : 0;
 		}
+		if (maxRestartsExhausted) return 2;
 		const stallResult = await handleStallRecovery(health, state, {
 			stallThreshold,
 			maxRestarts,
@@ -2745,10 +2747,8 @@ async function runSupervisorAction(options, deps = {}) {
 			emitEvent,
 			log
 		});
-		if (stallResult !== null) {
-			if (stallResult.maxRestartsExceeded) return 2;
-			state = stallResult.state;
-		}
+		if (stallResult !== null) if (stallResult.maxRestartsExceeded) maxRestartsExhausted = true;
+		else state = stallResult.state;
 		await sleep(pollInterval * 1e3);
 	}
 }
@@ -2778,6 +2778,7 @@ async function runMultiProjectSupervisor(options, deps = {}) {
 	}]));
 	const doneProjects = new Set();
 	const projectExitCodes = new Map();
+	const maxRestartsExhaustedProjects = new Set();
 	const startTime = Date.now();
 	function emitEvent(event) {
 		if (outputFormat === "json") {
@@ -2834,6 +2835,11 @@ async function runMultiProjectSupervisor(options, deps = {}) {
 				projectExitCodes.set(projectRoot, summary.failed.length > 0 || summary.escalated.length > 0 ? 1 : 0);
 				continue;
 			}
+			if (maxRestartsExhaustedProjects.has(projectRoot)) {
+				doneProjects.add(projectRoot);
+				projectExitCodes.set(projectRoot, 2);
+				continue;
+			}
 			const stallResult = await handleStallRecovery(health, state, {
 				stallThreshold,
 				maxRestarts,
@@ -2846,10 +2852,8 @@ async function runMultiProjectSupervisor(options, deps = {}) {
 				}),
 				log: (msg) => log(`[${projectRoot}] ${msg}`)
 			});
-			if (stallResult !== null) if (stallResult.maxRestartsExceeded) {
-				doneProjects.add(projectRoot);
-				projectExitCodes.set(projectRoot, 2);
-			} else states.set(projectRoot, stallResult.state);
+			if (stallResult !== null) if (stallResult.maxRestartsExceeded) maxRestartsExhaustedProjects.add(projectRoot);
+			else states.set(projectRoot, stallResult.state);
 		}
 		if (doneProjects.size >= projects.length) {
 			const elapsedSeconds = Math.round((Date.now() - startTime) / 1e3);

package/dist/{run-BJ5z_b2J.js → run-33J0SBp1.js}

@@ -1,4 +1,4 @@
-import { registerRunCommand, runRunAction } from "./run-Fzhz3-mv.js";
+import { registerRunCommand, runRunAction } from "./run-DI9s014E.js";
 import "./logger-D2fS2ccL.js";
 import "./config-migrator-CQmBdKeG.js";
 import "./helpers-RL22dYtn.js";

package/dist/{run-Fzhz3-mv.js → run-DI9s014E.js}

@@ -8155,6 +8155,8 @@ async function getAutoHealthData(options) {
 		const initialized = existsSync$1(doltDirPath);
 		let responsive = false;
 		let version;
+		let branches;
+		let currentBranch;
 		try {
 			await stateStore.getHistory(1);
 			responsive = true;
@@ -8166,13 +8168,30 @@ async function getAutoHealthData(options) {
 				const match = stdout.match(/dolt version (\S+)/);
 				if (match) version = match[1];
 			} catch {}
+			try {
+				const { execFile: ef } = await import("node:child_process");
+				const { promisify: p } = await import("node:util");
+				const execFileAsync = p(ef);
+				const { stdout } = await execFileAsync("dolt", ["branch", "--list"], { cwd: repoPath });
+				const lines = stdout.split("\n").filter((l) => l.trim().length > 0);
+				branches = lines.map((l) => {
+					const trimmed = l.trim();
+					if (trimmed.startsWith("* ")) {
+						currentBranch = trimmed.slice(2).trim();
+						return currentBranch;
+					}
+					return trimmed;
+				});
+			} catch {}
 		} catch {
 			responsive = false;
 		}
 		doltStateInfo = {
 			initialized,
 			responsive,
-			...version !== void 0 ? { version } : {}
+			...version !== void 0 ? { version } : {},
+			...branches !== void 0 ? { branches } : {},
+			...currentBranch !== void 0 ? { current_branch: currentBranch } : {}
 		};
 	}
 	const NO_PIPELINE = {
@@ -10660,6 +10679,21 @@ function createImplementationOrchestrator(deps) {
 				phase: "IN_STORY_CREATION",
 				result: createResult
 			});
+			if (config.pipelineRunId !== void 0 && createResult.tokenUsage !== void 0) try {
+				addTokenUsage(db, config.pipelineRunId, {
+					phase: "create-story",
+					agent: "create-story",
+					input_tokens: createResult.tokenUsage.input,
+					output_tokens: createResult.tokenUsage.output,
+					cost_usd: 0,
+					metadata: JSON.stringify({ storyKey })
+				});
+			} catch (tokenErr) {
+				logger$26.warn({
+					storyKey,
+					err: tokenErr
+				}, "Failed to record create-story token usage");
+			}
 			persistState();
 			if (createResult.result === "failed") {
 				const errMsg = createResult.error ?? "create-story failed";
@@ -10757,6 +10791,7 @@ function createImplementationOrchestrator(deps) {
 		updateStory(storyKey, { phase: "IN_TEST_PLANNING" });
 		persistState();
 		let testPlanPhaseResult = "failed";
+		let testPlanTokenUsage;
 		try {
 			const testPlanResult = await runTestPlan({
 				db,
@@ -10772,6 +10807,7 @@ function createImplementationOrchestrator(deps) {
 				pipelineRunId: config.pipelineRunId ?? ""
 			});
 			testPlanPhaseResult = testPlanResult.result;
+			testPlanTokenUsage = testPlanResult.tokenUsage;
 			if (testPlanResult.result === "success") logger$26.info({ storyKey }, "Test plan generated successfully");
 			else logger$26.warn({ storyKey }, "Test planning returned failed result — proceeding to dev-story without test plan");
 		} catch (err) {
@@ -10781,6 +10817,21 @@ function createImplementationOrchestrator(deps) {
 			}, "Test planning failed — proceeding to dev-story without test plan");
 		}
 		endPhase(storyKey, "test-plan");
+		if (config.pipelineRunId !== void 0 && testPlanTokenUsage !== void 0) try {
+			addTokenUsage(db, config.pipelineRunId, {
+				phase: "test-plan",
+				agent: "test-plan",
+				input_tokens: testPlanTokenUsage.input,
+				output_tokens: testPlanTokenUsage.output,
+				cost_usd: 0,
+				metadata: JSON.stringify({ storyKey })
+			});
+		} catch (tokenErr) {
+			logger$26.warn({
+				storyKey,
+				err: tokenErr
+			}, "Failed to record test-plan token usage");
+		}
 		eventBus.emit("orchestrator:story-phase-complete", {
 			storyKey,
 			phase: "IN_TEST_PLANNING",
@@ -10929,6 +10980,21 @@ function createImplementationOrchestrator(deps) {
 					pipelineRunId: config.pipelineRunId
 				});
 				devFilesModified = devResult.files_modified ?? [];
+				if (config.pipelineRunId !== void 0 && devResult.tokenUsage !== void 0) try {
+					addTokenUsage(db, config.pipelineRunId, {
+						phase: "dev-story",
+						agent: "dev-story",
+						input_tokens: devResult.tokenUsage.input,
+						output_tokens: devResult.tokenUsage.output,
+						cost_usd: 0,
+						metadata: JSON.stringify({ storyKey })
+					});
+				} catch (tokenErr) {
+					logger$26.warn({
+						storyKey,
+						err: tokenErr
+					}, "Failed to record dev-story token usage");
+				}
 				eventBus.emit("orchestrator:story-phase-complete", {
 					storyKey,
 					phase: "IN_DEV",
@@ -11144,6 +11210,24 @@ function createImplementationOrchestrator(deps) {
 						...previousIssueList.length > 0 ? { previousIssues: previousIssueList } : {}
 					});
 				}
+				if (config.pipelineRunId !== void 0 && reviewResult.tokenUsage !== void 0) try {
+					addTokenUsage(db, config.pipelineRunId, {
+						phase: "code-review",
+						agent: useBatchedReview ? "code-review-batched" : "code-review",
+						input_tokens: reviewResult.tokenUsage.input,
+						output_tokens: reviewResult.tokenUsage.output,
+						cost_usd: 0,
+						metadata: JSON.stringify({
+							storyKey,
+							reviewCycle: reviewCycles
+						})
+					});
+				} catch (tokenErr) {
+					logger$26.warn({
+						storyKey,
+						err: tokenErr
+					}, "Failed to record code-review token usage");
+				}
 				const isPhantomReview = reviewResult.dispatchFailed === true || reviewResult.verdict !== "SHIP_IT" && reviewResult.verdict !== "LGTM_WITH_NOTES" && (reviewResult.issue_list === void 0 || reviewResult.issue_list.length === 0) && reviewResult.error !== void 0;
 				if (isPhantomReview && !timeoutRetried) {
 					timeoutRetried = true;
@@ -11717,16 +11801,22 @@ function createImplementationOrchestrator(deps) {
 		persistState();
 		recordProgress();
 		if (config.enableHeartbeat) startHeartbeat();
+		const _startupTimings = {};
 		if (projectRoot !== void 0) {
+			const seedStart = Date.now();
 			const seedResult = seedMethodologyContext(db, projectRoot);
+			_startupTimings.seedMethodologyMs = Date.now() - seedStart;
 			if (seedResult.decisionsCreated > 0) logger$26.info({
 				decisionsCreated: seedResult.decisionsCreated,
-				skippedCategories: seedResult.skippedCategories
+				skippedCategories: seedResult.skippedCategories,
+				durationMs: _startupTimings.seedMethodologyMs
 			}, "Methodology context seeded from planning artifacts");
 		}
 		try {
 			if (stateStore !== void 0) {
+				const stateStoreInitStart = Date.now();
 				await stateStore.initialize();
+				_startupTimings.stateStoreInitMs = Date.now() - stateStoreInitStart;
 				for (const key of storyKeys) {
 					const pendingState = _stories.get(key);
 					if (pendingState !== void 0) persistStoryState(key, pendingState).catch((err) => logger$26.warn({
@@ -11735,7 +11825,9 @@ function createImplementationOrchestrator(deps) {
 					}, "StateStore write failed during PENDING init"));
 				}
 				try {
+					const queryStoriesStart = Date.now();
 					const existingRecords = await stateStore.queryStories({});
+					_startupTimings.queryStoriesMs = Date.now() - queryStoriesStart;
 					for (const record of existingRecords) _stateStoreCache.set(record.storyKey, record);
 				} catch (err) {
 					logger$26.warn({ err }, "StateStore.queryStories() failed during init — status merge will be empty (best-effort)");
@@ -11750,7 +11842,9 @@ function createImplementationOrchestrator(deps) {
 			}
 			let contractDeclarations = [];
 			if (stateStore !== void 0) {
+				const queryContractsStart = Date.now();
 				const allContractRecords = await stateStore.queryContracts();
+				_startupTimings.queryContractsMs = Date.now() - queryContractsStart;
 				contractDeclarations = allContractRecords.map((r) => ({
 					storyKey: r.storyKey,
 					contractName: r.contractName,
@@ -11780,7 +11874,9 @@ function createImplementationOrchestrator(deps) {
 					}
 				}).filter((d) => d !== null);
 			}
+			const conflictDetectStart = Date.now();
 			const { batches, edges: contractEdges } = detectConflictGroupsWithContracts(storyKeys, { moduleMap: pack.manifest.conflictGroups }, contractDeclarations);
+			_startupTimings.conflictDetectMs = Date.now() - conflictDetectStart;
 			if (contractEdges.length > 0) logger$26.info({
 				contractEdges,
 				edgeCount: contractEdges.length
@@ -11792,11 +11888,13 @@ function createImplementationOrchestrator(deps) {
 				maxConcurrency: config.maxConcurrency
 			}, "Orchestrator starting");
 			if (config.skipPreflight !== true) {
+				const preflightStart = Date.now();
 				const preFlightResult = runBuildVerification({
 					verifyCommand: pack.manifest.verifyCommand,
 					verifyTimeoutMs: pack.manifest.verifyTimeoutMs,
 					projectRoot: projectRoot ?? process.cwd()
 				});
+				_startupTimings.preflightMs = Date.now() - preflightStart;
 				if (preFlightResult.status === "failed" || preFlightResult.status === "timeout") {
 					stopHeartbeat();
 					const truncatedOutput = (preFlightResult.output ?? "").slice(0, 2e3);
@@ -11816,6 +11914,7 @@ function createImplementationOrchestrator(deps) {
 				}
 				if (preFlightResult.status !== "skipped") logger$26.info("Pre-flight build check passed");
 			}
+			logger$26.info(_startupTimings, "Orchestrator startup timings (ms)");
 			try {
 				for (const batchGroups of batches) await runWithConcurrency(batchGroups, config.maxConcurrency);
 			} catch (err) {
@@ -12162,14 +12261,17 @@ const PHASE_ARTIFACTS = [
 * 4. The first required phase WITHOUT an artifact is where we start
 * 5. If nothing exists → analysis (needs concept)
 */
-function detectStartPhase(db, projectRoot) {
+function detectStartPhase(db, projectRoot, epicNumber) {
 	try {
-		const storyKeys = resolveStoryKeys(db, projectRoot);
-		if (storyKeys.length > 0) return {
-			phase: "implementation",
-			reason: `${storyKeys.length} stories ready for implementation`,
-			needsConcept: false
-		};
+		const storyKeys = resolveStoryKeys(db, projectRoot, { epicNumber });
+		if (storyKeys.length > 0) {
+			const scopeLabel = epicNumber !== void 0 ? ` (epic ${epicNumber})` : "";
+			return {
+				phase: "implementation",
+				reason: `${storyKeys.length} stories ready for implementation${scopeLabel}`,
+				needsConcept: false
+			};
+		}
 	} catch {}
 	let lastCompletedPhase;
 	try {
@@ -16221,7 +16323,7 @@ async function runRunAction(options) {
 			try {
 				detectDb.open();
 				runMigrations(detectDb.db);
-				const detection = detectStartPhase(detectDb.db, projectRoot);
+				const detection = detectStartPhase(detectDb.db, projectRoot, epicNumber);
 				if (detection.phase !== "implementation") {
 					effectiveStartPhase = detection.phase;
 					if (outputFormat === "human") process.stdout.write(`[AUTO-DETECT] ${detection.reason}\n`);
@@ -16700,7 +16802,7 @@ async function runRunAction(options) {
 			writeRunMetrics(db, {
 				run_id: pipelineRun.id,
 				methodology: pack.manifest.name,
-				status: failedKeys.length > 0 || escalatedKeys.length > 0 ? "failed" : "completed",
+				status: failedKeys.length > 0 ? "failed" : escalatedKeys.length > 0 ? "completed_with_escalations" : "completed",
 				started_at: pipelineRun.created_at ?? "",
 				completed_at: new Date().toISOString(),
 				wall_clock_seconds: Math.round((runEndMs - runStartMs) / 1e3),
@@ -17119,4 +17221,4 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 
 //#endregion
 export { DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DatabaseWrapper, DoltNotInstalled, FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, TelemetryPersistence, VALID_PHASES, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDispatcher, createDoltClient, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initializeDolt, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runMigrations, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
-//# sourceMappingURL=run-Fzhz3-mv.js.map
+//# sourceMappingURL=run-DI9s014E.js.map

package/package.json

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