substrate-ai 0.20.147 → 0.20.148

package/dist/adapter-registry-hLwwiJGM.js

@@ -0,0 +1,4 @@
+import { AdapterRegistry } from "./dist-CZk5SeSt.js";
+import "./adapter-registry-DIcrxjH8.js";
+
+export { AdapterRegistry };

package/dist/cli/index.js

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
-import { FileKvStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createDatabaseAdapter, createDoltOperatorReader, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion } from "../health-nQ_Txd5T.js";
+import { FileKvStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createDatabaseAdapter, createDoltOperatorReader, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion } from "../health-Aqc5cghP.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, InMemoryDatabaseAdapter, IngestionServer, MonitorDatabaseImpl, OPERATIONAL_FINDING, PartialGlobalSettingsSchema, PartialProviderConfigSchema, ProvidersSchema, RoutingRecommender, STORY_METRICS, TelemetryConfigSchema, addTokenUsage, aggregateTokenUsageForRun, checkDoltInstalled, compareRunMetrics, createAmendmentRun, createConfigSystem, createDecision, createPipelineRun, createStderrLogger, getActiveDecisions, getAllCostEntriesFiltered, getBaselineRunMetrics, getDecisionsByCategory, getDecisionsByPhaseForRun, getLatestCompletedRun, getLatestRun, getPipelineRunById, getPlanningCostTotal, getRetryableEscalations, getRunMetrics, getRunningPipelineRuns, getSessionCostSummary, getSessionCostSummaryFiltered, getStoryMetricsForRun, getTokenUsageSummary, incrementRunRestarts, initSchema, initWorkGraphSchema, initializeDolt, listRunMetrics, loadParentRunDecisions, supersedeDecision, swallowDebug, tagRunAsBaseline, updatePipelineRun } from "../dist-DT378h1M.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-BBVZdkEo.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, createPipelineRun, createStderrLogger, getActiveDecisions, getAllCostEntriesFiltered, getBaselineRunMetrics, getDecisionsByCategory, getDecisionsByPhaseForRun, getLatestCompletedRun, getLatestRun, getPipelineRunById, getPlanningCostTotal, getRetryableEscalations, getRunMetrics, getRunningPipelineRuns, getSessionCostSummary, getSessionCostSummaryFiltered, getStoryMetricsForRun, getTokenUsageSummary, incrementRunRestarts, initSchema, initWorkGraphSchema, initializeDolt, listRunMetrics, loadParentRunDecisions, supersedeDecision, swallowDebug, tagRunAsBaseline, updatePipelineRun } from "../dist-CZk5SeSt.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-B9DV9sro.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-DlWwZpfO.js";
-import "../errors-BGE3kaH8.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-D6NAZgt8.js";
+import "../errors-_tbIg6Cv.js";
 import "../routing-DFxoKHDt.js";
 import { WorkGraphRepository } from "../work-graph-repository-DZyJv5pV.js";
 import "../decisions-CzSIEeGP.js";
 import "../decision-router-BAPpON_C.js";
-import "../interactive-prompt-xJ3K-IUQ.js";
+import "../interactive-prompt-BLkX0iE_.js";
 import "../recovery-engine-BKGBeBnW.js";
 import "../version-manager-impl-qFBiO4Eh.js";
-import { registerUpgradeCommand } from "../upgrade-BVHnUYUd.js";
+import { registerUpgradeCommand } from "../upgrade-BEfZJU4K.js";
 import { Command } from "commander";
 import { fileURLToPath } from "url";
 import { dirname, join, resolve } from "path";
@@ -624,11 +624,15 @@ const SubstrateConfigSchema = z.object({
 	supervisor_poll_interval_seconds: z.number().int().positive().optional(),
 	retry_budget: z.number().int().positive().optional(),
 	epics_path: z.string().optional(),
-	finalization: z.object({ mode: z.enum([
-		"merge",
-		"branch",
-		"pr"
-	]).optional() }).strict().optional()
+	finalization: z.object({
+		mode: z.enum([
+			"merge",
+			"branch",
+			"pr"
+		]).optional(),
+		merge_strategy: z.enum(["ff-only", "three-way"]).optional(),
+		epic_gate_command: z.string().optional()
+	}).strict().optional()
 }).strict();
 const PartialSubstrateConfigSchema = z.object({
 	config_format_version: z.enum(["1"]).optional(),
@@ -648,11 +652,15 @@ const PartialSubstrateConfigSchema = z.object({
 	supervisor_poll_interval_seconds: z.number().int().positive().optional(),
 	retry_budget: z.number().int().positive().optional(),
 	epics_path: z.string().optional(),
-	finalization: z.object({ mode: z.enum([
-		"merge",
-		"branch",
-		"pr"
-	]).optional() }).strict().optional()
+	finalization: z.object({
+		mode: z.enum([
+			"merge",
+			"branch",
+			"pr"
+		]).optional(),
+		merge_strategy: z.enum(["ff-only", "three-way"]).optional(),
+		epic_gate_command: z.string().optional()
+	}).strict().optional()
 }).strict();
 
 //#endregion
@@ -7062,7 +7070,7 @@ async function runStatusAction(options) {
 			logger$15.debug({ err }, "Work graph query failed, continuing without work graph data");
 		}
 		if (run === void 0) {
-			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-BJoVPIyR.js");
+			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-Cm0aQCQL.js");
 			const substrateDirPath = join(projectRoot, ".substrate");
 			const processInfo = inspectProcessTree$1({
 				projectRoot,
@@ -8010,7 +8018,7 @@ function defaultSupervisorDeps() {
 				if (cached === null) {
 					const { AdapterRegistry: AR } = await import(
 						/* @vite-ignore */
-						"../adapter-registry-SL7-DtOW.js"
+						"../adapter-registry-hLwwiJGM.js"
 );
 					cached = new AR();
 					await cached.discoverAndRegister();
@@ -8577,11 +8585,11 @@ async function runSupervisorAction(options, deps = {}) {
 						try {
 							const { createExperimenter } = await import(
 								/* @vite-ignore */
-								"../experimenter-COLnRT8i.js"
+								"../experimenter-RnaEiLUD.js"
 );
 							const { getLatestRun: getLatest } = await import(
 								/* @vite-ignore */
-								"../decisions-qFnqErZ5.js"
+								"../decisions-DSDqOEN4.js"
 );
 							const expAdapter = createDatabaseAdapter({
 								backend: "auto",
@@ -8591,7 +8599,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-D3mhgkIL.js"
+									"../run-BX-__EJm.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({
@@ -9116,7 +9124,7 @@ async function runMetricsAction(options) {
 			const routingConfigPath = join(dbDir, "routing.yml");
 			let routingConfig = null;
 			if (existsSync$1(routingConfigPath)) try {
-				const { loadModelRoutingConfig } = await import("../routing-Dz4GQta5.js");
+				const { loadModelRoutingConfig } = await import("../routing-QBUaShFv.js");
 				routingConfig = loadModelRoutingConfig(routingConfigPath);
 			} catch {}
 			if (routingConfig === null) routingConfig = {
@@ -13442,8 +13450,8 @@ async function createProgram() {
 /** Fire-and-forget startup version check (story 8.3, AC3/AC5) */
 function checkForUpdatesInBackground(currentVersion) {
 	if (process.env.SUBSTRATE_NO_UPDATE_CHECK === "1") return;
-	import("../upgrade-V0xYGkQs.js").then(async () => {
-		const { createVersionManager } = await import("../version-manager-impl-BWqvme_f.js");
+	import("../upgrade-emlrK3YW.js").then(async () => {
+		const { createVersionManager } = await import("../version-manager-impl-_x1n4xZk.js");
 		const vm = createVersionManager();
 		const result = await vm.checkForUpdates();
 		if (result.updateAvailable) {

package/dist/{decisions-qFnqErZ5.js → decisions-DSDqOEN4.js}

@@ -1,4 +1,4 @@
-import { addTokenUsage, createDecision, createPipelineRun, createRequirement, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunningPipelineRuns, getTokenUsageSummary, listRequirements, registerArtifact, updateDecision, updatePipelineRun, updatePipelineRunConfig, upsertDecision } from "./dist-DT378h1M.js";
+import { addTokenUsage, createDecision, createPipelineRun, createRequirement, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunningPipelineRuns, getTokenUsageSummary, listRequirements, registerArtifact, updateDecision, updatePipelineRun, updatePipelineRunConfig, upsertDecision } from "./dist-CZk5SeSt.js";
 import "./decisions-CzSIEeGP.js";
 
 export { getLatestRun };

package/dist/{dist-DT378h1M.js → dist-CZk5SeSt.js}

@@ -6252,11 +6252,15 @@ const SubstrateConfigSchema = z.object({
 	telemetry: TelemetryConfigSchema.optional(),
 	worktree: WorktreeConfigSchema.optional(),
 	trivialOutputThreshold: z.number().int().nonnegative().optional(),
-	finalization: z.object({ mode: z.enum([
-		"merge",
-		"branch",
-		"pr"
-	]).optional() }).strict().optional()
+	finalization: z.object({
+		mode: z.enum([
+			"merge",
+			"branch",
+			"pr"
+		]).optional(),
+		merge_strategy: z.enum(["ff-only", "three-way"]).optional(),
+		epic_gate_command: z.string().optional()
+	}).strict().optional()
 }).passthrough();
 const PartialProviderConfigSchema = ProviderConfigSchema.partial();
 const PartialGlobalSettingsSchema = GlobalSettingsSchema.partial();
@@ -6274,11 +6278,15 @@ const PartialSubstrateConfigSchema = z.object({
 	telemetry: TelemetryConfigSchema.partial().optional(),
 	worktree: WorktreeConfigSchema.partial().optional(),
 	trivialOutputThreshold: z.number().int().nonnegative().optional(),
-	finalization: z.object({ mode: z.enum([
-		"merge",
-		"branch",
-		"pr"
-	]).optional() }).strict().optional()
+	finalization: z.object({
+		mode: z.enum([
+			"merge",
+			"branch",
+			"pr"
+		]).optional(),
+		merge_strategy: z.enum(["ff-only", "three-way"]).optional(),
+		epic_gate_command: z.string().optional()
+	}).strict().optional()
 }).passthrough();
 
 //#endregion
@@ -11646,4 +11654,4 @@ async function callLLM(params) {
 
 //#endregion
 export { ADVISORY_NOTES, AdapterRegistry, AdtError, BudgetConfigSchema, CLAUDE_AUTH_FAILURE_HINT, CODEX_SANDBOX_BLOCK_HINT, CURRENT_CONFIG_FORMAT_VERSION, CURRENT_TASK_GRAPH_VERSION, Categorizer, ClaudeCodeAdapter, CodexCLIAdapter, ConfigError, ConfigIncompatibleFormatError, ConsumerAnalyzer, CostTrackerConfigSchema, DEFAULT_CONFIG, DEFAULT_GLOBAL_SETTINGS, DispatcherImpl, DoltClient, DoltNotInstalled, DoltQueryError, ESCALATION_DIAGNOSIS, EXPERIMENT_RESULT, EfficiencyScorer, GeminiCLIAdapter, GlobalSettingsSchema, InMemoryDatabaseAdapter, IngestionServer, LEARNING_FINDING, LogTurnAnalyzer, ModelRoutingConfigSchema, MonitorDatabaseImpl, OPERATIONAL_FINDING, PartialGlobalSettingsSchema, PartialProviderConfigSchema, ProviderPolicySchema, ProvidersSchema, Recommender, RoutingConfigError, RoutingRecommender, RoutingResolver, RoutingTelemetry, RoutingTokenAccumulator, RoutingTuner, STORY_METRICS, STORY_OUTCOME, SubstrateConfigSchema, TASK_TYPE_PHASE_MAP, TEST_EXPANSION_FINDING, TEST_PLAN, TelemetryConfigSchema, TelemetryNormalizer, TelemetryPipeline, TurnAnalyzer, VersionManagerImpl, addTokenUsage, aggregateTokenUsageForRun, aggregateTokenUsageForStory, buildAuditLogEntry, buildBranchName, buildModificationDirective, buildPRBody, buildWorktreePath, callLLM, checkDoltInstalled, classifyVersionGap, compareRunMetrics, createAmendmentRun, createConfigSystem, createDatabaseAdapter as createDatabaseAdapter$1, createDecision, createExperimenter, createPipelineRun, createRequirement, createStderrLogger, createVersionManager, detectClaudeAuthFailure, detectCodexSandboxBlock, detectInterfaceChanges, determineVerdict, getActiveDecisions, getAllCostEntriesFiltered, getArtifactByTypeForRun, getArtifactsByRun, getBaselineRunMetrics, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestCompletedRun, getLatestRun, getModelTier, getPipelineRunById, getPlanningCostTotal, getRetryableEscalations, getRunMetrics, getRunningPipelineRuns, getSessionCostSummary, getSessionCostSummaryFiltered, getStoryMetricsForRun, getTokenUsageSummary, incrementRunRestarts, initSchema, initWorkGraphSchema, initializeDolt, listRequirements, listRunMetrics, loadModelRoutingConfig, loadParentRunDecisions, registerArtifact, resolvePromptFile, supersedeDecision, swallowDebug, tagRunAsBaseline, updateDecision, updatePipelineRun, updatePipelineRunConfig, upsertDecision, writeRunMetrics, writeStoryMetrics };
-//# sourceMappingURL=dist-DT378h1M.js.map
+//# sourceMappingURL=dist-CZk5SeSt.js.map

package/dist/{errors-BGE3kaH8.js → errors-_tbIg6Cv.js}

@@ -1,4 +1,4 @@
-import { AdtError } from "./dist-DT378h1M.js";
+import { AdtError } from "./dist-CZk5SeSt.js";
 
 //#region src/core/errors.ts
 /** Error thrown when task configuration is invalid */
@@ -71,4 +71,4 @@ var TaskGraphIncompatibleFormatError = class extends AdtError {
 
 //#endregion
 export { BudgetExceededError, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError };
-//# sourceMappingURL=errors-BGE3kaH8.js.map
+//# sourceMappingURL=errors-_tbIg6Cv.js.map

package/dist/{experimenter-COLnRT8i.js → experimenter-RnaEiLUD.js}

@@ -1,3 +1,3 @@
-import { buildAuditLogEntry, buildBranchName, buildModificationDirective, buildPRBody, buildWorktreePath, createExperimenter, determineVerdict, resolvePromptFile } from "./dist-DT378h1M.js";
+import { buildAuditLogEntry, buildBranchName, buildModificationDirective, buildPRBody, buildWorktreePath, createExperimenter, determineVerdict, resolvePromptFile } from "./dist-CZk5SeSt.js";
 
 export { createExperimenter };

package/dist/{health-nQ_Txd5T.js → health-Aqc5cghP.js}

@@ -1,6 +1,6 @@
 import { createLogger } from "./logger-KeHncl-f.js";
-import { DoltClient, DoltQueryError, createDatabaseAdapter$1 as createDatabaseAdapter, getLatestRun, getPipelineRunById, initSchema } from "./dist-DT378h1M.js";
-import { resolveMainRepoRoot, resolveRunManifest } from "./manifest-read-DlWwZpfO.js";
+import { DoltClient, DoltQueryError, createDatabaseAdapter$1 as createDatabaseAdapter, getLatestRun, getPipelineRunById, initSchema } from "./dist-CZk5SeSt.js";
+import { resolveMainRepoRoot, resolveRunManifest } from "./manifest-read-D6NAZgt8.js";
 import { createRequire } from "module";
 import { dirname, join } from "path";
 import { existsSync, readFileSync } from "node:fs";
@@ -1000,4 +1000,4 @@ function registerHealthCommand(program, _version = "0.0.0", projectRoot = proces
 
 //#endregion
 export { BMAD_BASELINE_TOKENS_FULL, DEFAULT_STALL_THRESHOLD_SECONDS, FileKvStore, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, __commonJS, __require, __toESM, buildPipelineStatusOutput, createDatabaseAdapter$1 as createDatabaseAdapter, createDoltOperatorReader, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, isOrchestratorProcessLine, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion, runHealthAction, validateStoryKey };
-//# sourceMappingURL=health-nQ_Txd5T.js.map
+//# sourceMappingURL=health-Aqc5cghP.js.map

package/dist/{health-BJoVPIyR.js → health-Cm0aQCQL.js}

@@ -1,7 +1,7 @@
-import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-nQ_Txd5T.js";
+import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-Aqc5cghP.js";
 import "./logger-KeHncl-f.js";
-import "./dist-DT378h1M.js";
-import "./manifest-read-DlWwZpfO.js";
+import "./dist-CZk5SeSt.js";
+import "./manifest-read-D6NAZgt8.js";
 import "./work-graph-repository-DZyJv5pV.js";
 import "./decisions-CzSIEeGP.js";
 

package/dist/{index-DaBYDiWn.d.ts → index-CvNLhgKV.d.ts}

@@ -298,6 +298,11 @@ declare const SubstrateConfigSchema: z.ZodObject<{
       branch: "branch";
       pr: "pr";
     }>>;
+    merge_strategy: z.ZodOptional<z.ZodEnum<{
+      "ff-only": "ff-only";
+      "three-way": "three-way";
+    }>>;
+    epic_gate_command: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
 }, z.core.$loose>;
 type SubstrateConfig = z.infer<typeof SubstrateConfigSchema>; //#endregion
@@ -1591,4 +1596,4 @@ interface Recommendation {
 
 //#endregion
 export { AdapterDiscoveryResult, AdapterRegistry as AdapterRegistry$1, AdtError as AdtError$1, ClaudeCodeAdapter as ClaudeCodeAdapter$1, CodexCLIAdapter as CodexCLIAdapter$1, ConfigError as ConfigError$1, ConfigIncompatibleFormatError as ConfigIncompatibleFormatError$1, CoreEvents, DatabaseAdapter, DiscoveryReport, GeminiCLIAdapter as GeminiCLIAdapter$1, Recommendation, TypedEventBus };
-//# sourceMappingURL=index-DaBYDiWn.d.ts.map
+//# sourceMappingURL=index-CvNLhgKV.d.ts.map

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AdapterDiscoveryResult, AdapterRegistry$1 as AdapterRegistry, AdtError$1 as AdtError, ClaudeCodeAdapter$1 as ClaudeCodeAdapter, CodexCLIAdapter$1 as CodexCLIAdapter, ConfigError$1 as ConfigError, ConfigIncompatibleFormatError$1 as ConfigIncompatibleFormatError, DiscoveryReport, GeminiCLIAdapter$1 as GeminiCLIAdapter, Recommendation, TypedEventBus } from "./index-DaBYDiWn.js";
+import { AdapterDiscoveryResult, AdapterRegistry$1 as AdapterRegistry, AdtError$1 as AdtError, ClaudeCodeAdapter$1 as ClaudeCodeAdapter, CodexCLIAdapter$1 as CodexCLIAdapter, ConfigError$1 as ConfigError, ConfigIncompatibleFormatError$1 as ConfigIncompatibleFormatError, DiscoveryReport, GeminiCLIAdapter$1 as GeminiCLIAdapter, Recommendation, TypedEventBus } from "./index-CvNLhgKV.js";
 import pino from "pino";
 import { z } from "zod";
 import { Readable, Writable } from "node:stream";
@@ -1074,6 +1074,11 @@ declare const SubstrateConfigSchema: z.ZodObject<{
       branch: "branch";
       pr: "pr";
     }>>;
+    merge_strategy: z.ZodOptional<z.ZodEnum<{
+      "ff-only": "ff-only";
+      "three-way": "three-way";
+    }>>;
+    epic_gate_command: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
 }, z.core.$strict>;
 type SubstrateConfig = z.infer<typeof SubstrateConfigSchema>;

package/dist/index.js

@@ -1,8 +1,8 @@
 import { childLogger, createLogger, logger } from "./logger-KeHncl-f.js";
 import { assertDefined, createEventBus, createTuiApp, deepClone, formatDuration, generateId, isPlainObject, isTuiCapable, printNonTtyWarning, sleep, withRetry } from "./helpers-CElYrONe.js";
-import { AdapterRegistry, AdtError, ClaudeCodeAdapter, CodexCLIAdapter, ConfigError, ConfigIncompatibleFormatError, GeminiCLIAdapter } from "./dist-DT378h1M.js";
+import { AdapterRegistry, AdtError, ClaudeCodeAdapter, CodexCLIAdapter, ConfigError, ConfigIncompatibleFormatError, GeminiCLIAdapter } from "./dist-CZk5SeSt.js";
 import "./adapter-registry-DIcrxjH8.js";
-import { BudgetExceededError, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError } from "./errors-BGE3kaH8.js";
+import { BudgetExceededError, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError } from "./errors-_tbIg6Cv.js";
 
 //#region src/core/di.ts
 /**

package/dist/{interactive-prompt-xJ3K-IUQ.js → interactive-prompt-BLkX0iE_.js}

@@ -1,5 +1,5 @@
 import { createLogger } from "./logger-KeHncl-f.js";
-import { readCurrentRunId, resolveMainRepoRoot } from "./manifest-read-DlWwZpfO.js";
+import { readCurrentRunId, resolveMainRepoRoot } from "./manifest-read-D6NAZgt8.js";
 import { join } from "node:path";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import * as readline from "node:readline";
@@ -180,4 +180,4 @@ async function runInteractivePrompt(decisionContext) {
 
 //#endregion
 export { runInteractivePrompt };
-//# sourceMappingURL=interactive-prompt-xJ3K-IUQ.js.map
+//# sourceMappingURL=interactive-prompt-BLkX0iE_.js.map

package/dist/{manifest-read-DlWwZpfO.js → manifest-read-D6NAZgt8.js}

@@ -1,5 +1,5 @@
 import { createLogger } from "./logger-KeHncl-f.js";
-import { LEARNING_FINDING, createDecision, getDecisionsByCategory } from "./dist-DT378h1M.js";
+import { LEARNING_FINDING, createDecision, getDecisionsByCategory } from "./dist-CZk5SeSt.js";
 import * as path$1 from "path";
 import { join } from "path";
 import { readFile } from "fs/promises";
@@ -6300,4 +6300,4 @@ async function resolveRunManifest(dbRoot, runId) {
 
 //#endregion
 export { FindingsInjector, RunManifest, RuntimeProbeListSchema, SupervisorLock, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, aggregateProbeAuthorMetrics, applyConfigToGraph, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, parseRuntimeProbes, readCurrentRunId, renderFindings, resolveGraphPath, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics, runAcTraceabilityCheck, runStaleVerificationRecovery };
-//# sourceMappingURL=manifest-read-DlWwZpfO.js.map
+//# sourceMappingURL=manifest-read-D6NAZgt8.js.map

package/dist/modules/interactive-prompt/index.js

@@ -1,6 +1,6 @@
 import "../../logger-KeHncl-f.js";
-import "../../dist-DT378h1M.js";
-import "../../manifest-read-DlWwZpfO.js";
-import { runInteractivePrompt } from "../../interactive-prompt-xJ3K-IUQ.js";
+import "../../dist-CZk5SeSt.js";
+import "../../manifest-read-D6NAZgt8.js";
+import { runInteractivePrompt } from "../../interactive-prompt-BLkX0iE_.js";
 
 export { runInteractivePrompt };

package/dist/{routing-Dz4GQta5.js → routing-QBUaShFv.js}

@@ -1,4 +1,4 @@
-import { ModelRoutingConfigSchema, ProviderPolicySchema, RoutingConfigError, RoutingRecommender, RoutingResolver, RoutingTelemetry, RoutingTokenAccumulator, RoutingTuner, TASK_TYPE_PHASE_MAP, getModelTier, loadModelRoutingConfig } from "./dist-DT378h1M.js";
+import { ModelRoutingConfigSchema, ProviderPolicySchema, RoutingConfigError, RoutingRecommender, RoutingResolver, RoutingTelemetry, RoutingTokenAccumulator, RoutingTuner, TASK_TYPE_PHASE_MAP, getModelTier, loadModelRoutingConfig } from "./dist-CZk5SeSt.js";
 import "./routing-DFxoKHDt.js";
 
 export { loadModelRoutingConfig };

package/dist/{run-BBVZdkEo.js → run-B9DV9sro.js}

@@ -1,11 +1,11 @@
-import { BMAD_BASELINE_TOKENS_FULL, FileKvStore, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN, VALID_PHASES, __commonJS, __require, __toESM, buildPipelineStatusOutput, createDatabaseAdapter, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, validateStoryKey } from "./health-nQ_Txd5T.js";
+import { BMAD_BASELINE_TOKENS_FULL, FileKvStore, STOP_AFTER_VALID_PHASES, STORY_KEY_PATTERN, VALID_PHASES, __commonJS, __require, __toESM, buildPipelineStatusOutput, createDatabaseAdapter, formatOutput, formatPipelineSummary, formatTokenTelemetry, inspectProcessTree, parseDbTimestampAsUtc, validateStoryKey } from "./health-Aqc5cghP.js";
 import { createLogger } from "./logger-KeHncl-f.js";
 import { TypedEventBusImpl, createEventBus, createTuiApp, isTuiCapable, printNonTtyWarning, sleep } from "./helpers-CElYrONe.js";
-import { ADVISORY_NOTES, CLAUDE_AUTH_FAILURE_HINT, CODEX_SANDBOX_BLOCK_HINT, 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, classifyVersionGap, createConfigSystem, createDatabaseAdapter$1, createDecision, createPipelineRun, createRequirement, createStderrLogger, detectClaudeAuthFailure, detectCodexSandboxBlock, detectInterfaceChanges, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunMetrics, getRunningPipelineRuns, getStoryMetricsForRun, getTokenUsageSummary, initSchema, listRequirements, loadModelRoutingConfig, registerArtifact, swallowDebug, updatePipelineRun, updatePipelineRunConfig, upsertDecision, writeRunMetrics, writeStoryMetrics } from "./dist-DT378h1M.js";
-import { FindingsInjector, RunManifest, RuntimeProbeListSchema, applyConfigToGraph, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, parseRuntimeProbes, renderFindings, resolveGraphPath, resolveMainRepoRoot, runAcTraceabilityCheck, runStaleVerificationRecovery } from "./manifest-read-DlWwZpfO.js";
+import { ADVISORY_NOTES, CLAUDE_AUTH_FAILURE_HINT, CODEX_SANDBOX_BLOCK_HINT, 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, classifyVersionGap, createConfigSystem, createDatabaseAdapter$1, createDecision, createPipelineRun, createRequirement, createStderrLogger, detectClaudeAuthFailure, detectCodexSandboxBlock, detectInterfaceChanges, getArtifactByTypeForRun, getArtifactsByRun, getDecisionsByCategory, getDecisionsByPhase, getDecisionsByPhaseForRun, getLatestRun, getPipelineRunById, getRunMetrics, getRunningPipelineRuns, getStoryMetricsForRun, getTokenUsageSummary, initSchema, listRequirements, loadModelRoutingConfig, registerArtifact, swallowDebug, updatePipelineRun, updatePipelineRunConfig, upsertDecision, writeRunMetrics, writeStoryMetrics } from "./dist-CZk5SeSt.js";
+import { FindingsInjector, RunManifest, RuntimeProbeListSchema, applyConfigToGraph, createDefaultVerificationPipeline, createGraphOrchestrator, createSdlcCodeReviewHandler, createSdlcCreateStoryHandler, createSdlcDevStoryHandler, createSdlcPhaseHandler, detectsEventDrivenAC, detectsStateIntegratingAC, extractTargetFilesFromStoryContent, parseRuntimeProbes, renderFindings, resolveGraphPath, resolveMainRepoRoot, runAcTraceabilityCheck, runStaleVerificationRecovery } from "./manifest-read-D6NAZgt8.js";
 import { WorkGraphRepository, detectCycles } from "./work-graph-repository-DZyJv5pV.js";
 import { deriveExitCode, routeDecision } from "./decision-router-BAPpON_C.js";
-import { runInteractivePrompt } from "./interactive-prompt-xJ3K-IUQ.js";
+import { runInteractivePrompt } from "./interactive-prompt-BLkX0iE_.js";
 import { runRecoveryEngine } from "./recovery-engine-BKGBeBnW.js";
 import { basename, dirname, extname, join } from "path";
 import { access, readFile, readdir, stat } from "fs/promises";
@@ -9606,11 +9606,26 @@ const logger$16 = createLogger("compiled-workflows:merge-to-main");
 */
 async function runMergeToMain(params) {
 	const { storyKey, branchName, startBranch, worktreeManager, eventBus, projectRoot } = params;
+	const mergeStrategy = params.mergeStrategy ?? "ff-only";
 	logger$16.info({
 		storyKey,
 		branchName,
-		startBranch
+		startBranch,
+		mergeStrategy
 	}, "Starting merge-to-main phase");
+	const dirtiedFiles = listParentDirtyIntersection(branchName, startBranch, projectRoot);
+	if (dirtiedFiles.length > 0) {
+		logger$16.warn({
+			storyKey,
+			branchName,
+			dirtiedFiles
+		}, "parent working tree has uncommitted changes to files in the story diff — refusing to merge");
+		return {
+			success: false,
+			reason: "parent-tree-dirtied-by-run",
+			dirtiedFiles
+		};
+	}
 	const ffSuccess = tryFfMerge(branchName, projectRoot);
 	if (ffSuccess) {
 		logger$16.info({
@@ -9620,6 +9635,17 @@ async function runMergeToMain(params) {
 		await cleanupAfterSuccessfulMerge(storyKey, branchName, worktreeManager, projectRoot);
 		return { success: true };
 	}
+	if (mergeStrategy === "ff-only") {
+		logger$16.warn({
+			storyKey,
+			branchName,
+			startBranch
+		}, "fast-forward not possible (base moved since the story branched) and merge_strategy is ff-only — refusing 3-way merge. Set finalization.merge_strategy: three-way to allow it (required for concurrent multi-story runs), or integrate the branch manually.");
+		return {
+			success: false,
+			reason: "ff-only-merge-not-possible"
+		};
+	}
 	logger$16.info({
 		storyKey,
 		branchName
@@ -9651,6 +9677,47 @@ async function runMergeToMain(params) {
 	};
 }
 /**
+* H3.3 (AC1): files that are both dirty in the parent working tree and part of
+* the story branch's diff against the start branch. Best-effort: if either
+* git query fails, returns [] (the merge itself will surface genuine issues).
+*/
+function listParentDirtyIntersection(branchName, startBranch, projectRoot) {
+	try {
+		const statusOut = execFileSync("git", ["status", "--porcelain"], {
+			cwd: projectRoot,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+		const dirty = new Set(statusOut.split("\n").filter((line) => line.trim().length > 0).map((line) => {
+			const body = line.slice(3).trim();
+			const arrow = body.indexOf(" -> ");
+			return arrow === -1 ? body : body.slice(arrow + 4);
+		}));
+		if (dirty.size === 0) return [];
+		const diffOut = execFileSync("git", [
+			"diff",
+			"--name-only",
+			`${startBranch}...${branchName}`
+		], {
+			cwd: projectRoot,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+		return diffOut.split("\n").filter((f$1) => f$1.trim().length > 0).filter((f$1) => dirty.has(f$1));
+	} catch (err) {
+		logger$16.warn({ err }, "parent-clean precondition check failed (best-effort) — proceeding to merge");
+		return [];
+	}
+}
+/**
 * Attempt a fast-forward merge of `branchName` into the current branch.
 *
 * @param branchName  - Branch to merge
@@ -16746,6 +16813,63 @@ function createImplementationOrchestrator(deps) {
 					}, "merge-to-main pre-flight verification failed — proceeding with merge phase");
 				}
 				const finalizationMode = config.finalizationMode ?? "merge";
+				const epicGateCommand = config.epicGateCommand;
+				if (epicGateCommand !== void 0 && epicGateCommand.trim() !== "" && finalizationMode !== "branch") {
+					const epicOf = (key) => key.includes("-") ? key.slice(0, key.lastIndexOf("-")) : key;
+					const epicId = epicOf(storyKey);
+					const TERMINAL_PHASES = ["COMPLETE", "ESCALATED"];
+					const isLastOfEpic = [..._stories.entries()].filter(([key]) => key !== storyKey && epicOf(key) === epicId).every(([, st]) => TERMINAL_PHASES.includes(st.phase));
+					if (isLastOfEpic) {
+						logger$27.info({
+							storyKey,
+							epicId,
+							epicGateCommand
+						}, "H3.4: last story of epic — running epic gate command");
+						let gateOutput = "";
+						let gatePassed = false;
+						try {
+							gateOutput = execSync(epicGateCommand, {
+								cwd: projectRoot,
+								encoding: "utf-8",
+								stdio: [
+									"ignore",
+									"pipe",
+									"pipe"
+								],
+								timeout: 6e5,
+								maxBuffer: 10 * 1024 * 1024
+							});
+							gatePassed = true;
+						} catch (gateCmdErr) {
+							const e = gateCmdErr;
+							gateOutput = `${e.stdout ?? ""}${e.stderr ?? ""}`.trim() || (e.message ?? String(gateCmdErr));
+						}
+						if (!gatePassed) {
+							logger$27.error({
+								storyKey,
+								epicId,
+								output: gateOutput.slice(0, 500)
+							}, "H3.4: epic gate command failed — halting finalization; branch preserved");
+							updateStory(storyKey, {
+								phase: "ESCALATED",
+								error: "epic-gate-failed",
+								completedAt: new Date().toISOString()
+							});
+							await emitEscalation({
+								storyKey,
+								lastVerdict: "epic-gate-failed",
+								reviewCycles: completedReviewCycles,
+								issues: [`epic gate command failed for epic ${epicId} (last story ${storyKey}): \`${epicGateCommand}\`\noutput (truncated):\n${gateOutput.slice(0, 4e3)}`]
+							});
+							await persistState();
+							return "terminal";
+						}
+						logger$27.info({
+							storyKey,
+							epicId
+						}, "H3.4: epic gate passed");
+					}
+				}
 				if (finalizationMode === "branch" || finalizationMode === "pr") {
 					let prUrl;
 					if (finalizationMode === "pr") try {
@@ -16822,7 +16946,8 @@ function createImplementationOrchestrator(deps) {
 						startBranch: _orchestratorStartBranch,
 						worktreeManager: _worktreeManager,
 						eventBus,
-						projectRoot
+						projectRoot,
+						mergeStrategy: config.mergeStrategy ?? "ff-only"
 					});
 				} catch (mergeErr) {
 					const errMsg = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
@@ -16845,21 +16970,28 @@ function createImplementationOrchestrator(deps) {
 					return "terminal";
 				}
 				if (!mergeResult.success) {
+					const failReason = mergeResult.reason ?? "merge-conflict-detected";
+					const issues = [];
+					if (failReason === "parent-tree-dirtied-by-run") issues.push(`parent working tree has uncommitted changes to ${mergeResult.dirtiedFiles?.length ?? 0} file(s) the story also modified: ${(mergeResult.dirtiedFiles ?? []).join(", ")} — merging would entangle unreviewed parent edits with verified story content. Commit or stash the parent changes, then merge ${branchName} manually.`);
+					else if (failReason === "ff-only-merge-not-possible") issues.push(`${_orchestratorStartBranch ?? "the start branch"} moved since ${branchName} was created and merge_strategy is ff-only — substrate will not synthesize a merge commit. Set finalization.merge_strategy: three-way (required for concurrent multi-story runs) or integrate the branch manually.`);
+					else issues.push(`merge conflict in ${mergeResult.conflictingFiles?.length ?? 0} file(s): ${(mergeResult.conflictingFiles ?? []).join(", ")}`);
 					logger$27.warn({
 						storyKey,
 						branchName,
-						conflictingFiles: mergeResult.conflictingFiles
-					}, "merge-to-main conflict — escalating story with merge-conflict-detected");
+						reason: failReason,
+						conflictingFiles: mergeResult.conflictingFiles,
+						dirtiedFiles: mergeResult.dirtiedFiles
+					}, `merge-to-main failed — escalating story with ${failReason}`);
 					updateStory(storyKey, {
 						phase: "ESCALATED",
-						error: "merge-conflict-detected",
+						error: failReason,
 						completedAt: new Date().toISOString()
 					});
 					await emitEscalation({
 						storyKey,
-						lastVerdict: "merge-conflict-detected",
+						lastVerdict: failReason,
 						reviewCycles: completedReviewCycles,
-						issues: [`merge conflict in ${mergeResult.conflictingFiles?.length ?? 0} file(s): ${(mergeResult.conflictingFiles ?? []).join(", ")}`]
+						issues
 					});
 					await persistState();
 					return "terminal";
@@ -18116,7 +18248,13 @@ function createImplementationOrchestrator(deps) {
 			}).trim();
 			logger$27.info({ orchestratorStartBranch: _orchestratorStartBranch }, "Captured orchestrator start branch for merge-to-main");
 		} catch (branchErr) {
-			logger$27.warn({ err: branchErr }, "Failed to capture orchestrator start branch — merge-to-main will skip worktree integration");
+			if (config.noWorktree !== true) {
+				logger$27.error({ err: branchErr }, "FATAL: failed to capture the orchestrator start branch (git rev-parse --abbrev-ref HEAD). Worktree finalization cannot work without it. Fix git in the project root or re-run with --no-worktree.");
+				_state = "FAILED";
+				_completedAt = new Date().toISOString();
+				return getStatus();
+			}
+			logger$27.warn({ err: branchErr }, "Failed to capture orchestrator start branch — merge-to-main will skip worktree integration (--no-worktree run)");
 		}
 		for (const key of storyKeys) {
 			const pendingState = {
@@ -46953,6 +47091,8 @@ async function runRunAction(options) {
 	let meshProjectId;
 	let configRetryBudget;
 	let configFinalizationMode;
+	let configMergeStrategy;
+	let configEpicGateCommand;
 	let configWorktreeCopyFiles;
 	try {
 		const configSystem = createConfigSystem({ projectConfigDir: dbDir });
@@ -46980,6 +47120,8 @@ async function runRunAction(options) {
 		}
 		if (typeof cfg.retry_budget === "number") configRetryBudget = cfg.retry_budget;
 		if (cfg.finalization?.mode !== void 0) configFinalizationMode = cfg.finalization.mode;
+		if (cfg.finalization?.merge_strategy !== void 0) configMergeStrategy = cfg.finalization.merge_strategy;
+		if (cfg.finalization?.epic_gate_command !== void 0) configEpicGateCommand = cfg.finalization.epic_gate_command;
 		if (Array.isArray(cfg.worktree?.copy_files) && cfg.worktree.copy_files.length > 0) {
 			configWorktreeCopyFiles = [...cfg.worktree.copy_files];
 			logger.info({ copyFiles: configWorktreeCopyFiles }, "Loaded worktree.copy_files from config");
@@ -47080,6 +47222,8 @@ async function runRunAction(options) {
 		agentId,
 		...noWorktree === true ? { noWorktree: true } : {},
 		...finalization !== void 0 ? { finalizationMode: finalization } : configFinalizationMode !== void 0 ? { finalizationMode: configFinalizationMode } : {},
+		...configMergeStrategy !== void 0 ? { mergeStrategy: configMergeStrategy } : {},
+		...configEpicGateCommand !== void 0 ? { epicGateCommand: configEpicGateCommand } : {},
 		...configWorktreeCopyFiles !== void 0 ? { worktreeCopyFiles: configWorktreeCopyFiles } : {}
 	});
 	let storyKeys = [...parsedStoryKeys];
@@ -47644,6 +47788,8 @@ async function runRunAction(options) {
 					probeAuthorStateIntegrating: resolvedProbeAuthorStateIntegrating,
 					...noWorktree === true ? { noWorktree: true } : {},
 					...finalization !== void 0 ? { finalizationMode: finalization } : configFinalizationMode !== void 0 ? { finalizationMode: configFinalizationMode } : {},
+					...configMergeStrategy !== void 0 ? { mergeStrategy: configMergeStrategy } : {},
+					...configEpicGateCommand !== void 0 ? { epicGateCommand: configEpicGateCommand } : {},
 					...configWorktreeCopyFiles !== void 0 ? { worktreeCopyFiles: configWorktreeCopyFiles } : {}
 				},
 				projectRoot,
@@ -47867,7 +48013,7 @@ async function runRunAction(options) {
 	}
 }
 async function runFullPipeline(options) {
-	const { packName, packPath, dbDir, dbPath, startPhase, stopAfter, concept, concurrency, outputFormat, projectRoot, events: eventsFlag, skipUx, research: researchFlag, skipResearch: skipResearchFlag, skipPreflight, skipVerification, maxReviewCycles = 2, retryBudget, registry: injectedRegistry, tokenCeilings, stories: explicitStories, telemetryEnabled: fullTelemetryEnabled, telemetryPort: fullTelemetryPort, agentId, meshUrl: fpMeshUrl, meshProjectId: fpMeshProjectId, engineType: fpEngineType, probeAuthor, probeAuthorStateIntegrating: fpProbeAuthorStateIntegrating, noWorktree, worktreeCopyFiles: fpWorktreeCopyFiles, finalizationMode: fpFinalizationMode } = options;
+	const { packName, packPath, dbDir, dbPath, startPhase, stopAfter, concept, concurrency, outputFormat, projectRoot, events: eventsFlag, skipUx, research: researchFlag, skipResearch: skipResearchFlag, skipPreflight, skipVerification, maxReviewCycles = 2, retryBudget, registry: injectedRegistry, tokenCeilings, stories: explicitStories, telemetryEnabled: fullTelemetryEnabled, telemetryPort: fullTelemetryPort, agentId, meshUrl: fpMeshUrl, meshProjectId: fpMeshProjectId, engineType: fpEngineType, probeAuthor, probeAuthorStateIntegrating: fpProbeAuthorStateIntegrating, noWorktree, worktreeCopyFiles: fpWorktreeCopyFiles, finalizationMode: fpFinalizationMode, mergeStrategy: fpMergeStrategy, epicGateCommand: fpEpicGateCommand } = options;
 	if (!existsSync$1(dbDir)) mkdirSync$1(dbDir, { recursive: true });
 	let doltServerFull = null;
 	try {
@@ -48178,6 +48324,8 @@ async function runFullPipeline(options) {
 						...fpProbeAuthorStateIntegrating !== void 0 ? { probeAuthorStateIntegrating: fpProbeAuthorStateIntegrating } : {},
 						...noWorktree === true ? { noWorktree: true } : {},
 						...fpFinalizationMode !== void 0 ? { finalizationMode: fpFinalizationMode } : {},
+						...fpMergeStrategy !== void 0 ? { mergeStrategy: fpMergeStrategy } : {},
+						...fpEpicGateCommand !== void 0 ? { epicGateCommand: fpEpicGateCommand } : {},
 						...fpWorktreeCopyFiles !== void 0 ? { worktreeCopyFiles: fpWorktreeCopyFiles } : {}
 					},
 					projectRoot,
@@ -48348,7 +48496,7 @@ async function runFullPipeline(options) {
 */
 async function emitPreDispatchVersionAdvisory(currentVersion) {
 	if (process.env["SUBSTRATE_NO_UPDATE_CHECK"] === "1") return;
-	const { createVersionManager } = await import("./version-manager-impl-BWqvme_f.js");
+	const { createVersionManager } = await import("./version-manager-impl-_x1n4xZk.js");
 	const vm = createVersionManager();
 	const result = await vm.checkForUpdates(true);
 	const gap = classifyVersionGap(currentVersion, result.latestVersion);
@@ -48455,4 +48603,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-BBVZdkEo.js.map
+//# sourceMappingURL=run-B9DV9sro.js.map

package/dist/{run-D3mhgkIL.js → run-BX-__EJm.js}

@@ -1,14 +1,14 @@
-import "./health-nQ_Txd5T.js";
+import "./health-Aqc5cghP.js";
 import "./logger-KeHncl-f.js";
 import "./helpers-CElYrONe.js";
-import "./dist-DT378h1M.js";
-import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-BBVZdkEo.js";
-import "./manifest-read-DlWwZpfO.js";
+import "./dist-CZk5SeSt.js";
+import { normalizeGraphSummaryToStatus, registerRunCommand, resolveMaxReviewCycles, resolveProbeAuthorStateIntegrating, runRunAction, wireNdjsonEmitter } from "./run-B9DV9sro.js";
+import "./manifest-read-D6NAZgt8.js";
 import "./routing-DFxoKHDt.js";
 import "./work-graph-repository-DZyJv5pV.js";
 import "./decisions-CzSIEeGP.js";
 import "./decision-router-BAPpON_C.js";
-import "./interactive-prompt-xJ3K-IUQ.js";
+import "./interactive-prompt-BLkX0iE_.js";
 import "./recovery-engine-BKGBeBnW.js";
 
 export { runRunAction };

package/dist/src/modules/recovery-engine/index.d.ts

@@ -1,4 +1,4 @@
-import { CoreEvents, DatabaseAdapter, TypedEventBus } from "../../../index-DaBYDiWn.js";
+import { CoreEvents, DatabaseAdapter, TypedEventBus } from "../../../index-CvNLhgKV.js";
 import { z } from "zod";
 
 //#region packages/sdlc/dist/verification/findings.d.ts

package/dist/{upgrade-BVHnUYUd.js → upgrade-BEfZJU4K.js}

@@ -1,4 +1,4 @@
-import { createVersionManager } from "./dist-DT378h1M.js";
+import { createVersionManager } from "./dist-CZk5SeSt.js";
 import { execSync, spawn } from "child_process";
 import * as readline from "readline";
 
@@ -123,4 +123,4 @@ function registerUpgradeCommand(program) {
 
 //#endregion
 export { isGlobalInstall, registerUpgradeCommand, runUpgradeCommand };
-//# sourceMappingURL=upgrade-BVHnUYUd.js.map
+//# sourceMappingURL=upgrade-BEfZJU4K.js.map

package/dist/{upgrade-V0xYGkQs.js → upgrade-emlrK3YW.js}

@@ -1,5 +1,5 @@
-import "./dist-DT378h1M.js";
+import "./dist-CZk5SeSt.js";
 import "./version-manager-impl-qFBiO4Eh.js";
-import { isGlobalInstall, registerUpgradeCommand, runUpgradeCommand } from "./upgrade-BVHnUYUd.js";
+import { isGlobalInstall, registerUpgradeCommand, runUpgradeCommand } from "./upgrade-BEfZJU4K.js";
 
 export { isGlobalInstall, registerUpgradeCommand, runUpgradeCommand };

package/dist/{version-manager-impl-BWqvme_f.js → version-manager-impl-_x1n4xZk.js}

@@ -1,4 +1,4 @@
-import { VersionManagerImpl, createVersionManager } from "./dist-DT378h1M.js";
+import { VersionManagerImpl, createVersionManager } from "./dist-CZk5SeSt.js";
 import "./version-manager-impl-qFBiO4Eh.js";
 
 export { createVersionManager };

package/package.json

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

package/dist/adapter-registry-SL7-DtOW.js

@@ -1,4 +0,0 @@
-import { AdapterRegistry } from "./dist-DT378h1M.js";
-import "./adapter-registry-DIcrxjH8.js";
-
-export { AdapterRegistry };