@adhdev/daemon-standalone 1.0.45-rc.7 → 1.0.45-rc.9

package/dist/index.js

@@ -37027,10 +37027,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "c935da6be0da24d1e046a4ecb5139e8490dba7b4" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "c935da6b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.45-rc.7" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-12T10:49:30.678Z" : void 0);
+      const commit = readInjected(true ? "6a45bfebc577345264d61b02a71a657bbc313033" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "6a45bfeb" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.45-rc.9" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-13T03:05:02.343Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -37802,40 +37802,38 @@ var require_dist3 = __commonJS({
     async function getSubmoduleStatuses(repo, options) {
       if (!repo.repoRoot) return { submodules: [], headOidByPath: /* @__PURE__ */ new Map() };
       try {
-        const { submodules, headOidByPath } = await deriveSubmoduleGitlinkStatuses(repo, options);
-        await Promise.all(submodules.map((submodule) => enrichSubmoduleWorktreeStatus(repo, submodule, options)));
+        const paths = await readSubmodulePaths(repo, options);
+        const ignoreSet = new Set(options.submoduleIgnorePaths || []);
+        const visiblePaths = paths.filter((path54) => !ignoreSet.has(path54));
+        const expectedByPath = await readGitlinkExpectedShas(repo, visiblePaths, options);
+        const lastCheckedAt = Date.now();
+        const headOidByPath = /* @__PURE__ */ new Map();
+        const submodules = await Promise.all(
+          visiblePaths.map(async (path54) => {
+            const repoPath = repo.repoRoot + "/" + path54;
+            const expected = expectedByPath.get(path54) ?? null;
+            const worktree = await readSubmoduleWorktreeStatus(repo, repoPath, options);
+            const actual = worktree.headOid;
+            if (actual) headOidByPath.set(path54, actual);
+            const outOfSync = actual === null ? true : expected !== null && expected !== actual;
+            return {
+              path: path54,
+              // Prefer the recorded gitlink SHA (matches the legacy column); fall back
+              // to the checked-out SHA so the field is never empty when both are known.
+              commit: expected ?? actual ?? "",
+              repoPath,
+              dirty: worktree.dirty,
+              outOfSync,
+              lastCheckedAt,
+              ...worktree.error ? { error: worktree.error } : {}
+            };
+          })
+        );
         return { submodules, headOidByPath };
       } catch {
         return { submodules: [], headOidByPath: /* @__PURE__ */ new Map() };
       }
     }
-    async function deriveSubmoduleGitlinkStatuses(repo, options) {
-      if (!repo.repoRoot) return { submodules: [], headOidByPath: /* @__PURE__ */ new Map() };
-      const paths = await readSubmodulePaths(repo, options);
-      const ignoreSet = new Set(options.submoduleIgnorePaths || []);
-      const lastCheckedAt = Date.now();
-      const headOidByPath = /* @__PURE__ */ new Map();
-      const entries = await Promise.all(
-        paths.filter((path54) => !ignoreSet.has(path54)).map(async (path54) => {
-          const repoPath = repo.repoRoot + "/" + path54;
-          const expected = await readGitlinkExpectedSha(repo, path54, options);
-          const actual = await readSubmoduleHeadSha(repo, repoPath, options);
-          if (actual) headOidByPath.set(path54, actual);
-          const outOfSync = actual === null ? true : expected !== null && expected !== actual;
-          return {
-            path: path54,
-            // Prefer the recorded gitlink SHA (matches the legacy column); fall back
-            // to the checked-out SHA so the field is never empty when both are known.
-            commit: expected ?? actual ?? "",
-            repoPath,
-            dirty: false,
-            outOfSync,
-            lastCheckedAt
-          };
-        })
-      );
-      return { submodules: entries, headOidByPath };
-    }
     async function readSubmodulePaths(repo, options) {
       if (!repo.repoRoot) return [];
       const gitmodulesPath = repo.repoRoot + "/.gitmodules";
@@ -37857,38 +37855,30 @@ var require_dist3 = __commonJS({
         return [];
       }
     }
-    async function readGitlinkExpectedSha(repo, submodulePath, options) {
-      try {
-        const result = await runGit(repo, ["ls-tree", "HEAD", submodulePath], options);
-        const line = result.stdout.split("\n").find((l) => l.trim().length > 0);
-        if (!line) return null;
-        const match = line.match(/^\s*\d+\s+commit\s+([0-9a-f]{40})\b/);
-        return match ? match[1] : null;
-      } catch {
-        return null;
-      }
-    }
-    async function readSubmoduleHeadSha(repo, repoPath, options) {
+    async function readGitlinkExpectedShas(repo, submodulePaths, options) {
+      const expectedByPath = /* @__PURE__ */ new Map();
+      if (submodulePaths.length === 0 || !repo.repoRoot) return expectedByPath;
       try {
-        const result = await runGit(repo, ["rev-parse", "HEAD"], { ...options, cwd: repoPath });
-        const sha = result.stdout.trim();
-        return /^[0-9a-f]{40}$/.test(sha) ? sha : null;
+        const result = await runGit(repo, ["ls-tree", "-z", "HEAD", "--", ...submodulePaths], options);
+        for (const entry of result.stdout.split("\0")) {
+          const match = entry.match(/^\d{6} commit ([0-9a-f]{40,64})\t(.+)$/s);
+          if (match) expectedByPath.set(match[2], match[1]);
+        }
       } catch {
-        return null;
       }
+      return expectedByPath;
     }
-    async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
+    async function readSubmoduleWorktreeStatus(repo, repoPath, options) {
       try {
         const result = await runGit(repo, ["status", "--porcelain=v2", "--branch"], {
           ...options,
-          cwd: submodule.repoPath
+          cwd: repoPath
         });
         const parsed = parsePorcelainV2Status(result.stdout);
         const dirty = parsed.staged + parsed.modified + parsed.untracked + parsed.deleted + parsed.renamed > 0 || parsed.conflictFiles.length > 0;
-        submodule.dirty = submodule.dirty || dirty;
+        return { headOid: parsed.headOid, dirty };
       } catch (error48) {
-        submodule.dirty = true;
-        submodule.error = formatGitError(error48);
+        return { headOid: null, dirty: true, error: formatGitError(error48) };
       }
     }
     var import_node_path;
@@ -38773,8 +38763,7 @@ var require_dist3 = __commonJS({
       }
     });
     function adhdevHome(env2 = process.env) {
-      const override = env2.ADHDEV_HOME?.trim();
-      return override ? override : path42.join(os6.homedir(), ".adhdev");
+      return resolveConfigDir(env2);
     }
     function statuslineDir(env2 = process.env) {
       return path42.join(adhdevHome(env2), "claude-statusline");
@@ -38802,10 +38791,11 @@ var require_dist3 = __commonJS({
         "use strict";
         os6 = __toESM2(require("os"));
         path42 = __toESM2(require("path"));
+        init_config_dir();
       }
     });
     function renderWrapperScript(options) {
-      return WRAPPER_TEMPLATE.replace("__ADHDEV_SNAPSHOT_PATH__", JSON.stringify(options.snapshotPath)).replace("__ADHDEV_ORIGINAL_COMMAND__", JSON.stringify(options.originalCommand)).replace("__ADHDEV_SNAPSHOT_VERSION__", JSON.stringify(options.snapshotVersion)).replace("__ADHDEV_MIN_WRITE_INTERVAL_MS__", JSON.stringify(options.minWriteIntervalMs)).replace("__ADHDEV_MAX_WRITE_INTERVAL_MS__", JSON.stringify(options.maxWriteIntervalMs));
+      return WRAPPER_TEMPLATE.replace("__ADHDEV_SNAPSHOT_PATH__", JSON.stringify(options.snapshotPath)).replace("__ADHDEV_EXTRA_SNAPSHOT_PATHS__", JSON.stringify(options.additionalSnapshotPaths ?? [])).replace("__ADHDEV_ORIGINAL_COMMAND__", JSON.stringify(options.originalCommand)).replace("__ADHDEV_SNAPSHOT_VERSION__", JSON.stringify(options.snapshotVersion)).replace("__ADHDEV_MIN_WRITE_INTERVAL_MS__", JSON.stringify(options.minWriteIntervalMs)).replace("__ADHDEV_MAX_WRITE_INTERVAL_MS__", JSON.stringify(options.maxWriteIntervalMs));
     }
     var WRAPPER_TEMPLATE;
     var init_wrapper_source = __esm2({
@@ -38825,6 +38815,7 @@ import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { dirname } from 'node:path';
 
 const SNAPSHOT_PATH = __ADHDEV_SNAPSHOT_PATH__;
+const EXTRA_SNAPSHOT_PATHS = __ADHDEV_EXTRA_SNAPSHOT_PATHS__;
 const ORIGINAL_COMMAND = __ADHDEV_ORIGINAL_COMMAND__;
 const SNAPSHOT_VERSION = __ADHDEV_SNAPSHOT_VERSION__;
 const MIN_WRITE_INTERVAL_MS = __ADHDEV_MIN_WRITE_INTERVAL_MS__;
@@ -38910,13 +38901,24 @@ function capture(payload) {
     };
     if (typeof payload.version === 'string') snapshot.cliVersion = payload.version;
 
-    // Write via a temp file + rename so a reader never sees a half-written
-    // file, and so a killed invocation cannot truncate a good snapshot.
-    // Claude Code cancels in-flight statusline scripts, so that is a real case.
-    mkdirSync(dirname(SNAPSHOT_PATH), { recursive: true });
-    const temp = SNAPSHOT_PATH + '.' + process.pid + '.tmp';
-    writeFileSync(temp, JSON.stringify(snapshot), 'utf-8');
-    renameSync(temp, SNAPSHOT_PATH);
+    // Fan out to every track's snapshot path (the primary plus the sibling
+    // tracks discovered at install time). Claude Code's statusLine slot is
+    // machine-global, so this one reading belongs to every adhdev track on the
+    // box; each track's daemon reads only its own directory.
+    for (const target of [SNAPSHOT_PATH, ...EXTRA_SNAPSHOT_PATHS]) {
+        try {
+            // Write via a temp file + rename so a reader never sees a half-written
+            // file, and so a killed invocation cannot truncate a good snapshot.
+            // Claude Code cancels in-flight statusline scripts, so that is a real case.
+            mkdirSync(dirname(target), { recursive: true });
+            const temp = target + '.' + process.pid + '.tmp';
+            writeFileSync(temp, JSON.stringify(snapshot), 'utf-8');
+            renameSync(temp, target);
+        } catch {
+            // One unwritable track dir must not starve the others — and none
+            // of this may reach the user's prompt (see the header note).
+        }
+    }
 }
 
 const stdinBuffer = await readStdin();
@@ -38967,6 +38969,26 @@ child.on('exit', () => process.exit(0));
         stateDir: statuslineDir(env2)
       };
     }
+    function discoverSiblingSnapshotPaths(env2 = process.env, homeDir = os22.homedir()) {
+      const own = snapshotPath(env2);
+      let entries;
+      try {
+        entries = fs32.readdirSync(homeDir, { withFileTypes: true });
+      } catch {
+        return [];
+      }
+      const targets = /* @__PURE__ */ new Set();
+      for (const entry of entries) {
+        if (!entry.isDirectory() || !entry.name.startsWith(".adhdev")) {
+          continue;
+        }
+        const candidate = path52.join(homeDir, entry.name, "claude-statusline", "quota.json");
+        if (candidate !== own) {
+          targets.add(candidate);
+        }
+      }
+      return [...targets].sort();
+    }
     function isWrapperCommand(command, wrapperFile) {
       if (typeof command !== "string" || command === "") {
         return false;
@@ -39036,6 +39058,7 @@ child.on('exit', () => process.exit(0));
       const originalCommand = typeof originalStatusLine?.command === "string" && originalStatusLine.command !== "" ? originalStatusLine.command : null;
       const script = renderWrapperScript({
         snapshotPath: paths.snapshotFile,
+        additionalSnapshotPaths: discoverSiblingSnapshotPaths(env2),
         originalCommand,
         snapshotVersion: SNAPSHOT_VERSION,
         minWriteIntervalMs: MIN_WRITE_INTERVAL_MS,
@@ -39139,6 +39162,7 @@ child.on('exit', () => process.exit(0));
       };
     }
     var fs32;
+    var os22;
     var path52;
     var WRAPPER_MARKER;
     var StatuslineInstallError2;
@@ -39146,6 +39170,7 @@ child.on('exit', () => process.exit(0));
       "src/quota/statusline/install.ts"() {
         "use strict";
         fs32 = __toESM2(require("fs"));
+        os22 = __toESM2(require("os"));
         path52 = __toESM2(require("path"));
         init_snapshot();
         init_paths();
@@ -39883,7 +39908,7 @@ child.on('exit', () => process.exit(0));
     });
     function kimiHome(env2) {
       const override = env2.KIMI_CODE_HOME?.trim();
-      return override ? override : path6.join(os22.homedir(), ".kimi-code");
+      return override ? override : path6.join(os32.homedir(), ".kimi-code");
     }
     function credentialsPath(env2) {
       return path6.join(kimiHome(env2), "credentials", "kimi-code.json");
@@ -40016,6 +40041,13 @@ child.on('exit', () => process.exit(0));
         metadata: { source: "oauth" }
       };
     }
+    async function readErrorBody(response) {
+      try {
+        return await response.text?.() ?? "";
+      } catch {
+        return "";
+      }
+    }
     function retryAfterMs(header, nowMs) {
       if (!header) {
         return void 0;
@@ -40059,11 +40091,28 @@ child.on('exit', () => process.exit(0));
           },
           signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS2)
         });
-        if (response.status === 401 || response.status === 403) {
+        if (response.status === 401) {
           return quotaFailure(
             "kimi",
             "error",
-            `Kimi usage request was rejected (HTTP ${response.status})`,
+            "Kimi usage request was rejected (HTTP 401)",
+            { source: "oauth", failureKind: "unauthorized" }
+          );
+        }
+        if (response.status === 403) {
+          const body = await readErrorBody(response);
+          if (USAGE_LIMIT_BODY_PATTERN.test(body)) {
+            return quotaFailure(
+              "kimi",
+              "error",
+              "Kimi usage limit reached (HTTP 403) \u2014 quota refreshes at the next reset/billing cycle",
+              { source: "oauth", failureKind: "quota-exhausted" }
+            );
+          }
+          return quotaFailure(
+            "kimi",
+            "error",
+            "Kimi usage request was rejected (HTTP 403)",
             { source: "oauth", failureKind: "unauthorized" }
           );
         }
@@ -40092,22 +40141,24 @@ child.on('exit', () => process.exit(0));
       }
     }
     var fs5;
-    var os22;
+    var os32;
     var path6;
     var DEFAULT_BASE_URL;
     var REQUEST_TIMEOUT_MS2;
     var EXPIRY_SKEW_SECONDS;
+    var USAGE_LIMIT_BODY_PATTERN;
     var init_kimi = __esm2({
       "src/quota/fetchers/kimi.ts"() {
         "use strict";
         fs5 = __toESM2(require("fs"));
-        os22 = __toESM2(require("os"));
+        os32 = __toESM2(require("os"));
         path6 = __toESM2(require("path"));
         init_types();
         init_deps();
         DEFAULT_BASE_URL = "https://api.kimi.com/coding/v1";
         REQUEST_TIMEOUT_MS2 = 1e4;
         EXPIRY_SKEW_SECONDS = 5;
+        USAGE_LIMIT_BODY_PATTERN = /usage limit|quota\s*(exhausted|refresh)|billing cycle/i;
       }
     });
     function opencodeCommand(env2) {
@@ -40778,7 +40829,7 @@ child.on('exit', () => process.exit(0));
     function unixExtraBinDirs() {
       const dirs = [];
       const fs56 = require("fs");
-      const home = os32.homedir();
+      const home = os42.homedir();
       const push = (dir) => {
         if (!dir) return;
         try {
@@ -40802,11 +40853,11 @@ child.on('exit', () => process.exit(0));
     function findBinary(name) {
       const trimmed = String(name || "").trim();
       if (!trimmed) return trimmed;
-      const expanded = trimmed.startsWith("~") ? path8.join(os32.homedir(), trimmed.slice(1)) : trimmed;
+      const expanded = trimmed.startsWith("~") ? path8.join(os42.homedir(), trimmed.slice(1)) : trimmed;
       if (path8.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
         return path8.isAbsolute(expanded) ? expanded : path8.resolve(expanded);
       }
-      const isWin = os32.platform() === "win32";
+      const isWin = os42.platform() === "win32";
       const paths = (process.env.PATH || "").split(path8.delimiter);
       const extraDirs = [];
       if (isWin) {
@@ -40874,7 +40925,7 @@ child.on('exit', () => process.exit(0));
     }
     function shSingleQuote(arg) {
       if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-      if (os32.platform() === "win32") {
+      if (os42.platform() === "win32") {
         return `"${arg.replace(/"/g, '""')}"`;
       }
       return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -40940,7 +40991,7 @@ child.on('exit', () => process.exit(0));
         }
       };
     }
-    var os32;
+    var os42;
     var path8;
     var import_child_process;
     var TerminalTranscriptAccumulator;
@@ -40953,7 +41004,7 @@ child.on('exit', () => process.exit(0));
     var init_provider_cli_shared = __esm2({
       "src/cli-adapters/provider-cli-shared.ts"() {
         "use strict";
-        os32 = __toESM2(require("os"));
+        os42 = __toESM2(require("os"));
         path8 = __toESM2(require("path"));
         import_child_process = require("child_process");
         init_spawn_env();
@@ -41141,7 +41192,7 @@ child.on('exit', () => process.exit(0));
     function expandHome(value) {
       const trimmed = value.trim();
       if (!trimmed.startsWith("~")) return trimmed;
-      return path9.join(os42.homedir(), trimmed.slice(1));
+      return path9.join(os52.homedir(), trimmed.slice(1));
     }
     function isExplicitCommandPath(command) {
       const trimmed = command.trim();
@@ -41183,7 +41234,7 @@ child.on('exit', () => process.exit(0));
       });
     }
     async function detectCLIs(providerLoader, options) {
-      const platform10 = os42.platform();
+      const platform10 = os52.platform();
       const whichCmd = platform10 === "win32" ? "where" : "which";
       const includeVersion = options?.includeVersion !== false;
       const cliList = providerLoader ? providerLoader.getCliDetectionList({ includeDisabled: options?.includeDisabled }) : [];
@@ -41225,7 +41276,7 @@ child.on('exit', () => process.exit(0));
         const cliList = providerLoader.getCliDetectionList();
         const target = cliList.find((c) => c.id === resolvedId);
         if (target) {
-          const platform10 = os42.platform();
+          const platform10 = os52.platform();
           const whichCmd = platform10 === "win32" ? "where" : "which";
           try {
             const firstPath = await resolveDetectionPath(target.command, whichCmd);
@@ -41308,7 +41359,7 @@ child.on('exit', () => process.exit(0));
       return out;
     }
     var import_child_process2;
-    var os42;
+    var os52;
     var path9;
     var import_fs4;
     var PROVIDER_VERSIONS_TTL_MS;
@@ -41320,7 +41371,7 @@ child.on('exit', () => process.exit(0));
       "src/detection/cli-detector.ts"() {
         "use strict";
         import_child_process2 = require("child_process");
-        os42 = __toESM2(require("os"));
+        os52 = __toESM2(require("os"));
         path9 = __toESM2(require("path"));
         import_fs4 = require("fs");
         init_provider_cli_shared();
@@ -41716,7 +41767,7 @@ ${error48.message || ""}`;
     function expandPath(p) {
       const t = (p || "").trim();
       if (!t) return "";
-      if (t.startsWith("~")) return path13.join(os62.homedir(), t.slice(1).replace(/^\//, ""));
+      if (t.startsWith("~")) return path13.join(os7.homedir(), t.slice(1).replace(/^\//, ""));
       return path13.resolve(t);
     }
     function validateWorkspacePath(absPath) {
@@ -41789,7 +41840,7 @@ ${error48.message || ""}`;
         };
       }
       if (a.useHome === true) {
-        return { ok: true, path: os62.homedir(), source: "home" };
+        return { ok: true, path: os7.homedir(), source: "home" };
       }
       return {
         ok: false,
@@ -41873,7 +41924,7 @@ ${error48.message || ""}`;
       return { config: { ...config2, defaultWorkspaceId: id } };
     }
     var fs7;
-    var os62;
+    var os7;
     var path13;
     var import_crypto22;
     var MAX_WORKSPACES;
@@ -41881,7 +41932,7 @@ ${error48.message || ""}`;
       "src/config/workspaces.ts"() {
         "use strict";
         fs7 = __toESM2(require("fs"));
-        os62 = __toESM2(require("os"));
+        os7 = __toESM2(require("os"));
         path13 = __toESM2(require("path"));
         import_crypto22 = require("crypto");
         MAX_WORKSPACES = 50;
@@ -43015,6 +43066,7 @@ ${error48.message || ""}`;
       getMagiKindPanel: () => getMagiKindPanel,
       getMesh: () => getMesh,
       getMeshByRepo: () => getMeshByRepo,
+      getMeshQuotaRouting: () => getMeshQuotaRouting,
       listMagiKindPanels: () => listMagiKindPanels,
       listMagiKindPanelsReadOnly: () => listMagiKindPanelsReadOnly,
       listMeshes: () => listMeshes,
@@ -43030,6 +43082,7 @@ ${error48.message || ""}`;
       setDifficultyBrains: () => setDifficultyBrains,
       setMagiKindPanel: () => setMagiKindPanel,
       setMeshHostPin: () => setMeshHostPin,
+      setMeshQuotaRouting: () => setMeshQuotaRouting,
       tokenIdForManualPairing: () => tokenIdForManualPairing,
       updateMesh: () => updateMesh,
       updateNode: () => updateNode
@@ -43732,12 +43785,59 @@ ${error48.message || ""}`;
       saveMeshConfig(stored);
       return normalized;
     }
+    function validateQuotaRoutingOverrides(input) {
+      if (input === void 0 || input === null) return {};
+      if (typeof input !== "object" || Array.isArray(input)) {
+        throw new Error("invalid_quota_routing: quotaRouting must be an object of threshold overrides");
+      }
+      const out = {};
+      for (const [key2, raw] of Object.entries(input)) {
+        const isPercent = QUOTA_ROUTING_PERCENT_FIELDS.has(key2);
+        if (!isPercent && !QUOTA_ROUTING_NONNEGATIVE_FIELDS.has(key2)) {
+          throw new Error(
+            `invalid_quota_routing: unknown field '${key2}' (known fields: ` + [...QUOTA_ROUTING_PERCENT_FIELDS, ...QUOTA_ROUTING_NONNEGATIVE_FIELDS].join(", ") + ")"
+          );
+        }
+        if (typeof raw !== "number" || !Number.isFinite(raw)) {
+          throw new Error(`invalid_quota_routing: ${key2} must be a finite number (got ${JSON.stringify(raw)})`);
+        }
+        if (isPercent && (raw < 0 || raw > 100)) {
+          throw new Error(`invalid_quota_routing: ${key2} must be between 0 and 100 (got ${raw})`);
+        }
+        if (!isPercent && raw < 0) {
+          throw new Error(`invalid_quota_routing: ${key2} must be >= 0 (got ${raw})`);
+        }
+        out[key2] = raw;
+      }
+      return out;
+    }
+    function getMeshQuotaRouting(meshId) {
+      const config2 = loadMeshConfig();
+      const stored = resolveScopedMesh(config2, meshId)?.policy?.quotaRouting;
+      return normalizeQuotaRoutingPolicy(stored) ?? {};
+    }
+    function setMeshQuotaRouting(input, meshId) {
+      const overrides = validateQuotaRoutingOverrides(input);
+      const stored = loadMeshConfig();
+      const mesh = resolveScopedMesh(stored, meshId);
+      if (!mesh) {
+        throw new Error(
+          meshId?.trim() ? `invalid_quota_routing: mesh '${meshId.trim()}' not found` : `quota_routing_mesh_ambiguous: this machine hosts ${stored.meshes.length} meshes, so a quota-routing write must name its mesh explicitly (meshId). Thresholds are per mesh \u2014 they decide which (node, provider) pairs the launch gate skips, so writing to the wrong mesh changes what work that mesh refuses.`
+        );
+      }
+      mesh.policy = mergeAndNormalizePolicy(mesh.policy, { quotaRouting: overrides });
+      mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      saveMeshConfig(stored);
+      return normalizeQuotaRoutingPolicy(overrides) ?? {};
+    }
     var import_fs5;
     var import_path5;
     var import_crypto3;
     var mergeMeshPolicy;
     var MAGI_KIND_PANEL_KINDS;
     var MAX_MAGI_KIND_SLOTS;
+    var QUOTA_ROUTING_PERCENT_FIELDS;
+    var QUOTA_ROUTING_NONNEGATIVE_FIELDS;
     var init_mesh_config = __esm2({
       "src/config/mesh-config.ts"() {
         "use strict";
@@ -43752,6 +43852,8 @@ ${error48.message || ""}`;
         mergeMeshPolicy = mergeAndNormalizePolicy;
         MAGI_KIND_PANEL_KINDS = ["claim_audit", "rca", "design", "freeform"];
         MAX_MAGI_KIND_SLOTS = 24;
+        QUOTA_ROUTING_PERCENT_FIELDS = /* @__PURE__ */ new Set(["sessionMinRemainingPercent", "weeklyMinRemainingPercent"]);
+        QUOTA_ROUTING_NONNEGATIVE_FIELDS = /* @__PURE__ */ new Set(["staleAfterMs", "sessionResetImminentMs", "spreadBonusMax"]);
       }
     });
     function normalizeProviderPriority(policy) {
@@ -47404,11 +47506,11 @@ Next step: ${nextStep}`;
       const pinnedProvider = typeof providerType === "string" && providerType.trim() ? providerType.trim() : void 0;
       const providerTags = pinnedProvider ? [pinnedProvider] : readNodeProviderTypes(node?.policy);
       const worktreeBranch = typeof node?.worktreeBranch === "string" && node.worktreeBranch.trim() ? node.worktreeBranch.trim() : null;
-      const os28 = readNodeOverride(node, "platform") ?? readNodeReporter(node, "platform") ?? process.platform;
+      const os29 = readNodeOverride(node, "platform") ?? readNodeReporter(node, "platform") ?? process.platform;
       const arch2 = readNodeOverride(node, "arch") ?? readNodeReporter(node, "arch") ?? process.arch;
       return normalizeMeshCapabilityTags([
         ...Array.isArray(node?.capabilities) ? node.capabilities : [],
-        `os=${os28}`,
+        `os=${os29}`,
         `arch=${arch2}`,
         ...providerTags.map((p) => `provider=${p}`),
         // Worktree nodes automatically expose a "worktree=<branch>" tag so that
@@ -52047,7 +52149,7 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
       sections.push(TOOL_EXPOSURE_PREFLIGHT_SECTION);
       sections.push(WORKFLOW_SECTION);
       sections.push(ONBOARDING_SECTION);
-      sections.push(buildRulesSection(coordinatorCliType));
+      sections.push(buildRulesSection(coordinatorCliType, mergeAndNormalizePolicy(void 0, mesh.policy)));
       return sections.join("\n\n");
     }
     function readUserPromptFile(cliType, suffix) {
@@ -52080,7 +52182,7 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
         tools: TOOLS_SECTION,
         workflow: WORKFLOW_SECTION,
         onboarding: ONBOARDING_SECTION,
-        rules: buildRulesSection(coordinatorCliType),
+        rules: buildRulesSection(coordinatorCliType, mergeAndNormalizePolicy(void 0, mesh.policy)),
         toolExposurePreflight: TOOL_EXPOSURE_PREFLIGHT_SECTION
       };
       return template.replace(/\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g, (m, key2) => {
@@ -52413,12 +52515,14 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
       return `## Policy
 ${rules.join("\n")}`;
     }
-    function buildRulesSection(coordinatorCliType) {
+    function buildRulesSection(coordinatorCliType, policy) {
       const coordinatorNote = coordinatorCliType ? `
 - **Coordinator runtime is not a delegation default.** This coordinator is running as \`${coordinatorCliType}\`, but delegated node sessions must follow the user's requested provider, not the coordinator's own runtime.` : "";
+      const destructiveGitRequiresApproval = policy ? policy.requireApprovalForDestructiveGit : true;
+      const destructiveGitRule = destructiveGitRequiresApproval ? "\n- **Never run destructive git operations without explicit user approval.** Force push (`push --force`/`--force-with-lease`), `git reset --hard`, and any history rewrite (`rebase`, `filter-branch`, `commit --amend` on already-pushed work) can destroy work that is not recoverable from the mesh ledger. This mesh's policy currently requires approval for these (see Policy above). Ask first and wait for a yes \u2014 there is no code-level gate backing this up, so skipping the ask is the only thing that can lose the user's work." : "\n- **This mesh's policy does not require approval for destructive git operations** (`requireApprovalForDestructiveGit` is off). Still treat force push, `git reset --hard`, and history rewrites as high-risk: prefer a non-destructive alternative when one exists, and mention what you did in your summary so the user can catch a mistake quickly.";
       return `## Rules
 
-- **Route, don't implement.** Delegate all code reading, analysis, and execution to node agents. Never read source files or run commands in the coordinator \u2014 keep context lean. See also: **Never use local sub-agents** below.
+- **Route, don't implement.** Delegate all code reading, analysis, and execution to node agents. Never read source files or run commands in the coordinator \u2014 keep context lean. See also: **Never use local sub-agents** below.${destructiveGitRule}
 - **Never use local sub-agents.** Do NOT spawn your runtime's own sub-agents (e.g. Claude Code's Task/Explore/Agent tools, or any equivalent in-process agent-spawning tool) to read code, investigate, run RCA, or implement. Such sub-agents execute on the coordinator's machine, outside the mesh \u2014 they escape mesh parallelism, the ledger/audit trail, node capability profiles, and worktree isolation, and leave no \`mesh_task_history\` record. ALL code reading, analysis, RCA, and implementation must be delegated to mesh nodes via \`mesh_enqueue_task\` / \`mesh_send_task\` (use \`task_mode: "live_debug_readonly"\` for read-only investigation), or cross-verified via \`mesh_magi_review\` for read-only fan-out. The coordinator's own actions are limited to \`mesh_*\` tool orchestration and synthesizing results.
 - **Front-load task messages.** Include everything the agent needs (files, problem, expected fix) in \`mesh_enqueue_task\` / \`mesh_send_task\`. Append a structured result request at the end: ask the worker to conclude with a JSON block containing \`status\`, \`changedFiles\`, \`gitStatus\`, \`validationResults\`, \`errors\`, \`nextAction\`. The daemon parses this automatically; you can read it from \`mesh_task_history\`.
 - **Reuse idle sessions.** For follow-up, retry, commit/push, or cleanup on the same issue, send only the delta to the existing idle session. Start a fresh session only when: (a) branch/worktree isolation is required, (b) the existing session had a dispatch failure or provider mismatch, (c) the transcript/runtime is contaminated or interrupted, (d) the user explicitly asks for a different provider/session, or (e) **the delta is a genuinely NEW subject rather than a continuation** \u2014 a new topic appended to an existing session can be dropped or re-run as the previous task, so give it its own task even when a session sits idle. Continuation of the same issue in an already-idle session is allowed and preferred \u2014 this rule blocks concurrent unrelated work interleaved into a live (still-generating) session, not sequential same-issue follow-ups. The test is subject continuity, not timing: carrying an investigation forward into its own fix is the SAME subject and belongs in that session (Workflow 3f), while an unrelated bug is a new subject even if the same session just went idle.
@@ -53952,14 +54056,14 @@ When the user asks to **set up / configure / onboard** this repo for Repo Mesh (
     }
     function resolveHermesCoordinatorHome(meshId, workspace) {
       const key2 = `${meshId || "mesh"}
-${(0, import_node_path3.resolve)(workspace || os7.tmpdir())}`;
+${(0, import_node_path3.resolve)(workspace || os8.tmpdir())}`;
       const hash2 = shortHash(key2);
-      return (0, import_node_path3.join)(os7.tmpdir(), `adhdev-hermes-mesh-coordinator-${hash2}`);
+      return (0, import_node_path3.join)(os8.tmpdir(), `adhdev-hermes-mesh-coordinator-${hash2}`);
     }
     function resolveMcpConfigPath(configPath, workspace) {
       const trimmed = configPath.trim();
-      if (trimmed === "~") return os7.homedir();
-      if (trimmed.startsWith("~/")) return (0, import_node_path3.join)(os7.homedir(), trimmed.slice(2));
+      if (trimmed === "~") return os8.homedir();
+      if (trimmed.startsWith("~/")) return (0, import_node_path3.join)(os8.homedir(), trimmed.slice(2));
       if ((0, import_node_path3.isAbsolute)(trimmed)) return trimmed;
       return (0, import_node_path3.join)(workspace, trimmed);
     }
@@ -54037,7 +54141,7 @@ ${(0, import_node_path3.resolve)(workspace || os7.tmpdir())}`;
           const template = injection.template && injection.template.includes("{prompt}") ? injection.template : "{prompt}";
           const body = template.replace(/\{prompt\}/g, systemPrompt);
           try {
-            const dir = (0, import_node_fs3.mkdtempSync)((0, import_node_path3.join)(os7.tmpdir(), `adhdev-coord-${ctx.cliType}-`));
+            const dir = (0, import_node_fs3.mkdtempSync)((0, import_node_path3.join)(os8.tmpdir(), `adhdev-coord-${ctx.cliType}-`));
             const filePath = (0, import_node_path3.join)(dir, "coordinator-agent.md");
             (0, import_node_fs3.writeFileSync)(filePath, body, "utf-8");
             ctx.cliArgs.push(injection.flag, filePath);
@@ -54197,7 +54301,7 @@ ${rendered}`, "utf-8");
       });
     }
     var import_node_fs3;
-    var os7;
+    var os8;
     var import_session_host_core32;
     var import_node_path3;
     var DEFAULT_SERVER_NAME;
@@ -54208,7 +54312,7 @@ ${rendered}`, "utf-8");
       "src/commands/mesh-coordinator.ts"() {
         "use strict";
         import_node_fs3 = require("fs");
-        os7 = __toESM2(require("os"));
+        os8 = __toESM2(require("os"));
         import_session_host_core32 = require_dist();
         import_node_path3 = require("path");
         init_logger();
@@ -60514,7 +60618,17 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       const entry = quotaEntryFor(node, providerType);
       if (!entry) return null;
       const { facts, quota } = entry;
-      if (quota.status !== "ok") return null;
+      if (quota.status !== "ok") {
+        if (quota.status === "error" && quota.metadata?.failureKind === "quota-exhausted" && isQuotaSnapshotFresh(facts, quota, policy, now)) {
+          return {
+            reason: PROVIDER_QUOTA_EXHAUSTED_SKIP_REASON,
+            window: "unknown",
+            remainingPercent: 0,
+            thresholdPercent: 0
+          };
+        }
+        return null;
+      }
       if (!isQuotaSnapshotFresh(facts, quota, policy, now)) return null;
       const resolved = resolveQuotaRoutingPolicy(policy);
       const session = remainingPercent(quota.session);
@@ -60559,12 +60673,14 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
     }
     var PROVIDER_QUOTA_SESSION_LOW_SKIP_REASON;
     var PROVIDER_QUOTA_WEEKLY_LOW_SKIP_REASON;
+    var PROVIDER_QUOTA_EXHAUSTED_SKIP_REASON;
     var init_mesh_quota_routing = __esm2({
       "src/mesh/mesh-quota-routing.ts"() {
         "use strict";
         init_repo_mesh_types();
         PROVIDER_QUOTA_SESSION_LOW_SKIP_REASON = "provider_quota_session_low";
         PROVIDER_QUOTA_WEEKLY_LOW_SKIP_REASON = "provider_quota_weekly_low";
+        PROVIDER_QUOTA_EXHAUSTED_SKIP_REASON = "provider_quota_exhausted";
       }
     });
     function isAnthropicProvider(providerType) {
@@ -61134,10 +61250,11 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
           // busy counterpart SLOT_MODEL_BUSY_SKIP_REASON is deliberately NOT listed:
           // that one clears on its own when the slot goes idle.
           SLOT_MODEL_ABSENT_SKIP_REASON
-          // QUOTA GATE: 'provider_quota_session_low' / 'provider_quota_weekly_low' are
-          // deliberately NOT listed either — an exhausted quota window RESETS, so the
-          // block self-resolves exactly like the slot-busy case; the task waits in the
-          // queue and the coordinator is not paged (mesh-quota-routing.ts).
+          // QUOTA GATE: 'provider_quota_session_low' / 'provider_quota_weekly_low' /
+          // 'provider_quota_exhausted' are deliberately NOT listed either — an
+          // exhausted quota window RESETS, so the block self-resolves exactly like
+          // the slot-busy case; the task waits in the queue and the coordinator is
+          // not paged (mesh-quota-routing.ts).
         ];
         TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON = "target_node_bootstrap_pending";
         lastActionableSkipNotified = /* @__PURE__ */ new Map();
@@ -61642,7 +61759,11 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       }
       const quotaClaimBlock = evaluateProviderQuotaGate(node, providerType, mesh?.policy?.quotaRouting ?? null);
       if (quotaClaimBlock) {
-        LOG2.info("MeshQueue", `QUOTA GATE: deferring queue claim for node ${nodeId} (${sessionId}): provider '${providerType}' has ${quotaClaimBlock.remainingPercent.toFixed(1)}% ${quotaClaimBlock.window} quota remaining (< ${quotaClaimBlock.thresholdPercent}% threshold) \u2014 task left pending until the window resets`);
+        if (quotaClaimBlock.reason === PROVIDER_QUOTA_EXHAUSTED_SKIP_REASON) {
+          LOG2.info("MeshQueue", `QUOTA GATE: deferring queue claim for node ${nodeId} (${sessionId}): provider '${providerType}' reported its quota EXHAUSTED \u2014 task left pending until the quota resets`);
+        } else {
+          LOG2.info("MeshQueue", `QUOTA GATE: deferring queue claim for node ${nodeId} (${sessionId}): provider '${providerType}' has ${quotaClaimBlock.remainingPercent.toFixed(1)}% ${quotaClaimBlock.window} quota remaining (< ${quotaClaimBlock.thresholdPercent}% threshold) \u2014 task left pending until the window resets`);
+        }
         return false;
       }
       const inlineBootstrapNode = (() => {
@@ -62387,7 +62508,11 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
             }
             const quotaBlock = evaluateProviderQuotaGate(node, resolved.providerType, mesh?.policy?.quotaRouting ?? null);
             if (quotaBlock) {
-              LOG2.info("MeshQueue", `QUOTA GATE: provider '${resolved.providerType}' on node ${nodeId} has ${quotaBlock.remainingPercent.toFixed(1)}% ${quotaBlock.window} quota remaining (< ${quotaBlock.thresholdPercent}% threshold, task ${task.id}); leaving the task queued until the window resets`);
+              if (quotaBlock.reason === PROVIDER_QUOTA_EXHAUSTED_SKIP_REASON) {
+                LOG2.info("MeshQueue", `QUOTA GATE: provider '${resolved.providerType}' on node ${nodeId} reported its quota EXHAUSTED (task ${task.id}); leaving the task queued until the quota resets`);
+              } else {
+                LOG2.info("MeshQueue", `QUOTA GATE: provider '${resolved.providerType}' on node ${nodeId} has ${quotaBlock.remainingPercent.toFixed(1)}% ${quotaBlock.window} quota remaining (< ${quotaBlock.thresholdPercent}% threshold, task ${task.id}); leaving the task queued until the window resets`);
+              }
               markSkip(nodeId, quotaBlock.reason, { providerType: resolved.providerType });
               continue;
             }
@@ -63147,7 +63272,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       }
     });
     async function updateDarwinMemoryCache() {
-      if (os8.platform() !== "darwin") return;
+      if (os9.platform() !== "darwin") return;
       try {
         const { stdout } = await execAsync2("vm_stat", {
           encoding: "utf-8",
@@ -63171,26 +63296,26 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
         const fileBacked = counts["file_backed"] ?? 0;
         const availPages = free + inactive + speculative + purgeable + fileBacked;
         const bytes = availPages * pageSize;
-        cachedDarwinAvail = Number.isFinite(bytes) && bytes >= 0 ? Math.min(bytes, os8.totalmem()) : null;
+        cachedDarwinAvail = Number.isFinite(bytes) && bytes >= 0 ? Math.min(bytes, os9.totalmem()) : null;
       } catch {
       }
     }
     function getHostMemorySnapshot() {
-      if (os8.platform() === "darwin" && !darwinMemoryInterval) {
+      if (os9.platform() === "darwin" && !darwinMemoryInterval) {
         updateDarwinMemoryCache();
         darwinMemoryInterval = setInterval(updateDarwinMemoryCache, 3e3);
         darwinMemoryInterval.unref();
       }
-      const totalMem = os8.totalmem();
-      const freeMem = os8.freemem();
-      const availableMem = os8.platform() === "darwin" ? cachedDarwinAvail ?? freeMem : freeMem;
+      const totalMem = os9.totalmem();
+      const freeMem = os9.freemem();
+      const availableMem = os9.platform() === "darwin" ? cachedDarwinAvail ?? freeMem : freeMem;
       return {
         totalMem,
         freeMem,
         availableMem
       };
     }
-    var os8;
+    var os9;
     var import_child_process4;
     var import_util3;
     var execAsync2;
@@ -63199,7 +63324,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
     var init_host_memory = __esm2({
       "src/system/host-memory.ts"() {
         "use strict";
-        os8 = __toESM2(require("os"));
+        os9 = __toESM2(require("os"));
         import_child_process4 = require("child_process");
         import_util3 = require("util");
         execAsync2 = (0, import_util3.promisify)(import_child_process4.exec);
@@ -64343,8 +64468,8 @@ ${cleanBody}`;
     }
     function buildMachineInfo2(profile = "full") {
       const base = {
-        hostname: os9.hostname(),
-        platform: os9.platform()
+        hostname: os10.hostname(),
+        platform: os10.platform()
       };
       if (profile === "live") {
         return base;
@@ -64353,23 +64478,23 @@ ${cleanBody}`;
         const memSnap2 = getHostMemorySnapshot();
         return {
           ...base,
-          arch: os9.arch(),
-          cpus: os9.cpus().length,
+          arch: os10.arch(),
+          cpus: os10.cpus().length,
           totalMem: memSnap2.totalMem,
-          release: os9.release()
+          release: os10.release()
         };
       }
       const memSnap = getHostMemorySnapshot();
       return {
         ...base,
-        arch: os9.arch(),
-        cpus: os9.cpus().length,
+        arch: os10.arch(),
+        cpus: os10.cpus().length,
         totalMem: memSnap.totalMem,
         freeMem: memSnap.freeMem,
         availableMem: memSnap.availableMem,
-        loadavg: os9.loadavg(),
-        uptime: os9.uptime(),
-        release: os9.release()
+        loadavg: os10.loadavg(),
+        uptime: os10.uptime(),
+        release: os10.release()
       };
     }
     function parseMessageTime(value) {
@@ -64606,13 +64731,13 @@ ${cleanBody}`;
         }
       };
     }
-    var os9;
+    var os10;
     var READ_DEBUG_ENABLED;
     var recentReadDebugSignatureBySession;
     var init_snapshot2 = __esm2({
       "src/status/snapshot.ts"() {
         "use strict";
-        os9 = __toESM2(require("os"));
+        os10 = __toESM2(require("os"));
         init_config();
         init_state_store();
         init_recent_activity();
@@ -70807,7 +70932,7 @@ ${cleanBody}`;
     }
     function expandTemplateRootForEnumeration(template, input) {
       if (!template) return "";
-      const posixHome = () => toPosixPath(os12.homedir());
+      const posixHome = () => toPosixPath(os13.homedir());
       let out = template;
       if (out === "~") out = posixHome();
       else if (out.startsWith("~/")) out = `${posixHome()}/${out.slice(2)}`;
@@ -71420,13 +71545,13 @@ ${cleanBody}`;
       if (!template) return null;
       let out = template;
       if (out.startsWith("~/") || out === "~") {
-        out = path27.join(os12.homedir(), out.slice(2));
+        out = path27.join(os13.homedir(), out.slice(2));
       }
       out = out.replace(/\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}/g, (_m, name, fallback) => {
         const v = input.envOverrides?.[name] ?? process.env[name];
         return v != null && v !== "" ? v : fallback ?? "";
       });
-      if (out.startsWith("~/")) out = path27.join(os12.homedir(), out.slice(2));
+      if (out.startsWith("~/")) out = path27.join(os13.homedir(), out.slice(2));
       const now = /* @__PURE__ */ new Date();
       const workspaceRaw = input.workspace ?? "";
       let workspaceResolved = workspaceRaw;
@@ -71469,7 +71594,7 @@ ${cleanBody}`;
     function scanProjectsRootForSessionFile(template, input, requestedSessionId) {
       if (!requestedSessionId) return null;
       let head = template;
-      if (head.startsWith("~/") || head === "~") head = path27.join(os12.homedir(), head.slice(2));
+      if (head.startsWith("~/") || head === "~") head = path27.join(os13.homedir(), head.slice(2));
       const base = staticTemplateBase(head);
       if (!base) return null;
       let baseStat = null;
@@ -71618,13 +71743,13 @@ ${cleanBody}`;
       if (!template) return null;
       let out = template;
       if (out.startsWith("~/") || out === "~") {
-        out = path27.join(os12.homedir(), out.slice(2));
+        out = path27.join(os13.homedir(), out.slice(2));
       }
       out = out.replace(/\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}/g, (_m, name, fallback) => {
         const v = input.envOverrides?.[name] ?? process.env[name];
         return v != null && v !== "" ? v : fallback ?? "";
       });
-      if (out.startsWith("~/")) out = path27.join(os12.homedir(), out.slice(2));
+      if (out.startsWith("~/")) out = path27.join(os13.homedir(), out.slice(2));
       const workspaceRaw = input.workspace ?? "";
       let workspaceResolved = workspaceRaw;
       if (workspaceRaw) {
@@ -72083,7 +72208,7 @@ ${cleanBody}`;
       return t.negate ? !result : result;
     }
     var fs222;
-    var os12;
+    var os13;
     var path27;
     var UUID_RE;
     var DEFAULT_TOOL_CALL_TYPES;
@@ -72092,7 +72217,7 @@ ${cleanBody}`;
       "src/providers/spec/native-history-executor.ts"() {
         "use strict";
         fs222 = __toESM2(require("fs"));
-        os12 = __toESM2(require("os"));
+        os13 = __toESM2(require("os"));
         path27 = __toESM2(require("path"));
         init_logger();
         init_load_better_sqlite3();
@@ -72585,7 +72710,7 @@ ${cleanBody}`;
       cachedPty = void 0;
       requireNodePty = loader2 ?? (() => require("node-pty"));
     }
-    var os13;
+    var os14;
     var cachedPty;
     var requireNodePty;
     var NodePtyRuntimeTransport;
@@ -72593,7 +72718,7 @@ ${cleanBody}`;
     var init_pty_transport = __esm2({
       "src/cli-adapters/pty-transport.ts"() {
         "use strict";
-        os13 = __toESM2(require("os"));
+        os14 = __toESM2(require("os"));
         init_spawn_env();
         init_resolve_executable();
         requireNodePty = () => require("node-pty");
@@ -72634,9 +72759,9 @@ ${cleanBody}`;
               try {
                 const fs56 = require("fs");
                 const stat2 = fs56.statSync(cwd);
-                if (!stat2.isDirectory()) cwd = os13.homedir();
+                if (!stat2.isDirectory()) cwd = os14.homedir();
               } catch {
-                cwd = os13.homedir();
+                cwd = os14.homedir();
               }
             }
             const handle = pty.spawn(resolveWin32Executable(command), args, {
@@ -75311,7 +75436,7 @@ ${cont}` : cont;
     function resolveCliSpawnPlanFromParts(options) {
       const { command, baseArgs, shell, baseEnv, workingDir, extraArgs, extraEnv, geometry, diagnosticCliType, diagnosticProviderVersion } = options;
       const binaryPath = findBinary(command);
-      const isWin = os14.platform() === "win32";
+      const isWin = os15.platform() === "win32";
       const allArgs = [...baseArgs ?? [], ...extraArgs ?? []].map(
         (arg) => typeof arg === "string" ? arg.replace(/\{\{workingDir\}\}/g, workingDir) : arg
       );
@@ -75399,13 +75524,13 @@ ${cont}` : cont;
       }
       return "";
     }
-    var os14;
+    var os15;
     var path28;
     var import_session_host_core7;
     var init_provider_cli_runtime = __esm2({
       "src/cli-adapters/provider-cli-runtime.ts"() {
         "use strict";
-        os14 = __toESM2(require("os"));
+        os15 = __toESM2(require("os"));
         path28 = __toESM2(require("path"));
         init_logger();
         import_session_host_core7 = require_dist();
@@ -75480,16 +75605,19 @@ ${cont}` : cont;
       missingBackgroundSourceWarned.add(cliType);
       LOG2.warn("CLI", `[${cliType}] background-task tracking declared but nativeHistory.source missing after provider resolve; background detection inactive`);
     }
-    var os15;
+    var os16;
     var import_crypto11;
     var import_session_host_core8;
     var missingBackgroundSourceWarned;
     var FORCE_SUBMIT_SETTLE_MS;
+    var WIN32_INJECT_ENTER_MAX_RETRIES;
+    var WIN32_INJECT_ENTER_RETRY_DELAY_MS;
+    var WIN32_INJECT_COMPOSER_TAIL_LINES;
     var ProviderCliAdapter;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
         "use strict";
-        os15 = __toESM2(require("os"));
+        os16 = __toESM2(require("os"));
         import_crypto11 = require("crypto");
         init_interactive_prompt();
         init_kimi_pending_question();
@@ -75511,6 +75639,9 @@ ${cont}` : cont;
         init_provider_cli_shared();
         missingBackgroundSourceWarned = /* @__PURE__ */ new Set();
         FORCE_SUBMIT_SETTLE_MS = 150;
+        WIN32_INJECT_ENTER_MAX_RETRIES = 2;
+        WIN32_INJECT_ENTER_RETRY_DELAY_MS = 300;
+        WIN32_INJECT_COMPOSER_TAIL_LINES = 8;
         ProviderCliAdapter = class _ProviderCliAdapter {
           constructor(provider, workingDir, extraArgs = [], extraEnv = {}, transportFactory = new NodePtyTransportFactory(), owningSessionId) {
             this.extraArgs = extraArgs;
@@ -75521,7 +75652,7 @@ ${cont}` : cont;
             this.transportFactory = transportFactory;
             this.cliType = provider.type;
             this.cliName = provider.name;
-            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os15.homedir()) : workingDir;
+            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os16.homedir()) : workingDir;
             const resolvedConfig = resolveCliAdapterConfig(provider);
             this.timeouts = resolvedConfig.timeouts;
             this.approvalKeys = resolvedConfig.approvalKeys;
@@ -75658,6 +75789,9 @@ ${cont}` : cont;
           pendingOutboundStaleTimer = null;
           // Submit retry timer — PTY-level, not state machine
           submitRetryTimer = null;
+          // WIN32-INJECT-ENTER-RETRY: pending bare-ENTER resend for a mesh_send_keys
+          // injection whose submit may have been swallowed by win32 ConPTY.
+          injectEnterRetryTimer = null;
           // PTY-WRITE-SERIALIZE: a single per-session tail promise that serializes every
           // PTY write. Each writeToPty() call chains its actual write after the previous
           // one and returns a promise that resolves only after ITS write completes, so
@@ -76217,6 +76351,10 @@ ${lastSnapshot}`;
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.injectEnterRetryTimer) {
+              clearTimeout(this.injectEnterRetryTimer);
+              this.injectEnterRetryTimer = null;
+            }
             if (this.pendingOutputParseTimer) {
               clearTimeout(this.pendingOutputParseTimer);
               this.pendingOutputParseTimer = null;
@@ -77031,6 +77169,10 @@ ${lastSnapshot}`;
               clearTimeout(this.submitRetryTimer);
               this.submitRetryTimer = null;
             }
+            if (this.injectEnterRetryTimer) {
+              clearTimeout(this.injectEnterRetryTimer);
+              this.injectEnterRetryTimer = null;
+            }
             this.engine.onTurnStarted(turnScope);
             this.engine.submitRetryPromptSnippet = extractPromptRetrySnippet(text);
             const normalizedPromptSnippet = normalizePromptText(this.engine.submitRetryPromptSnippet);
@@ -77594,7 +77736,17 @@ ${lastSnapshot}`;
               LOG2.warn("CLI", `[${this.cliType}] send_keys refused (actionable_modal): keys=${encoded.keys.join(",")} \u2014 use mesh_approve`);
               return { ok: false, refused: "actionable_modal", keys: encoded.keys, hasDestructive: encoded.hasDestructive };
             }
+            if (this.injectEnterRetryTimer) {
+              clearTimeout(this.injectEnterRetryTimer);
+              this.injectEnterRetryTimer = null;
+            }
             await this.writeToPty(encoded.sequence);
+            if (process.platform === "win32" && encoded.submits) {
+              const snippet2 = extractPromptRetrySnippet(
+                items.map((it) => "text" in it ? it.text : "").join("\n")
+              );
+              if (snippet2) this.scheduleWin32InjectEnterRetry(snippet2, 1);
+            }
             LOG2.info("CLI", `[${this.cliType}] send_keys injected keys=${encoded.keys.join(",") || "(text-only)"} bytes=${Buffer.byteLength(encoded.sequence, "utf8")} destructive=${encoded.hasDestructive}`);
             return {
               ok: true,
@@ -77611,6 +77763,30 @@ ${lastSnapshot}`;
             const str2 = Buffer.isBuffer(data) ? data.toString("utf8") : data;
             await this.writeToPty(str2);
           }
+          /**
+           * WIN32-INJECT-ENTER-RETRY: resend the bare submit key while the injected
+           * text still stands in the composer (bottom viewport lines). Stops the
+           * instant the text leaves that region — proof the submit was consumed —
+           * so a delayed (not lost) original ENTER is never doubled. Bounded by
+           * WIN32_INJECT_ENTER_MAX_RETRIES; see the constants' comment for the
+           * rationale. Never logs the snippet (it is user text).
+           */
+          scheduleWin32InjectEnterRetry(snippet2, attempt) {
+            this.injectEnterRetryTimer = setTimeout(() => {
+              this.injectEnterRetryTimer = null;
+              if (!this.ptyProcess) return;
+              const screenLines = this.terminalScreen.getText().split("\n");
+              const composerRegion = screenLines.slice(-WIN32_INJECT_COMPOSER_TAIL_LINES).join("\n");
+              if (!promptLikelyVisible(composerRegion, snippet2)) return;
+              LOG2.info("CLI", `[${this.cliType}] send_keys ENTER retry (attempt ${attempt}/${WIN32_INJECT_ENTER_MAX_RETRIES}): injected text still in composer`);
+              void this.writeToPty(MESH_SEND_KEY_ENCODING.ENTER).catch((error48) => {
+                LOG2.warn("CLI", `[${this.cliType}] send_keys ENTER retry write failed: ${error48?.message || error48}`);
+              });
+              if (attempt < WIN32_INJECT_ENTER_MAX_RETRIES) {
+                this.scheduleWin32InjectEnterRetry(snippet2, attempt + 1);
+              }
+            }, WIN32_INJECT_ENTER_RETRY_DELAY_MS);
+          }
           resolveModal(buttonIndex) {
             this.engine.resolveModal(buttonIndex);
           }
@@ -80156,7 +80332,7 @@ ${lastSnapshot}`;
     init_git_worktree();
     init_config();
     init_config_dir();
-    var os52 = __toESM2(require("os"));
+    var os62 = __toESM2(require("os"));
     var path12 = __toESM2(require("path"));
     var import_session_host_core22 = require_dist();
     init_config_dir();
@@ -80200,7 +80376,7 @@ ${lastSnapshot}`;
     var cached22 = null;
     function resolveInstanceContext(options = {}) {
       const env2 = options.env ?? process.env;
-      const homeDir = options.homeDir ?? os52.homedir();
+      const homeDir = options.homeDir ?? os62.homedir();
       const envDir = typeof env2.ADHDEV_CONFIG_DIR === "string" ? env2.ADHDEV_CONFIG_DIR.trim() : "";
       const explicitDir = typeof options.configDir === "string" ? options.configDir.trim() : "";
       if (explicitDir && envDir && (0, import_session_host_core22.canonicalizeInstancePath)(explicitDir) !== (0, import_session_host_core22.canonicalizeInstancePath)(envDir)) {
@@ -80221,7 +80397,7 @@ ${lastSnapshot}`;
     }
     function getProcessInstanceContext(options = {}) {
       const envDir = typeof process.env.ADHDEV_CONFIG_DIR === "string" ? process.env.ADHDEV_CONFIG_DIR.trim() : "";
-      const key2 = `${envDir}|${os52.homedir()}|${options.standalone ? "standalone" : "daemon"}`;
+      const key2 = `${envDir}|${os62.homedir()}|${options.standalone ? "standalone" : "daemon"}`;
       if (!cached22 || cached22.key !== key2) {
         cached22 = { key: key2, context: resolveInstanceContext({ standalone: options.standalone }) };
       }
@@ -81525,17 +81701,17 @@ ${lastSnapshot}`;
       return null;
     }
     async function detectIDEs(providerLoader) {
-      const os28 = (0, import_os3.platform)();
+      const os29 = (0, import_os3.platform)();
       const results = [];
       for (const def of getMergedDefinitions()) {
         const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
-        const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os28] || []) || []);
+        const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os29] || []) || []);
         let resolvedCli = cliPath;
-        if (!resolvedCli && appPath && os28 === "darwin") {
+        if (!resolvedCli && appPath && os29 === "darwin") {
           const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
           if ((0, import_fs17.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
-        if (!resolvedCli && appPath && os28 === "win32") {
+        if (!resolvedCli && appPath && os29 === "win32") {
           const { dirname: dirname23 } = await import("path");
           const appDir = dirname23(appPath);
           const candidates = [
@@ -81552,7 +81728,7 @@ ${lastSnapshot}`;
             }
           }
         }
-        const installed = os28 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
+        const installed = os29 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
         const version2 = null;
         results.push({
           id: def.id,
@@ -88255,7 +88431,7 @@ ${effect.notification.body || ""}`.trim();
     }
     var fs15 = __toESM2(require("fs"));
     var path232 = __toESM2(require("path"));
-    var os10 = __toESM2(require("os"));
+    var os11 = __toESM2(require("os"));
     var KEY_TO_VK = {
       Backspace: 8,
       Tab: 9,
@@ -88509,7 +88685,7 @@ ${effect.notification.body || ""}`.trim();
     function resolveSafePath(requestedPath) {
       const rawPath = typeof requestedPath === "string" ? requestedPath.trim() : "";
       const inputPath = rawPath || ".";
-      const home = os10.homedir();
+      const home = os11.homedir();
       if (inputPath.startsWith("~")) {
         return path232.resolve(path232.join(home, inputPath.slice(1)));
       }
@@ -90914,7 +91090,7 @@ ${effect.notification.body || ""}`.trim();
     var import_child_process8 = require("child_process");
     var import_child_process9 = require("child_process");
     var fs20 = __toESM2(require("fs"));
-    var os11 = __toESM2(require("os"));
+    var os12 = __toESM2(require("os"));
     var path26 = __toESM2(require("path"));
     var import_child_process7 = require("child_process");
     var fs19 = __toESM2(require("fs"));
@@ -91781,7 +91957,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
       const packageRoot = findCurrentPackageRoot(options.currentCliPath || process.argv[1], options.packageName);
       const npmInvocation = resolveSiblingNpmInvocation(options.nodeExecutable || process.execPath, options.platform);
       const platform10 = options.platform || process.platform;
-      const homeDir = options.homeDir || os11.homedir();
+      const homeDir = options.homeDir || os12.homedir();
       const instanceDir = options.instanceDir || resolveInstanceDir();
       let installPrefix = packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null;
       if (platform10 === "win32" && isPortableNode22Prefix(installPrefix, homeDir, instanceDir)) {
@@ -92193,12 +92369,12 @@ ${marker}`,
       }
       const instanceDir = resolveInstanceDir();
       const windowsInstallerLayout = resolveWindowsInstallerLayout({
-        homeDir: os11.homedir(),
+        homeDir: os12.homedir(),
         installPrefix: installCommand.surface.installPrefix,
         instanceDir
       });
       if (windowsInstallerLayout) {
-        const portableNode = findPortableNode22(os11.homedir(), process.execPath, instanceDir);
+        const portableNode = findPortableNode22(os12.homedir(), process.execPath, instanceDir);
         if (!portableNode) {
           throw new Error("installer-managed Windows update requires the portable Node.js 22 runtime");
         }
@@ -93335,7 +93511,7 @@ ${marker}`,
       })
     );
     init_dist();
-    var os20 = __toESM2(require("os"));
+    var os21 = __toESM2(require("os"));
     var path35 = __toESM2(require("path"));
     var crypto6 = __toESM2(require("crypto"));
     var import_fs18 = require("fs");
@@ -93429,7 +93605,7 @@ ${marker}`,
       }
     }
     init_summary_metadata();
-    var os19 = __toESM2(require("os"));
+    var os20 = __toESM2(require("os"));
     var crypto5 = __toESM2(require("crypto"));
     var fs31 = __toESM2(require("fs"));
     init_contracts2();
@@ -93569,7 +93745,7 @@ ${marker}`,
     var path31 = __toESM2(require("path"));
     init_provider_cli_adapter();
     var fs25 = __toESM2(require("fs"));
-    var os17 = __toESM2(require("os"));
+    var os18 = __toESM2(require("os"));
     var path30 = __toESM2(require("path"));
     init_terminal_screen();
     var import_session_host_core9 = require_dist();
@@ -93748,12 +93924,12 @@ ${marker}`,
     init_fsm_types();
     init_fsm_loader();
     var fs24 = __toESM2(require("fs"));
-    var os16 = __toESM2(require("os"));
+    var os17 = __toESM2(require("os"));
     var path29 = __toESM2(require("path"));
     init_logger();
     function expandHome2(p) {
-      if (p === "~") return os16.homedir();
-      if (p.startsWith("~/")) return path29.join(os16.homedir(), p.slice(2));
+      if (p === "~") return os17.homedir();
+      if (p.startsWith("~/")) return path29.join(os17.homedir(), p.slice(2));
       return p;
     }
     function realWorkspacePath(workingDir) {
@@ -94589,7 +94765,7 @@ ${marker}`,
       }
       fireDelegate(d) {
         const ev = this.currentEval;
-        const task = d.task_template.replace(/\{node\}/g, os17.hostname()).replace(/\{state\.label\}/g, ev?.state.label ?? "").replace(/\{state\.title\}/g, ev?.state.title ?? "").replace(/\{duration_ms\}/g, String(d.after_duration_ms ?? 0));
+        const task = d.task_template.replace(/\{node\}/g, os18.hostname()).replace(/\{state\.label\}/g, ev?.state.label ?? "").replace(/\{state\.title\}/g, ev?.state.title ?? "").replace(/\{duration_ms\}/g, String(d.after_duration_ms ?? 0));
         this.emit({ kind: "delegate", id: d.id, task });
       }
       // ────────────────────────────────────────────────────────────────────
@@ -94983,7 +95159,7 @@ ${marker}`,
         const ctl = (this.spec.control_bar ?? []).find((c) => c.action.type === "attach_image");
         if (!ctl || ctl.action.type !== "attach_image") return;
         const ext = guessExt(mime);
-        const tmp = path30.join(os17.tmpdir(), `adhdev-attach-${Date.now()}${ext}`);
+        const tmp = path30.join(os18.tmpdir(), `adhdev-attach-${Date.now()}${ext}`);
         try {
           fs25.writeFileSync(tmp, Buffer.from(blob, "base64"));
         } catch {
@@ -96282,7 +96458,7 @@ ${marker}`,
     init_transcript_claim_registry();
     init_chat_message_normalization();
     init_working_dir();
-    var os18 = __toESM2(require("os"));
+    var os19 = __toESM2(require("os"));
     var path322 = __toESM2(require("path"));
     var crypto4 = __toESM2(require("crypto"));
     var fs28 = __toESM2(require("fs"));
@@ -96353,7 +96529,7 @@ ${marker}`,
       const promptParts = [];
       const imageRefs = [];
       const resourceRefs = [];
-      const materializeDir = options.materializeDir || path322.join(os18.tmpdir(), "adhdev-input-media");
+      const materializeDir = options.materializeDir || path322.join(os19.tmpdir(), "adhdev-input-media");
       input.parts.forEach((part, index) => {
         if (part.type === "text" && part.text.trim()) {
           promptParts.push(part.text.trim());
@@ -98563,7 +98739,7 @@ ${buttons.join("\n")}`;
        * Replaces the previously duplicated probeOpenCode/Codex/Goose functions.
        */
       probeSessionIdFromConfig(probe) {
-        const resolvedDbPath = probe.dbPath.replace(/^~/, os19.homedir());
+        const resolvedDbPath = probe.dbPath.replace(/^~/, os20.homedir());
         const now = Date.now();
         if (this.sqliteProbeCache.missingUntil > now) return null;
         if (!fs31.existsSync(resolvedDbPath)) {
@@ -102126,7 +102302,7 @@ ${rawInput}` : rawInput;
     }
     function expandExecutable(command) {
       const trimmed = command.trim();
-      return trimmed.startsWith("~") ? path35.join(os20.homedir(), trimmed.slice(1)) : trimmed;
+      return trimmed.startsWith("~") ? path35.join(os21.homedir(), trimmed.slice(1)) : trimmed;
     }
     function commandExists(command) {
       const trimmed = command.trim();
@@ -102276,9 +102452,9 @@ ${rawInput}` : rawInput;
       return false;
     }
     function ensureEmptyDelegatedMcpConfig(workspace) {
-      const baseDir = path35.join(os20.tmpdir(), "adhdev-delegated-agent-empty-mcp");
+      const baseDir = path35.join(os21.tmpdir(), "adhdev-delegated-agent-empty-mcp");
       (0, import_fs18.mkdirSync)(baseDir, { recursive: true });
-      const workspaceHash = shortHash(path35.resolve(workspace || os20.tmpdir()));
+      const workspaceHash = shortHash(path35.resolve(workspace || os21.tmpdir()));
       const filePath = path35.join(baseDir, `${workspaceHash}.json`);
       (0, import_fs18.writeFileSync)(filePath, JSON.stringify({ mcpServers: {} }, null, 2), "utf-8");
       return filePath;
@@ -102673,7 +102849,7 @@ ${rawInput}` : rawInput;
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os20.homedir()) : path35.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os21.homedir()) : path35.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const rawProvider = this.providerLoader.getByAlias(cliType);
         const provider = rawProvider ? this.providerLoader.resolve(normalizedType) || rawProvider : void 0;
@@ -103700,7 +103876,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     };
     var import_child_process12 = require("child_process");
     var net3 = __toESM2(require("net"));
-    var os24 = __toESM2(require("os"));
+    var os25 = __toESM2(require("os"));
     var path46 = __toESM2(require("path"));
     var fs41 = __toESM2(require("fs"));
     var path45 = __toESM2(require("path"));
@@ -104170,7 +104346,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_config();
     init_native_history_executor();
     var fs36 = __toESM2(require("fs"));
-    var os23 = __toESM2(require("os"));
+    var os24 = __toESM2(require("os"));
     var path40 = __toESM2(require("path"));
     var fs322 = __toESM2(require("fs"));
     var path36 = __toESM2(require("path"));
@@ -104706,7 +104882,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var fs34 = __toESM2(require("fs"));
     var path38 = __toESM2(require("path"));
-    var os21 = __toESM2(require("os"));
+    var os222 = __toESM2(require("os"));
     init_load_better_sqlite3();
     init_logger();
     function extractTimestampValue3(value) {
@@ -104730,7 +104906,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
     }
     function antigravityRoot() {
-      return path38.join(os21.homedir(), ".gemini", "antigravity-cli");
+      return path38.join(os222.homedir(), ".gemini", "antigravity-cli");
     }
     function historyJsonlPath() {
       return path38.join(antigravityRoot(), "history.jsonl");
@@ -105345,11 +105521,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var fs35 = __toESM2(require("fs"));
     var path39 = __toESM2(require("path"));
-    var os222 = __toESM2(require("os"));
+    var os23 = __toESM2(require("os"));
     init_load_better_sqlite3();
     init_usage_normalize();
-    var HERMES_STATE_DB = path39.join(os222.homedir(), ".hermes", "state.db");
-    var HERMES_LEGACY_SESSIONS_DIR = path39.join(os222.homedir(), ".hermes", "sessions");
+    var HERMES_STATE_DB = path39.join(os23.homedir(), ".hermes", "state.db");
+    var HERMES_LEGACY_SESSIONS_DIR = path39.join(os23.homedir(), ".hermes", "sessions");
     function statMtimeMs4(p) {
       try {
         return Math.floor(fs35.statSync(p).mtimeMs);
@@ -105637,7 +105813,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function resolveClaudePath(workspace, sessionId) {
-      const dir = path40.join(os23.homedir(), ".claude", "projects", cwdAsDashes(workspace));
+      const dir = path40.join(os24.homedir(), ".claude", "projects", cwdAsDashes(workspace));
       if (!fs36.existsSync(dir)) return null;
       if (sessionId) {
         const candidate = path40.join(dir, `${sessionId}.jsonl`);
@@ -105759,7 +105935,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var AGY_SPAWN_CLAIM_GRACE_MS = 2e3;
     function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instanceId) {
-      const agyRoot = path40.join(os23.homedir(), ".gemini", "antigravity-cli");
+      const agyRoot = path40.join(os24.homedir(), ".gemini", "antigravity-cli");
       const owner = antigravityOwnerToken(workspace, sessionStartedAtMs, instanceId);
       if (sessionId && isUuidLikeSessionId2(sessionId)) {
         const dbPath = path40.join(agyRoot, "conversations", `${sessionId}.db`);
@@ -105843,9 +106019,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function resolveHermesPath(workspace, sessionId) {
       void workspace;
       void sessionId;
-      const dbPath = path40.join(os23.homedir(), ".hermes", "state.db");
+      const dbPath = path40.join(os24.homedir(), ".hermes", "state.db");
       if (fs36.existsSync(dbPath)) return dbPath;
-      const dir = path40.join(os23.homedir(), ".hermes", "sessions");
+      const dir = path40.join(os24.homedir(), ".hermes", "sessions");
       if (!fs36.existsSync(dir)) return null;
       return newestRecentFile2(dir, /^session_.*\.json$/);
     }
@@ -105871,7 +106047,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return cwd.replace(/\//g, "-");
     }
     function codexSessionsRoot() {
-      return path40.join(os23.homedir(), ".codex", "sessions");
+      return path40.join(os24.homedir(), ".codex", "sessions");
     }
     function isUuidLikeSessionId2(sessionId) {
       return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(sessionId);
@@ -108890,7 +109066,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       });
     }
     async function killIdeProcess(ideId) {
-      const plat = os24.platform();
+      const plat = os25.platform();
       const appName = getMacAppIdentifiers()[ideId];
       const winProcesses = getWinProcessNames()[ideId];
       try {
@@ -108951,7 +109127,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function isIdeRunning(ideId) {
-      const plat = os24.platform();
+      const plat = os25.platform();
       try {
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
@@ -109006,7 +109182,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function detectCurrentWorkspace(ideId) {
-      const plat = os24.platform();
+      const plat = os25.platform();
       if (plat === "darwin") {
         try {
           const appName = getMacAppIdentifiers()[ideId];
@@ -109026,7 +109202,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           const appName = appNameMap[ideId];
           if (appName) {
             const storagePath = path46.join(
-              process.env.APPDATA || path46.join(os24.homedir(), "AppData", "Roaming"),
+              process.env.APPDATA || path46.join(os25.homedir(), "AppData", "Roaming"),
               appName,
               "storage.json"
             );
@@ -109048,7 +109224,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       return void 0;
     }
     async function launchWithCdp(options = {}) {
-      const platform10 = os24.platform();
+      const platform10 = os25.platform();
       let targetIde;
       const ides = await detectIDEs(getProviderLoader());
       if (options.ideId) {
@@ -109339,6 +109515,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     };
     init_dist();
+    init_repo_mesh_types();
     init_mesh_host_ownership();
     init_worktree_bootstrap_config();
     init_mesh_events();
@@ -109610,11 +109787,11 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             MESH_JSON_CONFIG_LOCATIONS: MESH_JSON_CONFIG_LOCATIONS2
           } = await Promise.resolve().then(() => (init_mesh_json_config(), mesh_json_config_exports));
           const { mkdirSync: mkdirSync30, writeFileSync: writeFileSync30 } = await import("fs");
-          const { dirname: dirname23, join: join62 } = await import("path");
+          const { dirname: dirname23, join: join63 } = await import("path");
           const scaffold = buildMeshJsonConfigScaffold2(mesh);
           const scaffoldJson = serializeMeshJsonConfigScaffold2(scaffold);
           const relativePath = MESH_JSON_CONFIG_LOCATIONS2[0];
-          const absolutePath = join62(workspace, relativePath);
+          const absolutePath = join63(workspace, relativePath);
           const validation = normalizeRepoMeshDeclarativeConfig2(scaffold);
           if (!validation.valid) {
             return { success: false, meshId, error: `invalid mesh.json scaffold: ${validation.errors.join("; ")}` };
@@ -109721,14 +109898,14 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             MESH_JSON_CONFIG_LOCATIONS: MESH_JSON_CONFIG_LOCATIONS2
           } = await Promise.resolve().then(() => (init_mesh_json_config(), mesh_json_config_exports));
           const { existsSync: existsSync62, readFileSync: readFileSync53, mkdirSync: mkdirSync30, writeFileSync: writeFileSync30 } = await import("fs");
-          const { dirname: dirname23, join: join62 } = await import("path");
+          const { dirname: dirname23, join: join63 } = await import("path");
           const yaml6 = await Promise.resolve().then(() => (init_js_yaml(), js_yaml_exports));
           const relativePath = MESH_JSON_CONFIG_LOCATIONS2[0];
           let baseDoc = { version: 1 };
-          let existingPath = join62(workspace, relativePath);
+          let existingPath = join63(workspace, relativePath);
           let existedAsYaml = false;
           for (const relative8 of MESH_JSON_CONFIG_LOCATIONS2) {
-            const candidate = join62(workspace, relative8);
+            const candidate = join63(workspace, relative8);
             if (!existsSync62(candidate)) continue;
             try {
               const text = readFileSync53(candidate, "utf-8");
@@ -109914,6 +110091,59 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           return { success: false, error: e.message };
         }
       },
+      // ─── Quota-aware routing thresholds (PER MESH, machine-local) ───
+      // The dedicated write path for RepoMeshPolicy.quotaRouting — previously only
+      // reachable as a raw JSON patch through update_mesh's general `policy`
+      // passthrough. The launch gate / fitness spread read the EFFECTIVE thresholds
+      // through resolveQuotaRoutingPolicy, so `resolved` below is exactly what the
+      // gate will apply; `quotaRouting` is the persisted overrides-only view
+      // (fields equal to the defaults are never persisted — persistence economy).
+      mesh_quota_routing_get: async (_ctx, args) => {
+        const requestedMeshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        try {
+          const { getMeshQuotaRouting: getMeshQuotaRouting2, resolveScopedMeshId: resolveScopedMeshId2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+          const overrides = getMeshQuotaRouting2(requestedMeshId || void 0);
+          const meshId = requestedMeshId || resolveScopedMeshId2();
+          return {
+            success: true,
+            quotaRouting: overrides,
+            resolved: resolveQuotaRoutingPolicy(overrides),
+            defaults: DEFAULT_QUOTA_ROUTING_POLICY,
+            scope: {
+              kind: "mesh",
+              storage: "machine_local",
+              meshId: meshId ?? null,
+              resolvedFrom: requestedMeshId ? "explicit" : meshId ? "sole_mesh" : "ambiguous",
+              ...requestedMeshId || meshId ? {} : {
+                note: "Several meshes are configured and no meshId was given, so these are the shipped defaults, not any mesh's saved thresholds. Pass meshId."
+              }
+            }
+          };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      },
+      mesh_quota_routing_set: async (ctx, args) => {
+        const requestedMeshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        try {
+          const { setMeshQuotaRouting: setMeshQuotaRouting2, getMesh: getMesh2, resolveScopedMeshId: resolveScopedMeshId2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+          const quotaRouting = setMeshQuotaRouting2(args?.quotaRouting, requestedMeshId || void 0);
+          const meshId = requestedMeshId || resolveScopedMeshId2();
+          if (meshId) {
+            const fresh = getMesh2(meshId);
+            if (fresh && ctx.getCachedInlineMesh(meshId)) ctx.inlineMeshCache.set(meshId, fresh);
+            ctx.invalidateAggregateMeshStatus(meshId);
+          }
+          return {
+            success: true,
+            quotaRouting,
+            resolved: resolveQuotaRoutingPolicy(quotaRouting),
+            meshId: meshId ?? null
+          };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      },
       add_mesh_node: async (ctx, args) => {
         const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
         const workspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";
@@ -113302,8 +113532,19 @@ ${asText(streams.stderr)}
       });
     }
     function buildSubmodulePublishRequiredNextStep(entries) {
-      const refs = entries.map((entry) => `${entry.path}@${entry.commit}`).join(", ");
-      return `Ask the user for explicit approval to push/publish the unreachable submodule commit(s) (${refs}) to the configured submodule remote main branch, then rerun mesh_refine_node. Do not merge the root branch until every submodule gitlink commit is reachable from submodule origin/main.`;
+      const convergeable = entries.filter((entry) => entry.equivalentPublishedCommit);
+      const publishable = entries.filter((entry) => !entry.equivalentPublishedCommit);
+      const parts = [];
+      if (convergeable.length > 0) {
+        const refs = convergeable.map((entry) => `${entry.path}: ${entry.commit} \u2192 ${entry.equivalentPublishedCommit}`).join(", ");
+        parts.push(`Converge the submodule gitlink(s) to the already-published equivalent commit(s) (${refs}): a commit with an identical tree already exists on the submodule remote main branch, so publishing the local same-content twin is wrong. Retarget the gitlink to the published commit, commit the root pointer update, then rerun mesh_refine_node.`);
+      }
+      if (publishable.length > 0) {
+        const refs = publishable.map((entry) => `${entry.path}@${entry.commit}`).join(", ");
+        parts.push(`Ask the user for explicit approval to push/publish the unreachable submodule commit(s) (${refs}) to the configured submodule remote main branch, then rerun mesh_refine_node.`);
+      }
+      parts.push("Do not merge the root branch until every submodule gitlink commit is reachable from submodule origin/main.");
+      return parts.join(" ");
     }
     function resolveRefineryAutoPublishSubmoduleMainCommits(mesh, workspace) {
       if (mesh?.policy?.allowAutoPublishSubmoduleMainCommits === true) {
@@ -113857,6 +114098,47 @@ ${mergeTreeErr?.stderr || ""}`;
         return false;
       }
     }
+    function resolveSubmoduleRemoteMainRef(submoduleRepoPath) {
+      try {
+        const sym = (0, import_node_child_process9.execFileSync)(GIT3, ["symbolic-ref", "-q", "refs/remotes/origin/HEAD"], { cwd: submoduleRepoPath, encoding: "utf8" }).trim();
+        if (sym) return sym;
+      } catch {
+      }
+      for (const branch of ["main", "master"]) {
+        try {
+          (0, import_node_child_process9.execFileSync)(GIT3, ["rev-parse", "--verify", "-q", `refs/remotes/origin/${branch}`], { cwd: submoduleRepoPath, stdio: ["ignore", "pipe", "pipe"] });
+          return `refs/remotes/origin/${branch}`;
+        } catch {
+        }
+      }
+      return void 0;
+    }
+    function findEquivalentPublishedSubmoduleCommit(submoduleRepoPath, baseCommit, branchCommit, remoteRef) {
+      try {
+        const mergeTreeOut = (0, import_node_child_process9.execFileSync)(GIT3, ["merge-tree", "--write-tree", baseCommit, branchCommit], {
+          cwd: submoduleRepoPath,
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "pipe"]
+        });
+        const mergedTree = mergeTreeOut.trim().split(/\s+/)[0] || "";
+        if (!mergedTree) return void 0;
+        const candidates = (0, import_node_child_process9.execFileSync)(GIT3, ["rev-list", "--max-count=100", remoteRef, "--not", baseCommit], {
+          cwd: submoduleRepoPath,
+          encoding: "utf8"
+        }).split("\n").map((s2) => s2.trim()).filter(Boolean);
+        for (const candidate of candidates) {
+          try {
+            (0, import_node_child_process9.execFileSync)(GIT3, ["merge-base", "--is-ancestor", baseCommit, candidate], { cwd: submoduleRepoPath, stdio: "ignore" });
+          } catch {
+            continue;
+          }
+          const tree = (0, import_node_child_process9.execFileSync)(GIT3, ["rev-parse", `${candidate}^{tree}`], { cwd: submoduleRepoPath, encoding: "utf8" }).trim();
+          if (tree === mergedTree) return candidate;
+        }
+      } catch {
+      }
+      return void 0;
+    }
     function ensureSubmoduleCommitLocal(submoduleRepoPath, baseSubmoduleRepoPath, commit) {
       if (!commit) return;
       try {
@@ -113893,6 +114175,21 @@ ${mergeTreeErr?.stderr || ""}`;
           continue;
         }
         sawDiverged = true;
+        try {
+          (0, import_node_child_process9.execFileSync)(GIT3, ["-c", "protocol.file.allow=always", "fetch", "-q", "origin"], { cwd: submoduleRepoPath, stdio: ["ignore", "ignore", "pipe"] });
+        } catch {
+        }
+        const remoteMainRef = resolveSubmoduleRemoteMainRef(submoduleRepoPath);
+        const publishedEquivalent = remoteMainRef ? findEquivalentPublishedSubmoduleCommit(submoduleRepoPath, baseCommit, branchCommit, remoteMainRef) : void 0;
+        if (publishedEquivalent) {
+          try {
+            (0, import_node_child_process9.execFileSync)(GIT3, ["checkout", "-q", "--detach", publishedEquivalent], { cwd: submoduleRepoPath, stdio: ["ignore", "ignore", "pipe"] });
+          } catch {
+          }
+          gitlinks.push({ path: path54, baseCommit, branchCommit, rebasedCommit: publishedEquivalent, action: "converged_to_published" });
+          resolutions.push({ path: path54, baseCommit, branchCommit, rebasedCommit: publishedEquivalent });
+          continue;
+        }
         let rebasedCommit;
         try {
           (0, import_node_child_process9.execFileSync)(GIT3, ["checkout", "-q", "--detach", branchCommit], { cwd: submoduleRepoPath, stdio: ["ignore", "ignore", "pipe"] });
@@ -114290,6 +114587,19 @@ ${mergeTreeErr?.stderr || ""}`;
           await runGit3(submodulePath, ["cat-file", "-e", `${commit}^{commit}`]);
           return true;
         };
+        const findEquivalentPublishedCommit = async (submodulePath, commit, remoteRef) => {
+          try {
+            const targetTree = (await runGit3(submodulePath, ["rev-parse", `${commit}^{tree}`])).trim();
+            if (!targetTree) return void 0;
+            const candidates = (await runGit3(submodulePath, ["rev-list", "--max-count=100", remoteRef])).split("\n").map((s2) => s2.trim()).filter(Boolean);
+            for (const candidate of candidates) {
+              const tree = (await runGit3(submodulePath, ["rev-parse", `${candidate}^{tree}`])).trim();
+              if (tree === targetTree) return candidate;
+            }
+          } catch {
+          }
+          return void 0;
+        };
         const treeOutput = await runGit3(repoRoot, ["ls-tree", "-r", "-z", mergedTree]);
         const gitlinks = treeOutput.split("\0").filter(Boolean).map((record2) => {
           const match = /^160000\s+commit\s+([0-9a-f]{40})\t(.+)$/.exec(record2);
@@ -114323,11 +114633,7 @@ ${mergeTreeErr?.stderr || ""}`;
               entry.localReachable = false;
               if (options.allowAutoPublishSubmoduleMainCommits === true && options.worktreeRoot) {
                 try {
-                  const imported = await importCommitFromWorktreeSubmodule(
-                    submodulePath,
-                    (0, import_path17.resolve)(options.worktreeRoot, gitlink.path),
-                    gitlink.commit
-                  );
+                  const imported = await importCommitFromWorktreeSubmodule(submodulePath, (0, import_path17.resolve)(options.worktreeRoot, gitlink.path), gitlink.commit);
                   if (imported) {
                     entry.localReachable = true;
                     entry.importedFromWorktree = true;
@@ -114370,36 +114676,48 @@ ${mergeTreeErr?.stderr || ""}`;
               } catch (e) {
                 entry.remoteReachable = false;
                 entry.remoteMainReachable = false;
-                entry.publishRequired = true;
-                const details = truncateValidationOutput(e?.stderr || e?.message || String(e));
-                entry.error = `Submodule remote main reachability check failed for origin/${submoduleDefaultBranch}: ${details}`;
-                if (options.allowAutoPublishSubmoduleMainCommits === true && entry.localReachable === true) {
-                  entry.autoPublishAllowed = true;
-                  entry.autoPublishAttempted = true;
-                  try {
-                    const publish = await publishCommitToRemoteMain(submodulePath, gitlink.commit, submoduleDefaultBranch);
-                    entry.autoPublishRefspec = publish.refspec;
-                    entry.publishStdout = truncateValidationOutput(publish.stdout);
-                    entry.publishStderr = truncateValidationOutput(publish.stderr);
-                    entry.autoPublishSucceeded = true;
-                    await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, submoduleDefaultBranch);
-                    entry.fetchedFromOrigin = true;
-                    entry.remoteReachable = true;
-                    entry.remoteMainReachable = true;
-                    entry.autoPublishVerified = true;
-                    entry.publishRequired = false;
-                    entry.reachable = true;
-                    entry.error = void 0;
-                  } catch (publishError) {
-                    entry.autoPublishSucceeded = false;
-                    entry.autoPublishVerified = false;
-                    const publishDetails = truncateValidationOutput(publishError?.stderr || publishError?.message || String(publishError));
-                    entry.error = `Submodule auto-publish to origin/${submoduleDefaultBranch} failed or could not be verified: ${publishDetails}`;
+                const equivalentPublished = await findEquivalentPublishedCommit(submodulePath, gitlink.commit, `refs/remotes/origin/${submoduleDefaultBranch}`);
+                if (equivalentPublished) {
+                  entry.equivalentPublishedCommit = equivalentPublished;
+                  entry.publishRequired = false;
+                  entry.error = `Submodule commit ${gitlink.commit} is not reachable from origin/${submoduleDefaultBranch}, but an equivalent commit ${equivalentPublished} (identical tree) is already published there; converge the gitlink to the published commit instead of publishing a same-content twin.`;
+                  if (options.allowAutoPublishSubmoduleMainCommits === true) {
+                    entry.autoPublishAllowed = true;
+                    entry.autoPublishAttempted = false;
+                    entry.autoPublishSkippedReason = `an equivalent commit (${equivalentPublished}) is already published on origin/${submoduleDefaultBranch}; publishing a same-content twin is wrong \u2014 converge the gitlink to the published commit instead`;
+                  }
+                } else {
+                  entry.publishRequired = true;
+                  const details = truncateValidationOutput(e?.stderr || e?.message || String(e));
+                  entry.error = `Submodule remote main reachability check failed for origin/${submoduleDefaultBranch}: ${details}`;
+                  if (options.allowAutoPublishSubmoduleMainCommits === true && entry.localReachable === true) {
+                    entry.autoPublishAllowed = true;
+                    entry.autoPublishAttempted = true;
+                    try {
+                      const publish = await publishCommitToRemoteMain(submodulePath, gitlink.commit, submoduleDefaultBranch);
+                      entry.autoPublishRefspec = publish.refspec;
+                      entry.publishStdout = truncateValidationOutput(publish.stdout);
+                      entry.publishStderr = truncateValidationOutput(publish.stderr);
+                      entry.autoPublishSucceeded = true;
+                      await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, submoduleDefaultBranch);
+                      entry.fetchedFromOrigin = true;
+                      entry.remoteReachable = true;
+                      entry.remoteMainReachable = true;
+                      entry.autoPublishVerified = true;
+                      entry.publishRequired = false;
+                      entry.reachable = true;
+                      entry.error = void 0;
+                    } catch (publishError) {
+                      entry.autoPublishSucceeded = false;
+                      entry.autoPublishVerified = false;
+                      const publishDetails = truncateValidationOutput(publishError?.stderr || publishError?.message || String(publishError));
+                      entry.error = `Submodule auto-publish to origin/${submoduleDefaultBranch} failed or could not be verified: ${publishDetails}`;
+                    }
+                  } else if (options.allowAutoPublishSubmoduleMainCommits === true) {
+                    entry.autoPublishAllowed = true;
+                    entry.autoPublishAttempted = false;
+                    entry.autoPublishSkippedReason = entry.autoPublishSkippedReason || `candidate commit is not reachable in the source checkout or worktree submodule, so Refinery cannot push it to origin/${submoduleDefaultBranch}`;
                   }
-                } else if (options.allowAutoPublishSubmoduleMainCommits === true) {
-                  entry.autoPublishAllowed = true;
-                  entry.autoPublishAttempted = false;
-                  entry.autoPublishSkippedReason = entry.autoPublishSkippedReason || `candidate commit is not reachable in the source checkout or worktree submodule, so Refinery cannot push it to origin/${submoduleDefaultBranch}`;
                 }
               }
             } catch (e) {
@@ -114968,18 +115286,49 @@ ${mergeTreeErr?.stderr || ""}`;
         const resolved = await refineResolveRefsStage(self, meshId, nodeId, args, refineStages);
         if (resolved.kind === "terminal") return resolved.result;
         const ctx = resolved.ctx;
-        const syncBase = await refineSyncBaseStage(self, ctx);
-        if (syncBase.kind === "terminal") return syncBase.result;
-        const validation = await refineValidationStage(self, ctx);
-        if (validation.kind === "terminal") return validation.result;
-        const patchEquivalence = await refinePatchEquivalenceStage(self, ctx);
-        if (patchEquivalence.kind === "terminal") return patchEquivalence.result;
-        const submoduleReachability = await refineSubmoduleReachabilityStage(self, ctx);
-        if (submoduleReachability.kind === "terminal") return submoduleReachability.result;
-        const effectiveDiff = await refineEffectiveDiffStage(self, ctx);
-        if (effectiveDiff.kind === "terminal") return effectiveDiff.result;
-        const merge3 = await refineMergeAndFinalizeStage(self, ctx);
-        return merge3.result;
+        const leaseKey = `${ctx.repoRoot}::${ctx.baseBranch}`;
+        const leaseHolder = buildRefineJobKey(self, meshId, nodeId);
+        if (self.refineBaseLeases.has(leaseKey) && self.refineBaseLeases.get(leaseKey) !== leaseHolder) {
+          recordMeshRefineStage(refineStages, "base_lease", "skipped", Date.now(), {
+            leaseKey,
+            heldBy: self.refineBaseLeases.get(leaseKey),
+            retryable: true
+          });
+          return {
+            success: false,
+            code: "base_locked",
+            convergenceStatus: "blocked_review",
+            retryable: true,
+            error: `Another refine holds the base lease for ${ctx.baseBranch} in this repo; retry after it completes.`,
+            branch: ctx.branch,
+            into: ctx.baseBranch,
+            refineStages,
+            finalBranchConvergenceState: {
+              branch: ctx.branch,
+              baseBranch: ctx.baseBranch,
+              merged: false,
+              removed: false,
+              status: "blocked_review"
+            }
+          };
+        }
+        self.refineBaseLeases.set(leaseKey, leaseHolder);
+        try {
+          const syncBase = await refineSyncBaseStage(self, ctx);
+          if (syncBase.kind === "terminal") return syncBase.result;
+          const validation = await refineValidationStage(self, ctx);
+          if (validation.kind === "terminal") return validation.result;
+          const patchEquivalence = await refinePatchEquivalenceStage(self, ctx);
+          if (patchEquivalence.kind === "terminal") return patchEquivalence.result;
+          const submoduleReachability = await refineSubmoduleReachabilityStage(self, ctx);
+          if (submoduleReachability.kind === "terminal") return submoduleReachability.result;
+          const effectiveDiff = await refineEffectiveDiffStage(self, ctx);
+          if (effectiveDiff.kind === "terminal") return effectiveDiff.result;
+          const merge3 = await refineMergeAndFinalizeStage(self, ctx);
+          return merge3.result;
+        } finally {
+          if (self.refineBaseLeases.get(leaseKey) === leaseHolder) self.refineBaseLeases.delete(leaseKey);
+        }
       } catch (e) {
         return { success: false, error: e.message, refineStages };
       }
@@ -115499,6 +115848,7 @@ ${tail}` : ""
         unreachable: submoduleReachability.unreachable.map((entry) => ({
           path: entry.path,
           commit: entry.commit,
+          equivalentPublishedCommit: entry.equivalentPublishedCommit,
           publishRequired: entry.publishRequired === true,
           autoPublishAllowed: entry.autoPublishAllowed,
           autoPublishAttempted: entry.autoPublishAttempted,
@@ -115517,15 +115867,23 @@ ${tail}` : ""
       });
       if (submoduleReachability.status === "failed") {
         const nextStep = buildSubmodulePublishRequiredNextStep(submoduleReachability.unreachable);
+        const convergeToPublished = submoduleReachability.unreachable.length > 0 && submoduleReachability.unreachable.every((entry) => !!entry.equivalentPublishedCommit);
+        const blockedReason = convergeToPublished ? "submodule_converge_to_published" : "submodule_publish_required";
         return { kind: "terminal", result: {
           success: false,
           code: "submodule_reachability_failed",
           convergenceStatus: "blocked_review",
-          publishRequired: true,
-          blockedReason: "submodule_publish_required",
-          error: "Refinery submodule reachability preflight failed because one or more submodule gitlink commits are not reachable from their configured remote main branch; merge/refine cleanup was not attempted.",
+          publishRequired: !convergeToPublished,
+          ...convergeToPublished ? { convergeToPublished: true } : {},
+          blockedReason,
+          error: convergeToPublished ? "Refinery submodule reachability preflight found submodule gitlink commit(s) that are not reachable from their configured remote main branch, but each has an equivalent commit (identical tree) already published there; converge the gitlink(s) to the published commit(s) instead of publishing same-content twins. Merge/refine cleanup was not attempted." : "Refinery submodule reachability preflight failed because one or more submodule gitlink commits are not reachable from their configured remote main branch; merge/refine cleanup was not attempted.",
           nextStep,
-          nextSteps: [
+          nextSteps: convergeToPublished ? [
+            "Do NOT publish the local submodule commit(s): an equivalent commit (identical tree) is already published on the submodule remote main branch for every unreachable gitlink.",
+            "Retarget each submodule gitlink to the already-published equivalent commit shown in the evidence (equivalentPublishedCommit), commit the root pointer update, and push the submodule checkout to that commit.",
+            "Rerun mesh_refine_node after the gitlink points at the published commit.",
+            "Do not merge the root branch until every submodule gitlink commit is reachable from submodule origin/main."
+          ] : [
             "Ask the user for explicit approval before pushing or publishing any submodule commit.",
             "Push/publish each unreachable submodule commit to the configured submodule remote main branch shown in the evidence.",
             "Rerun mesh_refine_node after remote reachability is confirmed.",
@@ -115534,6 +115892,7 @@ ${tail}` : ""
           unreachableSubmoduleCommits: submoduleReachability.unreachable.map((entry) => ({
             path: entry.path,
             commit: entry.commit,
+            equivalentPublishedCommit: entry.equivalentPublishedCommit,
             remote: entry.remote,
             remoteUrl: entry.remoteUrl,
             remoteReachable: entry.remoteReachable,
@@ -115562,7 +115921,7 @@ ${tail}` : ""
             patchEquivalence: "passed",
             submoduleReachability: "failed",
             status: "blocked_review",
-            reason: "submodule_publish_required",
+            reason: blockedReason,
             nextStep
           }
         } };
@@ -115679,7 +116038,8 @@ ${hintLines.join("\n")}` : "",
       const { meshId, nodeId, args, repoRoot, baseHead, node, branch, baseBranch, sourceNode, validationSummary, patchEquivalence, submoduleReachability, mesh, refineStages, execFileAsync: execFileAsync6 } = ctx;
       const leaseKey = `${repoRoot}::${baseBranch}`;
       const leaseHolder = buildRefineJobKey(self, meshId, nodeId);
-      if (self.refineBaseLeases.has(leaseKey) && self.refineBaseLeases.get(leaseKey) !== leaseHolder) {
+      const alreadyHeld = self.refineBaseLeases.get(leaseKey) === leaseHolder;
+      if (!alreadyHeld && self.refineBaseLeases.has(leaseKey)) {
         recordMeshRefineStage(refineStages, "base_lease", "skipped", Date.now(), {
           leaseKey,
           heldBy: self.refineBaseLeases.get(leaseKey),
@@ -115706,11 +116066,11 @@ ${hintLines.join("\n")}` : "",
           }
         } };
       }
-      self.refineBaseLeases.set(leaseKey, leaseHolder);
+      if (!alreadyHeld) self.refineBaseLeases.set(leaseKey, leaseHolder);
       try {
         return await runRefineMergeAndFinalizeLocked(self, ctx);
       } finally {
-        if (self.refineBaseLeases.get(leaseKey) === leaseHolder) self.refineBaseLeases.delete(leaseKey);
+        if (!alreadyHeld && self.refineBaseLeases.get(leaseKey) === leaseHolder) self.refineBaseLeases.delete(leaseKey);
       }
     }
     async function runRefineMergeAndFinalizeLocked(self, ctx) {
@@ -120071,7 +120431,7 @@ ${e?.stderr || ""}`;
     init_chat_message_normalization();
     var fs49 = __toESM2(require("fs"));
     var path48 = __toESM2(require("path"));
-    var os25 = __toESM2(require("os"));
+    var os26 = __toESM2(require("os"));
     var import_os6 = require("os");
     init_config();
     var import_child_process13 = require("child_process");
@@ -120196,7 +120556,7 @@ ${e?.stderr || ""}`;
     function checkPathExists2(paths) {
       for (const p of paths) {
         if (p.includes("*")) {
-          const home = os25.homedir();
+          const home = os26.homedir();
           const resolved = p.replace(/\*/g, home.split(path48.sep).pop() || "");
           if (fs49.existsSync(resolved)) return resolved;
         } else {
@@ -122593,7 +122953,7 @@ async (params) => {
     }
     var fs52 = __toESM2(require("fs"));
     var path51 = __toESM2(require("path"));
-    var os26 = __toESM2(require("os"));
+    var os27 = __toESM2(require("os"));
     var import_session_host_core11 = require_dist();
     function getAutoImplPid(ctx) {
       const pid = ctx.autoImplProcess?.pid;
@@ -122795,7 +123155,7 @@ async (params) => {
         });
         const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
         const prompt = buildAutoImplPrompt(ctx, type2, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-        const tmpDir = path51.join(os26.tmpdir(), "adhdev-autoimpl");
+        const tmpDir = path51.join(os27.tmpdir(), "adhdev-autoimpl");
         if (!fs52.existsSync(tmpDir)) fs52.mkdirSync(tmpDir, { recursive: true });
         const promptFile = path51.join(tmpDir, `prompt-${type2}-${Date.now()}.md`);
         fs52.writeFileSync(promptFile, prompt, "utf-8");
@@ -122950,7 +123310,7 @@ async (params) => {
         const interactiveFlags = ["--yolo", "--interactive", "-i"];
         const baseArgs = [...spawn7.args || []].filter((a) => !interactiveFlags.includes(a));
         let shellCmd;
-        const isWin = os26.platform() === "win32";
+        const isWin = os27.platform() === "win32";
         const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
         const promptMode = autoImpl?.promptMode ?? "stdin";
         const extraArgs = autoImpl?.extraArgs ?? [];
@@ -122989,7 +123349,7 @@ async (params) => {
         try {
           const pty = require("node-pty");
           ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-          const isWin2 = os26.platform() === "win32";
+          const isWin2 = os27.platform() === "win32";
           child = pty.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
             name: "xterm-256color",
             cols: import_session_host_core11.DEFAULT_SESSION_HOST_COLS,
@@ -125645,7 +126005,7 @@ data: ${JSON.stringify(msg.data)}
     }
     var import_child_process14 = require("child_process");
     var fs54 = __toESM2(require("fs"));
-    var os27 = __toESM2(require("os"));
+    var os28 = __toESM2(require("os"));
     var path53 = __toESM2(require("path"));
     var import_session_host_core15 = require_dist();
     init_logger();
@@ -125717,7 +126077,7 @@ data: ${JSON.stringify(msg.data)}
         }
         let portableNode = null;
         try {
-          portableNode = findPortableNode22(os27.homedir(), process.execPath, resolveInstanceDir());
+          portableNode = findPortableNode22(os28.homedir(), process.execPath, resolveInstanceDir());
         } catch (error48) {
           LOG2.warn(
             "SessionHost",