@adhdev/daemon-core 0.9.82-rc.431 → 0.9.82-rc.433

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "49da6ea69224e07bf4282182228952cbc7064cab" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "49da6ea6" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.431" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-30T06:24:16.993Z" : void 0);
+  const commit = readInjected(true ? "bf124fd471f6149d84a75594a6adaaff75793523" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "bf124fd4" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.433" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-30T14:21:42.763Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -2504,17 +2504,285 @@ var init_hash = __esm({
   }
 });
 
+// ../mesh-shared/dist/index.mjs
+function readRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function readString2(...values) {
+  for (const value of values) {
+    if (typeof value !== "string") continue;
+    const trimmed = value.trim();
+    if (trimmed) return trimmed;
+  }
+  return void 0;
+}
+function readNumber(...values) {
+  for (const value of values) {
+    if (typeof value === "number" && Number.isFinite(value)) return value;
+  }
+  return void 0;
+}
+function readBoolean(...values) {
+  for (const value of values) {
+    if (typeof value === "boolean") return value;
+  }
+  return void 0;
+}
+function joinRepoPath(root, relativePath) {
+  const normalizedRoot = typeof root === "string" ? root.trim().replace(/[\\/]+$/, "") : "";
+  const normalizedPath = typeof relativePath === "string" ? relativePath.trim() : "";
+  if (!normalizedPath) return void 0;
+  if (/^(?:[A-Za-z]:[\\/]|\/)/.test(normalizedPath)) return normalizedPath;
+  if (!normalizedRoot) return void 0;
+  return `${normalizedRoot}/${normalizedPath.replace(/^[\\/]+/, "")}`;
+}
+function scoreGitUpstreamFreshness(status) {
+  switch (status) {
+    case "fresh":
+      return 30;
+    case "no_upstream":
+      return 4;
+    case "unchecked":
+    case void 0:
+      return 0;
+    case "stale":
+      return -10;
+    case "unavailable":
+      return -15;
+    default:
+      return 0;
+  }
+}
+function readGitSubmodules(value, parentRepoRoot) {
+  if (!Array.isArray(value)) return void 0;
+  const submodules = value.map((entry) => {
+    const submodule = readRecord(entry);
+    const path43 = readString2(submodule.path);
+    const commit = readString2(submodule.commit);
+    const repoPath = readString2(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path43);
+    if (!path43 || !commit) return null;
+    const result = {
+      path: path43,
+      commit,
+      dirty: readBoolean(submodule.dirty) ?? false,
+      outOfSync: readBoolean(submodule.outOfSync, submodule.out_of_sync) ?? false,
+      lastCheckedAt: readNumber(submodule.lastCheckedAt, submodule.last_checked_at) ?? Date.now()
+    };
+    if (repoPath) result.repoPath = repoPath;
+    const error = readString2(submodule.error);
+    if (error) result.error = error;
+    return result;
+  }).filter((entry) => entry !== null);
+  return submodules.length > 0 ? submodules : void 0;
+}
+function hasGitStatusEvidence(status) {
+  return readBoolean(status.isGitRepo) !== void 0 || Boolean(readString2(status.branch, status.upstream, status.upstreamStatus, status.upstream_status, status.headCommit)) || Boolean(readString2(status.repoRoot, status.repo_root, status.workspace)) || readNumber(
+    status.ahead,
+    status.behind,
+    status.staged,
+    status.modified,
+    status.untracked,
+    status.deleted,
+    status.renamed,
+    status.lastCheckedAt,
+    status.last_checked_at
+  ) !== void 0 || Array.isArray(status.submodules) && status.submodules.length > 0;
+}
+function normalizeGitStatus(status, node, options) {
+  const explicitIsGitRepo = readBoolean(status.isGitRepo);
+  if (!Object.keys(status).length || !hasGitStatusEvidence(status)) return void 0;
+  const isGitRepo = explicitIsGitRepo ?? true;
+  const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((entry) => typeof entry === "string") : [];
+  const conflictCount = readNumber(status.conflicts) ?? conflictFiles.length;
+  const hasConflicts = readBoolean(status.hasConflicts) ?? conflictCount > 0;
+  const repoRoot = readString2(status.repoRoot, status.repo_root, node.repoRoot, node.repo_root, status.workspace, node.workspace) || void 0;
+  const submodules = readGitSubmodules(status.submodules, repoRoot);
+  const upstreamStatus = readString2(status.upstreamStatus, status.upstream_status);
+  const upstreamFetchedAt2 = readNumber(status.upstreamFetchedAt, status.upstream_fetched_at);
+  const upstreamFetchError = readString2(status.upstreamFetchError, status.upstream_fetch_error);
+  const error = readString2(status.error);
+  const staged = readNumber(status.staged) ?? 0;
+  const modified = readNumber(status.modified) ?? 0;
+  const untracked = readNumber(status.untracked) ?? 0;
+  const deleted = readNumber(status.deleted) ?? 0;
+  const renamed = readNumber(status.renamed) ?? 0;
+  return {
+    workspace: readString2(status.workspace, node.workspace) || "",
+    repoRoot: repoRoot ?? null,
+    isGitRepo,
+    branch: readString2(status.branch) ?? null,
+    headCommit: readString2(status.headCommit) ?? null,
+    headMessage: readString2(status.headMessage) ?? null,
+    upstream: readString2(status.upstream) ?? null,
+    upstreamStatus: upstreamStatus ?? "unchecked",
+    ...upstreamFetchedAt2 !== void 0 ? { upstreamFetchedAt: upstreamFetchedAt2 } : {},
+    ...upstreamFetchError ? { upstreamFetchError } : {},
+    ahead: readNumber(status.ahead) ?? 0,
+    behind: readNumber(status.behind) ?? 0,
+    staged,
+    modified,
+    untracked,
+    deleted,
+    renamed,
+    dirty: readBoolean(status.dirty, status.isDirty, status.is_dirty) ?? (staged + modified + untracked + deleted + renamed > 0 || hasConflicts),
+    hasConflicts,
+    conflictFiles,
+    stashCount: readNumber(status.stashCount, status.stash_count) ?? 0,
+    lastCheckedAt: options?.lastCheckedAt ?? readNumber(status.lastCheckedAt, status.last_checked_at) ?? Date.now(),
+    ...submodules ? { submodules } : {},
+    ...error ? { error } : {}
+  };
+}
+function scoreGitStatusCandidate(git) {
+  if (!git) return Number.NEGATIVE_INFINITY;
+  let score = 0;
+  if (git.isGitRepo === true) score += 50;
+  if (git.isGitRepo === false) score -= 10;
+  if (git.branch) score += 20;
+  if (git.headCommit) score += 20;
+  if (git.upstream) score += 10;
+  score += scoreGitUpstreamFreshness(git.upstreamStatus);
+  if (typeof git.ahead === "number") score += 2;
+  if (typeof git.behind === "number") score += 2;
+  if (Array.isArray(git.submodules) && git.submodules.length > 0) score += 4 + git.submodules.length;
+  if (git.error) score -= 20;
+  return score;
+}
+function pickBestTransitGitStatus(node, options) {
+  const rawGit = readRecord(node.lastGit ?? node.last_git);
+  const gitResult = readRecord(rawGit.result);
+  const directStatus = readRecord(rawGit.status);
+  const nestedStatus = readRecord(gitResult.status);
+  const rawProbe = readRecord(node.lastProbe ?? node.last_probe);
+  const probeGit = readRecord(rawProbe.git);
+  const probeGitResult = readRecord(probeGit.result);
+  const probeDirectStatus = readRecord(probeGit.status);
+  const probeNestedStatus = readRecord(probeGitResult.status);
+  const lastCheckedAt = options?.lastCheckedAt;
+  let best = null;
+  for (const status of [directStatus, nestedStatus, probeDirectStatus, probeNestedStatus]) {
+    const normalized = normalizeGitStatus(status, node, { lastCheckedAt: lastCheckedAt ?? Date.now() });
+    if (!normalized) continue;
+    const score = scoreGitStatusCandidate(normalized);
+    if (!best || score > best.score) best = { git: normalized, score };
+  }
+  return best?.git;
+}
+function normalizeMeshNodeId(node) {
+  const record = node && typeof node === "object" ? node : {};
+  return readString2(record.id, record.nodeId, record.node_id);
+}
+function meshNodeIdMatches(node, candidateId) {
+  if (!candidateId) return false;
+  const trimmed = candidateId.trim();
+  if (!trimmed) return false;
+  return normalizeMeshNodeId(node) === trimmed;
+}
+function normalizeMeshWorkspaceForCompare(dir) {
+  if (typeof dir !== "string") return "";
+  return dir.trim().replace(/[\\/]+/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+function meshWorkspacesEquivalent(a, b) {
+  const left = normalizeMeshWorkspaceForCompare(a);
+  const right = normalizeMeshWorkspaceForCompare(b);
+  if (!left || !right) return false;
+  return left === right;
+}
+function machineCoreFromDaemonId(id) {
+  const trimmed = readString2(id);
+  if (!trimmed) return void 0;
+  for (const prefix of DAEMON_ID_PREFIXES) {
+    if (trimmed.startsWith(prefix)) {
+      const core = trimmed.slice(prefix.length).trim();
+      return core || void 0;
+    }
+  }
+  return trimmed;
+}
+function canonicalDaemonId(id) {
+  const core = machineCoreFromDaemonId(id);
+  if (!core) return void 0;
+  if (!core.startsWith("mach_")) return core;
+  return `daemon_${core}`;
+}
+function daemonIdsEquivalent(a, b) {
+  const coreA = machineCoreFromDaemonId(a);
+  const coreB = machineCoreFromDaemonId(b);
+  if (!coreA || !coreB) return false;
+  return coreA === coreB;
+}
+function expandDaemonIdForms(ids) {
+  const list = Array.isArray(ids) ? ids : ids != null ? [ids] : [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const add = (value) => {
+    if (!value || seen.has(value)) return;
+    seen.add(value);
+    out.push(value);
+  };
+  for (const raw of list) add(readString2(raw));
+  for (const raw of list) {
+    const core = machineCoreFromDaemonId(readString2(raw));
+    if (!core || !core.startsWith("mach_")) continue;
+    add(core);
+    for (const prefix of DAEMON_ID_PREFIXES) add(`${prefix}${core}`);
+  }
+  return out;
+}
+function summarizeGitShape(status) {
+  const record = readRecord(status);
+  if (!Object.keys(record).length) return null;
+  const submodules = Array.isArray(record.submodules) ? record.submodules.map((entry) => {
+    const sub = readRecord(entry);
+    return {
+      path: readString2(sub.path) ?? null,
+      commit: readString2(sub.commit)?.slice(0, 12) ?? null,
+      dirty: readBoolean(sub.dirty) ?? false,
+      outOfSync: readBoolean(sub.outOfSync, sub.out_of_sync) ?? false
+    };
+  }) : [];
+  return {
+    isGitRepo: readBoolean(record.isGitRepo),
+    workspace: readString2(record.workspace) ?? null,
+    repoRoot: readString2(record.repoRoot, record.repo_root) ?? null,
+    branch: readString2(record.branch) ?? null,
+    upstream: readString2(record.upstream) ?? null,
+    upstreamStatus: readString2(record.upstreamStatus, record.upstream_status) ?? null,
+    headCommit: readString2(record.headCommit, record.head_commit)?.slice(0, 12) ?? null,
+    ahead: readNumber(record.ahead) ?? null,
+    behind: readNumber(record.behind) ?? null,
+    dirtyCounts: {
+      staged: readNumber(record.staged) ?? 0,
+      modified: readNumber(record.modified) ?? 0,
+      untracked: readNumber(record.untracked) ?? 0,
+      deleted: readNumber(record.deleted) ?? 0,
+      renamed: readNumber(record.renamed) ?? 0
+    },
+    lastCheckedAt: readNumber(record.lastCheckedAt, record.last_checked_at) ?? null,
+    submoduleCount: submodules.length,
+    submodules
+  };
+}
+var DAEMON_ID_PREFIXES, MAGI_RAW_ANSWER_CAP;
+var init_dist = __esm({
+  "../mesh-shared/dist/index.mjs"() {
+    "use strict";
+    DAEMON_ID_PREFIXES = ["daemon_", "standalone_"];
+    MAGI_RAW_ANSWER_CAP = 4e3;
+  }
+});
+
 // src/mesh/mesh-host-ownership.ts
 function readObject(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function readString2(value) {
+function readString3(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function normalizeMeshDaemonRole(value) {
   return value === "host" || value === "member" ? value : void 0;
 }
-function resolveMeshHostStatus(mesh) {
+function resolveMeshHostStatus(mesh, opts) {
   const meshRecord = readObject(mesh);
   const raw = readObject(meshRecord?.meshHost);
   const role = normalizeMeshDaemonRole(raw?.role) ?? "host";
@@ -2525,9 +2793,21 @@ function resolveMeshHostStatus(mesh) {
     canOwnQueue: role === "host",
     defaulted: !raw
   };
-  const hostDaemonId = readString2(raw?.hostDaemonId);
-  const hostNodeId = readString2(raw?.hostNodeId);
-  const hostAddress = readString2(raw?.hostAddress);
+  let hostDaemonId = readString3(raw?.hostDaemonId);
+  let hostNodeId = readString3(raw?.hostNodeId);
+  const hostAddress = readString3(raw?.hostAddress);
+  const localDaemonId = readString3(opts?.localDaemonId);
+  if (role === "host" && !hostDaemonId && localDaemonId) {
+    hostDaemonId = localDaemonId;
+    if (!hostNodeId && Array.isArray(meshRecord?.nodes)) {
+      const selfNode = meshRecord.nodes.find((n) => {
+        const nodeDaemonId = readString3(readObject(n)?.daemonId);
+        return nodeDaemonId ? daemonIdsEquivalent(nodeDaemonId, localDaemonId) : false;
+      });
+      const selfNodeId = readString3(readObject(selfNode)?.id);
+      if (selfNodeId) hostNodeId = selfNodeId;
+    }
+  }
   if (hostDaemonId) normalized.hostDaemonId = hostDaemonId;
   if (hostNodeId) normalized.hostNodeId = hostNodeId;
   if (hostAddress) normalized.hostAddress = hostAddress;
@@ -2535,11 +2815,11 @@ function resolveMeshHostStatus(mesh) {
     const status = pairing.status === "pairing" || pairing.status === "paired" || pairing.status === "rejected" || pairing.status === "revoked" ? pairing.status : "not_configured";
     normalized.pairing = {
       status,
-      ...readString2(pairing.tokenId) ? { tokenId: readString2(pairing.tokenId) } : {},
-      ...readString2(pairing.joinedAt) ? { joinedAt: readString2(pairing.joinedAt) } : {},
-      ...readString2(pairing.lastPairedAt) ? { lastPairedAt: readString2(pairing.lastPairedAt) } : {},
-      ...readString2(pairing.lastRejectedAt) ? { lastRejectedAt: readString2(pairing.lastRejectedAt) } : {},
-      ...readString2(pairing.expiresAt) ? { expiresAt: readString2(pairing.expiresAt) } : {}
+      ...readString3(pairing.tokenId) ? { tokenId: readString3(pairing.tokenId) } : {},
+      ...readString3(pairing.joinedAt) ? { joinedAt: readString3(pairing.joinedAt) } : {},
+      ...readString3(pairing.lastPairedAt) ? { lastPairedAt: readString3(pairing.lastPairedAt) } : {},
+      ...readString3(pairing.lastRejectedAt) ? { lastRejectedAt: readString3(pairing.lastRejectedAt) } : {},
+      ...readString3(pairing.expiresAt) ? { expiresAt: readString3(pairing.expiresAt) } : {}
     };
   }
   return normalized;
@@ -2570,6 +2850,7 @@ function createDefaultMeshHostMetadata() {
 var init_mesh_host_ownership = __esm({
   "src/mesh/mesh-host-ownership.ts"() {
     "use strict";
+    init_dist();
   }
 });
 
@@ -3080,274 +3361,6 @@ var init_mesh_config = __esm({
   }
 });
 
-// ../mesh-shared/dist/index.mjs
-function readRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-function readString3(...values) {
-  for (const value of values) {
-    if (typeof value !== "string") continue;
-    const trimmed = value.trim();
-    if (trimmed) return trimmed;
-  }
-  return void 0;
-}
-function readNumber(...values) {
-  for (const value of values) {
-    if (typeof value === "number" && Number.isFinite(value)) return value;
-  }
-  return void 0;
-}
-function readBoolean(...values) {
-  for (const value of values) {
-    if (typeof value === "boolean") return value;
-  }
-  return void 0;
-}
-function joinRepoPath(root, relativePath) {
-  const normalizedRoot = typeof root === "string" ? root.trim().replace(/[\\/]+$/, "") : "";
-  const normalizedPath = typeof relativePath === "string" ? relativePath.trim() : "";
-  if (!normalizedPath) return void 0;
-  if (/^(?:[A-Za-z]:[\\/]|\/)/.test(normalizedPath)) return normalizedPath;
-  if (!normalizedRoot) return void 0;
-  return `${normalizedRoot}/${normalizedPath.replace(/^[\\/]+/, "")}`;
-}
-function scoreGitUpstreamFreshness(status) {
-  switch (status) {
-    case "fresh":
-      return 30;
-    case "no_upstream":
-      return 4;
-    case "unchecked":
-    case void 0:
-      return 0;
-    case "stale":
-      return -10;
-    case "unavailable":
-      return -15;
-    default:
-      return 0;
-  }
-}
-function readGitSubmodules(value, parentRepoRoot) {
-  if (!Array.isArray(value)) return void 0;
-  const submodules = value.map((entry) => {
-    const submodule = readRecord(entry);
-    const path43 = readString3(submodule.path);
-    const commit = readString3(submodule.commit);
-    const repoPath = readString3(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path43);
-    if (!path43 || !commit) return null;
-    const result = {
-      path: path43,
-      commit,
-      dirty: readBoolean(submodule.dirty) ?? false,
-      outOfSync: readBoolean(submodule.outOfSync, submodule.out_of_sync) ?? false,
-      lastCheckedAt: readNumber(submodule.lastCheckedAt, submodule.last_checked_at) ?? Date.now()
-    };
-    if (repoPath) result.repoPath = repoPath;
-    const error = readString3(submodule.error);
-    if (error) result.error = error;
-    return result;
-  }).filter((entry) => entry !== null);
-  return submodules.length > 0 ? submodules : void 0;
-}
-function hasGitStatusEvidence(status) {
-  return readBoolean(status.isGitRepo) !== void 0 || Boolean(readString3(status.branch, status.upstream, status.upstreamStatus, status.upstream_status, status.headCommit)) || Boolean(readString3(status.repoRoot, status.repo_root, status.workspace)) || readNumber(
-    status.ahead,
-    status.behind,
-    status.staged,
-    status.modified,
-    status.untracked,
-    status.deleted,
-    status.renamed,
-    status.lastCheckedAt,
-    status.last_checked_at
-  ) !== void 0 || Array.isArray(status.submodules) && status.submodules.length > 0;
-}
-function normalizeGitStatus(status, node, options) {
-  const explicitIsGitRepo = readBoolean(status.isGitRepo);
-  if (!Object.keys(status).length || !hasGitStatusEvidence(status)) return void 0;
-  const isGitRepo = explicitIsGitRepo ?? true;
-  const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((entry) => typeof entry === "string") : [];
-  const conflictCount = readNumber(status.conflicts) ?? conflictFiles.length;
-  const hasConflicts = readBoolean(status.hasConflicts) ?? conflictCount > 0;
-  const repoRoot = readString3(status.repoRoot, status.repo_root, node.repoRoot, node.repo_root, status.workspace, node.workspace) || void 0;
-  const submodules = readGitSubmodules(status.submodules, repoRoot);
-  const upstreamStatus = readString3(status.upstreamStatus, status.upstream_status);
-  const upstreamFetchedAt2 = readNumber(status.upstreamFetchedAt, status.upstream_fetched_at);
-  const upstreamFetchError = readString3(status.upstreamFetchError, status.upstream_fetch_error);
-  const error = readString3(status.error);
-  const staged = readNumber(status.staged) ?? 0;
-  const modified = readNumber(status.modified) ?? 0;
-  const untracked = readNumber(status.untracked) ?? 0;
-  const deleted = readNumber(status.deleted) ?? 0;
-  const renamed = readNumber(status.renamed) ?? 0;
-  return {
-    workspace: readString3(status.workspace, node.workspace) || "",
-    repoRoot: repoRoot ?? null,
-    isGitRepo,
-    branch: readString3(status.branch) ?? null,
-    headCommit: readString3(status.headCommit) ?? null,
-    headMessage: readString3(status.headMessage) ?? null,
-    upstream: readString3(status.upstream) ?? null,
-    upstreamStatus: upstreamStatus ?? "unchecked",
-    ...upstreamFetchedAt2 !== void 0 ? { upstreamFetchedAt: upstreamFetchedAt2 } : {},
-    ...upstreamFetchError ? { upstreamFetchError } : {},
-    ahead: readNumber(status.ahead) ?? 0,
-    behind: readNumber(status.behind) ?? 0,
-    staged,
-    modified,
-    untracked,
-    deleted,
-    renamed,
-    dirty: readBoolean(status.dirty, status.isDirty, status.is_dirty) ?? (staged + modified + untracked + deleted + renamed > 0 || hasConflicts),
-    hasConflicts,
-    conflictFiles,
-    stashCount: readNumber(status.stashCount, status.stash_count) ?? 0,
-    lastCheckedAt: options?.lastCheckedAt ?? readNumber(status.lastCheckedAt, status.last_checked_at) ?? Date.now(),
-    ...submodules ? { submodules } : {},
-    ...error ? { error } : {}
-  };
-}
-function scoreGitStatusCandidate(git) {
-  if (!git) return Number.NEGATIVE_INFINITY;
-  let score = 0;
-  if (git.isGitRepo === true) score += 50;
-  if (git.isGitRepo === false) score -= 10;
-  if (git.branch) score += 20;
-  if (git.headCommit) score += 20;
-  if (git.upstream) score += 10;
-  score += scoreGitUpstreamFreshness(git.upstreamStatus);
-  if (typeof git.ahead === "number") score += 2;
-  if (typeof git.behind === "number") score += 2;
-  if (Array.isArray(git.submodules) && git.submodules.length > 0) score += 4 + git.submodules.length;
-  if (git.error) score -= 20;
-  return score;
-}
-function pickBestTransitGitStatus(node, options) {
-  const rawGit = readRecord(node.lastGit ?? node.last_git);
-  const gitResult = readRecord(rawGit.result);
-  const directStatus = readRecord(rawGit.status);
-  const nestedStatus = readRecord(gitResult.status);
-  const rawProbe = readRecord(node.lastProbe ?? node.last_probe);
-  const probeGit = readRecord(rawProbe.git);
-  const probeGitResult = readRecord(probeGit.result);
-  const probeDirectStatus = readRecord(probeGit.status);
-  const probeNestedStatus = readRecord(probeGitResult.status);
-  const lastCheckedAt = options?.lastCheckedAt;
-  let best = null;
-  for (const status of [directStatus, nestedStatus, probeDirectStatus, probeNestedStatus]) {
-    const normalized = normalizeGitStatus(status, node, { lastCheckedAt: lastCheckedAt ?? Date.now() });
-    if (!normalized) continue;
-    const score = scoreGitStatusCandidate(normalized);
-    if (!best || score > best.score) best = { git: normalized, score };
-  }
-  return best?.git;
-}
-function normalizeMeshNodeId(node) {
-  const record = node && typeof node === "object" ? node : {};
-  return readString3(record.id, record.nodeId, record.node_id);
-}
-function meshNodeIdMatches(node, candidateId) {
-  if (!candidateId) return false;
-  const trimmed = candidateId.trim();
-  if (!trimmed) return false;
-  return normalizeMeshNodeId(node) === trimmed;
-}
-function normalizeMeshWorkspaceForCompare(dir) {
-  if (typeof dir !== "string") return "";
-  return dir.trim().replace(/[\\/]+/g, "/").replace(/\/+$/, "").toLowerCase();
-}
-function meshWorkspacesEquivalent(a, b) {
-  const left = normalizeMeshWorkspaceForCompare(a);
-  const right = normalizeMeshWorkspaceForCompare(b);
-  if (!left || !right) return false;
-  return left === right;
-}
-function machineCoreFromDaemonId(id) {
-  const trimmed = readString3(id);
-  if (!trimmed) return void 0;
-  for (const prefix of DAEMON_ID_PREFIXES) {
-    if (trimmed.startsWith(prefix)) {
-      const core = trimmed.slice(prefix.length).trim();
-      return core || void 0;
-    }
-  }
-  return trimmed;
-}
-function canonicalDaemonId(id) {
-  const core = machineCoreFromDaemonId(id);
-  if (!core) return void 0;
-  if (!core.startsWith("mach_")) return core;
-  return `daemon_${core}`;
-}
-function daemonIdsEquivalent(a, b) {
-  const coreA = machineCoreFromDaemonId(a);
-  const coreB = machineCoreFromDaemonId(b);
-  if (!coreA || !coreB) return false;
-  return coreA === coreB;
-}
-function expandDaemonIdForms(ids) {
-  const list = Array.isArray(ids) ? ids : ids != null ? [ids] : [];
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  const add = (value) => {
-    if (!value || seen.has(value)) return;
-    seen.add(value);
-    out.push(value);
-  };
-  for (const raw of list) add(readString3(raw));
-  for (const raw of list) {
-    const core = machineCoreFromDaemonId(readString3(raw));
-    if (!core || !core.startsWith("mach_")) continue;
-    add(core);
-    for (const prefix of DAEMON_ID_PREFIXES) add(`${prefix}${core}`);
-  }
-  return out;
-}
-function summarizeGitShape(status) {
-  const record = readRecord(status);
-  if (!Object.keys(record).length) return null;
-  const submodules = Array.isArray(record.submodules) ? record.submodules.map((entry) => {
-    const sub = readRecord(entry);
-    return {
-      path: readString3(sub.path) ?? null,
-      commit: readString3(sub.commit)?.slice(0, 12) ?? null,
-      dirty: readBoolean(sub.dirty) ?? false,
-      outOfSync: readBoolean(sub.outOfSync, sub.out_of_sync) ?? false
-    };
-  }) : [];
-  return {
-    isGitRepo: readBoolean(record.isGitRepo),
-    workspace: readString3(record.workspace) ?? null,
-    repoRoot: readString3(record.repoRoot, record.repo_root) ?? null,
-    branch: readString3(record.branch) ?? null,
-    upstream: readString3(record.upstream) ?? null,
-    upstreamStatus: readString3(record.upstreamStatus, record.upstream_status) ?? null,
-    headCommit: readString3(record.headCommit, record.head_commit)?.slice(0, 12) ?? null,
-    ahead: readNumber(record.ahead) ?? null,
-    behind: readNumber(record.behind) ?? null,
-    dirtyCounts: {
-      staged: readNumber(record.staged) ?? 0,
-      modified: readNumber(record.modified) ?? 0,
-      untracked: readNumber(record.untracked) ?? 0,
-      deleted: readNumber(record.deleted) ?? 0,
-      renamed: readNumber(record.renamed) ?? 0
-    },
-    lastCheckedAt: readNumber(record.lastCheckedAt, record.last_checked_at) ?? null,
-    submoduleCount: submodules.length,
-    submodules
-  };
-}
-var DAEMON_ID_PREFIXES, MAGI_RAW_ANSWER_CAP;
-var init_dist = __esm({
-  "../mesh-shared/dist/index.mjs"() {
-    "use strict";
-    DAEMON_ID_PREFIXES = ["daemon_", "standalone_"];
-    MAGI_RAW_ANSWER_CAP = 4e3;
-  }
-});
-
 // src/mesh/coordinator-prompt.ts
 var coordinator_prompt_exports = {};
 __export(coordinator_prompt_exports, {
@@ -16782,7 +16795,9 @@ function flushPendingForMeshIdleCoordinators(components, meshId) {
       if (readNonEmptyString2(settings.meshCoordinatorFor) !== meshId) continue;
       const status = readNonEmptyString2(state.status).toLowerCase();
       const modalParked = typeof inst.isModalParked === "function" ? inst.isModalParked() === true : status === "waiting_choice" || status === "waiting_approval";
-      if (status === "idle" && !modalParked) {
+      const drainStatus = typeof inst.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+      const idle = drainStatus !== null ? drainStatus === "idle" : status === "idle";
+      if (idle && !modalParked) {
         idleCoordinators.push({ instance: inst, sessionId: readNonEmptyString2(state.instanceId) });
       }
     }
@@ -16955,6 +16970,9 @@ function resolveAutoPruneMinAgeMs() {
   }
   return DEFAULT_AUTO_PRUNE_MIN_AGE_MS;
 }
+function resolvePendingHeldDrainEscalateMs() {
+  return resolveTunedReconcileMs("MESH_PENDING_HELD_DRAIN_ESCALATE_MS", DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS, 4e3, 5 * 6e4);
+}
 function resolveReconcileIntervalMs() {
   const raw = readNonEmptyString2(process.env.MESH_RECONCILE_INTERVAL_MS);
   if (raw) {
@@ -16974,6 +16992,9 @@ function resolveTunedReconcileMs(envName, def, min, max) {
 function resolveAckedDeathDeadlineMs() {
   return resolveTunedReconcileMs("MESH_INFLIGHT_ACKED_DEATH_DEADLINE_MS", 8 * 6e4, 0, 60 * 6e4);
 }
+function resolveAckedTranscriptFastTrackGraceMs() {
+  return resolveTunedReconcileMs("MESH_INFLIGHT_ACKED_TRANSCRIPT_FASTTRACK_GRACE_MS", 4e4, 0, 5 * 6e4);
+}
 function inFlightSynthKey(meshId, taskId) {
   return `${meshId}::${taskId}`;
 }
@@ -17017,6 +17038,8 @@ function findLiveCoordinators(components) {
     if (!meshId) continue;
     const status = readNonEmptyString2(state.status).toLowerCase();
     const modalParked = typeof inst.isModalParked === "function" ? inst.isModalParked() === true : status === "waiting_choice" || status === "waiting_approval";
+    const drainStatus = typeof inst.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+    const idle = drainStatus !== null ? drainStatus === "idle" : status === "idle";
     const sessionId = readNonEmptyString2(state.instanceId);
     if (getLogLevel() === "debug") {
       let adapterRaw = "?";
@@ -17031,7 +17054,7 @@ function findLiveCoordinators(components) {
       const lastStatus = readNonEmptyString2(inst.lastStatus) || "?";
       const autoApproveBusy = inst.autoApproveBusy;
       const maskSince = inst.autoApproveMaskSince;
-      LOG.debug("MeshReconcile", `coordDiag sess=${sessionId || "?"} mesh=${meshId} getState=${status || "?"} lastStatus=${lastStatus} adapterRaw=${adapterRaw} autoApproveBusy=${autoApproveBusy === true} maskSince=${maskSince || 0}`);
+      LOG.debug("MeshReconcile", `coordDiag sess=${sessionId || "?"} mesh=${meshId} getState=${status || "?"} drainStatus=${drainStatus || "n/a"} lastStatus=${lastStatus} adapterRaw=${adapterRaw} autoApproveBusy=${autoApproveBusy === true} maskSince=${maskSince || 0}`);
     }
     const stateKey = `${meshId}::${sessionId || "?"}`;
     const prevParked = coordinatorModalParkState.get(stateKey);
@@ -17043,7 +17066,7 @@ function findLiveCoordinators(components) {
         LOG.info("MeshReconcile", `Coordinator ${sessionId || "?"} (mesh ${meshId}) left modal-park (status=${status}) \u2014 held events will drain on this/next tick`);
       }
     }
-    out.push({ meshId, instance: inst, sessionId, idle: status === "idle", modalParked });
+    out.push({ meshId, instance: inst, sessionId, idle, modalParked });
   }
   return out;
 }
@@ -17138,6 +17161,63 @@ function recordHeldTerminalEventsToLedger(meshId, drainDaemonIds, reason, heldFo
     }
   }
 }
+function oldestHeldTerminalEventAgeMs(meshId, drainDaemonIds) {
+  let pending;
+  try {
+    pending = getPendingMeshCoordinatorEvents(meshId, drainDaemonIds.length > 0 ? drainDaemonIds : void 0);
+  } catch {
+    return 0;
+  }
+  const now = Date.now();
+  let maxAge = 0;
+  for (const event of pending) {
+    if (!shouldForceInjectMeshEvent(event.event)) continue;
+    const queuedAt = typeof event.queuedAt === "number" ? event.queuedAt : now;
+    const age = now - queuedAt;
+    if (age > maxAge) maxAge = age;
+  }
+  return maxAge;
+}
+function reconfirmGenuinelyIdleCoordinators(generating) {
+  const out = [];
+  for (const c of generating) {
+    const inst = c.instance;
+    const drainStatus = typeof inst?.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+    const genuinelyIdle = drainStatus !== null ? drainStatus === "idle" : c.idle;
+    if (genuinelyIdle) out.push({ ...c, idle: true });
+  }
+  return out;
+}
+function drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, targetCoordinators, logLabel) {
+  let pendingEvents = [];
+  try {
+    pendingEvents = drainPendingMeshCoordinatorEvents(
+      meshId,
+      drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId
+    );
+  } catch (e) {
+    LOG.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
+    return 0;
+  }
+  if (pendingEvents.length === 0) return 0;
+  LOG.info("MeshReconcile", `Reconcile inject \u2192 ${logLabel}: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
+  for (const pending of pendingEvents) {
+    const wantSession = readNonEmptyString2(pending.targetCoordinatorSessionId);
+    if (wantSession) {
+      const matched = targetCoordinators.filter((c) => c.sessionId === wantSession);
+      if (matched.length === 0) {
+        holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId);
+        continue;
+      }
+      for (const c of matched) injectPendingIntoCoordinator(c.instance, pending);
+      continue;
+    }
+    for (const c of targetCoordinators) {
+      injectPendingIntoCoordinator(c.instance, pending);
+    }
+  }
+  return pendingEvents.length;
+}
 function recoverStrandedAssignedDispatches(meshId, store) {
   const assigned = getQueue(meshId, { status: ["assigned"] });
   if (!assigned.length) return;
@@ -17349,6 +17429,19 @@ async function runMeshReconcileTick(components) {
           }
         }
         if (hasPending) {
+          const escalateMs = resolvePendingHeldDrainEscalateMs();
+          const heldAgeMs = oldestHeldTerminalEventAgeMs(
+            meshId,
+            drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId ? [localDaemonId] : []
+          );
+          if (heldAgeMs >= escalateMs) {
+            const escapeTargets = reconfirmGenuinelyIdleCoordinators(generatingCoordinators);
+            if (escapeTargets.length > 0) {
+              LOG.info("MeshReconcile", `Reconcile age-escape \u2192 generating-hold: held terminal event(s) for mesh ${meshId} aged ${Math.round(heldAgeMs / 1e3)}s (\u2265 ${Math.round(escalateMs / 1e3)}s) and ${escapeTargets.length} coordinator(s) re-confirmed genuinely idle on the raw adapter \u2014 draining once`);
+              const drained = drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, escapeTargets, "age-escape");
+              if (drained > 0) continue;
+            }
+          }
           LOG.info("MeshReconcile", `Reconcile skip \u2192 generating: holding pending event(s) for mesh ${meshId} (${generatingCoordinators.length} coordinator(s) busy; events left queued for the next idle tick)`);
           if (getLogLevel() === "debug") {
             LOG.debug("MeshReconcile", `coordHoldGenerating mesh=${meshId} heldFor=[${generatingCoordinators.map((c) => c.sessionId || "?").join(",")}] (these were classified busy; cross-ref same-tick coordDiag by sessionId)`);
@@ -17369,33 +17462,7 @@ async function runMeshReconcileTick(components) {
       } catch {
       }
     }
-    let pendingEvents = [];
-    try {
-      pendingEvents = drainPendingMeshCoordinatorEvents(
-        meshId,
-        drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId
-      );
-    } catch (e) {
-      LOG.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
-      continue;
-    }
-    if (pendingEvents.length === 0) continue;
-    LOG.info("MeshReconcile", `Reconcile inject \u2192 idle: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
-    for (const pending of pendingEvents) {
-      const wantSession = readNonEmptyString2(pending.targetCoordinatorSessionId);
-      if (wantSession) {
-        const matched = targetCoordinators.filter((c) => c.sessionId === wantSession);
-        if (matched.length === 0) {
-          holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId);
-          continue;
-        }
-        for (const c of matched) injectPendingIntoCoordinator(c.instance, pending);
-        continue;
-      }
-      for (const c of targetCoordinators) {
-        injectPendingIntoCoordinator(c.instance, pending);
-      }
-    }
+    drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, targetCoordinators, "idle");
   }
 }
 function holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId) {
@@ -17665,28 +17732,52 @@ async function reconcileUnterminatedDirectDispatches(components, mesh, selfIds,
       }
       continue;
     }
-    inFlightAckedHoldState.set(synthKey, { liveConfirmedSinceAck: true, consecutiveReadFailures: 0 });
+    const priorHoldState = inFlightAckedHoldState.get(synthKey);
+    inFlightAckedHoldState.set(synthKey, {
+      liveConfirmedSinceAck: true,
+      consecutiveReadFailures: 0,
+      ...priorHoldState?.transcriptIdleSinceMs !== void 0 ? { transcriptIdleSinceMs: priorHoldState.transcriptIdleSinceMs } : {}
+    });
     const nowMs = Date.now();
     if (readChatPayloadStatus(payload) !== "idle") {
+      inFlightAckedHoldState.set(synthKey, { liveConfirmedSinceAck: true, consecutiveReadFailures: 0 });
       continue;
     }
+    const messages = Array.isArray(payload.messages) ? payload.messages : [];
+    const evidence = extractFinalAssistantSummaryEvidence(messages);
     if (isAcked) {
       const ackedAtMs = Date.parse(readNonEmptyString2(dispatch.updatedAt));
       const sinceAckMs = Number.isFinite(ackedAtMs) ? nowMs - ackedAtMs : Number.POSITIVE_INFINITY;
       const deathDeadlineMs = resolveAckedDeathDeadlineMs();
-      if (sinceAckMs < deathDeadlineMs) {
-        LOG.info("MeshReconcile", `Acked-hold: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) read idle ${Number.isFinite(sinceAckMs) ? Math.round(sinceAckMs / 1e3) + "s" : "\u221E"} since the generating_started ack \u2014 HOLDING synth indefinitely (worker is alive and will emit; a later real emit is idempotent). Death backstop fires at ${Math.round(deathDeadlineMs / 1e3)}s or on consecutive read failures.`);
+      const holdState = inFlightAckedHoldState.get(synthKey);
+      let fastTrackReady = false;
+      if (evidence.finalSummary) {
+        const idleSinceMs = holdState?.transcriptIdleSinceMs ?? nowMs;
+        if (holdState && holdState.transcriptIdleSinceMs === void 0) {
+          inFlightAckedHoldState.set(synthKey, { ...holdState, transcriptIdleSinceMs: idleSinceMs });
+        }
+        const fastTrackGraceMs = resolveAckedTranscriptFastTrackGraceMs();
+        const idleHeldMs = nowMs - idleSinceMs;
+        if (idleHeldMs >= fastTrackGraceMs) {
+          fastTrackReady = true;
+          LOG.info("MeshReconcile", `Acked-hold transcript fast-track: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) read idle WITH a final assistant message for ${Math.round(idleHeldMs / 1e3)}s continuous (grace ${Math.round(fastTrackGraceMs / 1e3)}s) \u2014 promoting the synth ahead of the ${Math.round(deathDeadlineMs / 1e3)}s death backstop; the worker's real emit was lost/late and a later one no-ops idempotently.`);
+        }
+      } else if (holdState?.transcriptIdleSinceMs !== void 0) {
+        inFlightAckedHoldState.set(synthKey, { ...holdState, transcriptIdleSinceMs: void 0 });
+      }
+      if (!fastTrackReady && sinceAckMs < deathDeadlineMs) {
+        LOG.info("MeshReconcile", `Acked-hold: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) read idle ${Number.isFinite(sinceAckMs) ? Math.round(sinceAckMs / 1e3) + "s" : "\u221E"} since the generating_started ack \u2014 HOLDING synth (worker presumed alive; a later real emit is idempotent). Transcript fast-track promotes at ${Math.round(resolveAckedTranscriptFastTrackGraceMs() / 1e3)}s continuous idle-with-final-assistant; death backstop at ${Math.round(deathDeadlineMs / 1e3)}s or on consecutive read failures.`);
         continue;
       }
-      LOG.warn("MeshReconcile", `Acked-hold death deadline reached: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) still idle ${Math.round(sinceAckMs / 1e3)}s after the ack (deadline ${Math.round(deathDeadlineMs / 1e3)}s) \u2014 synthesizing the missing completion as a notification-loss net (a real emit, if it ever lands, no-ops idempotently).`);
+      if (!fastTrackReady) {
+        LOG.warn("MeshReconcile", `Acked-hold death deadline reached: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) still idle ${Math.round(sinceAckMs / 1e3)}s after the ack (deadline ${Math.round(deathDeadlineMs / 1e3)}s) \u2014 synthesizing the missing completion as a notification-loss net (a real emit, if it ever lands, no-ops idempotently).`);
+      }
     }
     if (realTerminalEmitPendingForTask(mesh.id, taskId)) {
       inFlightAckedHoldState.delete(synthKey);
       LOG.info("MeshReconcile", `Worker-emit priority: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) has a real terminal completion already queued \u2014 yielding synth to the worker's own emit`);
       continue;
     }
-    const messages = Array.isArray(payload.messages) ? payload.messages : [];
-    const evidence = extractFinalAssistantSummaryEvidence(messages);
     if (!evidence.finalSummary) continue;
     const dispatchedAtMs = Date.parse(readNonEmptyString2(dispatch.dispatchedAt));
     const transcriptAtMs = Date.parse(evidence.transcriptMessageAt ?? "");
@@ -17845,7 +17936,7 @@ function setupMeshReconcileLoop(components) {
     }
   };
 }
-var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, ACKED_DEATH_CONSECUTIVE_READ_FAILURES, inFlightAckedHoldState, coordinatorModalParkState, heldEventLedgerRecorded, ASSIGNED_STRANDED_DEADLINE_MS, STRICT_SESSION_MATCH_TTL_MS, unresolvedForwardRejectionCounts, MAX_FORWARD_REJECTIONS;
+var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS, ACKED_DEATH_CONSECUTIVE_READ_FAILURES, inFlightAckedHoldState, coordinatorModalParkState, heldEventLedgerRecorded, ASSIGNED_STRANDED_DEADLINE_MS, STRICT_SESSION_MATCH_TTL_MS, unresolvedForwardRejectionCounts, MAX_FORWARD_REJECTIONS;
 var init_mesh_reconcile_loop = __esm({
   "src/mesh/mesh-reconcile-loop.ts"() {
     "use strict";
@@ -17867,6 +17958,7 @@ var init_mesh_reconcile_loop = __esm({
     init_chat_message_normalization();
     DEFAULT_RECONCILE_INTERVAL_MS = 4e3;
     DEFAULT_AUTO_PRUNE_MIN_AGE_MS = 24 * 60 * 6e4;
+    DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS = 12e3;
     ACKED_DEATH_CONSECUTIVE_READ_FAILURES = 3;
     inFlightAckedHoldState = /* @__PURE__ */ new Map();
     coordinatorModalParkState = /* @__PURE__ */ new Map();
@@ -41239,6 +41331,49 @@ var CliProviderInstance = class _CliProviderInstance {
   isModalParked() {
     return this.resolveModalParkStatus() !== null;
   }
+  /**
+   * PTY-OVERTRUST-DRAIN (Defect B). The deliverability/drain status the mesh
+   * reconcile loop must consult — the RAW adapter turn-state, with the
+   * auto-approve "hold-idle" visual mask STRIPPED.
+   *
+   * getState().status overlays `autoApproveHoldIdle`/`autoApproveActive` to paint a
+   * genuinely-idle adapter as `generating` (a UI-flicker suppression while an
+   * auto-approve key-press settles — see getState() ~:800). That mask is correct
+   * for the dashboard, but the reconcile loop trusts it as "the coordinator is
+   * busy" and therefore HOLDS a worker's completion under
+   * `generating_no_idle_coordinator` even though the coordinator's PTY is at a real
+   * turn end and would accept the inject as a turn — the completion is stranded.
+   *
+   * This accessor reports the drain truth instead:
+   *   - 'modal_parked' — a GENUINE human-await modal (AskUserQuestion / a non-
+   *     transient tool-consent). Still excluded from drain (a force-inject here
+   *     writes raw keystrokes the modal eats → data corruption). Mirrors
+   *     isModalParked(), evaluated first so a parked session never reads idle.
+   *   - 'idle' — the RAW adapter is at a turn end (adapter.getStatus(allowParse:false)
+   *     === 'idle') and the session is not modal-parked. Drain-eligible REGARDLESS
+   *     of the auto-approve mask. This is the case the mask used to hide.
+   *   - 'generating' — the raw adapter is genuinely mid-turn. Held (a raw PTY write
+   *     into a generating claude-cli is not consumed as a turn → data loss). The
+   *     intentional removal of force-inject-into-generating is preserved.
+   *   - 'other' — any other raw status (error / starting / waiting_choice handled by
+   *     modal-park above). Not a drain target.
+   *
+   * Uses allowParse:false (engine.activeModal only, side-effect-free) so it never
+   * mutates the very auto-approve mask state the diagnostics read.
+   */
+  getDrainStatus() {
+    if (this.isModalParked()) return "modal_parked";
+    let rawStatus;
+    try {
+      const raw = this.adapter.getStatus({ allowParse: false })?.status;
+      rawStatus = typeof raw === "string" ? raw.trim() : "";
+    } catch {
+      return "other";
+    }
+    if (rawStatus === "idle") return "idle";
+    if (isCliGeneratingLikeStatus(rawStatus)) return "generating";
+    return "other";
+  }
   onEvent(event, data) {
     if (event === "send_message") {
       const input = normalizeInputEnvelope(data);
@@ -51388,7 +51523,7 @@ var meshStatusHandlers = {
       const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
       const mesh = meshRecord?.mesh;
       if (!mesh) return { success: false, error: "Mesh not found" };
-      const meshHost = resolveMeshHostStatus(mesh);
+      const meshHost = resolveMeshHostStatus(mesh, { localDaemonId: ctx.deps.statusInstanceId });
       const refreshRequested = args?.refresh === true || args?.forceRefresh === true;
       const verboseMissions = args?.verbose === true || args?.compact === false;
       const peekScope = typeof args?.coordinatorDaemonId === "string" && args.coordinatorDaemonId.trim() ? args.coordinatorDaemonId.trim() : ctx.deps.statusInstanceId || void 0;