@overdeck/desktop 0.49.2 → 0.50.0

package/server/node_modules/picomatch/lib/scan.js

@@ -50,7 +50,7 @@ const scan = (input, options) => {
   const opts = options || {};
 
   const length = input.length - 1;
-  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+  const scanToEnd = opts.parts === true || opts.tokens === true || opts.scanToEnd === true;
   const slashes = [];
   const tokens = [];
   const parts = [];
@@ -184,15 +184,21 @@ const scan = (input, options) => {
         }
 
         if (scanToEnd === true) {
+          let parens = 0;
+
           while (eos() !== true && (code = advance())) {
             if (code === CHAR_BACKWARD_SLASH) {
               backslashes = token.backslashes = true;
-              code = advance();
+              advance();
+              continue;
+            }
+
+            if (code === CHAR_LEFT_PARENTHESES) {
+              parens++;
               continue;
             }
 
-            if (code === CHAR_RIGHT_PARENTHESES) {
-              isGlob = token.isGlob = true;
+            if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
               finished = true;
               break;
             }
@@ -257,14 +263,21 @@ const scan = (input, options) => {
       isGlob = token.isGlob = true;
 
       if (scanToEnd === true) {
+        let parens = 1;
+
         while (eos() !== true && (code = advance())) {
-          if (code === CHAR_LEFT_PARENTHESES) {
+          if (code === CHAR_BACKWARD_SLASH) {
             backslashes = token.backslashes = true;
-            code = advance();
+            advance();
             continue;
           }
 
-          if (code === CHAR_RIGHT_PARENTHESES) {
+          if (code === CHAR_LEFT_PARENTHESES) {
+            parens++;
+            continue;
+          }
+
+          if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
             finished = true;
             break;
           }
@@ -351,7 +364,7 @@ const scan = (input, options) => {
     let prevIndex;
 
     for (let idx = 0; idx < slashes.length; idx++) {
-      const n = prevIndex ? prevIndex + 1 : start;
+      const n = prevIndex !== undefined ? prevIndex + 1 : start;
       const i = slashes[idx];
       const value = input.slice(n, i);
       if (opts.tokens) {
@@ -364,21 +377,20 @@ const scan = (input, options) => {
         depth(tokens[idx]);
         state.maxDepth += tokens[idx].depth;
       }
-      if (idx !== 0 || value !== '') {
+      if (i >= start) {
         parts.push(value);
+        prevIndex = i;
       }
-      prevIndex = i;
     }
 
-    if (prevIndex && prevIndex + 1 < input.length) {
-      const value = input.slice(prevIndex + 1);
-      parts.push(value);
+    const n = prevIndex !== undefined ? prevIndex + 1 : start;
+    const value = input.slice(n);
+    parts.push(value);
 
-      if (opts.tokens) {
-        tokens[tokens.length - 1].value = value;
-        depth(tokens[tokens.length - 1]);
-        state.maxDepth += tokens[tokens.length - 1].depth;
-      }
+    if (opts.tokens && prevIndex && prevIndex + 1 < input.length) {
+      tokens[tokens.length - 1].value = value;
+      depth(tokens[tokens.length - 1]);
+      state.maxDepth += tokens[tokens.length - 1].depth;
     }
 
     state.slashes = slashes;

package/server/node_modules/picomatch/package.json

@@ -1,7 +1,7 @@
 {
   "name": "picomatch",
   "description": "Blazing fast and accurate glob matcher written in JavaScript, with no dependencies and full support for standard and extended Bash glob features, including braces, extglobs, POSIX brackets, and regular expressions.",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "homepage": "https://github.com/micromatch/picomatch",
   "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
   "funding": "https://github.com/sponsors/jonschlinkert",

package/server/{orphan-proposed-reconciler-gf4TxfZb.js → orphan-proposed-reconciler-CnP0K2v3.js}

@@ -1,3 +1,3 @@
-import { n as handleOrphanProposedSpec } from "./orphan-proposed-reconciler-Dmk0kO_p.js";
-import "./work-agent-start-B65Gqn9N.js";
+import { n as handleOrphanProposedSpec } from "./orphan-proposed-reconciler-nFUlquZt.js";
+import "./work-agent-start-0nJ-6UeA.js";
 export { handleOrphanProposedSpec };

package/server/{orphan-proposed-reconciler-Dmk0kO_p.js → orphan-proposed-reconciler-nFUlquZt.js}

@@ -1,24 +1,24 @@
 import { a as __toCommonJS } from "./rolldown-runtime-DNCzzKnI.js";
-import { On as resolveProjectFromIssueSync, fn as init_projects, gn as listProjects } from "./config-yaml-D9nfpEx1.js";
-import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-BWZhVphb.js";
-import { C as init_tmux, j as listSessionNames } from "./tmux-DWEc4Ld9.js";
-import { m as getAgentState, q as init_agents } from "./agent-state-BJhGIJZe.js";
-import { o as getInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-DoVzb4b7.js";
-import { a as readAutoSpawnOnFinalizeFlagAsync } from "./auto-spawn-consent-Dc4mtM-B.js";
-import { c as init_control_settings, f as isFlywheelAutoPickupBacklog } from "./control-settings-BMoDHY1G.js";
-import { o as init_lifecycle, s as isXBriefFilename } from "./lifecycle-0NOEzomy.js";
-import { C as init_specs, N as getProjectPanPaths, P as init_paths, S as findSpecByIssue, f as readPlanSync, i as findPlanSync, s as init_io } from "./io-DKrWd3gX.js";
-import { i as loadCloisterConfig, r as init_config } from "./config-Doq_tF-f.js";
-import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-DJAOAuMN.js";
-import { i as issue_service_singleton_exports, n as init_issue_service_singleton } from "./issue-service-singleton-B2xy-IS9.js";
-import { d as getReviewStatusSync, p as init_review_status } from "./review-status-yOGD2MuK.js";
-import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-7ywLhuZO.js";
-import { h as init_pickup, r as LEGACY_PARKED_LABELS } from "./pickup-D1UbSDPd.js";
-import { r as activeOrderBookIssues } from "./flywheel-CjW2L7BS.js";
-import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-6RQsAjDX.js";
-import { t as recordDeadEndNeedsYou } from "./dead-end-trip-CnVmjnya.js";
-import "./spawn-planning-session-CkGweSCC.js";
-import { n as spawnWorkAgentThroughAgentsEndpoint, t as init_work_agent_start } from "./work-agent-start-B65Gqn9N.js";
+import { On as resolveProjectFromIssueSync, fn as init_projects, gn as listProjects } from "./config-yaml-D60AnTIu.js";
+import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-SlTXYCVf.js";
+import { C as init_tmux, j as listSessionNames } from "./tmux-wnT_hg-s.js";
+import { c as init_control_settings, f as isFlywheelAutoPickupBacklog } from "./control-settings-Db0uXgVM.js";
+import { m as getAgentState, q as init_agents } from "./agent-state-FABw8neJ.js";
+import { o as getInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-BeIWG_kT.js";
+import { a as readAutoSpawnOnFinalizeFlagAsync } from "./auto-spawn-consent-BesWchEi.js";
+import { o as init_lifecycle, s as isXBriefFilename } from "./lifecycle-DVXyUil2.js";
+import { C as init_specs, N as getProjectPanPaths, P as init_paths, S as findSpecByIssue, f as readPlanSync, i as findPlanSync, s as init_io } from "./io-BCtZoXHo.js";
+import { i as loadCloisterConfig, r as init_config } from "./config-_qaa1UXH.js";
+import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-Dbg_pVZg.js";
+import { i as issue_service_singleton_exports, n as init_issue_service_singleton } from "./issue-service-singleton-C_sZ0HjP.js";
+import { d as getReviewStatusSync, p as init_review_status } from "./review-status-DpniqzPT.js";
+import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-BlMSzSTw.js";
+import { h as init_pickup, r as LEGACY_PARKED_LABELS } from "./pickup-Dle6k9Xt.js";
+import { r as activeOrderBookIssues } from "./flywheel-DWKd7bMc.js";
+import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-CiYAa6bX.js";
+import { t as recordDeadEndNeedsYou } from "./dead-end-trip-Bs3hxIn6.js";
+import "./spawn-planning-session-DCmO6COk.js";
+import { n as spawnWorkAgentThroughAgentsEndpoint, t as init_work_agent_start } from "./work-agent-start-0nJ-6UeA.js";
 import { Effect } from "effect";
 import { existsSync, readdirSync } from "fs";
 import { join } from "path";
@@ -654,4 +654,4 @@ async function reconcileOrphanProposedSpecs(options = {}) {
 //#endregion
 export { triggerRebuildAndStart as a, reconcileOrphanProposedSpecs as i, handleOrphanProposedSpec as n, decideAutonomousWorkDispatch as o, hasReviewPipelinePresence as r, gatherAutonomousWorkDispatchInput as s, findOrphanProposedSpecsForReconciler as t };
 
-//# sourceMappingURL=orphan-proposed-reconciler-Dmk0kO_p.js.map
+//# sourceMappingURL=orphan-proposed-reconciler-nFUlquZt.js.map

package/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@overdeck/desktop-server",
-  "version": "0.49.2",
+  "version": "0.50.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@overdeck/desktop-server",
-      "version": "0.49.2",
+      "version": "0.50.0",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.73",
         "@google-cloud/speech": "7.3.1",
@@ -38,19 +38,19 @@
       }
     },
     "node_modules/@effect/platform-node/node_modules/@effect/platform-node-shared": {
-      "version": "4.0.0-rc.109",
-      "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-4.0.0-rc.109.tgz",
-      "integrity": "sha512-jhZJnf81N7Z5+Z41Qr0cKT75WzGu6M1W05xrSdu/V8PK0kSFtU5hJMBxSGDWNlgWhBwK0WRZtnMHY8HLdONg1w==",
+      "version": "4.0.0-rc.112",
+      "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-4.0.0-rc.112.tgz",
+      "integrity": "sha512-ttjz0xKamFN7vL8pNDYVwddJLjZvqKePc05djlz2VcdaKbLsnYbtMnL1rbOfHgEnIUSHGh7FkjaN4DM1Ov81sQ==",
       "license": "MIT",
       "dependencies": {
         "@types/ws": "^8.18.1",
-        "ws": "^8.21.0"
+        "ws": "^8.21.3"
       },
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "effect": "^4.0.0-rc.109"
+        "effect": "^4.0.0-rc.112"
       }
     },
     "node_modules/@google-cloud/common": {
@@ -739,9 +739,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "26.2.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.2.0.tgz",
-      "integrity": "sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==",
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.3.0.tgz",
+      "integrity": "sha512-L3fgrnchriRC2ExBflb8j4uZZURHZfQsmQeyVzhjcHW4kkwVyo8/0h1B2MVzMTrYUJYu6G7EWs14hW/L9putqw==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.3.0"
@@ -1203,9 +1203,9 @@
       }
     },
     "node_modules/effect/node_modules/uuid": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz",
-      "integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==",
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.2.tgz",
+      "integrity": "sha512-xZe/16rV4aa+HGSOCiY2YeLT1OybRLrrkL/Rqaq7p7GMVXjFh+6wN4oMYgjFmnSnhY8t6Xpdl2l9qmnHYuMHwQ==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
@@ -1702,9 +1702,9 @@
       "license": "MIT"
     },
     "node_modules/msgpackr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-2.0.5.tgz",
-      "integrity": "sha512-cef05H/dSYpLpqp3sj/qyZh5vhUYCalnaLO7j1yOmpsR0y/XwLVtK7r5gn+U/F7CTEfMowcGhlUQJDLcLf7jcA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-2.0.6.tgz",
+      "integrity": "sha512-plGul/tqjt9vqWFR9zyqyLZls6gb5KTLvnsRO2B9+TZ8tNiXiVI/CR8LiDWlAX4IUeVkQ9gsmzKA6voC2QOciw==",
       "license": "MIT",
       "optionalDependencies": {
         "msgpackr-extract": "^3.0.4"
@@ -1847,9 +1847,9 @@
       }
     },
     "node_modules/picomatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
-      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "license": "MIT",
       "engines": {
         "node": ">=12"

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@overdeck/desktop-server",
-  "version": "0.49.2",
+  "version": "0.50.0",
   "private": true,
   "type": "module",
   "dependencies": {

package/server/{pan-dir-BMda7tQj.js → pan-dir-B4NfzOf3.js}

@@ -1,8 +1,8 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Dt as queueAutoCommit, Tt as init_auto_commit, Zr as FsError, ci as init_errors, wt as flushAutoCommits } from "./config-yaml-D9nfpEx1.js";
+import { Dt as queueAutoCommit, Qr as FsError, Tt as init_auto_commit, li as init_errors, wt as flushAutoCommits } from "./config-yaml-D60AnTIu.js";
 import { m as init_types } from "./types-pLpbsNto.js";
-import { a as init_continue, i as getWorkspacePanPaths, n as getLegacyWorkspacePanPaths, r as getReadableWorkspacePanPaths, t as ensureWorkspacePanDir } from "./continue-i7Revg8D.js";
-import { C as init_specs, N as getProjectPanPaths, x as ensurePanDirs } from "./io-DKrWd3gX.js";
+import { a as init_continue, i as getWorkspacePanPaths, n as getLegacyWorkspacePanPaths, r as getReadableWorkspacePanPaths, t as ensureWorkspacePanDir } from "./continue-CnvrUfxw.js";
+import { C as init_specs, N as getProjectPanPaths, x as ensurePanDirs } from "./io-BCtZoXHo.js";
 import { Effect, FileSystem } from "effect";
 import { join } from "path";
 import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
@@ -307,4 +307,4 @@ var init_pan_dir = __esmMin((() => {
 //#endregion
 export { getDraftPath as a, clearFeedback as c, checkPrdGateSync as i, readFeedback as l, readWorkspaceContext as n, getIssueDraftPath as o, writeWorkspaceContext as r, promoteWorkspacePrdDraft as s, init_pan_dir as t, writeFeedback as u };
 
-//# sourceMappingURL=pan-dir-BMda7tQj.js.map
+//# sourceMappingURL=pan-dir-B4NfzOf3.js.map

package/server/{parked-residue-BiHb8cD7.js → parked-residue-8WbU0y1z.js}

@@ -1,18 +1,18 @@
-import { Ht as init_state_read_home, On as resolveProjectFromIssueSync, Ri as init_paths, Wt as resolveStateReadHomeSync, Y as init_record, fn as init_projects, j as RECORD_DIRNAME, li as AGENTS_DIR } from "./config-yaml-D9nfpEx1.js";
-import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-BWZhVphb.js";
-import { B as sendKeys, C as init_tmux, W as sessionExistsSync } from "./tmux-DWEc4Ld9.js";
-import { W as getAgentRuntimeStateSync, _ as init_agent_state, a as clearAgentOperatorGatesForIssuesSync, g as getAgentStateSync, q as init_agents, yn as listRunningAgentsSync } from "./agent-state-BJhGIJZe.js";
-import { i as loadCloisterConfig, r as init_config } from "./config-Doq_tF-f.js";
-import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-DJAOAuMN.js";
-import { _ as markMerged, c as init_merge_sync, f as listActiveAutoMerges, m as listProblemAutoMerges, t as cancelPending } from "./merge-sync-CJpOa0cZ.js";
-import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-BmRRflt0.js";
-import { U as reviewGatesPassedSync, Y as init_review_status_record_sync, Z as readJournalStatusSync, h as loadReviewStatuses, p as init_review_status, w as setReviewStatusSync } from "./review-status-yOGD2MuK.js";
-import { M as withConcurrencyLimit, j as init_concurrency } from "./github-app-7ywLhuZO.js";
-import { r as isAgentIdleForNudge } from "./agent-idle-ONBssBN_.js";
-import { n as sweepAutoCloseOutCache, t as getAutoCloseOutCanonicalState } from "./deacon-canonical-state-CkvxRPck.js";
-import { n as getForgeAdapter } from "./forge-RVTCK_5X.js";
-import { i as observeForgeMergeState } from "./merge-completeness-DQt7Qa7i.js";
-import { r as init_recovery_trip, t as acknowledgeAllOpenRecoveryTrips } from "./recovery-trip-BKLrL6NX.js";
+import { Ht as init_state_read_home, On as resolveProjectFromIssueSync, Wt as resolveStateReadHomeSync, Y as init_record, fn as init_projects, j as RECORD_DIRNAME, ui as AGENTS_DIR, zi as init_paths } from "./config-yaml-D60AnTIu.js";
+import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-SlTXYCVf.js";
+import { B as sendKeys, C as init_tmux, W as sessionExistsSync } from "./tmux-wnT_hg-s.js";
+import { W as getAgentRuntimeStateSync, _ as init_agent_state, a as clearAgentOperatorGatesForIssuesSync, g as getAgentStateSync, q as init_agents, yn as listRunningAgentsSync } from "./agent-state-FABw8neJ.js";
+import { i as loadCloisterConfig, r as init_config } from "./config-_qaa1UXH.js";
+import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-Dbg_pVZg.js";
+import { _ as markMerged, c as init_merge_sync, f as listActiveAutoMerges, m as listProblemAutoMerges, t as cancelPending } from "./merge-sync-YLvOPAry.js";
+import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-CyW-xSn4.js";
+import { U as reviewGatesPassedSync, Y as init_review_status_record_sync, Z as readJournalStatusSync, h as loadReviewStatuses, p as init_review_status, w as setReviewStatusSync } from "./review-status-DpniqzPT.js";
+import { M as withConcurrencyLimit, j as init_concurrency } from "./github-app-BlMSzSTw.js";
+import { r as isAgentIdleForNudge } from "./agent-idle-D-UQ7gDv.js";
+import { n as sweepAutoCloseOutCache, t as getAutoCloseOutCanonicalState } from "./deacon-canonical-state-DkdkQS5p.js";
+import { n as getForgeAdapter } from "./forge-CHADjOFs.js";
+import { i as observeForgeMergeState } from "./merge-completeness-BOtBUwTU.js";
+import { r as init_recovery_trip, t as acknowledgeAllOpenRecoveryTrips } from "./recovery-trip-CpfW6LCJ.js";
 import { join } from "node:path";
 import { Effect } from "effect";
 import { existsSync, readdirSync } from "fs";
@@ -76,7 +76,7 @@ function isStuckMergingState(status, now) {
 }
 async function readSpecStatus(projectPath, issueId) {
 	try {
-		const { findSpecByIssue } = await import("./specs-IYsFlM-L.js");
+		const { findSpecByIssue } = await import("./specs-oRGyfz6C.js");
 		return (await Effect.runPromise(findSpecByIssue(projectPath, issueId)))?.status;
 	} catch {
 		return;
@@ -158,7 +158,7 @@ async function reconcileStuckMergingStates() {
 		reviewGatesPassed: reviewGatesPassedSync,
 		setReviewStatus: setReviewStatusSync,
 		enqueuePostMerge: async (issueId, projectPath, branch) => {
-			const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-DAWgzXQA.js");
+			const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-OQoK8Ckg.js");
 			return enqueuePostMergeLifecycle(issueId, projectPath, branch);
 		},
 		warn: (message) => console.warn(message)
@@ -383,7 +383,7 @@ async function reconcileStaleMergeStatus() {
 		const statuses = loadReviewStatuses();
 		for (const [issueId, status] of Object.entries(statuses)) {
 			const postMergeIncomplete = status.mergeStatus === "merged" && status.mergeStep === "post-merge-cleanup";
-			if (status.mergeStatus === "merged" && !postMergeIncomplete) continue;
+			if (status.retiredAt || status.mergeStatus === "merged" && !postMergeIncomplete) continue;
 			if (isStuckMergingState(status, Date.now())) continue;
 			if (!postMergeIncomplete && staleMergeReconciled.has(issueId)) continue;
 			const project = resolveProjectFromIssueSync(issueId);
@@ -398,7 +398,7 @@ async function reconcileStaleMergeStatus() {
 			].includes(status.mergeStatus ?? "") || ["merging", "failed"].includes(mergeSet?.status ?? "");
 			let specStatus;
 			try {
-				const { findSpecByIssue } = await import("./specs-IYsFlM-L.js");
+				const { findSpecByIssue } = await import("./specs-oRGyfz6C.js");
 				const spec = await Effect.runPromise(findSpecByIssue(project.projectPath, issueId));
 				specStatus = spec?.status;
 				if (spec && (spec.status === "completed" || spec.status === "cancelled")) {
@@ -408,7 +408,7 @@ async function reconcileStaleMergeStatus() {
 			} catch {}
 			const branch = `feature/${issueId.toLowerCase()}`;
 			if (postMergeIncomplete) {
-				const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-DAWgzXQA.js");
+				const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-OQoK8Ckg.js");
 				const action = enqueuePostMergeLifecycle(issueId, project.projectPath, branch);
 				if (action) actions.push(action);
 				continue;
@@ -420,7 +420,7 @@ async function reconcileStaleMergeStatus() {
 			} catch {}
 			if (!isMerged) isMerged = (await observeGitHubBranchMerge(issueId, branch, project.projectPath)).merged;
 			if (shouldObserveForge && mergeRelevant) try {
-				const observation = await (await import("./merge-completeness-DkdabVch.js")).observeForgeMergeState(issueId);
+				const observation = await (await import("./merge-completeness-CoLJxfUY.js")).observeForgeMergeState(issueId);
 				const blocker = observation.repos.find((repo) => repo.state === "unverifiable");
 				if (blocker) {
 					console.warn(`[deacon] ${issueId}: forge merge state is unverifiable — ${blocker.reason}`);
@@ -447,7 +447,7 @@ async function reconcileStaleMergeStatus() {
 				const msg = `Reconciled stale mergeStatus for ${issueId} — branch ${branch} is merged to main`;
 				actions.push(msg);
 				console.log(`[deacon] ${msg}`);
-				const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-DAWgzXQA.js");
+				const { enqueuePostMergeLifecycle } = await import("./post-merge-lifecycle-worker-OQoK8Ckg.js");
 				const action = enqueuePostMergeLifecycle(issueId, project.projectPath, branch);
 				if (action) actions.push(action);
 			}
@@ -470,11 +470,11 @@ const falseMergedReset = /* @__PURE__ */ new Set();
 async function reconcileFalseMerged() {
 	const actions = [];
 	try {
-		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-Oi5hdn1n.js");
+		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-BWziYCf3.js");
 		if (!isGitHubAppConfigured()) return actions;
 		const statuses = loadReviewStatuses();
 		for (const [issueId, status] of Object.entries(statuses)) {
-			if (status.mergeStatus !== "merged") continue;
+			if (status.retiredAt || status.mergeStatus !== "merged") continue;
 			if (!status.prUrl) continue;
 			if (falseMergedReset.has(issueId)) continue;
 			const prRef = status.prUrl.match(/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/);
@@ -515,12 +515,12 @@ const CLOSED_PR_RECONCILE_COOLDOWN_MS = 600 * 1e3;
 async function reconcileClosedPrReadyForMerge() {
 	const actions = [];
 	try {
-		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-Oi5hdn1n.js");
+		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-BWziYCf3.js");
 		if (!isGitHubAppConfigured()) return actions;
 		const statuses = loadReviewStatuses();
 		const now = Date.now();
 		for (const [issueId, status] of Object.entries(statuses)) {
-			if (!status.readyForMerge) continue;
+			if (status.retiredAt || !status.readyForMerge) continue;
 			if (!status.prUrl) continue;
 			const cooledUntil = closedPrReadyReconcileCooldowns.get(issueId);
 			if (cooledUntil && now < cooledUntil) continue;
@@ -544,7 +544,7 @@ async function reconcileClosedPrReadyForMerge() {
 				} else {
 					setReviewStatusSync(issueId, {
 						readyForMerge: false,
-						mergeStatus: "failed",
+						retiredAt: new Date(now).toISOString(),
 						mergeNotes: `PR #${prNumber} was closed without merging — reopen the PR or reset review state to re-queue this issue`
 					});
 					const msg = `Reset readyForMerge for ${issueId} — PR #${prNumber} is ${prState.state} (not OPEN)`;
@@ -584,23 +584,34 @@ const STALE_MERGE_BLOCKER_COOLDOWN_MS = 120 * 1e3;
 * cooldown bounds the git-probe cost; resolveConflictGate also caches its
 * mergeability probe.
 */
-async function reconcileStaleMergeBlockers() {
+async function reconcileStaleMergeBlockers(gatherEligibility = async (ids) => (await import("./merge-eligibility-C4rTS97F.js")).gatherMergeEligibility(ids), workspaceExists = existsSync, resolveWorkspace = (issueId) => {
+	const resolved = resolveProjectFromIssueSync(issueId);
+	return resolved ? join$1(resolved.projectPath, "workspaces", `feature-${issueId.toLowerCase()}`) : null;
+}) {
 	const actions = [];
 	try {
-		const { resolveConflictGate, buildRealConflictGateDeps } = await import("./conflict-gate-D4XCtrm2.js");
+		const { resolveConflictGate, buildRealConflictGateDeps } = await import("./conflict-gate-0dD1kxjN.js");
 		const statuses = loadReviewStatuses();
 		const now = Date.now();
 		const deps = buildRealConflictGateDeps();
-		for (const [issueId, status] of Object.entries(statuses)) {
-			if (status.mergeStatus === "merged") continue;
-			if (!(status.blockerReasons ?? []).some((b) => b.type === "merge_conflict" || b.type === "not_mergeable")) continue;
+		const candidates = Object.entries(statuses).filter(([, status]) => !status.retiredAt && status.mergeStatus !== "merged" && (status.blockerReasons ?? []).some((b) => b.type === "merge_conflict" || b.type === "not_mergeable"));
+		const memberships = await gatherEligibility(candidates.map(([issueId]) => issueId));
+		for (const [issueId] of candidates) {
 			const cooledUntil = staleMergeBlockerCooldowns.get(issueId);
 			if (cooledUntil && now < cooledUntil) continue;
 			staleMergeBlockerCooldowns.set(issueId, now + STALE_MERGE_BLOCKER_COOLDOWN_MS);
-			const resolved = resolveProjectFromIssueSync(issueId);
-			if (!resolved) continue;
-			const workspacePath = join$1(resolved.projectPath, "workspaces", `feature-${issueId.toLowerCase()}`);
-			if (!existsSync(workspacePath)) continue;
+			const membership = memberships.get(issueId.toUpperCase());
+			if (!membership || membership.bucket !== "in_flight") {
+				if (membership) setReviewStatusSync(issueId, {
+					readyForMerge: false,
+					retiredAt: new Date(now).toISOString()
+				});
+				console.log(`[deacon] skipping ${issueId} — pipeline membership is ${membership?.bucket ?? "unavailable"}, not merge-eligible`);
+				continue;
+			}
+			const workspacePath = resolveWorkspace(issueId);
+			if (!workspacePath) continue;
+			if (!workspaceExists(workspacePath)) continue;
 			try {
 				if ((await resolveConflictGate(issueId, workspacePath, "main", deps)).clearedStaleBlocker) {
 					const msg = `Cleared stale merge blocker for ${issueId} — branch is mergeable again; readyForMerge will recompute`;
@@ -619,31 +630,24 @@ async function reconcileStaleMergeBlockers() {
 /**
 * Reconciler (PAN-2198): periodic twin of the boot-only fixStuckReadyForMerge,
 * for the NO-BLOCKER strand of "stuck after review".
-*
-* readyForMerge is re-derived on every setReviewStatusSync write. When the last
-* write left it false and there is NO merge-blocker, nothing re-derives it until
-* the next write — so a PR whose review+test+verify all passed but whose
-* readyForMerge was left false (e.g. a verdict that landed via a write path that
-* didn't recompute, or a gate that was transiently non-final) converges ONLY on
-* server restart (PAN-1758: "readyForMerge only flips via the startup repair
-* sweep"). This patrol re-derives it on the 60s deacon tick instead.
-*
-* Blocker strands are deliberately excluded — those are owned by
-* reconcileStaleMergeBlockers, and excluding them also avoids fighting the
-* setReviewStatus deriver's hasBlockers override (which would flip readyForMerge
-* straight back to false). Loop-safe: it writes ONLY readyForMerge (no
-* review/test status transition, so no review/test re-dispatch events fire), and
-* is idempotent — once flipped true, the readyForMerge!==false guard excludes the
-* issue, so steady state is zero writes. Flipping readyForMerge=true only makes
-* the issue merge-ELIGIBLE; the merge train / MERGE button remains the trigger.
+* Blocker strands remain owned by reconcileStaleMergeBlockers. Membership
+* prevents restoration without an open PR; successful restoration is idempotent.
 */
-function reconcileStuckReadyForMerge() {
+async function reconcileStuckReadyForMerge(gatherEligibility = async (ids) => (await import("./merge-eligibility-C4rTS97F.js")).gatherMergeEligibility(ids)) {
 	const actions = [];
 	try {
-		for (const [issueId, status] of Object.entries(loadReviewStatuses())) {
-			if (status.readyForMerge !== false) continue;
-			if ((status.blockerReasons?.length ?? 0) > 0) continue;
-			if (!reviewGatesPassedSync(status)) continue;
+		const candidates = Object.entries(loadReviewStatuses()).filter(([, status]) => !status.retiredAt && status.readyForMerge === false && (status.blockerReasons?.length ?? 0) === 0 && reviewGatesPassedSync(status));
+		const memberships = await gatherEligibility(candidates.map(([issueId]) => issueId));
+		for (const [issueId] of candidates) {
+			const membership = memberships.get(issueId.toUpperCase());
+			if (!membership || membership.bucket !== "in_flight") {
+				if (membership) setReviewStatusSync(issueId, {
+					readyForMerge: false,
+					retiredAt: (/* @__PURE__ */ new Date()).toISOString()
+				});
+				console.log(`[deacon] skipping ${issueId} — pipeline membership is ${membership?.bucket ?? "unavailable"}, not merge-eligible`);
+				continue;
+			}
 			setReviewStatusSync(issueId, { readyForMerge: true });
 			const msg = `Restored readyForMerge for ${issueId} — review+test+verify passed, no blocker (was stuck false)`;
 			actions.push(msg);
@@ -665,7 +669,7 @@ async function reconcileMergedButReviewing() {
 			null
 		]);
 		for (const [issueId, status] of Object.entries(statuses)) {
-			if (status.mergeStatus !== "merged") continue;
+			if (status.retiredAt || status.mergeStatus !== "merged") continue;
 			const reviewNonTerminal = nonTerminal.has(status.reviewStatus);
 			const testNonTerminal = nonTerminal.has(status.testStatus);
 			if (!reviewNonTerminal && !testNonTerminal) continue;
@@ -730,7 +734,7 @@ async function checkFailedMergeRetry() {
 					if (ciEntry.count === 5) {
 						console.log(`[deacon] CI check failure for ${issueId} — retries exhausted, notifying work agent`);
 						const ciNotes = status.mergeNotes || "CI checks are failing on the PR";
-						const { writeFeedbackFile } = await import("./feedback-writer-CH2846DP.js");
+						const { writeFeedbackFile } = await import("./feedback-writer-BzN4qvaP.js");
 						const ciFileResult = await Effect.runPromise(writeFeedbackFile({
 							issueId,
 							specialist: "merge-agent",
@@ -762,7 +766,7 @@ async function checkFailedMergeRetry() {
 				ciRetryMap.set(issueId, ciEntry);
 				console.log(`[deacon] CI check failure for ${issueId} — notifying agent to re-submit (attempt ${ciEntry.count}/5)`);
 				const ciNotes = status.mergeNotes || "CI checks are failing on the PR";
-				const { writeFeedbackFile } = await import("./feedback-writer-CH2846DP.js");
+				const { writeFeedbackFile } = await import("./feedback-writer-BzN4qvaP.js");
 				const ciFileResult2 = await Effect.runPromise(writeFeedbackFile({
 					issueId,
 					specialist: "merge-agent",
@@ -790,7 +794,7 @@ async function checkFailedMergeRetry() {
 				const lastNudge = timeoutNudgeCooldowns.get(issueIdForFb);
 				if (!lastNudge || now - lastNudge >= TIMEOUT_NUDGE_COOLDOWN_MS) {
 					const timeoutNotes = status.mergeNotes;
-					const { writeFeedbackFile } = await import("./feedback-writer-CH2846DP.js");
+					const { writeFeedbackFile } = await import("./feedback-writer-BzN4qvaP.js");
 					await Effect.runPromise(writeFeedbackFile({
 						issueId: issueIdForFb,
 						specialist: "merge-agent",
@@ -895,7 +899,7 @@ async function autoCloseOut(now = /* @__PURE__ */ new Date()) {
 				} } : {}
 			};
 			try {
-				const { closeOut } = await import("./workflows-CfHm8lVd.js");
+				const { closeOut } = await import("./workflows-BtHRlFIm.js");
 				const result = await Effect.runPromise(closeOut(ctx));
 				if (!result.success) {
 					const failed = result.steps.find((step) => !step.success && !step.skipped);
@@ -1126,4 +1130,4 @@ async function reconcileTerminalIssueResidue(projects, deps = defaultDeps()) {
 //#endregion
 export { checkFailedMergeRetry as a, ciRetryMap as c, reconcileMergedButReviewing as d, reconcileStaleMergeBlockers as f, reconcileStuckMergingStates as g, reconcileAutoMergeRows as h, autoCloseOut as i, reconcileClosedPrReadyForMerge as l, reconcileStuckReadyForMerge as m, reconcileTerminalIssueResidue as n, checkFirstCompletionAgents as o, reconcileStaleMergeStatus as p, listIssueRecords as r, checkReadyForMergeStuck as s, isRecordPipelineTerminal as t, reconcileFalseMerged as u };
 
-//# sourceMappingURL=parked-residue-BiHb8cD7.js.map
+//# sourceMappingURL=parked-residue-8WbU0y1z.js.map

package/server/{paths-DEe9j-kw.js → paths-rETQhTF2.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Li as getOverdeckHome, Ri as init_paths$1 } from "./config-yaml-D9nfpEx1.js";
+import { Ri as getOverdeckHome, zi as init_paths$1 } from "./config-yaml-D60AnTIu.js";
 import { dirname, isAbsolute, join, relative, resolve } from "path";
 import { mkdir } from "fs/promises";
 //#region ../../lib/memory/paths.ts
@@ -62,4 +62,4 @@ var init_paths = __esmMin((() => {
 //#endregion
 export { resolveArchiveDir as a, resolveMemoryRoot as c, resolveRagRunsFile as d, resolveStatusFile as f, init_paths as i, resolveObservationsFile as l, resolveWorkspaceMemoryRoot as m, ensureDir as n, resolveFtsDbPath as o, resolveSummariesDir as p, ensureParentDir as r, resolveMemoryBase as s, assertMemorySafeSegment as t, resolvePendingDir as u };
 
-//# sourceMappingURL=paths-DEe9j-kw.js.map
+//# sourceMappingURL=paths-rETQhTF2.js.map

package/server/{pending-lifecycle-claim-J5uIIJPu.js → pending-lifecycle-claim-yAwDuGS4.js}

@@ -107,4 +107,4 @@ async function settlePendingLifecycleClaim(claim, issueId, succeeded) {
 //#endregion
 export { settlePendingLifecycleClaim as n, claimPendingLifecycleFile as t };
 
-//# sourceMappingURL=pending-lifecycle-claim-J5uIIJPu.js.map
+//# sourceMappingURL=pending-lifecycle-claim-yAwDuGS4.js.map

package/server/{pickup-D1UbSDPd.js → pickup-Dle6k9Xt.js}

@@ -187,4 +187,4 @@ var init_pickup = __esmMin((() => {
 //#endregion
 export { normalizeGate as _, PARKED_LABEL as a, VETOED_LABEL as c, computeEpicGroups as d, computeLanes as f, isAutoPickable as g, init_pickup as h, OBJECTION_LABEL as i, classifyIssue as l, computeWaves as m, EPIC_LABEL as n, READY_LABEL as o, computeStats as p, LEGACY_PARKED_LABELS as r, RELEASED_LABEL as s, BLOCKS_MAIN_LABEL as t, computeCohort as u, selectNeedsPlanning as v };
 
-//# sourceMappingURL=pickup-D1UbSDPd.js.map
+//# sourceMappingURL=pickup-Dle6k9Xt.js.map

package/server/{pipeline-agent-reader-D-6okryb.js → pipeline-agent-reader-CeWhQzXC.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CHIvOb9q.js";
-import { a as getWorkspaceForIssue, o as init_resolver } from "./resolver-gxv97jsQ.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CJRi_5Wu.js";
+import { a as getWorkspaceForIssue, o as init_resolver } from "./resolver-C2QKOf09.js";
 import { a as registerFeedbackAgentStateReader, i as registerActiveReviewArtifactContextReader, t as init_agent_state_source } from "./agent-state-source-69g8dqMg.js";
 //#region ../../lib/overdeck/agent-state-sync.ts
 function isoFromMillis(value) {
@@ -241,4 +241,4 @@ var init_pipeline_agent_reader = __esmMin((() => {
 //#endregion
 export { readVerdictPreservationStatus as a, registerWorkStartVerdictAdapter as c, getOverdeckAgentStateSync as d, init_agent_state_sync as f, stateToOverdeckParamsForDb as h, init_work_start_verdicts as i, resetWorkStartPipelineVerdicts as l, saveOverdeckAgentStateSync as m, readPipelineTelemetryAgentState as n, refreshWorkStartReviewedAnchor as o, listOverdeckAgentStatesSync as p, registerPipelineTelemetryAgentReader as r, registerVerdictPreservationStatusReader as s, init_pipeline_agent_reader as t, AGENT_COLUMNS_FOR_DB as u };
 
-//# sourceMappingURL=pipeline-agent-reader-D-6okryb.js.map
+//# sourceMappingURL=pipeline-agent-reader-CeWhQzXC.js.map

package/server/{pipeline-membership-PGX3Pe8V.js → pipeline-membership-BV4hdkHm.js}

@@ -57,4 +57,4 @@ var init_pipeline_membership = __esmMin((() => {
 //#endregion
 export { init_pipeline_membership as n, resolvePipelineMembership as r, PLANNED_BACKLOG_SPEC_ONLY_REASON as t };
 
-//# sourceMappingURL=pipeline-membership-PGX3Pe8V.js.map
+//# sourceMappingURL=pipeline-membership-BV4hdkHm.js.map

package/server/{pipeline-membership-CCbgBzNC.js → pipeline-membership-C9ykcjsn.js}

@@ -1,3 +1,3 @@
-import { n as init_pipeline_membership, r as resolvePipelineMembership, t as PLANNED_BACKLOG_SPEC_ONLY_REASON } from "./pipeline-membership-PGX3Pe8V.js";
+import { n as init_pipeline_membership, r as resolvePipelineMembership, t as PLANNED_BACKLOG_SPEC_ONLY_REASON } from "./pipeline-membership-BV4hdkHm.js";
 init_pipeline_membership();
 export { PLANNED_BACKLOG_SPEC_ONLY_REASON, resolvePipelineMembership };