substrate-ai 0.6.6 → 0.6.8

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { AdapterTelemetryPersistence, AppError, DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DoltClient, DoltNotInstalled, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, FileStateStore, GitClient, GrammarLoader, IngestionServer, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SUBSTRATE_OWNED_SETTINGS_KEYS, SymbolParser, VALID_PHASES, WorkGraphRepository, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDatabaseAdapter, createDispatcher, createDoltClient, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, createTelemetryAdvisor, detectCycles, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initSchema, initializeDolt, isSyncAdapter, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-BiREqhp_.js";
+import { AdapterTelemetryPersistence, AppError, DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DoltClient, DoltNotInstalled, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, FileStateStore, GitClient, GrammarLoader, IngestionServer, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SUBSTRATE_OWNED_SETTINGS_KEYS, SymbolParser, VALID_PHASES, WorkGraphRepository, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDatabaseAdapter, createDispatcher, createDoltClient, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, createTelemetryAdvisor, detectCycles, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initSchema, initializeDolt, isSyncAdapter, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runSolutioningPhase, validateStopAfterFromConflict } from "../run-tB6yG6o8.js";
 import { createLogger } from "../logger-D2fS2ccL.js";
 import { AdapterRegistry } from "../adapter-registry-D2zdMwVu.js";
 import { CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, PartialSubstrateConfigSchema } from "../config-migrator-DtZW1maj.js";
@@ -3486,7 +3486,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-DZpZt2zm.js"
+									"../run-ME16n4N_.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({

package/dist/{run-DZpZt2zm.js → run-ME16n4N_.js}

@@ -1,4 +1,4 @@
-import { registerRunCommand, runRunAction } from "./run-BiREqhp_.js";
+import { registerRunCommand, runRunAction } from "./run-tB6yG6o8.js";
 import "./logger-D2fS2ccL.js";
 import "./config-migrator-DtZW1maj.js";
 import "./helpers-BihqWgVe.js";

package/dist/{run-BiREqhp_.js → run-tB6yG6o8.js}

@@ -1922,8 +1922,8 @@ function resolveBmadMethodVersion(fromDir = __dirname) {
 const BMAD_BASELINE_TOKENS_FULL = 56800;
 /** BMAD baseline token total for create+dev+review comparison */
 const BMAD_BASELINE_TOKENS = 23800;
-/** Story key pattern: <epic>-<story> e.g. "10-1", "1-1a", "NEW-26" */
-const STORY_KEY_PATTERN$1 = /^[A-Za-z0-9]+-[A-Za-z0-9]+$/;
+/** Story key pattern: e.g. "10-1", "1-1a", "NEW-26", "E6" */
+const STORY_KEY_PATTERN$1 = /^[A-Za-z0-9]+(-[A-Za-z0-9]+)?$/;
 /**
 * Top-level keys in .claude/settings.json that substrate owns.
 * On init, these are set/updated unconditionally.
@@ -7266,6 +7266,30 @@ function detectPackageManager(projectRoot) {
 /** Default timeout in milliseconds for the build verification gate */
 const DEFAULT_VERIFY_TIMEOUT_MS = 6e4;
 /**
+* Derive turbo --filter flags from changed file paths.
+*
+* Maps file paths like "apps/web/src/foo.ts" or "packages/db/src/bar.ts"
+* to turbo package filters like "--filter=web" or "--filter=@nextgen/db".
+* Falls back to reading package.json in each directory to get the real
+* package name. Returns empty array if no turbo-scoped packages detected.
+*/
+function deriveTurboFilters(changedFiles, projectRoot) {
+	const packageDirs = new Set();
+	for (const file of changedFiles) {
+		const match$1 = file.match(/^((?:apps|packages)\/[^/]+)\//);
+		if (match$1) packageDirs.add(match$1[1]);
+	}
+	if (packageDirs.size === 0) return [];
+	const filters = [];
+	for (const dir of packageDirs) try {
+		const pkgJsonPath = join$1(projectRoot, dir, "package.json");
+		const raw = readFileSync$1(pkgJsonPath, "utf-8");
+		const pkg = JSON.parse(raw);
+		if (pkg.name) filters.push(`--filter=${pkg.name}`);
+	} catch {}
+	return filters;
+}
+/**
 * Run the build verification gate synchronously.
 *
 * Executes the configured verifyCommand (default: "npm run build") in the
@@ -7273,12 +7297,16 @@ const DEFAULT_VERIFY_TIMEOUT_MS = 6e4;
 * returns { status: 'passed' }. On failure or timeout, returns a structured
 * result with status, exitCode, output, and reason.
 *
+* When changedFiles is provided and the command is a turbo build, the build
+* is scoped to only the affected packages via --filter flags. This prevents
+* cascading failures from other concurrent stories' modifications.
+*
 * AC4/5: reads verifyCommand from options (or defaults to 'npm run build').
 * AC6: if verifyCommand is empty string or false, returns { status: 'skipped' }.
 * AC8: timeout is configurable via verifyTimeoutMs (default 60 s).
 */
 function runBuildVerification(options) {
-	const { verifyCommand, verifyTimeoutMs, projectRoot } = options;
+	const { verifyCommand, verifyTimeoutMs, projectRoot, changedFiles } = options;
 	let cmd;
 	if (verifyCommand === void 0) {
 		const detection = detectPackageManager(projectRoot);
@@ -7290,6 +7318,16 @@ function runBuildVerification(options) {
 		cmd = detection.command;
 	} else cmd = verifyCommand;
 	if (!cmd) return { status: "skipped" };
+	if (changedFiles && changedFiles.length > 0 && typeof cmd === "string" && cmd.includes("turbo")) {
+		const filters = deriveTurboFilters(changedFiles, projectRoot);
+		if (filters.length > 0) {
+			cmd = `${cmd} ${filters.join(" ")}`;
+			logger$23.info({
+				filters,
+				originalCmd: options.verifyCommand ?? "(auto-detected)"
+			}, "Build verification: scoped turbo build to affected packages");
+		}
+	}
 	const timeoutMs = verifyTimeoutMs ?? DEFAULT_VERIFY_TIMEOUT_MS;
 	try {
 		const stdout = execSync(cmd, {
@@ -7805,12 +7843,12 @@ var FileStateStore = class {
 //#region src/modules/state/dolt-store.ts
 const log = createLogger("modules:state:dolt");
 /**
-* Validate that a story key matches the expected pattern (e.g. "26-7", "1-1a", "NEW-26").
+* Validate that a story key matches the expected pattern (e.g. "26-7", "1-1a", "NEW-26", "E6").
 * Prevents SQL injection via string-interpolated identifiers.
 */
-const STORY_KEY_PATTERN = /^[A-Za-z0-9]+-[A-Za-z0-9]+$/;
+const STORY_KEY_PATTERN = /^[A-Za-z0-9]+(-[A-Za-z0-9]+)?$/;
 function assertValidStoryKey(storyKey) {
-	if (!STORY_KEY_PATTERN.test(storyKey)) throw new DoltQueryError("assertValidStoryKey", `Invalid story key: '${storyKey}'. Must match pattern <segment>-<segment> (e.g. "10-1", "1-1a", "NEW-26").`);
+	if (!STORY_KEY_PATTERN.test(storyKey)) throw new DoltQueryError("assertValidStoryKey", `Invalid story key: '${storyKey}'. Must match pattern <key> or <epic>-<story> (e.g. "E6", "10-1", "1-1a", "NEW-26").`);
 }
 /**
 * Dolt-backed implementation of the StateStore interface.
@@ -9379,6 +9417,29 @@ async function getGitDiffForFiles(files, workingDirectory = process.cwd()) {
 	], workingDirectory, "git-diff-files");
 }
 /**
+* Capture the file-level stat summary scoped to specific files.
+*
+* Runs `git diff --stat HEAD -- file1.ts file2.ts ...` to produce a condensed
+* stat summary limited to only the specified file paths. Used as a fallback
+* when the scoped full diff exceeds the token budget — ensures the stat-only
+* summary also stays scoped to the story's files rather than showing all
+* uncommitted changes in the repo.
+*
+* @param files - List of file paths to scope the stat summary to
+* @param workingDirectory - Directory to run git in (defaults to process.cwd())
+* @returns The scoped stat summary string, or '' on error/empty
+*/
+async function getGitDiffStatForFiles(files, workingDirectory = process.cwd()) {
+	if (files.length === 0) return "";
+	return runGitCommand([
+		"diff",
+		"--stat",
+		"HEAD",
+		"--",
+		...files
+	], workingDirectory, "git-diff-stat-files");
+}
+/**
 * Get all changed file paths from the working tree via `git status --porcelain`.
 *
 * Includes all status codes (M, A, R, D, ??) so that newly created untracked
@@ -10366,8 +10427,8 @@ async function runCodeReview(deps, params) {
 				estimatedTotal: scopedTotal,
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
-			}, "Scoped diff exceeds token ceiling — falling back to stat-only summary");
-			gitDiffContent = await getGitDiffStatSummary(cwd);
+			}, "Scoped diff exceeds token ceiling — falling back to scoped stat-only summary");
+			gitDiffContent = await getGitDiffStatForFiles(filesModified, cwd);
 		}
 	} else {
 		const changedFiles = await getGitChangedFiles(cwd);
@@ -10917,7 +10978,7 @@ async function runTestExpansion(deps, params) {
 				ceiling: TOKEN_CEILING,
 				fileCount: filesModified.length
 			}, "Scoped diff exceeds token ceiling — falling back to stat-only summary");
-			gitDiffContent = await getGitDiffStatSummary(cwd);
+			gitDiffContent = await getGitDiffStatForFiles(filesModified, cwd);
 		}
 	} catch (err) {
 		logger$13.warn({ error: err instanceof Error ? err.message : String(err) }, "Failed to get git diff — proceeding with empty diff");
@@ -17156,7 +17217,8 @@ function createImplementationOrchestrator(deps) {
 			const buildVerifyResult = config.skipBuildVerify === true ? { status: "skipped" } : runBuildVerification({
 				verifyCommand: pack.manifest.verifyCommand,
 				verifyTimeoutMs: pack.manifest.verifyTimeoutMs,
-				projectRoot: projectRoot ?? process.cwd()
+				projectRoot: projectRoot ?? process.cwd(),
+				changedFiles: gitDiffFiles
 			});
 			if (buildVerifyResult.status === "passed") {
 				eventBus.emit("story:build-verification-passed", { storyKey });
@@ -17164,30 +17226,80 @@ function createImplementationOrchestrator(deps) {
 			} else if (buildVerifyResult.status === "failed" || buildVerifyResult.status === "timeout") {
 				const truncatedOutput = (buildVerifyResult.output ?? "").slice(0, 2e3);
 				const reason = buildVerifyResult.reason ?? "build-verification-failed";
-				eventBus.emit("story:build-verification-failed", {
-					storyKey,
-					exitCode: buildVerifyResult.exitCode ?? 1,
-					output: truncatedOutput
-				});
-				logger$27.warn({
-					storyKey,
-					reason,
-					exitCode: buildVerifyResult.exitCode
-				}, "Build verification failed — escalating story");
-				updateStory(storyKey, {
-					phase: "ESCALATED",
-					error: reason,
-					completedAt: new Date().toISOString()
-				});
-				await writeStoryMetricsBestEffort(storyKey, "escalated", 0);
-				await emitEscalation({
-					storyKey,
-					lastVerdict: reason,
-					reviewCycles: 0,
-					issues: [truncatedOutput]
-				});
-				await persistState();
-				return;
+				let retryPassed = false;
+				const fullOutput = buildVerifyResult.output ?? "";
+				const missingPkgMatch = fullOutput.match(/Cannot find (?:module|package) ['"]([^'"]+)['"]/) ?? fullOutput.match(/ERR_MODULE_NOT_FOUND[^]*?['"]([^'"]+)['"]/);
+				if (missingPkgMatch && buildVerifyResult.status !== "timeout") {
+					const missingPkg = missingPkgMatch[1].replace(/^(@[^/]+\/[^/]+)\/.*$/, "$1").replace(/^([^@][^/]*)\/.*$/, "$1");
+					const resolvedRoot = projectRoot ?? process.cwd();
+					logger$27.warn({
+						storyKey,
+						missingPkg
+					}, "Build-fix retry: detected missing npm package — attempting npm install");
+					try {
+						execSync(`npm install ${missingPkg}`, {
+							cwd: resolvedRoot,
+							timeout: 6e4,
+							encoding: "utf-8",
+							stdio: "pipe"
+						});
+						logger$27.warn({
+							storyKey,
+							missingPkg
+						}, "Build-fix retry: npm install succeeded — retrying build verification");
+						const retryResult = runBuildVerification({
+							verifyCommand: pack.manifest.verifyCommand,
+							verifyTimeoutMs: pack.manifest.verifyTimeoutMs,
+							projectRoot: resolvedRoot,
+							changedFiles: gitDiffFiles
+						});
+						if (retryResult.status === "passed") {
+							retryPassed = true;
+							eventBus.emit("story:build-verification-passed", { storyKey });
+							logger$27.warn({
+								storyKey,
+								missingPkg
+							}, "Build-fix retry: build verification passed after installing missing package");
+						} else logger$27.warn({
+							storyKey,
+							missingPkg,
+							retryStatus: retryResult.status
+						}, "Build-fix retry: build still fails after installing missing package — escalating");
+					} catch (installErr) {
+						const installMsg = installErr instanceof Error ? installErr.message : String(installErr);
+						logger$27.warn({
+							storyKey,
+							missingPkg,
+							error: installMsg
+						}, "Build-fix retry: npm install failed — escalating");
+					}
+				}
+				if (!retryPassed) {
+					eventBus.emit("story:build-verification-failed", {
+						storyKey,
+						exitCode: buildVerifyResult.exitCode ?? 1,
+						output: truncatedOutput
+					});
+					logger$27.warn({
+						storyKey,
+						reason,
+						exitCode: buildVerifyResult.exitCode
+					}, "Build verification failed — escalating story");
+					updateStory(storyKey, {
+						phase: "ESCALATED",
+						error: reason,
+						completedAt: new Date().toISOString()
+					});
+					await writeStoryMetricsBestEffort(storyKey, "escalated", 0);
+					await emitEscalation({
+						storyKey,
+						lastVerdict: reason,
+						reviewCycles: 0,
+						issues: [truncatedOutput]
+					});
+					await persistState();
+					return;
+				}
 			}
 		}
 		try {
@@ -17921,24 +18033,20 @@ function createImplementationOrchestrator(deps) {
 	*/
 	async function runWithConcurrency(groups, maxConcurrency) {
 		const queue = [...groups];
-		const running = [];
+		const running = new Set();
 		function enqueue() {
 			const group = queue.shift();
 			if (group === void 0) return;
 			const p = processConflictGroup(group).finally(() => {
-				const idx = running.indexOf(p);
-				if (idx !== -1) running.splice(idx, 1);
+				running.delete(p);
+				while (running.size < maxConcurrency && queue.length > 0) enqueue();
 			});
-			running.push(p);
-			if (running.length > _maxConcurrentActual) _maxConcurrentActual = running.length;
+			running.add(p);
+			if (running.size > _maxConcurrentActual) _maxConcurrentActual = running.size;
 		}
 		const initial = Math.min(maxConcurrency, queue.length);
 		for (let i = 0; i < initial; i++) enqueue();
-		while (queue.length > 0) {
-			await Promise.race(running);
-			enqueue();
-		}
-		await Promise.all(running);
+		while (running.size > 0) await Promise.race(running);
 	}
 	async function run(storyKeys) {
 		if (_state === "RUNNING" || _state === "PAUSED") {
@@ -18069,6 +18177,11 @@ function createImplementationOrchestrator(deps) {
 				batchCount: batches.length,
 				maxConcurrency: config.maxConcurrency
 			}, "Orchestrator starting");
+			logger$27.info({
+				storyCount: storyKeys.length,
+				conflictGroups: batches.length,
+				maxConcurrency: config.maxConcurrency
+			}, `Story dispatch plan: ${storyKeys.length} stories in ${batches.length} conflict groups (max concurrency: ${config.maxConcurrency})`);
 			if (config.skipPreflight !== true) {
 				const preflightStart = Date.now();
 				const preFlightResult = runBuildVerification({
@@ -22590,7 +22703,7 @@ async function runRunAction(options) {
 	if (storiesArg !== void 0 && storiesArg !== "") {
 		parsedStoryKeys = storiesArg.split(",").map((k) => k.trim()).filter((k) => k.length > 0);
 		for (const key of parsedStoryKeys) if (!validateStoryKey(key)) {
-			const errorMsg = `Story key '${key}' is not a valid format. Expected: <epic>-<story> (e.g., 10-1, 1-1a, NEW-26)`;
+			const errorMsg = `Story key '${key}' is not a valid format. Expected: <key> or <epic>-<story> (e.g., E6, 10-1, 1-1a, NEW-26)`;
 			if (outputFormat === "json") process.stdout.write(formatOutput(null, "json", false, errorMsg) + "\n");
 			else process.stderr.write(`Error: ${errorMsg}\n`);
 			return 1;
@@ -23182,6 +23295,19 @@ async function runRunAction(options) {
 			});
 		}
 		const ingestionServer = telemetryEnabled ? new IngestionServer({ port: telemetryPort }) : void 0;
+		if (ingestionServer !== void 0) {
+			process.on("exit", () => {
+				ingestionServer.stop();
+			});
+			process.on("SIGINT", () => {
+				ingestionServer.stop();
+				process.exit(130);
+			});
+			process.on("SIGTERM", () => {
+				ingestionServer.stop();
+				process.exit(143);
+			});
+		}
 		if (telemetryPersistence !== void 0) {
 			const routingTelemetry = new RoutingTelemetry(telemetryPersistence, logger);
 			eventBus.on("routing:model-selected", (payload) => {
@@ -23542,6 +23668,19 @@ async function runFullPipeline(options) {
 				}
 			} else if (currentPhase === "implementation") {
 				const fpIngestionServer = fullTelemetryEnabled ? new IngestionServer({ port: fullTelemetryPort ?? 4318 }) : void 0;
+				if (fpIngestionServer !== void 0) {
+					process.on("exit", () => {
+						fpIngestionServer.stop();
+					});
+					process.on("SIGINT", () => {
+						fpIngestionServer.stop();
+						process.exit(130);
+					});
+					process.on("SIGTERM", () => {
+						fpIngestionServer.stop();
+						process.exit(143);
+					});
+				}
 				const fpTelemetryPersistence = fullTelemetryEnabled ? new AdapterTelemetryPersistence(adapter) : void 0;
 				const orchestrator = createImplementationOrchestrator({
 					db: adapter,
@@ -23705,4 +23844,4 @@ function registerRunCommand(program, _version = "0.0.0", projectRoot = process.c
 
 //#endregion
 export { AdapterTelemetryPersistence, AppError, DEFAULT_CONFIG, DEFAULT_ROUTING_POLICY, DoltClient, DoltNotInstalled, DoltRepoMapMetaRepository, DoltSymbolRepository, ERR_REPO_MAP_STORAGE_WRITE, FileStateStore, GitClient, GrammarLoader, IngestionServer, RepoMapInjector, RepoMapModule, RepoMapQueryEngine, RepoMapStorage, SUBSTRATE_OWNED_SETTINGS_KEYS, SymbolParser, VALID_PHASES, WorkGraphRepository, buildPipelineStatusOutput, checkDoltInstalled, createConfigSystem, createContextCompiler, createDatabaseAdapter, createDispatcher, createDoltClient, createEventEmitter, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStateStore, createStopAfterGate, createTelemetryAdvisor, detectCycles, findPackageRoot, formatOutput, formatPhaseCompletionSummary, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, initSchema, initializeDolt, isSyncAdapter, parseDbTimestampAsUtc, registerHealthCommand, registerRunCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, resolveMainRepoRoot, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runRunAction, runSolutioningPhase, validateStopAfterFromConflict };
-//# sourceMappingURL=run-BiREqhp_.js.map
+//# sourceMappingURL=run-tB6yG6o8.js.map

package/package.json

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