substrate-ai 0.20.78 → 0.20.80

package/dist/cli/index.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-import { FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion } from "../health-EyALt_76.js";
+import { FileStateStore, SUBSTRATE_OWNED_SETTINGS_KEYS, VALID_PHASES, buildPipelineStatusOutput, createDatabaseAdapter, createStateStore, findPackageRoot, formatOutput, formatPipelineStatusHuman, formatPipelineSummary, formatTokenTelemetry, getAllDescendantPids, getAutoHealthData, getSubstrateDefaultSettings, inspectProcessTree, parseDbTimestampAsUtc, registerHealthCommand, resolveBmadMethodSrcPath, resolveBmadMethodVersion } from "../health-CuKzY0Fn.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, createDoltClient, createPipelineRun, getActiveDecisions, getAllCostEntriesFiltered, getBaselineRunMetrics, getDecisionsByCategory, getDecisionsByPhaseForRun, getLatestCompletedRun, getLatestRun, getPipelineRunById, getPlanningCostTotal, getRetryableEscalations, getRunMetrics, getRunningPipelineRuns, getSessionCostSummary, getSessionCostSummaryFiltered, getStoryMetricsForRun, getTokenUsageSummary, incrementRunRestarts, initSchema, initializeDolt, listRunMetrics, loadParentRunDecisions, supersedeDecision, swallowDebug, tagRunAsBaseline, updatePipelineRun } from "../dist-DCBSXUiX.js";
-import "../adapter-registry-DXLMTmfD.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-DP4lBymM.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, createImplementationOrchestrator, createPackLoader, createPhaseOrchestrator, createStopAfterGate, createTelemetryAdvisor, escape, formatPhaseCompletionSummary, getFactoryRunSummaries, getScenarioResultsForRun, getTwinRunsForRun, listGraphRuns, registerExportCommand, registerFactoryCommand, registerRunCommand, registerScenariosCommand, resolveStoryKeys, runAnalysisPhase, runPlanningPhase, runProbeAuthor, runSolutioningPhase, unescape, validateStopAfterFromConflict } from "../run-5R5ZPgSw.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-Bhe2gX2V.js";
+import "../adapter-registry-DIcrxjH8.js";
+import { RunManifest, SupervisorLock, ZERO_FINDINGS_BY_AUTHOR, ZERO_FINDING_COUNTS, ZERO_PROBE_AUTHOR_METRICS, aggregateProbeAuthorMetrics, parseRuntimeProbes, readCurrentRunId, resolveMainRepoRoot, resolveRunManifest, rollupFindingCounts, rollupFindingsByAuthor, rollupProbeAuthorByClass, rollupProbeAuthorMetrics, runAcTraceabilityCheck } from "../manifest-read-Boipz5aP.js";
 import "../errors-D7xD-utp.js";
 import "../routing-DFxoKHDt.js";
 import { WorkGraphRepository } from "../work-graph-repository-DZyJv5pV.js";
 import "../decisions-CzSIEeGP.js";
 import "../decision-router-DblHY8se.js";
-import "../interactive-prompt-DqvUvzPv.js";
+import "../interactive-prompt-CsvMelhG.js";
 import "../recovery-engine-BKGBeBnW.js";
 import "../version-manager-impl-qFBiO4Eh.js";
 import { registerUpgradeCommand } from "../upgrade-BMnmwTu6.js";
@@ -23,15 +23,13 @@ import { EventEmitter } from "node:events";
 import yaml from "js-yaml";
 import * as actualFS from "node:fs";
 import { existsSync, promises, readFileSync, writeFileSync } from "node:fs";
-import { execFile, spawn, spawnSync } from "node:child_process";
-import * as path$3 from "node:path";
-import * as path$2 from "node:path";
+import { execFile, spawnSync } from "node:child_process";
 import * as path$1 from "node:path";
 import { basename as basename$1, join as join$1, posix, relative, resolve as resolve$1, win32 } from "node:path";
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
 import * as fs from "node:fs/promises";
-import { access as access$1, lstat, readFile as readFile$1, readdir as readdir$1, readlink, realpath } from "node:fs/promises";
+import { lstat, readFile as readFile$1, readdir as readdir$1, readlink, realpath } from "node:fs/promises";
 import { appendFileSync, chmodSync, cpSync, existsSync as existsSync$1, lstatSync, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdir as readdir$2, readdirSync as readdirSync$1, readlinkSync, realpathSync as realpathSync$1, rmSync as rmSync$1, statSync as statSync$1, unlinkSync as unlinkSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { homedir } from "os";
 import { createRequire } from "node:module";
@@ -41,605 +39,6 @@ import { createInterface } from "node:readline";
 import { randomUUID as randomUUID$1 } from "crypto";
 import { createInterface as createInterface$1 } from "readline";
 
-//#region packages/core/dist/git/git-utils.js
-const MIN_GIT_MAJOR = 2;
-const MIN_GIT_MINOR = 20;
-/**
-* Spawn a git subprocess with the given args.
-*
-* @param args    - Arguments to pass to git (e.g., ['worktree', 'add', ...])
-* @param options - Optional spawn options (cwd, env)
-* @returns       - Object with stdout, stderr, and exit code
-*/
-function spawnGit(args, options) {
-	return new Promise((resolve$2) => {
-		const proc = spawn("git", args, {
-			cwd: options?.cwd,
-			env: options?.env ?? process.env,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			]
-		});
-		let stdout = "";
-		let stderr = "";
-		proc.stdout?.on("data", (chunk) => {
-			stdout += chunk.toString();
-		});
-		proc.stderr?.on("data", (chunk) => {
-			stderr += chunk.toString();
-		});
-		proc.on("close", (code) => {
-			resolve$2({
-				stdout: stdout.trim(),
-				stderr: stderr.trim(),
-				code: code ?? 1
-			});
-		});
-		proc.on("error", (err) => {
-			resolve$2({
-				stdout: "",
-				stderr: err.message,
-				code: 1
-			});
-		});
-	});
-}
-/**
-* Get the installed git version string.
-*
-* @returns Version string like "2.42.0"
-* @throws  Error if git is not installed or version cannot be parsed
-*/
-async function getGitVersion() {
-	const result = await spawnGit(["--version"]);
-	if (result.code !== 0) throw new Error(`git --version failed: ${result.stderr}`);
-	const match = /git version\s+(\d+\.\d+(?:\.\d+)?)/.exec(result.stdout);
-	if (match === null || match[1] === void 0) throw new Error(`Unable to parse git version from output: "${result.stdout}"`);
-	return match[1];
-}
-/**
-* Parse a git version string into major/minor/patch components.
-*
-* @param versionString - Version string like "2.42.0" or "2.20"
-* @returns             - Parsed version components
-*/
-function parseGitVersion(versionString) {
-	const parts = versionString.split(".").map(Number);
-	return {
-		major: parts[0] ?? 0,
-		minor: parts[1] ?? 0,
-		patch: parts[2] ?? 0
-	};
-}
-/**
-* Check if the given git version string is >= 2.20.0.
-*
-* @param version - Version string like "2.42.0"
-* @returns       - true if version >= 2.20.0
-*/
-function isGitVersionSupported(version) {
-	const { major, minor } = parseGitVersion(version);
-	if (major > MIN_GIT_MAJOR) return true;
-	if (major === MIN_GIT_MAJOR && minor >= MIN_GIT_MINOR) return true;
-	return false;
-}
-/**
-* Verify that git is installed and version >= 2.20.
-*
-* @throws Error with clear message if git is not installed or too old
-*/
-async function verifyGitVersion() {
-	let version;
-	try {
-		version = await getGitVersion();
-	} catch (err) {
-		throw new Error(`git is not installed or could not be executed. Please install git 2.20 or newer. Details: ${String(err)}`);
-	}
-	if (!isGitVersionSupported(version)) {
-		const { major, minor, patch } = parseGitVersion(version);
-		throw new Error(`Git version ${major}.${minor}.${patch} is too old. Substrate requires git 2.20 or newer. Please upgrade git: https://git-scm.com/downloads`);
-	}
-}
-/**
-* Create a git worktree and its associated branch.
-*
-* Uses a single `git worktree add {worktreePath} -b {branchName} {baseBranch}`
-* command to create the worktree with a new branch in one step.
-*
-* @param projectRoot - Absolute path to the git repository root
-* @param taskId      - Task identifier (used in path derivation)
-* @param branchName  - Branch name to create (e.g., "substrate/task-abc123")
-* @param baseBranch  - Branch to base the worktree on (e.g., "main")
-* @returns           - Object with the worktreePath
-* @throws            - Error if git command fails
-*/
-async function createWorktree(projectRoot, taskId, branchName, baseBranch) {
-	const worktreePath = path$3.join(projectRoot, ".substrate-worktrees", taskId);
-	const addResult = await spawnGit([
-		"worktree",
-		"add",
-		worktreePath,
-		"-b",
-		branchName,
-		baseBranch
-	], { cwd: projectRoot });
-	if (addResult.code !== 0) throw new Error(`git worktree add failed for task "${taskId}": ${addResult.stderr || addResult.stdout}`);
-	return { worktreePath };
-}
-/**
-* Remove a git worktree by path.
-*
-* Uses `git worktree remove --force` to handle unclean worktrees.
-*
-* @param worktreePath - Absolute path to the worktree directory
-* @param projectRoot  - Absolute path to the git repository root
-* @throws             - Error if git command fails
-*/
-async function removeWorktree(worktreePath, projectRoot) {
-	const spawnOpts = {};
-	if (projectRoot !== void 0) spawnOpts.cwd = projectRoot;
-	const result = await spawnGit([
-		"worktree",
-		"remove",
-		"--force",
-		worktreePath
-	], spawnOpts);
-	if (result.code !== 0) throw new Error(`git worktree remove failed for "${worktreePath}": ${result.stderr || result.stdout}`);
-}
-/**
-* Delete a git branch using `git branch -D`.
-*
-* @param branchName  - Branch name to delete (e.g., "substrate/task-abc123")
-* @param projectRoot - Absolute path to the git repository root
-* @returns           - true if branch was successfully deleted, false otherwise
-*/
-async function removeBranch(branchName, projectRoot) {
-	const spawnOpts = {};
-	if (projectRoot !== void 0) spawnOpts.cwd = projectRoot;
-	const result = await spawnGit([
-		"branch",
-		"-D",
-		branchName
-	], spawnOpts);
-	if (result.code !== 0) return false;
-	return true;
-}
-/**
-* Scan the worktrees base directory and return paths of all found worktree directories.
-*
-* @param projectRoot   - Absolute path to the git repository root
-* @param baseDirectory - Relative directory name for worktrees (default: '.substrate-worktrees')
-* @returns             - Array of absolute worktree directory paths
-*/
-async function getOrphanedWorktrees(projectRoot, baseDirectory = ".substrate-worktrees") {
-	const worktreesDir = path$3.join(projectRoot, baseDirectory);
-	try {
-		await access$1(worktreesDir);
-	} catch {
-		return [];
-	}
-	let entries;
-	try {
-		entries = await readdir$1(worktreesDir, { withFileTypes: true });
-	} catch {
-		return [];
-	}
-	return entries.filter((entry) => entry.isDirectory()).map((entry) => path$3.join(worktreesDir, entry.name));
-}
-/**
-* Simulate a merge using git merge --no-commit --no-ff without committing.
-*
-* This runs in the target branch's working directory (the project root or
-* worktree path). The simulation must be aborted after checking conflicts
-* via abortMerge().
-*
-* @param branchName  - The source branch to simulate merging
-* @param cwd         - Working directory (must be on the target branch)
-* @returns           - true if merge would be clean, false if there are conflicts
-*/
-async function simulateMerge(branchName, cwd) {
-	const result = await spawnGit([
-		"merge",
-		"--no-commit",
-		"--no-ff",
-		branchName
-	], { cwd });
-	if (result.code === 0) return true;
-	return false;
-}
-/**
-* Abort a merge in progress using git merge --abort.
-*
-* Should be called after simulateMerge() to clean up the merge state,
-* regardless of whether conflicts were found.
-*
-* @param cwd - Working directory (same as used for simulateMerge)
-*/
-async function abortMerge(cwd) {
-	await spawnGit(["merge", "--abort"], { cwd });
-}
-/**
-* Get a list of files with conflicts during a merge.
-*
-* Must be called while a merge is in progress (after simulateMerge() and
-* before abortMerge()).
-*
-* @param cwd - Working directory of the repository
-* @returns   - Array of conflicting file paths
-*/
-async function getConflictingFiles(cwd) {
-	const result = await spawnGit([
-		"diff",
-		"--name-only",
-		"--diff-filter=U"
-	], { cwd });
-	if (result.code !== 0) return [];
-	if (result.stdout.trim() === "") return [];
-	return result.stdout.trim().split("\n").filter((f) => f.trim().length > 0);
-}
-/**
-* Perform an actual merge using git merge --no-ff.
-*
-* Should only be called after detectConflicts() confirms there are no conflicts.
-* Creates a merge commit even if fast-forward is possible (--no-ff ensures history).
-*
-* @param branchName  - The source branch to merge
-* @param cwd         - Working directory (must be on the target branch)
-* @returns           - true if merge succeeded, false otherwise
-*/
-async function performMerge(branchName, cwd) {
-	const result = await spawnGit([
-		"merge",
-		"--no-ff",
-		branchName
-	], { cwd });
-	if (result.code !== 0) return false;
-	return true;
-}
-/**
-* Get a list of files changed in the most recent merge.
-*
-* Uses git diff --name-only HEAD~1..HEAD to find files in the merge commit.
-* Falls back to empty array if commit history is insufficient.
-*
-* @param cwd - Working directory of the repository
-* @returns   - Array of file paths that were merged
-*/
-async function getMergedFiles(cwd) {
-	const result = await spawnGit([
-		"diff",
-		"--name-only",
-		"HEAD~1..HEAD"
-	], { cwd });
-	if (result.code !== 0) {
-		const altResult = await spawnGit([
-			"show",
-			"--name-only",
-			"--format=",
-			"HEAD"
-		], { cwd });
-		if (altResult.code !== 0) return [];
-		return altResult.stdout.trim().split("\n").filter((f) => f.trim().length > 0);
-	}
-	if (result.stdout.trim() === "") return [];
-	return result.stdout.trim().split("\n").filter((f) => f.trim().length > 0);
-}
-
-//#endregion
-//#region packages/core/dist/git/git-worktree-manager-impl.js
-const BRANCH_PREFIX = "substrate/task-";
-const DEFAULT_WORKTREE_BASE = ".substrate-worktrees";
-var GitWorktreeManagerImpl = class {
-	_eventBus;
-	_projectRoot;
-	_baseDirectory;
-	_db;
-	_logger;
-	/** Bound listener references for cleanup in shutdown() */
-	_onTaskReady;
-	_onTaskComplete;
-	_onTaskFailed;
-	constructor(eventBus, projectRoot, baseDirectory = DEFAULT_WORKTREE_BASE, db = null, logger$19) {
-		this._eventBus = eventBus;
-		this._projectRoot = projectRoot;
-		this._baseDirectory = baseDirectory;
-		this._db = db;
-		this._logger = logger$19 ?? console;
-		this._onTaskReady = ({ taskId }) => {
-			this._handleTaskReady(taskId).catch((err) => {
-				this._logger.error({
-					taskId,
-					err
-				}, "Unhandled error in _handleTaskReady");
-			});
-		};
-		this._onTaskComplete = ({ taskId }) => {
-			this._handleTaskDone(taskId);
-		};
-		this._onTaskFailed = ({ taskId }) => {
-			this._handleTaskDone(taskId);
-		};
-	}
-	async initialize() {
-		this._logger.info({ projectRoot: this._projectRoot }, "GitWorktreeManager.initialize()");
-		await this.verifyGitVersion();
-		const cleaned = await this.cleanupAllWorktrees();
-		if (cleaned > 0) this._logger.info({ cleaned }, "Recovered orphaned worktrees on startup");
-		this._eventBus.on("task:ready", this._onTaskReady);
-		this._eventBus.on("task:complete", this._onTaskComplete);
-		this._eventBus.on("task:failed", this._onTaskFailed);
-		this._logger.info("GitWorktreeManager initialized");
-	}
-	async shutdown() {
-		this._logger.info("GitWorktreeManager.shutdown()");
-		this._eventBus.off("task:ready", this._onTaskReady);
-		this._eventBus.off("task:complete", this._onTaskComplete);
-		this._eventBus.off("task:failed", this._onTaskFailed);
-		await this.cleanupAllWorktrees();
-		this._logger.info("GitWorktreeManager shutdown complete");
-	}
-	async _handleTaskReady(taskId) {
-		this._logger.debug({ taskId }, "task:ready — creating worktree");
-		try {
-			await this.createWorktree(taskId);
-		} catch (err) {
-			this._logger.error({
-				taskId,
-				err
-			}, "Failed to create worktree for task");
-		}
-	}
-	async _handleTaskDone(taskId) {
-		this._logger.debug({ taskId }, "task done — cleaning up worktree");
-		try {
-			await this.cleanupWorktree(taskId);
-		} catch (err) {
-			this._logger.warn({
-				taskId,
-				err
-			}, "Failed to cleanup worktree for task");
-		}
-	}
-	async createWorktree(taskId, baseBranch = "main") {
-		if (!taskId || taskId.trim().length === 0) throw new Error("createWorktree: taskId must be a non-empty string");
-		const branchName = BRANCH_PREFIX + taskId;
-		const worktreePath = this.getWorktreePath(taskId);
-		this._logger.debug({
-			taskId,
-			branchName,
-			worktreePath,
-			baseBranch
-		}, "createWorktree");
-		await createWorktree(this._projectRoot, taskId, branchName, baseBranch);
-		const createdAt = new Date();
-		this._eventBus.emit("worktree:created", {
-			taskId,
-			branchName,
-			worktreePath,
-			createdAt
-		});
-		const info = {
-			taskId,
-			branchName,
-			worktreePath,
-			createdAt
-		};
-		this._logger.info({
-			taskId,
-			branchName,
-			worktreePath
-		}, "Worktree created");
-		return info;
-	}
-	async cleanupWorktree(taskId) {
-		const branchName = BRANCH_PREFIX + taskId;
-		const worktreePath = this.getWorktreePath(taskId);
-		this._logger.debug({
-			taskId,
-			branchName,
-			worktreePath
-		}, "cleanupWorktree");
-		let worktreeExists = false;
-		try {
-			await access$1(worktreePath);
-			worktreeExists = true;
-		} catch {
-			this._logger.debug({
-				taskId,
-				worktreePath
-			}, "cleanupWorktree: worktree does not exist, skipping removal");
-		}
-		if (worktreeExists) try {
-			await removeWorktree(worktreePath, this._projectRoot);
-		} catch (err) {
-			this._logger.warn({
-				taskId,
-				worktreePath,
-				err
-			}, "removeWorktree failed during cleanup");
-		}
-		try {
-			await removeBranch(branchName, this._projectRoot);
-		} catch (err) {
-			this._logger.warn({
-				taskId,
-				branchName,
-				err
-			}, "removeBranch failed during cleanup");
-		}
-		this._eventBus.emit("worktree:removed", {
-			taskId,
-			branchName
-		});
-		this._logger.info({
-			taskId,
-			branchName
-		}, "Worktree cleaned up");
-	}
-	async cleanupAllWorktrees() {
-		this._logger.debug({ projectRoot: this._projectRoot }, "cleanupAllWorktrees");
-		const orphanedPaths = await getOrphanedWorktrees(this._projectRoot, this._baseDirectory);
-		let cleaned = 0;
-		for (const worktreePath of orphanedPaths) {
-			const taskId = path$2.basename(worktreePath);
-			let worktreeRemoved = false;
-			try {
-				await removeWorktree(worktreePath, this._projectRoot);
-				worktreeRemoved = true;
-				this._logger.debug({
-					taskId,
-					worktreePath
-				}, "cleanupAllWorktrees: removed orphaned worktree");
-			} catch (err) {
-				this._logger.warn({
-					taskId,
-					worktreePath,
-					err
-				}, "cleanupAllWorktrees: failed to remove worktree");
-			}
-			const branchName = BRANCH_PREFIX + taskId;
-			try {
-				const branchRemoved = await removeBranch(branchName, this._projectRoot);
-				if (branchRemoved) this._logger.debug({
-					taskId,
-					branchName
-				}, "cleanupAllWorktrees: removed orphaned branch");
-			} catch (err) {
-				this._logger.warn({
-					taskId,
-					branchName,
-					err
-				}, "cleanupAllWorktrees: failed to remove branch");
-			}
-			if (worktreeRemoved) cleaned++;
-		}
-		if (cleaned > 0) this._logger.info({ cleaned }, "cleanupAllWorktrees: recovered orphaned worktrees");
-		return cleaned;
-	}
-	async detectConflicts(taskId, targetBranch = "main") {
-		if (!taskId || taskId.trim().length === 0) throw new Error("detectConflicts: taskId must be a non-empty string");
-		const branchName = BRANCH_PREFIX + taskId;
-		const worktreePath = this.getWorktreePath(taskId);
-		this._logger.debug({
-			taskId,
-			branchName,
-			targetBranch
-		}, "detectConflicts");
-		try {
-			await access$1(worktreePath);
-		} catch {
-			throw new Error(`detectConflicts: Worktree for task "${taskId}" not found at "${worktreePath}". The worktree may have already been cleaned up.`);
-		}
-		const mergeClean = await simulateMerge(branchName, this._projectRoot);
-		let conflictingFiles = [];
-		try {
-			if (!mergeClean) conflictingFiles = await getConflictingFiles(this._projectRoot);
-		} finally {
-			await abortMerge(this._projectRoot);
-		}
-		const report = {
-			hasConflicts: !mergeClean || conflictingFiles.length > 0,
-			conflictingFiles,
-			taskId,
-			targetBranch
-		};
-		if (report.hasConflicts) this._eventBus.emit("worktree:conflict", {
-			taskId,
-			branch: branchName,
-			conflictingFiles: report.conflictingFiles
-		});
-		this._logger.info({
-			taskId,
-			hasConflicts: report.hasConflicts,
-			conflictCount: conflictingFiles.length
-		}, "Conflict detection complete");
-		return report;
-	}
-	async mergeWorktree(taskId, targetBranch = "main") {
-		if (!taskId || taskId.trim().length === 0) throw new Error("mergeWorktree: taskId must be a non-empty string");
-		const branchName = BRANCH_PREFIX + taskId;
-		this._logger.debug({
-			taskId,
-			branchName,
-			targetBranch
-		}, "mergeWorktree");
-		const conflictReport = await this.detectConflicts(taskId, targetBranch);
-		if (conflictReport.hasConflicts) {
-			this._logger.info({
-				taskId,
-				conflictCount: conflictReport.conflictingFiles.length
-			}, "Merge skipped due to conflicts");
-			return {
-				success: false,
-				mergedFiles: [],
-				conflicts: conflictReport
-			};
-		}
-		const mergeSuccess = await performMerge(branchName, this._projectRoot);
-		if (!mergeSuccess) throw new Error(`mergeWorktree: git merge --no-ff failed for task "${taskId}" branch "${branchName}"`);
-		const mergedFiles = await getMergedFiles(this._projectRoot);
-		this._eventBus.emit("worktree:merged", {
-			taskId,
-			branch: branchName,
-			mergedFiles
-		});
-		const result = {
-			success: true,
-			mergedFiles
-		};
-		this._logger.info({
-			taskId,
-			branchName,
-			mergedFileCount: mergedFiles.length
-		}, "Worktree merged successfully");
-		return result;
-	}
-	async listWorktrees() {
-		this._logger.debug({
-			projectRoot: this._projectRoot,
-			baseDirectory: this._baseDirectory
-		}, "listWorktrees");
-		const worktreePaths = await getOrphanedWorktrees(this._projectRoot, this._baseDirectory);
-		const results = [];
-		for (const worktreePath of worktreePaths) {
-			const taskId = path$2.basename(worktreePath);
-			const branchName = BRANCH_PREFIX + taskId;
-			let createdAt;
-			try {
-				const { stat: stat$2 } = await import("node:fs/promises");
-				const stats = await stat$2(worktreePath);
-				createdAt = stats.birthtime ?? stats.ctime;
-			} catch {
-				createdAt = new Date();
-			}
-			results.push({
-				taskId,
-				branchName,
-				worktreePath,
-				createdAt
-			});
-		}
-		this._logger.debug({ count: results.length }, "listWorktrees: found worktrees");
-		return results;
-	}
-	getWorktreePath(taskId) {
-		return path$2.join(this._projectRoot, this._baseDirectory, taskId);
-	}
-	async verifyGitVersion() {
-		try {
-			await verifyGitVersion();
-		} catch (err) {
-			throw new Error(`GitWorktreeManager: git version check failed: ${String(err)}`);
-		}
-	}
-};
-function createGitWorktreeManager(options) {
-	return new GitWorktreeManagerImpl(options.eventBus, options.projectRoot, options.baseDirectory, options.db ?? null, options.logger);
-}
-
-//#endregion
 //#region packages/core/dist/monitor/recommendation-engine.js
 /**
 * RecommendationEngine — generates routing recommendations from performance aggregates.
@@ -2533,9 +1932,9 @@ async function promptSubscriptionRouting(providerName, nonInteractive) {
 		});
 	});
 }
-async function directoryExists(path$4) {
+async function directoryExists(path$2) {
 	try {
-		await access(path$4);
+		await access(path$2);
 		return true;
 	} catch {
 		return false;
@@ -4487,10 +3886,10 @@ var PathBase = class {
 	/**
 	* Get the Path object referenced by the string path, resolved from this Path
 	*/
-	resolve(path$4) {
-		if (!path$4) return this;
-		const rootPath = this.getRootString(path$4);
-		const dir = path$4.substring(rootPath.length);
+	resolve(path$2) {
+		if (!path$2) return this;
+		const rootPath = this.getRootString(path$2);
+		const dir = path$2.substring(rootPath.length);
 		const dirParts = dir.split(this.splitSep);
 		const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
 		return result;
@@ -5145,8 +4544,8 @@ var PathWin32 = class PathWin32 extends PathBase {
 	/**
 	* @internal
 	*/
-	getRootString(path$4) {
-		return win32.parse(path$4).root;
+	getRootString(path$2) {
+		return win32.parse(path$2).root;
 	}
 	/**
 	* @internal
@@ -5191,8 +4590,8 @@ var PathPosix = class PathPosix extends PathBase {
 	/**
 	* @internal
 	*/
-	getRootString(path$4) {
-		return path$4.startsWith("/") ? "/" : "";
+	getRootString(path$2) {
+		return path$2.startsWith("/") ? "/" : "";
 	}
 	/**
 	* @internal
@@ -5285,9 +4684,9 @@ var PathScurryBase = class {
 	/**
 	* Get the depth of a provided path, string, or the cwd
 	*/
-	depth(path$4 = this.cwd) {
-		if (typeof path$4 === "string") path$4 = this.cwd.resolve(path$4);
-		return path$4.depth();
+	depth(path$2 = this.cwd) {
+		if (typeof path$2 === "string") path$2 = this.cwd.resolve(path$2);
+		return path$2.depth();
 	}
 	/**
 	* Return the cache of child entries.  Exposed so subclasses can create
@@ -5668,9 +5067,9 @@ var PathScurryBase = class {
 		process$1();
 		return results;
 	}
-	chdir(path$4 = this.cwd) {
+	chdir(path$2 = this.cwd) {
 		const oldCwd = this.cwd;
-		this.cwd = typeof path$4 === "string" ? this.cwd.resolve(path$4) : path$4;
+		this.cwd = typeof path$2 === "string" ? this.cwd.resolve(path$2) : path$2;
 		this.cwd[setAsCwd](oldCwd);
 	}
 };
@@ -6054,8 +5453,8 @@ var MatchRecord = class {
 		this.store.set(target, current === void 0 ? n : n & current);
 	}
 	entries() {
-		return [...this.store.entries()].map(([path$4, n]) => [
-			path$4,
+		return [...this.store.entries()].map(([path$2, n]) => [
+			path$2,
 			!!(n & 2),
 			!!(n & 1)
 		]);
@@ -6231,9 +5630,9 @@ var GlobUtil = class {
 	signal;
 	maxDepth;
 	includeChildMatches;
-	constructor(patterns, path$4, opts) {
+	constructor(patterns, path$2, opts) {
 		this.patterns = patterns;
-		this.path = path$4;
+		this.path = path$2;
 		this.opts = opts;
 		this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
 		this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6254,11 +5653,11 @@ var GlobUtil = class {
 			});
 		}
 	}
-	#ignored(path$4) {
-		return this.seen.has(path$4) || !!this.#ignore?.ignored?.(path$4);
+	#ignored(path$2) {
+		return this.seen.has(path$2) || !!this.#ignore?.ignored?.(path$2);
 	}
-	#childrenIgnored(path$4) {
-		return !!this.#ignore?.childrenIgnored?.(path$4);
+	#childrenIgnored(path$2) {
+		return !!this.#ignore?.childrenIgnored?.(path$2);
 	}
 	pause() {
 		this.paused = true;
@@ -6440,8 +5839,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
 	matches = new Set();
-	constructor(patterns, path$4, opts) {
-		super(patterns, path$4, opts);
+	constructor(patterns, path$2, opts) {
+		super(patterns, path$2, opts);
 	}
 	matchEmit(e) {
 		this.matches.add(e);
@@ -6468,8 +5867,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
 	results;
-	constructor(patterns, path$4, opts) {
-		super(patterns, path$4, opts);
+	constructor(patterns, path$2, opts) {
+		super(patterns, path$2, opts);
 		this.results = new Minipass({
 			signal: this.signal,
 			objectMode: true
@@ -7491,7 +6890,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-CUPkzJ8b.js");
+			const { inspectProcessTree: inspectProcessTree$1 } = await import("../health-D_2Tesme.js");
 			const substrateDirPath = join(projectRoot, ".substrate");
 			const processInfo = inspectProcessTree$1({
 				projectRoot,
@@ -8456,7 +7855,7 @@ function defaultSupervisorDeps() {
 				if (cached === null) {
 					const { AdapterRegistry: AR } = await import(
 						/* @vite-ignore */
-						"../adapter-registry-B42bBpfj.js"
+						"../adapter-registry-BgfwxcSY.js"
 );
 					cached = new AR();
 					await cached.discoverAndRegister();
@@ -9037,7 +8436,7 @@ async function runSupervisorAction(options, deps = {}) {
 								await initSchema(expAdapter);
 								const { runRunAction: runPipeline } = await import(
 									/* @vite-ignore */
-									"../run-E6tr8jf3.js"
+									"../run-L26TdXRR.js"
 );
 								const runStoryFn = async (opts) => {
 									const exitCode = await runPipeline({
@@ -13246,9 +12645,9 @@ function detectWorkingTreeChanges(targetFiles, projectRoot) {
 	const modifiedPaths = [];
 	const lines = result.stdout.split("\n").filter((l) => l.trim().length > 0);
 	for (const line of lines) {
-		const path$4 = line.length > 3 ? line.slice(3).trim() : line.trim();
-		for (const tf of targetFiles) if (path$4 === tf || path$4.endsWith(`/${tf}`) || tf.endsWith(`/${path$4}`) || path$4.endsWith(tf) || tf.endsWith(path$4)) {
-			modifiedPaths.push(path$4);
+		const path$2 = line.length > 3 ? line.slice(3).trim() : line.trim();
+		for (const tf of targetFiles) if (path$2 === tf || path$2.endsWith(`/${tf}`) || tf.endsWith(`/${path$2}`) || path$2.endsWith(tf) || tf.endsWith(path$2)) {
+			modifiedPaths.push(path$2);
 			break;
 		}
 	}