substrate-ai 0.20.78 → 0.20.81

package/dist/cli/templates/agents-md-substrate-section.md

@@ -67,6 +67,10 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 - On reported failure with coherent working tree: run `substrate reconcile-from-disk --dry-run` first; treat its output as source of truth before re-dispatching
 - Never re-run a failed story without explicit user confirmation
 
+### Per-Story Worktree Behavior
+
+Each dispatched story runs in `.substrate-worktrees/story-<key>` on its own branch (`substrate/story-<key>`). The agent's auto-commit (e.g., `feat(story-N-M): ...`) lands on the branch, not main. Merge to main happens after verification SHIP_IT; the worktree is then removed. After verification failure, the worktree and branch are preserved for `substrate reconcile-from-disk` inspection. Use `--no-worktree` if your project doesn't support worktrees (submodules, bare repos).
+
 ### Key Commands
 
 | Command | Purpose |
@@ -74,6 +78,7 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 | `substrate run --events` | Run pipeline with NDJSON event stream |
 | `substrate run --halt-on <severity>` | Halt policy: `all` / `critical` (default) / `none` |
 | `substrate run --non-interactive` | Suppress stdin prompts |
+| `substrate run --no-worktree` | Disable per-story git worktrees (use for submodules or bare repos) |
 | `substrate report [--run <id\|latest>]` | Per-run completion report |
 | `substrate report --verify-ac` | Append AC-to-Test traceability matrix |
 | `substrate reconcile-from-disk [--dry-run] [--yes]` | Path A reconciliation when tree is coherent |

package/dist/cli/templates/claude-md-substrate-section.md

@@ -79,6 +79,10 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 - **On reported failure with coherent working tree**: run `substrate reconcile-from-disk --dry-run` first; treat the dry-run output as the source of truth before re-dispatching the story
 - **Never re-run a failed story** without explicit user confirmation
 
+### Per-Story Worktree Behavior
+
+Each dispatched story runs in `.substrate-worktrees/story-<key>` on its own branch (`substrate/story-<key>`). The agent's auto-commit (e.g., `feat(story-N-M): ...`) lands on the branch, not main. Merge to main happens after verification SHIP_IT; the worktree is then removed. After verification failure, the worktree and branch are preserved for `substrate reconcile-from-disk` inspection. Use `--no-worktree` if your project doesn't support worktrees (submodules, bare repos).
+
 ### Key Commands Reference
 
 | Command | Purpose |
@@ -87,6 +91,7 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 | `substrate run --halt-on <severity>` | Decision Router halt policy: `all` / `critical` (default) / `none` |
 | `substrate run --non-interactive` | Suppress stdin prompts; combine with `--halt-on none` for fully autonomous |
 | `substrate run --verify-ac` | On-demand AC-to-Test traceability matrix |
+| `substrate run --no-worktree` | Disable per-story git worktrees (use for submodules or bare repos) |
 | `substrate report [--run <id\|latest>]` | Per-run completion report — outcomes, cost, escalation diagnostics, halt notifications |
 | `substrate report --verify-ac` | Append AC-to-Test traceability matrix to the report |
 | `substrate reconcile-from-disk [--dry-run] [--yes]` | Path A reconciliation when pipeline reports failed but tree is coherent |

package/dist/cli/templates/gemini-md-substrate-section.md

@@ -67,6 +67,10 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 - On reported failure with coherent working tree: run `substrate reconcile-from-disk --dry-run` first; treat its output as source of truth before re-dispatching
 - Never re-run a failed story without explicit user confirmation
 
+### Per-Story Worktree Behavior
+
+Each dispatched story runs in `.substrate-worktrees/story-<key>` on its own branch (`substrate/story-<key>`). The agent's auto-commit (e.g., `feat(story-N-M): ...`) lands on the branch, not main. Merge to main happens after verification SHIP_IT; the worktree is then removed. After verification failure, the worktree and branch are preserved for `substrate reconcile-from-disk` inspection. Use `--no-worktree` if your project doesn't support worktrees (submodules, bare repos).
+
 ### Key Commands
 
 | Command | Purpose |
@@ -74,6 +78,7 @@ The Recovery Engine runs a 3-tier auto-fix ladder before any halt — Tier A ret
 | `substrate run --events` | Run pipeline with NDJSON event stream |
 | `substrate run --halt-on <severity>` | Halt policy: `all` / `critical` (default) / `none` |
 | `substrate run --non-interactive` | Suppress stdin prompts |
+| `substrate run --no-worktree` | Disable per-story git worktrees (use for submodules or bare repos) |
 | `substrate report [--run <id\|latest>]` | Per-run completion report |
 | `substrate report --verify-ac` | Append AC-to-Test traceability matrix |
 | `substrate reconcile-from-disk [--dry-run] [--yes]` | Path A reconciliation when tree is coherent |

package/dist/{health-EyALt_76.js → health-CuKzY0Fn.js}

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

package/dist/{health-CUPkzJ8b.js → health-D_2Tesme.js}

@@ -1,7 +1,7 @@
-import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-EyALt_76.js";
+import { DEFAULT_STALL_THRESHOLD_SECONDS, getAllDescendantPids, getAutoHealthData, inspectProcessTree, isOrchestratorProcessLine, registerHealthCommand, runHealthAction } from "./health-CuKzY0Fn.js";
 import "./logger-KeHncl-f.js";
 import "./dist-DCBSXUiX.js";
-import "./manifest-read-DP4lBymM.js";
+import "./manifest-read-Boipz5aP.js";
 import "./work-graph-repository-DZyJv5pV.js";
 import "./decisions-CzSIEeGP.js";
 

package/dist/index.d.ts

@@ -755,6 +755,22 @@ interface DecisionHaltSkippedNonInteractiveEvent {
   /** Human-readable reason for skipping */
   reason: string;
 }
+/**
+ * Emitted when a 3-way merge fails due to conflicts between the story branch
+ * and the base branch (typically main). The worktree and branch are preserved
+ * for operator inspection. Story 75-2 (merge-to-main phase).
+ */
+interface PipelineMergeConflictDetectedEvent {
+  type: 'pipeline:merge-conflict-detected';
+  /** ISO-8601 timestamp generated at emit time */
+  ts: string;
+  /** Story key whose branch could not be merged (e.g., "75-2") */
+  storyKey: string;
+  /** Branch name that was being merged (e.g., "substrate/story-75-2") */
+  branchName: string;
+  /** Files with unresolved merge conflicts */
+  conflictingFiles: string[];
+}
 /**
  * Discriminated union of all pipeline event types.
  *
@@ -767,7 +783,7 @@ interface DecisionHaltSkippedNonInteractiveEvent {
  * }
  * ```
  */
-type PipelineEvent = PipelineStartEvent | PipelineCompleteEvent | PipelinePreFlightFailureEvent | PipelineProfileStaleEvent | PipelineContractMismatchEvent | PipelineContractVerificationSummaryEvent | StoryPhaseEvent | StoryDoneEvent | StoryEscalationEvent | StoryWarnEvent | StoryLogEvent | PipelineHeartbeatEvent | StoryStallEvent | StoryZeroDiffEscalationEvent | StoryBuildVerificationFailedEvent | StoryBuildVerificationPassedEvent | StoryInterfaceChangeWarningEvent | StoryMetricsEvent | SupervisorPollEvent | SupervisorKillEvent | SupervisorRestartEvent | SupervisorAbortEvent | SupervisorSummaryEvent | SupervisorAnalysisCompleteEvent | SupervisorAnalysisErrorEvent | SupervisorExperimentStartEvent | SupervisorExperimentSkipEvent | SupervisorExperimentRecommendationsEvent | SupervisorExperimentCompleteEvent | SupervisorExperimentErrorEvent | RoutingModelSelectedEvent | PipelinePhaseStartEvent | PipelinePhaseCompleteEvent | StoryAutoApprovedEvent | VerificationCheckCompleteEvent | VerificationStoryCompleteEvent | CostWarningEvent | CostCeilingReachedEvent | DecisionHaltSkippedNonInteractiveEvent; //#endregion
+type PipelineEvent = PipelineStartEvent | PipelineCompleteEvent | PipelinePreFlightFailureEvent | PipelineProfileStaleEvent | PipelineContractMismatchEvent | PipelineContractVerificationSummaryEvent | StoryPhaseEvent | StoryDoneEvent | StoryEscalationEvent | StoryWarnEvent | StoryLogEvent | PipelineHeartbeatEvent | StoryStallEvent | StoryZeroDiffEscalationEvent | StoryBuildVerificationFailedEvent | StoryBuildVerificationPassedEvent | StoryInterfaceChangeWarningEvent | StoryMetricsEvent | SupervisorPollEvent | SupervisorKillEvent | SupervisorRestartEvent | SupervisorAbortEvent | SupervisorSummaryEvent | SupervisorAnalysisCompleteEvent | SupervisorAnalysisErrorEvent | SupervisorExperimentStartEvent | SupervisorExperimentSkipEvent | SupervisorExperimentRecommendationsEvent | SupervisorExperimentCompleteEvent | SupervisorExperimentErrorEvent | RoutingModelSelectedEvent | PipelinePhaseStartEvent | PipelinePhaseCompleteEvent | StoryAutoApprovedEvent | VerificationCheckCompleteEvent | VerificationStoryCompleteEvent | CostWarningEvent | CostCeilingReachedEvent | DecisionHaltSkippedNonInteractiveEvent | PipelineMergeConflictDetectedEvent; //#endregion
 //#region src/core/errors.d.ts
 
 /**
@@ -1904,6 +1920,23 @@ interface OrchestratorEvents {
     runId: string;
     pendingProposalsCount: number;
   };
+  /**
+   * Story 75-2: 3-way merge failed due to conflicts between the story branch
+   * and the base branch (typically main). Worktree and branch are preserved
+   * for operator inspection. Story is marked ESCALATED with reason
+   * 'merge-conflict-detected'.
+   *
+   * Mirror of PipelineMergeConflictDetectedEvent in event-types.ts;
+   * both must stay in sync.
+   */
+  'pipeline:merge-conflict-detected': {
+    /** Story key whose branch could not be merged (e.g., "75-2") */
+    storyKey: string;
+    /** Branch name that was being merged (e.g., "substrate/story-75-2") */
+    branchName: string;
+    /** Files with unresolved merge conflicts */
+    conflictingFiles: string[];
+  };
 } //#endregion
 //#region src/core/event-bus.d.ts
 

package/dist/index.js

@@ -1,7 +1,7 @@
 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-DCBSXUiX.js";
-import "./adapter-registry-DXLMTmfD.js";
+import "./adapter-registry-DIcrxjH8.js";
 import { BudgetExceededError, GitError, RecoveryError, TaskConfigError, TaskGraphCycleError, TaskGraphError, TaskGraphIncompatibleFormatError, WorkerError, WorkerNotFoundError } from "./errors-D7xD-utp.js";
 
 //#region src/core/di.ts

package/dist/{interactive-prompt-DqvUvzPv.js → interactive-prompt-CsvMelhG.js}

@@ -1,5 +1,5 @@
 import { createLogger } from "./logger-KeHncl-f.js";
-import { readCurrentRunId, resolveMainRepoRoot } from "./manifest-read-DP4lBymM.js";
+import { readCurrentRunId, resolveMainRepoRoot } from "./manifest-read-Boipz5aP.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-DqvUvzPv.js.map
+//# sourceMappingURL=interactive-prompt-CsvMelhG.js.map

package/dist/{manifest-read-DP4lBymM.js → manifest-read-Boipz5aP.js}

@@ -4483,7 +4483,8 @@ const CliFlagsSchema = z.object({
 		defaultAction: z.string(),
 		reason: z.string(),
 		skippedAt: z.string()
-	})).optional()
+	})).optional(),
+	no_worktree: z.boolean().optional()
 });
 
 //#endregion
@@ -4760,6 +4761,7 @@ const RunManifestSchema = z.object({
 		run_total: 0
 	}),
 	pending_proposals: z.array(ProposalSchema),
+	orchestrator_start_branch: z.string().optional(),
 	stopped_reason: z.string().optional(),
 	stopped_at: z.string().optional(),
 	generation: z.number().int().nonnegative(),
@@ -5133,6 +5135,7 @@ var RunManifest = class RunManifest {
 		if (updates.run_status !== void 0) merged.run_status = updates.run_status;
 		if (updates.stopped_reason !== void 0) merged.stopped_reason = updates.stopped_reason;
 		if (updates.stopped_at !== void 0) merged.stopped_at = updates.stopped_at;
+		if (updates.orchestrator_start_branch !== void 0) merged.orchestrator_start_branch = updates.orchestrator_start_branch;
 		await this._writeImpl(merged);
 	}
 	/**
@@ -5146,7 +5149,8 @@ var RunManifest = class RunManifest {
 	* (preserves the single-writer guarantee from Epic 57-1).
 	* Non-fatal: callers MUST wrap in `.catch((err) => logger.warn(...))`.
 	*
-	* @param updates - Top-level status fields to merge (run_status, stopped_reason, stopped_at)
+	* @param updates - Top-level status fields to merge (run_status, stopped_reason, stopped_at,
+	*                  orchestrator_start_branch)
 	*/
 	async patchRunStatus(updates) {
 		return this._enqueue(() => this._patchRunStatusImpl(updates));
@@ -5841,4 +5845,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-DP4lBymM.js.map
+//# sourceMappingURL=manifest-read-Boipz5aP.js.map

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

@@ -1,6 +1,6 @@
 import "../../logger-KeHncl-f.js";
 import "../../dist-DCBSXUiX.js";
-import "../../manifest-read-DP4lBymM.js";
-import { runInteractivePrompt } from "../../interactive-prompt-DqvUvzPv.js";
+import "../../manifest-read-Boipz5aP.js";
+import { runInteractivePrompt } from "../../interactive-prompt-CsvMelhG.js";
 
 export { runInteractivePrompt };