@overdeck/desktop 0.45.23 → 0.45.24

package/server/{launcher-generator-CHVm7bGT.js → launcher-generator-BBWG_SiS.js}

@@ -1,9 +1,9 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { H as init_providers, Ur as packageRoot, Vr as init_paths, W as qualifyPiModel } from "./config-yaml-DvyMuOle.js";
-import { J as init_ui_theme, K as colorFgBgForTheme, q as getUiThemeSync } from "./tmux-ftABRAmc.js";
-import { o as getHarnessBehavior } from "./src-U7_kTPEE.js";
-import { t as init_behavior } from "./behavior-B_-4EKF3.js";
-import { f as toCodexSandboxValue, l as init_codex } from "./codex-TmSi-yTv.js";
+import { Br as getOverdeckHome, H as init_providers, Ur as packageRoot, Vr as init_paths, W as qualifyPiModel } from "./config-yaml-DySPNmKN.js";
+import { J as init_ui_theme, K as colorFgBgForTheme, q as getUiThemeSync } from "./tmux-R7N7y-Mh.js";
+import { o as getHarnessBehavior } from "./src-DtcUOZCq.js";
+import { t as init_behavior } from "./behavior-B3exJ42O.js";
+import { f as toCodexSandboxValue, l as init_codex } from "./codex-BZXGhUVB.js";
 import { dirname, join } from "node:path";
 import { Data } from "effect";
 //#region ../../lib/model-validation.ts
@@ -29,6 +29,73 @@ var init_model_validation = __esmMin((() => {
 	Data.TaggedError("ModelValidationError");
 }));
 //#endregion
+//#region ../../lib/launcher-git-guard.ts
+function shellQuote$1(value) {
+	return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function buildGitGuardLines(agentId) {
+	const guardDir = join(getOverdeckHome(), "agents", agentId, "git-guard");
+	const guardPath = join(guardDir, "git");
+	const pathForDoubleQuotes = guardDir.replace(/([\\"$`])/g, "\\$1");
+	return [
+		"_OVERDECK_REAL_GIT=\"$(command -v git)\"",
+		`mkdir -p ${shellQuote$1(guardDir)}`,
+		`cat > ${shellQuote$1(guardPath)} <<EOF`,
+		"#!/bin/sh",
+		"_OVERDECK_REAL_GIT=\"$_OVERDECK_REAL_GIT\"",
+		"if [ \"\\$OVERDECK_PAN_GIT_OP\" = \"1\" ]; then",
+		"  exec \"\\$_OVERDECK_REAL_GIT\" \"\\$@\"",
+		"fi",
+		"_overdeck_git_find_command() {",
+		"  while [ \"\\$#\" -gt 0 ]; do",
+		"    case \"\\$1\" in",
+		"      -C|-c|--git-dir|--work-tree|--namespace|--config-env|--super-prefix|--attr-source)",
+		"        shift",
+		"        [ \"\\$#\" -gt 0 ] && shift",
+		"        ;;",
+		"      -C?*|-c?*|--git-dir=*|--work-tree=*|--namespace=*|--config-env=*|--super-prefix=*|--attr-source=*)",
+		"        shift",
+		"        ;;",
+		"      --)",
+		"        shift",
+		"        break",
+		"        ;;",
+		"      -*)",
+		"        shift",
+		"        ;;",
+		"      *)",
+		"        printf \"%s\\n\" \"\\$1\"",
+		"        return",
+		"        ;;",
+		"    esac",
+		"  done",
+		"  [ \"\\$#\" -gt 0 ] && printf \"%s\\n\" \"\\$1\"",
+		"}",
+		"_overdeck_git_command=\"\\$(_overdeck_git_find_command \"\\$@\")\"",
+		"case \"\\$_overdeck_git_command\" in",
+		"  rebase|stash)",
+		"    echo \"Overdeck agents must not run git \\$_overdeck_git_command directly. Use pan sync-main to sync main or pan done to submit.\" >&2",
+		"    exit 1",
+		"    ;;",
+		"  reset)",
+		"    for _overdeck_git_arg in \"\\$@\"; do",
+		"      if [ \"\\$_overdeck_git_arg\" = \"--hard\" ]; then",
+		"        echo \"Overdeck agents must not run git reset --hard. Commit, explicitly discard, or surface the state instead.\" >&2",
+		"        exit 1",
+		"      fi",
+		"    done",
+		"    ;;",
+		"esac",
+		"exec \"\\$_OVERDECK_REAL_GIT\" \"\\$@\"",
+		"EOF",
+		`chmod 0755 ${shellQuote$1(guardPath)}`,
+		`export PATH="${pathForDoubleQuotes}:$PATH"`
+	];
+}
+var init_launcher_git_guard = __esmMin((() => {
+	init_paths();
+}));
+//#endregion
 //#region ../../lib/launcher-generator.ts
 /**
 * Quote a string for safe use as a shell literal in single quotes.
@@ -94,6 +161,7 @@ function generateLauncherScriptSync(config) {
 			explicitlySetOverdeckKeys.add("OVERDECK_SESSION_TYPE");
 		}
 	}
+	if (config.overdeckEnv?.agentId && config.spawnMode !== "conversation") lines.push(...buildGitGuardLines(config.overdeckEnv.agentId));
 	if (config.extraEnvExports) for (const expr of config.extraEnvExports) lines.push(expr);
 	if (config.codexHome) lines.push(`export CODEX_HOME=${shellQuote(config.codexHome)}`);
 	if (config.changeDir !== false) lines.push(`cd -- ${shellQuote(config.workingDir)}`);
@@ -144,6 +212,7 @@ function buildCommand(config) {
 	if (config.spawnMode === "conversation") {
 		if (behavior.launchCommandKind === "ohmypi-rpc") return buildOhmypiCommand(config, false);
 		if (behavior.launchCommandKind === "codex-work-tui") return buildCodexCommand(config, false);
+		if (behavior.launchCommandKind === "acp-host") return buildAcpCommand(config, false);
 		if (config.baseCommand) {
 			let cmd = config.baseCommand;
 			cmd += buildChannelsArgs(config);
@@ -203,6 +272,7 @@ function buildNonConversationCommand(config, useExec) {
 	const behavior = getHarnessBehavior(config.harness ?? "claude-code");
 	if (behavior.launchCommandKind === "ohmypi-rpc") return buildOhmypiCommand(config, useExec);
 	if (behavior.launchCommandKind === "codex-work-tui") return buildCodexCommand(config, useExec);
+	if (behavior.launchCommandKind === "acp-host") return buildAcpCommand(config, useExec);
 	const parts = [];
 	if (!config.baseCommand) return parts;
 	let cmd = config.baseCommand;
@@ -306,6 +376,29 @@ function buildOhmypiCommand(config, useExec) {
 function systemPromptFiles(config) {
 	return [...config.appendSystemPromptFile ? [config.appendSystemPromptFile] : [], ...config.appendSystemPromptFiles ?? []];
 }
+function buildAcpCommand(config, useExec) {
+	if (!config.acpAgentId) throw new Error("acp launcher requires acpAgentId");
+	if (!config.acpProvider) throw new Error("acp launcher requires acpProvider");
+	if (!config.acpWorkspace) throw new Error("acp launcher requires acpWorkspace");
+	if (!config.acpBinaryPath) throw new Error("acp launcher requires acpBinaryPath");
+	const tokens = [
+		"node",
+		shellQuote(join(packageRoot, "dist", "acp-host.js")),
+		"--agent",
+		shellQuote(config.acpAgentId),
+		"--provider",
+		shellQuote(config.acpProvider),
+		"--workspace",
+		shellQuote(config.acpWorkspace),
+		"--binary-path",
+		shellQuote(config.acpBinaryPath)
+	];
+	if (config.resumeSessionId) tokens.push("--resume", shellQuote(config.resumeSessionId));
+	if (config.model) tokens.push("--model", shellQuoteModelIdSync(config.model));
+	if (config.acpContextFile) tokens.push("--context-file", shellQuote(config.acpContextFile));
+	const cmd = tokens.join(" ");
+	return [useExec ? `exec ${cmd}` : cmd];
+}
 function buildCodexCommand(config, useExec) {
 	const cmd = computeCodexCommandTokens(config, useExec);
 	const flat = cmd.join(" ").replace(/\s+/g, " ");
@@ -361,6 +454,7 @@ var init_launcher_generator = __esmMin((() => {
 	init_model_validation();
 	init_ui_theme();
 	init_paths();
+	init_launcher_git_guard();
 	PROVIDER_ENV_UNSETS = [
 		"ANTHROPIC_API_KEY",
 		"ANTHROPIC_BASE_URL",
@@ -374,6 +468,6 @@ var init_launcher_generator = __esmMin((() => {
 	];
 }));
 //#endregion
-export { requireModelOverrideSync as a, normalizeModelOverrideSync as i, init_launcher_generator as n, shellQuoteModelIdSync as o, init_model_validation as r, generateLauncherScriptSync as t };
+export { normalizeModelOverrideSync as a, init_model_validation as i, init_launcher_generator as n, requireModelOverrideSync as o, MODEL_ID_PATTERN as r, shellQuoteModelIdSync as s, generateLauncherScriptSync as t };
 
-//# sourceMappingURL=launcher-generator-CHVm7bGT.js.map
+//# sourceMappingURL=launcher-generator-BBWG_SiS.js.map

package/server/{lifecycle-io-D8iNBcux.js → lifecycle-io-BREGpnLk.js}

@@ -1,8 +1,8 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Ht as flushAutoCommits, Ot as init_record, Pt as readRecordContinueViewSync, Ut as init_auto_commit, Wt as queueAutoCommit, _t as appendFeedbackEntrySync, bt as clearRecordFeedbackSync, ir as FsError, mr as init_errors, yt as appendSessionEntrySync } from "./config-yaml-DvyMuOle.js";
-import { a as generateXBriefFilename, c as parseXBriefFilename, i as ensureXBriefDirsSync, l as resolveXBriefDir, n as LEGACY_VBRIEF_LIFECYCLE_DIRS, o as init_lifecycle, u as slugify } from "./lifecycle-DfeyBDwA.js";
-import { A as init_xbrief_index, C as init_specs, S as getProjectPanPaths, d as readPlanSync, g as serializeXBriefDocument, j as invalidateXBriefIndex, l as normalizeXBriefEnvelope, o as init_io } from "./io-B3_AHDfr.js";
-import { t as init_pan_dir } from "./pan-dir-DeVUgwA7.js";
+import { Ht as flushAutoCommits, Ot as init_record, Pt as readRecordContinueViewSync, Ut as init_auto_commit, Wt as queueAutoCommit, _t as appendFeedbackEntrySync, bt as clearRecordFeedbackSync, ir as FsError, mr as init_errors, yt as appendSessionEntrySync } from "./config-yaml-DySPNmKN.js";
+import { a as generateXBriefFilename, c as parseXBriefFilename, i as ensureXBriefDirsSync, l as resolveXBriefDir, n as LEGACY_VBRIEF_LIFECYCLE_DIRS, o as init_lifecycle, u as slugify } from "./lifecycle-yPd___5E.js";
+import { A as init_xbrief_index, C as init_specs, S as getProjectPanPaths, d as readPlanSync, g as serializeXBriefDocument, j as invalidateXBriefIndex, l as normalizeXBriefEnvelope, o as init_io } from "./io-C9kF1wtJ.js";
+import { t as init_pan_dir } from "./pan-dir-B0c3w0Ya.js";
 import { Effect } from "effect";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, unlinkSync, writeFileSync } from "fs";
 import { basename, join } from "path";
@@ -264,4 +264,4 @@ var init_lifecycle_io = __esmMin((() => {
 //#endregion
 export { init_lifecycle_io as a, updatePlanStatus as c, findXBriefByIssueSync as i, appendFeedbackEntryForIssue as n, readContinueStateForIssue as o, clearFeedbackForIssue as r, transitionXBriefOnMain as s, appendContinueSessionEntryForIssue as t };
 
-//# sourceMappingURL=lifecycle-io-D8iNBcux.js.map
+//# sourceMappingURL=lifecycle-io-BREGpnLk.js.map

package/server/{lifecycle-io-Bsnr2K4F.js → lifecycle-io-DPo7x11I.js}

@@ -1,3 +1,3 @@
-import { a as init_lifecycle_io, s as transitionXBriefOnMain } from "./lifecycle-io-D8iNBcux.js";
+import { a as init_lifecycle_io, s as transitionXBriefOnMain } from "./lifecycle-io-BREGpnLk.js";
 init_lifecycle_io();
 export { transitionXBriefOnMain };

package/server/{lifecycle-sycO16hj.js → lifecycle-xmBfK2GJ.js}

@@ -1,12 +1,12 @@
-import { o as init_archive_planning, t as archivePlanning } from "./archive-planning-DYrYojxl.js";
-import { a as stepSkipped, i as stepOk, n as init_types, r as stepFailed } from "./types-BBNjPcqU.js";
-import { t as closeIssue } from "./close-issue-Dn_4c4G8.js";
-import { t as teardownWorkspace } from "./teardown-workspace-CEgauF4U.js";
-import { a as deepWipe, i as closeOut, n as cancelIssueWorkflow, o as resetToTodo, r as close, t as approve } from "./workflows-C9WmILql.js";
+import { o as init_archive_planning, t as archivePlanning } from "./archive-planning-Du25Jtst.js";
+import { a as stepSkipped, i as stepOk, n as init_types, r as stepFailed } from "./types-5M0lupud.js";
+import { t as closeIssue } from "./close-issue-DoOifFIK.js";
+import { t as teardownWorkspace } from "./teardown-workspace-DeTTImn-.js";
+import { a as deepWipe, i as closeOut, n as cancelIssueWorkflow, o as resetToTodo, r as close, t as approve } from "./workflows-mbQzh6mQ.js";
 //#region ../../lib/lifecycle/index.ts
 init_types();
 init_archive_planning();
 //#endregion
 export { approve, archivePlanning, cancelIssueWorkflow, close, closeIssue, closeOut, deepWipe, resetToTodo, stepFailed, stepOk, stepSkipped, teardownWorkspace };
 
-//# sourceMappingURL=lifecycle-sycO16hj.js.map
+//# sourceMappingURL=lifecycle-xmBfK2GJ.js.map

package/server/{lifecycle-DfeyBDwA.js → lifecycle-yPd___5E.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { mr as init_errors } from "./config-yaml-DvyMuOle.js";
+import { mr as init_errors } from "./config-yaml-DySPNmKN.js";
 import "effect";
 import { mkdirSync } from "fs";
 import { join } from "path";
@@ -118,4 +118,4 @@ var init_lifecycle = __esmMin((() => {
 //#endregion
 export { generateXBriefFilename as a, parseXBriefFilename as c, ensureXBriefDirsSync as i, resolveXBriefDir as l, LEGACY_VBRIEF_LIFECYCLE_DIRS as n, init_lifecycle as o, XBRIEF_FILENAME_SUFFIX as r, isXBriefFilename as s, LEGACY_VBRIEF_FILENAME_SUFFIX as t, slugify as u };
 
-//# sourceMappingURL=lifecycle-DfeyBDwA.js.map
+//# sourceMappingURL=lifecycle-yPd___5E.js.map

package/server/{linear-client-D4zqMnX7.js → linear-client-BsuUvkdA.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { a as init_tracker_config, n as getLinearApiKey } from "./tracker-config-B4itFzDo.js";
+import { a as init_tracker_config, n as getLinearApiKey } from "./tracker-config-G6latr8C.js";
 import { a as RateLimited, c as TrackerNotConfigured, d as init_typed_errors, r as IssueNotFound, s as TrackerApiError } from "./typed-errors-2BTMxkZq.js";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
 import { LinearClient } from "@linear/sdk";
@@ -192,4 +192,4 @@ var init_linear_client = __esmMin((() => {
 //#endregion
 export { init_linear_client as i, LinearClientLive as n, LinearClientOptionalLive as r, LinearClient$1 as t };
 
-//# sourceMappingURL=linear-client-D4zqMnX7.js.map
+//# sourceMappingURL=linear-client-BsuUvkdA.js.map

package/server/{linear-client-DqhDQO9k.js → linear-client-CTskEeT_.js}

@@ -1,3 +1,3 @@
-import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-D4zqMnX7.js";
+import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-BsuUvkdA.js";
 init_linear_client();
 export { LinearClient, LinearClientLive, LinearClientOptionalLive };

package/server/memory-fts-worker.js

@@ -1,4 +1,4 @@
-import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-BrL_VTRr.js";
+import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-CqY6zl-i.js";
 import { parentPort } from "node:worker_threads";
 //#region ../../lib/memory/fts-worker.ts
 init_fts_operations();

package/server/{merge-DK23JEdS.js → merge-B1DiziGU.js}

@@ -1,2 +1,2 @@
-import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-C_ZEhbqI.js";
+import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-CefQNAnq.js";
 export { AutoMerge, AutoMergeFilter, AutoMergeNotFound, AutoMergeStatus, ForgeMergeFailed, GateStatus, MergeApi, MergeInProgress, MergeResolver, MergeResolverLive, MergeSet, MergeSetNotFound, MergeSetRepo, MergeSetStatus, MergeWriter, MergeWriterLive, NotReadyForMerge, ProjectKey, QueueEntryStatus, QueueView, RebaseStatus, RepoKey, RepoMergeStatus, UatGeneration, UatGenerationFilter, UatGenerationNotFound, UatMember, UatMemberRole, UatName, UatNotPromotable, UatResolution, UatStatus, WorkspaceType, dequeueMerge, enqueueMerge, getAllActiveQueues, getCurrentMerge, getQueueForProject, markMergeProcessing, readyForMerge };

package/server/{merge-C_ZEhbqI.js → merge-CefQNAnq.js}

@@ -1,5 +1,5 @@
-import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-CzaSOgul.js";
-import { n as init_issues, t as IssueId } from "./issues-B6ToV6x1.js";
+import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-BEqFxlJc.js";
+import { n as init_issues, t as IssueId } from "./issues-BMmP_77e.js";
 import { Context, Effect, Layer, Schema } from "effect";
 import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
 //#region ../../lib/overdeck/merge.ts
@@ -700,4 +700,4 @@ function getAllActiveQueues() {
 //#endregion
 export { UatNotPromotable as A, readyForMerge as B, RepoMergeStatus as C, UatMember as D, UatGenerationNotFound as E, enqueueMerge as F, getAllActiveQueues as I, getCurrentMerge as L, UatStatus as M, WorkspaceType as N, UatMemberRole as O, dequeueMerge as P, getQueueForProject as R, RepoKey as S, UatGenerationFilter as T, NotReadyForMerge as _, ForgeMergeFailed as a, QueueView as b, MergeInProgress as c, MergeSet as d, MergeSetNotFound as f, MergeWriterLive as g, MergeWriter as h, AutoMergeStatus as i, UatResolution as j, UatName as k, MergeResolver as l, MergeSetStatus as m, AutoMergeFilter as n, GateStatus as o, MergeSetRepo as p, AutoMergeNotFound as r, MergeApi as s, AutoMerge as t, MergeResolverLive as u, ProjectKey as v, UatGeneration as w, RebaseStatus as x, QueueEntryStatus as y, markMergeProcessing as z };
 
-//# sourceMappingURL=merge-C_ZEhbqI.js.map
+//# sourceMappingURL=merge-CefQNAnq.js.map

package/server/{merge-agent-XrB80vfT.js → merge-agent-4WOWlSYA.js}

@@ -1,14 +1,14 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Tn as init_projects, Vr as init_paths, ar as GitError, f as loadConfigSync, jn as loadProjectsConfigSync, mr as init_errors, pr as VcsError, t as init_config_yaml, wr as OVERDECK_HOME } from "./config-yaml-DvyMuOle.js";
+import { Tn as init_projects, Vr as init_paths, ar as GitError, f as loadConfigSync, jn as loadProjectsConfigSync, mr as init_errors, pr as VcsError, t as init_config_yaml, wr as OVERDECK_HOME } from "./config-yaml-DySPNmKN.js";
 import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-DDlOIAML.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CzaSOgul.js";
-import { D as killSession, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux, z as sendKeys } from "./tmux-ftABRAmc.js";
-import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status, p as markWorkspaceStuck } from "./review-status-A7quS5KJ.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-tnxxqROg.js";
-import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-B0pmAz0a.js";
-import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-CSizH3HY.js";
-import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-BVa07a4a.js";
-import { i as runQualityGates, n as init_validation } from "./validation-B5JxoPUS.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
+import { D as killSession, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux, z as sendKeys } from "./tmux-R7N7y-Mh.js";
+import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status, p as markWorkspaceStuck } from "./review-status-kZj_KyCk.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-DHv5pSDT.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-DKZFMbFt.js";
+import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-CRw2zLPC.js";
+import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-BkaOqPsw.js";
+import { i as runQualityGates, n as init_validation } from "./validation-Dw1pzDzr.js";
 import { Data, Effect } from "effect";
 import { appendFileSync, existsSync, mkdirSync } from "fs";
 import { basename, dirname, join, relative } from "path";
@@ -19,7 +19,7 @@ import { promisify } from "util";
 //#region ../../lib/cloister/merge-agent-step0.ts
 async function shouldRestartForPostMerge(repoRoot, dependencies = {}) {
 	if ((await (dependencies.computeStaleness ?? (async () => {
-		const [{ getBuildInfo }, { computeBuildStaleness }] = await Promise.all([import("./build-info-DgTqZkL5.js"), import("./staleness-Cbl_w4Bw.js")]);
+		const [{ getBuildInfo }, { computeBuildStaleness }] = await Promise.all([import("./build-info-CZk_TITh.js"), import("./staleness-CT34nwr9.js")]);
 		return computeBuildStaleness({
 			repoRoot,
 			buildCommit: getBuildInfo().buildCommit
@@ -28,7 +28,7 @@ async function shouldRestartForPostMerge(repoRoot, dependencies = {}) {
 		(dependencies.log ?? console.log)("Running build already contains origin/main build inputs — skipping deploy restart");
 		return false;
 	}
-	const reason = await (dependencies.getBlockReason ?? (async () => (await import("./deploy-window-CM6W1-c6.js")).getDeployBlockReason()))();
+	const reason = await (dependencies.getBlockReason ?? (async () => (await import("./deploy-window-DkZraDyj.js")).getDeployBlockReason()))();
 	if (reason) {
 		(dependencies.log ?? console.log)(`Deploy window unsafe (${reason}) — deferring deploy to the staleness patrol`);
 		return false;
@@ -599,7 +599,7 @@ async function notifyTldrDaemon(projectPath, _sourceBranch) {
 			return;
 		}
 		console.log(`[merge-agent] Found ${changedFiles.length} changed source files to reindex`);
-		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-DL566HbH.js");
+		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-BYFkts95.js");
 		const tldrService = getTldrDaemonServiceSync(projectPath, venvPath);
 		if (!(await tldrService.getStatus()).running) {
 			console.log(`[merge-agent] TLDR daemon not running, skipping notification`);
@@ -629,7 +629,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 	}
 	const run = (async () => {
 		try {
-			const { findSpecByIssue } = await import("./specs-nN45DG2X.js");
+			const { findSpecByIssue } = await import("./specs-C8Wsn2XO.js");
 			const spec = await Effect.runPromise(findSpecByIssue(projectPath, issueId));
 			if (spec && (spec.status === "completed" || spec.status === "cancelled")) {
 				console.log(`[merge-agent] ${issueId} is closed out (spec ${spec.status}) — skipping post-merge lifecycle`);
@@ -691,7 +691,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		console.log(`[merge-agent] Running post-merge verify handoff for ${issueId}`);
 		try {
-			const { cleanupMergedLabels } = await import("./label-cleanup-BKPJm4Hv.js");
+			const { cleanupMergedLabels } = await import("./label-cleanup-B0UJwnv5.js");
 			const ghResolved = resolveGitHubIssueSync(issueId);
 			const labelCtx = ghResolved.isGitHub ? {
 				issueId,
@@ -740,8 +740,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Async post-merge release trigger failed for ${issueId}: ${err instanceof Error ? err.message : String(err)}`);
 		});
 		try {
-			const { setAgentPaused, getAgentState } = await import("./agents-FlIgQ3ql.js");
-			const { killSession, sessionExists } = await import("./tmux-DoThH6aj.js");
+			const { setAgentPaused, getAgentState } = await import("./agents-wi9NWzs2.js");
+			const { killSession, sessionExists } = await import("./tmux-B6z7h_vZ.js");
 			const issueLower = issueId.toLowerCase();
 			const reason = "awaiting close-out (verify on main)";
 			for (const agentId of [`agent-${issueLower}`, `planning-${issueLower}`]) {
@@ -766,8 +766,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Could not pause or kill agent sessions: ${err}`);
 		}
 		try {
-			const { killAllReviewerSessions } = await import("./review-agent-DJRO8EG8.js");
-			const { resolveProjectFromIssueSync } = await import("./projects-9SkRpES9.js");
+			const { killAllReviewerSessions } = await import("./review-agent-DNboMyW4.js");
+			const { resolveProjectFromIssueSync } = await import("./projects-vjjcmiN8.js");
 			const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 			if (projectKey) {
 				const { killed } = await Effect.runPromise(killAllReviewerSessions(projectKey, issueId));
@@ -781,7 +781,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		await killPostMergeRoleSessions(issueId);
 		try {
-			const { createResetMarker } = await import("./cli-BsVIHwzC.js");
+			const { createResetMarker } = await import("./cli-B86rejVV.js");
 			const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 			const marker = await createResetMarker({
 				projectId: basename(projectPath),
@@ -796,8 +796,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Memory reset marker creation failed (non-fatal): ${err}`);
 		}
 		try {
-			const { findWorkspacePath } = await import("./archive-planning-zkJb3BeM.js");
-			const { stopWorkspaceDocker } = await import("./workspace-manager-ZTdJAy9M.js");
+			const { findWorkspacePath } = await import("./archive-planning-BZDgzoEj.js");
+			const { stopWorkspaceDocker } = await import("./workspace-manager-CWT55qeI.js");
 			const issueLower = issueId.toLowerCase();
 			const workspacePath = findWorkspacePath(projectPath, issueLower);
 			if (workspacePath) {
@@ -828,7 +828,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] Release already started or completed for ${issueId} (${currentStatus}), skipping`);
 		return;
 	}
-	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-9SkRpES9.js");
+	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-vjjcmiN8.js");
 	const resolved = resolveProjectFromIssueSync(issueId);
 	if (!(resolved ? getProjectSync(resolved.projectKey) : null)?.release) {
 		setReviewStatusSync(issueId, {
@@ -838,7 +838,7 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 		console.log(`[merge-agent] No release config for ${issueId}; marked release skipped`);
 		return;
 	}
-	const { runRelease } = await import("./release-engine-DZpmGGzb.js");
+	const { runRelease } = await import("./release-engine-Cx48W7z8.js");
 	try {
 		await runRelease(issueId, projectPath);
 	} catch (err) {
@@ -857,10 +857,10 @@ async function triggerPostMergeReleaseIfConfigured(issueId, projectPath) {
 async function transitionIssueToVerifyingOnMain(issueId, projectPath) {
 	const [effectModule, issueLifecycleModule, githubModule, linearModule, rallyModule, errorsModule] = await Promise.all([
 		import("effect"),
-		import("./issue-lifecycle-Dy4vd0Oa.js"),
-		import("./github-client-B4QsdE-X.js"),
-		import("./linear-client-DqhDQO9k.js"),
-		import("./rally-client-CULK2XAY.js"),
+		import("./issue-lifecycle-B8sZHVHh.js"),
+		import("./github-client-DfQYVUaw.js"),
+		import("./linear-client-CTskEeT_.js"),
+		import("./rally-client-sgtVqzNU.js"),
 		import("./typed-errors-BHhE85Ul.js")
 	]);
 	const { Effect, Layer } = effectModule;
@@ -1592,4 +1592,4 @@ var init_merge_agent = __esmMin((() => {
 //#endregion
 export { init_operations as C, gitPush as S, listGitOperationsSync as T, scanGitPatterns as _, init_merge_agent as a, triggerPostMergeReleaseIfConfigured as b, isSyncMainMainPreferredPath as c, parseAgentOutput as d, postMergeLifecycle as f, scanForConflictMarkers as g, salvageStrandedMerge as h, captureTmuxOutput as i, logMergeHistory as l, runProjectQualityGates as m, GIT_PATTERNS as n, isAutoCommitExcludedPath as o, resetPostMergeState as p, autoCommitWorkspaceChangesBeforeSync as r, isMergeAgentRunning as s, AUTO_COMMIT_EXCLUDED_PATHS as t, notifyTldrDaemon as u, sendMessageToAgent as v, init_git_activity as w, MainDivergedError as x, syncMainIntoWorkspace as y };
 
-//# sourceMappingURL=merge-agent-XrB80vfT.js.map
+//# sourceMappingURL=merge-agent-4WOWlSYA.js.map

package/server/{merge-agent-BQM3a8z5.js → merge-agent-CKkgIBPB.js}

@@ -1,3 +1,3 @@
-import { _ as scanGitPatterns, a as init_merge_agent, b as triggerPostMergeReleaseIfConfigured, c as isSyncMainMainPreferredPath, d as parseAgentOutput, f as postMergeLifecycle, g as scanForConflictMarkers, h as salvageStrandedMerge, i as captureTmuxOutput, l as logMergeHistory, m as runProjectQualityGates, n as GIT_PATTERNS, o as isAutoCommitExcludedPath, p as resetPostMergeState, r as autoCommitWorkspaceChangesBeforeSync, s as isMergeAgentRunning, t as AUTO_COMMIT_EXCLUDED_PATHS, u as notifyTldrDaemon, v as sendMessageToAgent, y as syncMainIntoWorkspace } from "./merge-agent-XrB80vfT.js";
+import { _ as scanGitPatterns, a as init_merge_agent, b as triggerPostMergeReleaseIfConfigured, c as isSyncMainMainPreferredPath, d as parseAgentOutput, f as postMergeLifecycle, g as scanForConflictMarkers, h as salvageStrandedMerge, i as captureTmuxOutput, l as logMergeHistory, m as runProjectQualityGates, n as GIT_PATTERNS, o as isAutoCommitExcludedPath, p as resetPostMergeState, r as autoCommitWorkspaceChangesBeforeSync, s as isMergeAgentRunning, t as AUTO_COMMIT_EXCLUDED_PATHS, u as notifyTldrDaemon, v as sendMessageToAgent, y as syncMainIntoWorkspace } from "./merge-agent-4WOWlSYA.js";
 init_merge_agent();
 export { AUTO_COMMIT_EXCLUDED_PATHS, GIT_PATTERNS, autoCommitWorkspaceChangesBeforeSync, captureTmuxOutput, isAutoCommitExcludedPath, isMergeAgentRunning, isSyncMainMainPreferredPath, logMergeHistory, notifyTldrDaemon, parseAgentOutput, postMergeLifecycle, resetPostMergeState, runProjectQualityGates, salvageStrandedMerge, scanForConflictMarkers, scanGitPatterns, sendMessageToAgent, syncMainIntoWorkspace, triggerPostMergeReleaseIfConfigured };

package/server/{merge-batch-Bwoyr8Je.js → merge-batch-ClFn2T-y.js}

@@ -44,4 +44,4 @@ async function shipMergeBatch(issueIds, deps) {
 //#endregion
 export { shipMergeBatch };
 
-//# sourceMappingURL=merge-batch-Bwoyr8Je.js.map
+//# sourceMappingURL=merge-batch-ClFn2T-y.js.map

package/server/merge-ops-CR44oU9-.js

@@ -0,0 +1,2 @@
+import { c as triggerMerge } from "./workspaces-Do_9J0LQ.js";
+export { triggerMerge };

package/server/{merge-rebase-C1KIVr0s.js → merge-rebase-BfaTyXsw.js}

@@ -1,4 +1,4 @@
-import { ar as GitError, lr as MergeConflictError, mr as init_errors } from "./config-yaml-DvyMuOle.js";
+import { ar as GitError, lr as MergeConflictError, mr as init_errors } from "./config-yaml-DySPNmKN.js";
 import { Effect } from "effect";
 import { existsSync } from "fs";
 import { join } from "path";
@@ -131,4 +131,4 @@ function rebaseFeatureBranch(workspacePath, featureBranch, baseBranch, issueId)
 //#endregion
 export { rebaseFeatureBranch };
 
-//# sourceMappingURL=merge-rebase-C1KIVr0s.js.map
+//# sourceMappingURL=merge-rebase-BfaTyXsw.js.map

package/server/merge-set-DJ8-UErs.js

@@ -0,0 +1,83 @@
+import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
+import { $n as resolveIssueIdSync, Tn as init_projects, Yn as init_issue_id, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { T as upsertMergeSet, i as getMergeSetFromDb, o as init_merge_sync } from "./merge-sync-VPV28g0g.js";
+import { r as init_project_repos, s as resolveProjectReposFromResolvedIssueSync } from "./project-repos-B6GycDh9.js";
+import "effect";
+//#region ../../lib/merge-set.ts
+function upsertMergeSetSync(mergeSet) {
+	upsertMergeSet({
+		...mergeSet,
+		issueId: resolveIssueIdSync(mergeSet.issueId)
+	});
+}
+function getMergeSetSync(issueId) {
+	return getMergeSetFromDb(resolveIssueIdSync(issueId));
+}
+function buildMergeSetForIssueSync(issueId, labels = []) {
+	const resolved = resolveProjectFromIssueSync(issueId, labels);
+	if (!resolved) return null;
+	const repos = resolveProjectReposFromResolvedIssueSync(issueId, resolved);
+	if (!repos) return null;
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	return {
+		issueId,
+		projectKey: resolved.projectKey,
+		projectPath: resolved.projectPath,
+		workspaceType: repos.length > 1 ? "polyrepo" : "monorepo",
+		status: "draft",
+		createdAt: now,
+		updatedAt: now,
+		repos: repos.map((repo) => ({
+			repoKey: repo.repoKey,
+			repoPath: repo.repoPath,
+			forge: repo.forge,
+			sourceBranch: repo.sourceBranch,
+			targetBranch: repo.targetBranch,
+			reviewStatus: "pending",
+			testStatus: "pending",
+			rebaseStatus: "pending",
+			verificationStatus: "pending",
+			mergeStatus: "pending",
+			mergeOrder: repo.mergeOrder,
+			required: repo.required
+		}))
+	};
+}
+function ensureMergeSetForIssueSync(issueId, labels = []) {
+	const existing = getMergeSetSync(issueId);
+	if (existing) return existing;
+	const built = buildMergeSetForIssueSync(issueId, labels);
+	if (built) upsertMergeSetSync(built);
+	return built;
+}
+function withRepoArtifactUrlSync(mergeSet, repoKey, artifactUrl, artifactId) {
+	return {
+		...mergeSet,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		repos: mergeSet.repos.map((repo) => repo.repoKey === repoKey ? {
+			...repo,
+			artifactUrl,
+			artifactId
+		} : repo)
+	};
+}
+function withRepoStateSync(mergeSet, repoKey, patch) {
+	return {
+		...mergeSet,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		repos: mergeSet.repos.map((repo) => repo.repoKey === repoKey ? {
+			...repo,
+			...patch
+		} : repo)
+	};
+}
+var init_merge_set = __esmMin((() => {
+	init_merge_sync();
+	init_projects();
+	init_project_repos();
+	init_issue_id();
+}));
+//#endregion
+export { upsertMergeSetSync as a, init_merge_set as i, ensureMergeSetForIssueSync as n, withRepoArtifactUrlSync as o, getMergeSetSync as r, withRepoStateSync as s, buildMergeSetForIssueSync as t };
+
+//# sourceMappingURL=merge-set-DJ8-UErs.js.map

package/server/{merge-set-DnSYdBEp.js → merge-set-bUqbm3yc.js}

@@ -1,3 +1,3 @@
-import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-DLz0MkGT.js";
+import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-DJ8-UErs.js";
 init_merge_set();
 export { ensureMergeSetForIssueSync, getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync };

package/server/{merge-sync-SSv3E-pl.js → merge-sync-BJYeOODr.js}

@@ -1,3 +1,3 @@
-import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-DZ9dojJn.js";
+import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-VPV28g0g.js";
 init_merge_sync();
 export { resetProcessingToQueued };

package/server/{merge-sync-DZ9dojJn.js → merge-sync-VPV28g0g.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CzaSOgul.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
 //#region ../../lib/overdeck/merge-sync.ts
 function isoFromMillis(value) {
 	return value == null ? void 0 : new Date(value).toISOString();
@@ -401,4 +401,4 @@ var init_merge_sync = __esmMin((() => {
 //#endregion
 export { transitionToMerging as C, setUatGenerationStackStartedAtSync as S, upsertMergeSet as T, markFailed as _, getUatGenerationSync as a, resetProcessingToQueued as b, isFlywheelGloballyPaused as c, listDuePendingAutoMerges as d, listProblemAutoMerges as f, markBlocked as g, listUatGenerationsWithStacksSync as h, getMergeSetFromDb as i, isMergeTrainEnabled as l, listUatGenerationsSync as m, getActionableAutoMerge as n, init_merge_sync as o, listUatGenerationNamesSync as p, getAllActiveQueues as r, insertUatGenerationSync as s, cancelPending as t, listActiveAutoMerges as u, markMerged as v, updateUatGenerationSync as w, scheduleAutoMergeWithResult as x, requeueToPending as y };
 
-//# sourceMappingURL=merge-sync-DZ9dojJn.js.map
+//# sourceMappingURL=merge-sync-VPV28g0g.js.map

package/server/{merge-train-DxDfBTjr.js → merge-train-CHopycP0.js}

@@ -1,4 +1,4 @@
-import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-DZ9dojJn.js";
+import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-VPV28g0g.js";
 //#region ../../lib/cloister/merge-train-reconciler.ts
 init_merge_sync();
 /**
@@ -62,9 +62,9 @@ async function reconcileStaleSiblings(mergedIssueId, deps) {
 */
 async function runMergeTrainReconcile(mergedIssueId, opts = {}) {
 	if (!(opts.enabled ?? isMergeTrainEnabled)()) return [];
-	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-CyYQUksx.js")).buildRealReconcileDeps());
+	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-D1cOZzy2.js")).buildRealReconcileDeps());
 }
 //#endregion
 export { runMergeTrainReconcile };
 
-//# sourceMappingURL=merge-train-DxDfBTjr.js.map
+//# sourceMappingURL=merge-train-CHopycP0.js.map

package/server/{merge-train-deps-CyYQUksx.js → merge-train-deps-D1cOZzy2.js}

@@ -1,6 +1,6 @@
-import { Tn as init_projects, zn as resolveProjectFromIssueSync } from "./config-yaml-DvyMuOle.js";
-import { b as init_agents, ut as spawnRun } from "./queries-6d7Cdtm7.js";
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-BhSQ0d0l.js";
+import { Tn as init_projects, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { b as init_agents, ut as spawnRun } from "./queries-CjNIf-Ub.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-BTOpxtTC.js";
 import { join } from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -66,4 +66,4 @@ function buildRealReconcileDeps() {
 //#endregion
 export { buildRealReconcileDeps };
 
-//# sourceMappingURL=merge-train-deps-CyYQUksx.js.map
+//# sourceMappingURL=merge-train-deps-D1cOZzy2.js.map

package/server/{merge-verification-CSizH3HY.js → merge-verification-BkaOqPsw.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Tn as init_projects, zn as resolveProjectFromIssueSync } from "./config-yaml-DvyMuOle.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-tnxxqROg.js";
-import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-CMBdIFBQ.js";
+import { Tn as init_projects, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-DHv5pSDT.js";
+import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-C3QrAUd0.js";
 import { Effect } from "effect";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
@@ -121,4 +121,4 @@ var init_merge_verification = __esmMin((() => {
 //#endregion
 export { shouldSkipDispatchAsMerged as n, verifyMergedBeforeLifecycle as r, init_merge_verification as t };
 
-//# sourceMappingURL=merge-verification-CSizH3HY.js.map
+//# sourceMappingURL=merge-verification-BkaOqPsw.js.map