@adhdev/daemon-core 0.9.82-rc.351 → 0.9.82-rc.353

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "dad22ef2758130d10a3d55e3c419f0095d5e44b7" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "dad22ef2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.351" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-22T04:04:59.936Z" : void 0);
+  const commit = readInjected(true ? "a680b74d9b940b82f691ebb85a725a1a72445bfc" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "a680b74d" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.353" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-22T09:11:13.499Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -2708,6 +2708,257 @@ 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 path42 = readString3(submodule.path);
+    const commit = readString3(submodule.commit);
+    const repoPath = readString3(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path42);
+    if (!path42 || !commit) return null;
+    const result = {
+      path: path42,
+      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 upstreamFetchedAt = 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",
+    ...upstreamFetchedAt !== void 0 ? { upstreamFetchedAt } : {},
+    ...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 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 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;
+var init_dist = __esm({
+  "../mesh-shared/dist/index.mjs"() {
+    "use strict";
+    DAEMON_ID_PREFIXES = ["daemon_", "standalone_"];
+  }
+});
+
 // src/mesh/coordinator-prompt.ts
 var coordinator_prompt_exports = {};
 __export(coordinator_prompt_exports, {
@@ -3195,7 +3446,7 @@ function installGlobalInterceptor() {
 function getLogPath() {
   return currentLogFile;
 }
-var fs4, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH, LOG_DIR_PATH;
+var fs4, path9, os3, LEVEL_NUM, LEVEL_LABEL, currentLevel, ADHDEV_HOME, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH, LOG_DIR_PATH;
 var init_logger = __esm({
   "src/logging/logger.ts"() {
     "use strict";
@@ -3206,7 +3457,8 @@ var init_logger = __esm({
     LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
     LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
     currentLevel = "info";
-    LOG_DIR = process.platform === "win32" ? path9.join(process.env.LOCALAPPDATA || process.env.APPDATA || path9.join(os3.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os3.homedir(), "Library", "Logs", "adhdev") : path9.join(os3.homedir(), ".local", "share", "adhdev", "logs");
+    ADHDEV_HOME = process.env.ADHDEV_CONFIG_DIR && process.env.ADHDEV_CONFIG_DIR.trim() ? process.env.ADHDEV_CONFIG_DIR.trim() : path9.join(os3.homedir(), ".adhdev");
+    LOG_DIR = path9.join(ADHDEV_HOME, "logs");
     MAX_LOG_SIZE = 5 * 1024 * 1024;
     MAX_LOG_DAYS = 7;
     try {
@@ -4007,6 +4259,7 @@ __export(mesh_work_queue_exports, {
   nodeSatisfiesRequiredTags: () => nodeSatisfiesRequiredTags,
   normalizeMeshCapabilityTags: () => normalizeMeshCapabilityTags,
   normalizeMeshTaskMode: () => normalizeMeshTaskMode,
+  reclaimStrandedAssignedTask: () => reclaimStrandedAssignedTask,
   recordDirectDispatchTask: () => recordDirectDispatchTask,
   recordMeshToolCall: () => recordMeshToolCall,
   recordTaskAutoLaunch: () => recordTaskAutoLaunch,
@@ -4442,6 +4695,52 @@ function requeueTask(meshId, taskId, opts) {
     return entry;
   });
 }
+function reclaimStrandedAssignedTask(meshId, taskId, opts) {
+  requireMeshHostQueueOwner(opts);
+  return withQueueLock(meshId, () => {
+    const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
+    if (!entry) return null;
+    if (entry.status !== "assigned") return null;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const reason = opts?.reason || "assigned_stranded_dispatch_unconfirmed";
+    const reclaims = (entry.strandedReclaimCount || 0) + 1;
+    const prevNode = entry.assignedNodeId;
+    const prevSession = entry.assignedSessionId;
+    delete entry.assignedNodeId;
+    delete entry.assignedSessionId;
+    delete entry.assignedProviderType;
+    delete entry.dispatchTimestamp;
+    entry.strandedReclaimCount = reclaims;
+    entry.updatedAt = now;
+    if (reclaims > MAX_STRANDED_RECLAIMS) {
+      entry.status = "failed";
+      entry.cancelReason = `stranded_dispatch_unrecovered: reclaimed ${reclaims - 1} time(s) without a confirmed dispatch`;
+      MeshRuntimeStore.getInstance().updateQueueEntry(entry);
+      propagateDependencyFailure(meshId, taskId);
+    } else {
+      entry.status = "pending";
+      entry.requeuedAt = now;
+      entry.requeueReason = reason;
+      MeshRuntimeStore.getInstance().updateQueueEntry(entry);
+    }
+    try {
+      appendLedgerEntry(meshId, {
+        kind: "task_reclaimed",
+        nodeId: prevNode,
+        sessionId: prevSession,
+        payload: {
+          taskId,
+          reason,
+          ...typeof opts?.ageMs === "number" ? { ageMs: opts.ageMs } : {},
+          reclaimCount: reclaims,
+          outcome: entry.status
+        }
+      });
+    } catch {
+    }
+    return entry;
+  });
+}
 function updateSessionTaskStatus(meshId, sessionId, status, opts) {
   return withQueueLock(meshId, () => {
     const store = MeshRuntimeStore.getInstance();
@@ -4555,7 +4854,7 @@ function recordMeshToolCall(opts) {
     return { rateLimitExceeded: false, callsInWindow: 0, advisory: null };
   }
 }
-var import_crypto5, ACTIVE_MESH_QUEUE_STATUSES, HISTORICAL_MESH_QUEUE_STATUSES, MESH_TASK_MODES, LIVE_DEBUG_READONLY_FORBIDDEN, NEGATION_CUES, NEGATION_WINDOW_TOKENS, GIT_MUTATION_SUBCOMMANDS, GIT_STASH_READONLY_SUBCOMMANDS, DEPENDENCY_FAILURE_TERMINALS;
+var import_crypto5, ACTIVE_MESH_QUEUE_STATUSES, HISTORICAL_MESH_QUEUE_STATUSES, MESH_TASK_MODES, LIVE_DEBUG_READONLY_FORBIDDEN, NEGATION_CUES, NEGATION_WINDOW_TOKENS, GIT_MUTATION_SUBCOMMANDS, GIT_STASH_READONLY_SUBCOMMANDS, DEPENDENCY_FAILURE_TERMINALS, MAX_STRANDED_RECLAIMS;
 var init_mesh_work_queue = __esm({
   "src/mesh/mesh-work-queue.ts"() {
     "use strict";
@@ -4565,6 +4864,7 @@ var init_mesh_work_queue = __esm({
     init_mesh_runtime_store();
     init_mesh_config();
     init_logger();
+    init_mesh_ledger();
     ACTIVE_MESH_QUEUE_STATUSES = ["pending", "assigned"];
     HISTORICAL_MESH_QUEUE_STATUSES = ["completed", "failed", "cancelled"];
     MESH_TASK_MODES = ["code_change", "validation", "live_debug_readonly", "launch_app", "convergence"];
@@ -4617,6 +4917,7 @@ var init_mesh_work_queue = __esm({
     ]);
     GIT_STASH_READONLY_SUBCOMMANDS = /* @__PURE__ */ new Set(["list", "show"]);
     DEPENDENCY_FAILURE_TERMINALS = /* @__PURE__ */ new Set(["failed", "cancelled"]);
+    MAX_STRANDED_RECLAIMS = 3;
   }
 });
 
@@ -5502,6 +5803,22 @@ var init_mesh_runtime_store = __esm({
           updatedAt: r.updated_at
         }));
       }
+      /**
+       * Bug B watchdog support: true when at least one delivery record for the task has
+       * reached a confirmed-handed-off status (delivered / acked / completed). The
+       * assigned-stranded watchdog uses this to distinguish a dispatch that was never
+       * confirmed (reclaimable) from one that WAS handed to the worker (a genuinely
+       * in-flight or completion-lost task, which is PHASE 4's responsibility, not this
+       * watchdog's). Indexed by (mesh_id, task_id).
+       */
+      taskHasConfirmedDelivery(meshId, taskId) {
+        const row = this.db.prepare(`
+            SELECT 1 FROM mesh_session_delivery
+            WHERE mesh_id = ? AND task_id = ? AND status IN ('delivered','acked','completed')
+            LIMIT 1
+        `).get(meshId, taskId);
+        return !!row;
+      }
       expireStaleSessionDeliveries(meshId) {
         const now = (/* @__PURE__ */ new Date()).toISOString();
         this.db.prepare(`
@@ -6250,10 +6567,10 @@ var init_mesh_missions = __esm({
 });
 
 // src/mesh/mesh-refine-status.ts
-function readString3(value) {
+function readString4(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
-function readRecord(value) {
+function readRecord2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function eventStatus(event, fallback) {
@@ -6276,7 +6593,7 @@ function instructionForStatus(status) {
   return "Refine job failed; inspect result/finalBranchConvergenceState in mesh_task_history, fix the blocker, then rerun mesh_refine_node when ready.";
 }
 function mergeJob(jobs, patch) {
-  const jobId = readString3(patch.jobId);
+  const jobId = readString4(patch.jobId);
   if (!jobId) return;
   const previous = jobs.get(jobId);
   const status = patch.status || previous?.status || "running";
@@ -6294,54 +6611,54 @@ function mergeJob(jobs, patch) {
 function buildMeshAsyncRefineJobs(args) {
   const jobs = /* @__PURE__ */ new Map();
   for (const entry of args.ledgerEntries || []) {
-    const payload = readRecord(entry.payload);
+    const payload = readRecord2(entry.payload);
     if (payload?.source !== "refine_mesh_node_async_job") continue;
-    const refineJob = readRecord(payload.refineJob);
-    const result = readRecord(payload.result);
-    const finalState = readRecord(payload.finalBranchConvergenceState) || readRecord(result?.finalBranchConvergenceState);
-    const jobId = readString3(refineJob?.jobId);
+    const refineJob = readRecord2(payload.refineJob);
+    const result = readRecord2(payload.result);
+    const finalState = readRecord2(payload.finalBranchConvergenceState) || readRecord2(result?.finalBranchConvergenceState);
+    const jobId = readString4(refineJob?.jobId);
     if (!jobId) continue;
-    const status = ledgerStatus(entry.kind, readString3(refineJob?.status));
+    const status = ledgerStatus(entry.kind, readString4(refineJob?.status));
     mergeJob(jobs, {
       jobId,
-      interactionId: readString3(refineJob?.interactionId),
+      interactionId: readString4(refineJob?.interactionId),
       status,
-      meshId: readString3(refineJob?.meshId) || args.meshId,
-      nodeId: readString3(refineJob?.nodeId) || entry.nodeId,
-      targetNodeId: readString3(refineJob?.nodeId) || entry.nodeId,
-      targetDaemonId: readString3(refineJob?.targetDaemonId),
-      workspace: readString3(refineJob?.workspace),
-      branch: readString3(result?.branch) || readString3(finalState?.branch),
-      into: readString3(result?.into) || readString3(finalState?.baseBranch),
-      startedAt: readString3(refineJob?.startedAt),
-      completedAt: readString3(refineJob?.completedAt),
-      retryOfJobId: readString3(refineJob?.retryOfJobId) || readString3(payload.retryOfJobId),
+      meshId: readString4(refineJob?.meshId) || args.meshId,
+      nodeId: readString4(refineJob?.nodeId) || entry.nodeId,
+      targetNodeId: readString4(refineJob?.nodeId) || entry.nodeId,
+      targetDaemonId: readString4(refineJob?.targetDaemonId),
+      workspace: readString4(refineJob?.workspace),
+      branch: readString4(result?.branch) || readString4(finalState?.branch),
+      into: readString4(result?.into) || readString4(finalState?.baseBranch),
+      startedAt: readString4(refineJob?.startedAt),
+      completedAt: readString4(refineJob?.completedAt),
+      retryOfJobId: readString4(refineJob?.retryOfJobId) || readString4(payload.retryOfJobId),
       lastLedgerKind: entry.kind,
       lastUpdatedAt: entry.timestamp
     });
   }
   for (const event of args.pendingEvents || []) {
-    const metadata = readRecord(event.metadataEvent);
+    const metadata = readRecord2(event.metadataEvent);
     if (metadata?.source !== "refine_mesh_node_async_job") continue;
-    const result = readRecord(metadata.result);
-    const finalState = readRecord(result?.finalBranchConvergenceState);
-    const jobId = readString3(metadata.jobId);
+    const result = readRecord2(metadata.result);
+    const finalState = readRecord2(result?.finalBranchConvergenceState);
+    const jobId = readString4(metadata.jobId);
     if (!jobId) continue;
-    const status = eventStatus(event.event, readString3(metadata.status));
+    const status = eventStatus(event.event, readString4(metadata.status));
     mergeJob(jobs, {
       jobId,
-      interactionId: readString3(metadata.interactionId),
+      interactionId: readString4(metadata.interactionId),
       ...status ? { status } : {},
-      meshId: readString3(metadata.meshId) || event.meshId || args.meshId,
-      nodeId: readString3(metadata.nodeId) || event.nodeId,
-      targetNodeId: readString3(metadata.nodeId) || event.nodeId,
-      targetDaemonId: readString3(metadata.targetDaemonId),
-      workspace: readString3(metadata.workspace) || event.workspace,
-      branch: readString3(result?.branch) || readString3(finalState?.branch),
-      into: readString3(result?.into) || readString3(finalState?.baseBranch),
-      startedAt: readString3(metadata.startedAt),
-      completedAt: readString3(metadata.completedAt),
-      retryOfJobId: readString3(metadata.retryOfJobId),
+      meshId: readString4(metadata.meshId) || event.meshId || args.meshId,
+      nodeId: readString4(metadata.nodeId) || event.nodeId,
+      targetNodeId: readString4(metadata.nodeId) || event.nodeId,
+      targetDaemonId: readString4(metadata.targetDaemonId),
+      workspace: readString4(metadata.workspace) || event.workspace,
+      branch: readString4(result?.branch) || readString4(finalState?.branch),
+      into: readString4(result?.into) || readString4(finalState?.baseBranch),
+      startedAt: readString4(metadata.startedAt),
+      completedAt: readString4(metadata.completedAt),
+      retryOfJobId: readString4(metadata.retryOfJobId),
       lastEvent: event.event,
       lastUpdatedAt: new Date(event.queuedAt).toISOString()
     });
@@ -6402,10 +6719,10 @@ var mesh_review_inbox_exports = {};
 __export(mesh_review_inbox_exports, {
   deriveMeshReviewInboxItems: () => deriveMeshReviewInboxItems
 });
-function readString4(value) {
+function readString5(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
-function readRecord2(value) {
+function readRecord3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function readStringArray3(value, max) {
@@ -6415,20 +6732,20 @@ function readStringArray3(value, max) {
 }
 function isLocalNodeStatus(node) {
   if (node.isLocalWorktree === true) return true;
-  const connection = readRecord2(node.connection);
-  return readString4(connection?.state) === "self";
+  const connection = readRecord3(node.connection);
+  return readString5(connection?.state) === "self";
 }
 function readNodeConvergence(node) {
-  const convergence = readRecord2(node.branchConvergence);
-  const status = readString4(convergence?.status);
+  const convergence = readRecord3(node.branchConvergence);
+  const status = readString5(convergence?.status);
   if (!convergence || !status) return null;
   return {
     status,
-    reason: readString4(convergence.reason),
-    nextStep: readString4(convergence.nextStep),
+    reason: readString5(convergence.reason),
+    nextStep: readString5(convergence.nextStep),
     needsConvergence: convergence.needsConvergence === true,
-    branch: readString4(convergence.branch),
-    defaultBranch: readString4(convergence.defaultBranch)
+    branch: readString5(convergence.branch),
+    defaultBranch: readString5(convergence.defaultBranch)
   };
 }
 function isMergeCandidate(convergence) {
@@ -6436,15 +6753,15 @@ function isMergeCandidate(convergence) {
   return convergence.status === "cleanup_candidate" && convergence.reason === "clean_non_default_worktree_branch";
 }
 function readWorkerArtifact(value) {
-  const worker = readRecord2(value);
+  const worker = readRecord3(value);
   if (!worker) return null;
   const changed = readStringArray3(worker.changedFiles, MAX_CHANGED_FILES);
   return {
-    status: readString4(worker.status) ?? "unknown",
-    ...readString4(worker.classification) ? { classification: readString4(worker.classification) } : {},
+    status: readString5(worker.status) ?? "unknown",
+    ...readString5(worker.classification) ? { classification: readString5(worker.classification) } : {},
     changedFiles: changed.values,
     ...changed.truncated ? { changedFilesTruncated: true } : {},
-    validationResults: Array.isArray(worker.validationResults) ? worker.validationResults.map((item) => readRecord2(item)).filter((item) => item !== null) : [],
+    validationResults: Array.isArray(worker.validationResults) ? worker.validationResults.map((item) => readRecord3(item)).filter((item) => item !== null) : [],
     errors: readStringArray3(worker.errors, 20).values,
     requiresUserAction: worker.requiresUserAction === true
   };
@@ -6458,43 +6775,43 @@ function resolveNodeEvidence(nodeId, ledgerEntries) {
   for (let i = ledgerEntries.length - 1; i >= 0; i--) {
     const entry = ledgerEntries[i];
     if (entry.nodeId !== nodeId || !isTerminalLedgerKind(entry.kind)) continue;
-    const payload = readRecord2(entry.payload) ?? {};
+    const payload = readRecord3(entry.payload) ?? {};
     if (!evidence.available) {
       if (payload.source === "refine_mesh_node_async_job") {
-        const result = readRecord2(payload.result);
-        const validationSummary = readRecord2(result?.validationSummary);
+        const result = readRecord3(payload.result);
+        const validationSummary = readRecord3(result?.validationSummary);
         evidence = {
           available: true,
           kind: entry.kind,
           source: "refine_job",
           timestamp: entry.timestamp,
           ...entry.sessionId ? { sessionId: entry.sessionId } : {},
-          bootstrap: readRecord2(validationSummary?.bootstrap),
+          bootstrap: readRecord3(validationSummary?.bootstrap),
           validation: validationSummary ? Object.fromEntries(Object.entries(validationSummary).filter(([key]) => key !== "bootstrap")) : null,
-          checkpoint: readRecord2(result?.checkpoint),
+          checkpoint: readRecord3(result?.checkpoint),
           worker: null,
-          ...readRecord2(payload.finalBranchConvergenceState) ?? readRecord2(result?.finalBranchConvergenceState) ? { finalBranchConvergenceState: readRecord2(payload.finalBranchConvergenceState) ?? readRecord2(result?.finalBranchConvergenceState) } : {},
-          ...readRecord2(payload.refineJob) ? { refineJob: readRecord2(payload.refineJob) } : {}
+          ...readRecord3(payload.finalBranchConvergenceState) ?? readRecord3(result?.finalBranchConvergenceState) ? { finalBranchConvergenceState: readRecord3(payload.finalBranchConvergenceState) ?? readRecord3(result?.finalBranchConvergenceState) } : {},
+          ...readRecord3(payload.refineJob) ? { refineJob: readRecord3(payload.refineJob) } : {}
         };
       } else {
-        const envelope = readRecord2(payload.evidence);
+        const envelope = readRecord3(payload.evidence);
         evidence = {
           available: true,
           kind: entry.kind,
           source: "task_completion",
           timestamp: entry.timestamp,
-          ...readString4(payload.taskId) ? { taskId: readString4(payload.taskId) } : {},
+          ...readString5(payload.taskId) ? { taskId: readString5(payload.taskId) } : {},
           ...entry.sessionId ? { sessionId: entry.sessionId } : {},
           bootstrap: null,
-          validation: readRecord2(envelope?.validation),
-          checkpoint: readRecord2(envelope?.checkpoint),
+          validation: readRecord3(envelope?.validation),
+          checkpoint: readRecord3(envelope?.checkpoint),
           worker: readWorkerArtifact(envelope?.workerResult ?? payload.workerResult)
         };
       }
     }
     if (!transcriptHandle) {
-      const envelope = readRecord2(payload.evidence);
-      transcriptHandle = readRecord2(envelope?.transcriptHandle);
+      const envelope = readRecord3(payload.evidence);
+      transcriptHandle = readRecord3(envelope?.transcriptHandle);
     }
     if (evidence.available && transcriptHandle) break;
   }
@@ -6504,11 +6821,11 @@ function hasBlockedReviewRefineResult(nodeId, ledgerEntries) {
   for (let i = ledgerEntries.length - 1; i >= 0; i--) {
     const entry = ledgerEntries[i];
     if (entry.nodeId !== nodeId || !isTerminalLedgerKind(entry.kind)) continue;
-    const payload = readRecord2(entry.payload) ?? {};
+    const payload = readRecord3(entry.payload) ?? {};
     if (payload.source !== "refine_mesh_node_async_job") continue;
-    const result = readRecord2(payload.result);
-    const finalState = readRecord2(payload.finalBranchConvergenceState) ?? readRecord2(result?.finalBranchConvergenceState);
-    return readString4(finalState?.status) === "blocked_review" || readString4(result?.code) === "blocked_review";
+    const result = readRecord3(payload.result);
+    const finalState = readRecord3(payload.finalBranchConvergenceState) ?? readRecord3(result?.finalBranchConvergenceState);
+    return readString5(finalState?.status) === "blocked_review" || readString5(result?.code) === "blocked_review";
   }
   return false;
 }
@@ -6517,7 +6834,7 @@ function deriveMeshReviewInboxItems(args) {
   const excludedRemoteNodeIds = [];
   const refineJobs = buildMeshAsyncRefineJobs({ ledgerEntries: args.ledgerEntries });
   for (const node of args.nodes) {
-    const nodeId = readString4(node.nodeId) ?? readString4(node.id);
+    const nodeId = readString5(node.nodeId) ?? readString5(node.id);
     if (!nodeId) continue;
     if (!isLocalNodeStatus(node)) {
       excludedRemoteNodeIds.push(nodeId);
@@ -6539,8 +6856,8 @@ function deriveMeshReviewInboxItems(args) {
     ) ?? null;
     items.push({
       nodeId,
-      workspace: readString4(node.workspace),
-      branch: convergence.branch ?? readString4(node.worktreeBranch),
+      workspace: readString5(node.workspace),
+      branch: convergence.branch ?? readString5(node.worktreeBranch),
       defaultBranch: convergence.defaultBranch,
       isLocalWorktree: node.isLocalWorktree === true,
       reviewReason,
@@ -7751,220 +8068,6 @@ var init_mesh_fast_forward = __esm({
   }
 });
 
-// ../mesh-shared/dist/index.mjs
-function readRecord3(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-function readString5(...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 = readRecord3(entry);
-    const path42 = readString5(submodule.path);
-    const commit = readString5(submodule.commit);
-    const repoPath = readString5(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path42);
-    if (!path42 || !commit) return null;
-    const result = {
-      path: path42,
-      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 = readString5(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(readString5(status.branch, status.upstream, status.upstreamStatus, status.upstream_status, status.headCommit)) || Boolean(readString5(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 = readString5(status.repoRoot, status.repo_root, node.repoRoot, node.repo_root, status.workspace, node.workspace) || void 0;
-  const submodules = readGitSubmodules(status.submodules, repoRoot);
-  const upstreamStatus = readString5(status.upstreamStatus, status.upstream_status);
-  const upstreamFetchedAt = readNumber(status.upstreamFetchedAt, status.upstream_fetched_at);
-  const upstreamFetchError = readString5(status.upstreamFetchError, status.upstream_fetch_error);
-  const error = readString5(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: readString5(status.workspace, node.workspace) || "",
-    repoRoot: repoRoot ?? null,
-    isGitRepo,
-    branch: readString5(status.branch) ?? null,
-    headCommit: readString5(status.headCommit) ?? null,
-    headMessage: readString5(status.headMessage) ?? null,
-    upstream: readString5(status.upstream) ?? null,
-    upstreamStatus: upstreamStatus ?? "unchecked",
-    ...upstreamFetchedAt !== void 0 ? { upstreamFetchedAt } : {},
-    ...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 = readRecord3(node.lastGit ?? node.last_git);
-  const gitResult = readRecord3(rawGit.result);
-  const directStatus = readRecord3(rawGit.status);
-  const nestedStatus = readRecord3(gitResult.status);
-  const rawProbe = readRecord3(node.lastProbe ?? node.last_probe);
-  const probeGit = readRecord3(rawProbe.git);
-  const probeGitResult = readRecord3(probeGit.result);
-  const probeDirectStatus = readRecord3(probeGit.status);
-  const probeNestedStatus = readRecord3(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 readString5(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 summarizeGitShape(status) {
-  const record = readRecord3(status);
-  if (!Object.keys(record).length) return null;
-  const submodules = Array.isArray(record.submodules) ? record.submodules.map((entry) => {
-    const sub = readRecord3(entry);
-    return {
-      path: readString5(sub.path) ?? null,
-      commit: readString5(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: readString5(record.workspace) ?? null,
-    repoRoot: readString5(record.repoRoot, record.repo_root) ?? null,
-    branch: readString5(record.branch) ?? null,
-    upstream: readString5(record.upstream) ?? null,
-    upstreamStatus: readString5(record.upstreamStatus, record.upstream_status) ?? null,
-    headCommit: readString5(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 init_dist = __esm({
-  "../mesh-shared/dist/index.mjs"() {
-    "use strict";
-  }
-});
-
 // src/mesh/mesh-active-work.ts
 function readString6(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
@@ -8618,17 +8721,7 @@ var init_mesh_events_utils = __esm({
 
 // src/mesh/mesh-events-pending.ts
 function normalizeCoordinatorDaemonIds(coordinatorDaemonId) {
-  const raw = Array.isArray(coordinatorDaemonId) ? coordinatorDaemonId : coordinatorDaemonId != null ? [coordinatorDaemonId] : [];
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const id of raw) {
-    if (typeof id !== "string") continue;
-    const trimmed = id.trim();
-    if (!trimmed || seen.has(trimmed)) continue;
-    seen.add(trimmed);
-    out.push(trimmed);
-  }
-  return out;
+  return expandDaemonIdForms(coordinatorDaemonId);
 }
 function readRefineJobId2(event) {
   const metadata = readRecord4(event.metadataEvent) || event;
@@ -9018,6 +9111,7 @@ var init_mesh_events_pending = __esm({
     init_mesh_ledger();
     init_mesh_runtime_store();
     init_mesh_events_utils();
+    init_dist();
     REFINE_TERMINAL_EVENTS = /* @__PURE__ */ new Set(["refine:completed", "refine:failed"]);
     MAX_PENDING_EVENTS_BYTES = 100 * 1024;
     MAX_PENDING_EVENTS_KEEP = 50;
@@ -12469,12 +12563,9 @@ var init_snapshot = __esm({
 
 // src/mesh/mesh-events-coordinator.ts
 function resolveCoordinatorDrainDaemonIds(components) {
-  const ids = /* @__PURE__ */ new Set();
   const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
-  if (statusInstanceId) ids.add(statusInstanceId);
   const machineId = readNonEmptyString2(loadConfig().machineId);
-  if (machineId) ids.add(machineId);
-  return [...ids];
+  return expandDaemonIdForms([statusInstanceId, machineId]);
 }
 function getCachedMeshByWorkspace(workspace) {
   const now = Date.now();
@@ -12625,6 +12716,55 @@ function resolveActiveDirectDispatchTaskId(meshId, sessionId) {
     return void 0;
   }
 }
+function deliverTaskToSession(dispatchThunk, ctx) {
+  const delivery = createSessionDelivery({
+    meshId: ctx.meshId,
+    nodeId: ctx.nodeId,
+    sessionId: ctx.sessionId,
+    providerType: ctx.providerType,
+    taskId: ctx.task.id,
+    kind: "task",
+    message: ctx.task.message,
+    status: "delivering",
+    ...ctx.sourceCoordinatorSessionId ? { sourceCoordinatorSessionId: ctx.sourceCoordinatorSessionId } : {},
+    ...ctx.sourceCoordinatorDaemonId ? { sourceCoordinatorDaemonId: ctx.sourceCoordinatorDaemonId } : {}
+  });
+  let dispatchPromise;
+  try {
+    dispatchPromise = Promise.resolve(dispatchThunk());
+  } catch (e) {
+    dispatchPromise = Promise.reject(e);
+  }
+  let timer;
+  const guarded = Promise.race([
+    dispatchPromise,
+    new Promise((_, reject) => {
+      timer = setTimeout(
+        () => reject(new Error(`dispatch_confirm_timeout after ${DISPATCH_CONFIRM_TIMEOUT_MS}ms`)),
+        DISPATCH_CONFIRM_TIMEOUT_MS
+      );
+      if (typeof timer?.unref === "function") timer.unref();
+    })
+  ]);
+  guarded.then(() => {
+    if (timer) clearTimeout(timer);
+    updateSessionDeliveryStatus(delivery.id, "delivered");
+  }).catch((e) => {
+    if (timer) clearTimeout(timer);
+    LOG.error("MeshQueue", `Failed to dispatch task via ${ctx.transport} to node ${ctx.nodeId}: ${e?.message}`);
+    updateSessionDeliveryStatus(delivery.id, "failed", { lastError: e?.message, incrementAttempt: true });
+    updateTaskStatus(ctx.meshId, ctx.task.id, "pending");
+    try {
+      appendLedgerEntry(ctx.meshId, {
+        kind: "dispatch_failed",
+        nodeId: ctx.nodeId,
+        sessionId: ctx.sessionId,
+        payload: { taskId: ctx.task.id, deliveryId: delivery.id, error: e?.message, retryable: true, transport: ctx.transport }
+      });
+    } catch {
+    }
+  });
+}
 function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType) {
   const mesh = getMeshWithCache(components, meshId);
   const node = mesh?.nodes.find((n) => readMeshNodeId(n) === nodeId);
@@ -12643,46 +12783,33 @@ function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType)
     if (!isLocalNode) {
       const localDaemonIdForDispatch = readNonEmptyString2(loadConfig().machineId) || void 0;
       const sourceCoordinatorSessionId = readNonEmptyString2(task.sourceCoordinatorSessionId) || void 0;
-      const delivery2 = createSessionDelivery({
-        meshId,
-        nodeId,
-        sessionId,
-        providerType,
-        taskId: task.id,
-        kind: "task",
-        message: task.message,
-        status: "delivering",
-        ...sourceCoordinatorSessionId ? { sourceCoordinatorSessionId } : {},
-        ...localDaemonIdForDispatch ? { sourceCoordinatorDaemonId: localDaemonIdForDispatch } : {}
-      });
-      components.dispatchMeshCommand(node.daemonId, "agent_command", {
-        targetSessionId: sessionId,
-        cliType: providerType,
-        action: "send_chat",
-        message: task.message,
-        meshContext: {
+      const dispatchMeshCommand = components.dispatchMeshCommand;
+      const remoteDaemonId = node.daemonId;
+      deliverTaskToSession(
+        () => dispatchMeshCommand(remoteDaemonId, "agent_command", {
+          targetSessionId: sessionId,
+          cliType: providerType,
+          action: "send_chat",
+          message: task.message,
+          meshContext: {
+            meshId,
+            nodeId,
+            taskId: task.id,
+            ...localDaemonIdForDispatch ? { coordinatorDaemonId: localDaemonIdForDispatch } : {},
+            ...sourceCoordinatorSessionId ? { coordinatorSessionId: sourceCoordinatorSessionId } : {}
+          }
+        }),
+        {
           meshId,
           nodeId,
-          taskId: task.id,
-          ...localDaemonIdForDispatch ? { coordinatorDaemonId: localDaemonIdForDispatch } : {},
-          ...sourceCoordinatorSessionId ? { coordinatorSessionId: sourceCoordinatorSessionId } : {}
-        }
-      }).then(() => {
-        updateSessionDeliveryStatus(delivery2.id, "delivered");
-      }).catch((e) => {
-        LOG.error("MeshQueue", `Failed to dispatch task via P2P to remote node ${nodeId}: ${e?.message}`);
-        updateSessionDeliveryStatus(delivery2.id, "failed", { lastError: e?.message, incrementAttempt: true });
-        updateTaskStatus(meshId, task.id, "pending");
-        try {
-          appendLedgerEntry(meshId, {
-            kind: "dispatch_failed",
-            nodeId,
-            sessionId,
-            payload: { taskId: task.id, deliveryId: delivery2.id, error: e?.message, retryable: true }
-          });
-        } catch {
+          sessionId,
+          providerType,
+          task,
+          transport: "remote",
+          ...sourceCoordinatorSessionId ? { sourceCoordinatorSessionId } : {},
+          ...localDaemonIdForDispatch ? { sourceCoordinatorDaemonId: localDaemonIdForDispatch } : {}
         }
-      });
+      );
       return true;
     }
   }
@@ -12704,39 +12831,24 @@ function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType)
     }
   } catch {
   }
-  const delivery = createSessionDelivery({
-    meshId,
-    nodeId,
-    sessionId,
-    providerType,
-    taskId: task.id,
-    kind: "task",
-    message: task.message,
-    status: "delivering",
-    ...readNonEmptyString2(task.sourceCoordinatorSessionId) ? { sourceCoordinatorSessionId: readNonEmptyString2(task.sourceCoordinatorSessionId) } : {},
-    ...readNonEmptyString2(loadConfig().machineId) ? { sourceCoordinatorDaemonId: readNonEmptyString2(loadConfig().machineId) } : {}
-  });
-  components.cliManager.handleCliCommand("agent_command", {
-    targetSessionId: sessionId,
-    cliType: providerType,
-    action: "send_chat",
-    message: task.message
-  }).then(() => {
-    updateSessionDeliveryStatus(delivery.id, "delivered");
-  }).catch((e) => {
-    LOG.error("MeshQueue", `Failed to dispatch task locally to node ${nodeId}: ${e?.message}`);
-    updateSessionDeliveryStatus(delivery.id, "failed", { lastError: e?.message, incrementAttempt: true });
-    updateTaskStatus(meshId, task.id, "pending");
-    try {
-      appendLedgerEntry(meshId, {
-        kind: "dispatch_failed",
-        nodeId,
-        sessionId,
-        payload: { taskId: task.id, deliveryId: delivery.id, error: e?.message, retryable: true }
-      });
-    } catch {
+  deliverTaskToSession(
+    () => components.cliManager.handleCliCommand("agent_command", {
+      targetSessionId: sessionId,
+      cliType: providerType,
+      action: "send_chat",
+      message: task.message
+    }),
+    {
+      meshId,
+      nodeId,
+      sessionId,
+      providerType,
+      task,
+      transport: "local",
+      ...readNonEmptyString2(task.sourceCoordinatorSessionId) ? { sourceCoordinatorSessionId: readNonEmptyString2(task.sourceCoordinatorSessionId) } : {},
+      ...readNonEmptyString2(loadConfig().machineId) ? { sourceCoordinatorDaemonId: readNonEmptyString2(loadConfig().machineId) } : {}
     }
-  });
+  );
   return true;
 }
 function sweepExpiredCooldowns() {
@@ -13001,7 +13113,7 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       }
     }
     const candidateNodes = Array.isArray(mesh?.nodes) ? mesh.nodes.filter((node) => {
-      if (task.targetNodeId && readMeshNodeId(node) !== task.targetNodeId) return false;
+      if (task.targetNodeId && !meshNodeIdMatches(node, task.targetNodeId)) return false;
       if (task.requiredTags?.length) {
         const priorities = normalizeProviderPriority(node?.policy);
         const providerCandidates = priorities.length ? priorities : [void 0];
@@ -13012,7 +13124,12 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       return true;
     }) : [];
     if (!candidateNodes.length) {
-      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "no_node_satisfies_required_tags", nodeId: task.targetNodeId });
+      const targetPinUnmatched = !!task.targetNodeId && !(Array.isArray(mesh?.nodes) && mesh.nodes.some((n) => meshNodeIdMatches(n, task.targetNodeId)));
+      markAutoLaunch(meshId, task.id, {
+        status: "skipped",
+        reason: targetPinUnmatched ? "target_node_id_unmatched" : "no_node_satisfies_required_tags",
+        nodeId: task.targetNodeId
+      });
       continue;
     }
     const strategy = resolveSchedulingStrategy(mesh);
@@ -13963,7 +14080,7 @@ function setupMeshEventForwarding(components) {
     });
   });
 }
-var import_fs13, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS;
+var import_fs13, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, DISPATCH_CONFIRM_TIMEOUT_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS;
 var init_mesh_events_coordinator = __esm({
   "src/mesh/mesh-events-coordinator.ts"() {
     "use strict";
@@ -13992,6 +14109,7 @@ var init_mesh_events_coordinator = __esm({
     idleAutoFastForwardLastAttempt = /* @__PURE__ */ new Map();
     INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS = 30 * 60 * 1e3;
     RECENT_COMPLETION_FINGERPRINT_TTL_MS = 10 * 60 * 1e3;
+    DISPATCH_CONFIRM_TIMEOUT_MS = 12e4;
     autoLaunchInProgress = /* @__PURE__ */ new Set();
     autoLaunchCooldownUntil = /* @__PURE__ */ new Map();
     AUTO_LAUNCH_COOLDOWN_MS = 5e3;
@@ -14047,12 +14165,9 @@ function resolveReconcileIntervalMs() {
   return DEFAULT_RECONCILE_INTERVAL_MS;
 }
 function resolveCoordinatorDaemonIds(components) {
-  const ids = /* @__PURE__ */ new Set();
   const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
-  if (statusInstanceId) ids.add(statusInstanceId);
   const machineId = readNonEmptyString2(loadConfig().machineId);
-  if (machineId) ids.add(machineId);
-  return [...ids];
+  return expandDaemonIdForms([statusInstanceId, machineId]);
 }
 function daemonHostsMesh(mesh, daemonIds) {
   const host = mesh.meshHost;
@@ -14136,6 +14251,24 @@ function recordHeldTerminalEventsToLedger(meshId, drainDaemonIds, reason, heldFo
     }
   }
 }
+function recoverStrandedAssignedDispatches(meshId, store) {
+  const assigned = getQueue(meshId, { status: ["assigned"] });
+  if (!assigned.length) return;
+  const nowMs = Date.now();
+  for (const row of assigned) {
+    const dispatchedAtMs = Date.parse(row.dispatchTimestamp ?? "");
+    if (!Number.isFinite(dispatchedAtMs)) continue;
+    if (nowMs - dispatchedAtMs < ASSIGNED_STRANDED_DEADLINE_MS) continue;
+    if (store.taskHasConfirmedDelivery(meshId, row.id)) continue;
+    const reclaimed = reclaimStrandedAssignedTask(meshId, row.id, {
+      reason: "assigned_stranded_dispatch_unconfirmed",
+      ageMs: nowMs - dispatchedAtMs
+    });
+    if (reclaimed) {
+      LOG.warn("MeshReconcile", `Reclaimed stranded assigned task ${row.id} on mesh ${meshId} (node=${row.assignedNodeId ?? "?"} session=${row.assignedSessionId ?? "?"}, dispatched ${Math.round((nowMs - dispatchedAtMs) / 1e3)}s ago, never confirmed delivered \u2192 ${reclaimed.status})`);
+    }
+  }
+}
 async function runMeshReconcileTick(components) {
   const localDaemonId = readNonEmptyString2(loadConfig().machineId) || void 0;
   const drainDaemonIds = resolveCoordinatorDaemonIds(components);
@@ -14165,6 +14298,17 @@ async function runMeshReconcileTick(components) {
       }
     }
   }
+  if (store) {
+    for (const mesh of listMeshes()) {
+      const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
+      if (!daemonHostsMesh(mesh, selfIds)) continue;
+      try {
+        recoverStrandedAssignedDispatches(mesh.id, store);
+      } catch (e) {
+        LOG.warn("MeshReconcile", `Assigned-stranded watchdog failed for mesh ${mesh.id}: ${e?.message || e}`);
+      }
+    }
+  }
   for (const mesh of listMeshes()) {
     const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
     if (!daemonHostsMesh(mesh, selfIds)) continue;
@@ -14552,7 +14696,7 @@ function setupMeshReconcileLoop(components) {
     }
   };
 }
-var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, heldEventLedgerRecorded, STRICT_SESSION_MATCH_TTL_MS;
+var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, heldEventLedgerRecorded, ASSIGNED_STRANDED_DEADLINE_MS, STRICT_SESSION_MATCH_TTL_MS;
 var init_mesh_reconcile_loop = __esm({
   "src/mesh/mesh-reconcile-loop.ts"() {
     "use strict";
@@ -14565,6 +14709,7 @@ var init_mesh_reconcile_loop = __esm({
     init_mesh_events_coordinator();
     init_mesh_unresolved_forward_outbox();
     init_mesh_events_utils();
+    init_dist();
     init_mesh_work_queue();
     init_mesh_ledger();
     init_mesh_active_work();
@@ -14573,6 +14718,7 @@ var init_mesh_reconcile_loop = __esm({
     DEFAULT_RECONCILE_INTERVAL_MS = 4e3;
     DEFAULT_AUTO_PRUNE_MIN_AGE_MS = 24 * 60 * 6e4;
     heldEventLedgerRecorded = /* @__PURE__ */ new Set();
+    ASSIGNED_STRANDED_DEADLINE_MS = 5 * 6e4;
     STRICT_SESSION_MATCH_TTL_MS = 6e4;
   }
 });
@@ -14605,6 +14751,84 @@ var init_mesh_events = __esm({
   }
 });
 
+// src/providers/approval-utils.ts
+function normalizeApprovalLabel(value) {
+  return String(value || "").toLowerCase().replace(/^[\s\[(<{]*\d+(?:\s*[.)\]}>:-]|\s)+/, "").replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+}
+function isNegativeApprovalLabel(value) {
+  const label = normalizeApprovalLabel(value);
+  return /^(no|deny|reject|cancel|skip|exit|stop)\b/.test(label) || /\bwithout\b/.test(label) || /\bdo not\b/.test(label);
+}
+function hasNegativeApprovalOption(buttons) {
+  return (buttons || []).some((button) => isNegativeApprovalLabel(String(button || "")));
+}
+function getApprovalPositiveHints(provider) {
+  const customHints = Array.isArray(provider?.approvalPositiveHints) ? provider.approvalPositiveHints.map((hint) => normalizeApprovalLabel(String(hint || ""))).filter(Boolean) : [];
+  return customHints.length > 0 ? customHints : DEFAULT_APPROVAL_POSITIVE_HINTS;
+}
+function pickApprovalButton(buttons, provider) {
+  const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
+  if (labels.length === 0) {
+    return { index: -1, label: "" };
+  }
+  const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
+  const hints = getApprovalPositiveHints(provider);
+  for (const hint of hints) {
+    const exactIndex = normalizedButtons.findIndex((label, index) => label === hint && !isNegativeApprovalLabel(labels[index]));
+    if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
+    const prefixIndex = normalizedButtons.findIndex((label, index) => label.startsWith(hint) && !isNegativeApprovalLabel(labels[index]));
+    if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
+    const includeIndex = normalizedButtons.findIndex((label, index) => label.includes(hint) && !isNegativeApprovalLabel(labels[index]));
+    if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
+  }
+  return { index: -1, label: "" };
+}
+function pickAutoApprovalButton(buttons) {
+  const labels = (buttons || []).map((button) => String(button || "").trim());
+  const index = labels.findIndex(Boolean);
+  return index >= 0 ? { index, label: labels[index] } : { index: -1, label: "" };
+}
+function formatAutoApprovalMessage(modalMessage, buttonLabel) {
+  const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ""}`];
+  const cleanMessage = String(modalMessage || "").trim();
+  if (cleanMessage) lines.push(cleanMessage);
+  return lines.join("\n");
+}
+function looksLikeActiveApprovalPromptText(content) {
+  const text = content.trim();
+  if (!text || text.length > 2e3) return false;
+  const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text) || /this command requires approval/i.test(text) || /quick safety check/i.test(text) || /is this a project you trust/i.test(text);
+  const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text) || /^\s*1[.)]\s+yes\b/im.test(text);
+  if (hasApprovalQuestion && hasNumberedChoices) return true;
+  const lastLines = text.split(/\r?\n/).slice(-12).join("\n");
+  const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines) || /yes.*always allow/i.test(lastLines);
+  const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
+  if (hasDontAskAgain && hasNoOption) return true;
+  if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
+  return false;
+}
+var DEFAULT_APPROVAL_POSITIVE_HINTS;
+var init_approval_utils = __esm({
+  "src/providers/approval-utils.ts"() {
+    "use strict";
+    DEFAULT_APPROVAL_POSITIVE_HINTS = [
+      "yes",
+      "allow once",
+      "approve",
+      "accept",
+      "continue",
+      "run",
+      "proceed",
+      "confirm",
+      "save",
+      "ok",
+      "trust",
+      "allow",
+      "always allow"
+    ];
+  }
+});
+
 // src/logging/debug-config.ts
 function normalizeCategories(categories) {
   if (!Array.isArray(categories)) return [];
@@ -15591,6 +15815,27 @@ function compileSettledPromptMatchers(spec) {
   });
   return { prompt, footers };
 }
+function extractButtonLabels(spec, text) {
+  if (!text) return [];
+  const flags = spec.buttonFlags && spec.buttonFlags.includes("m") ? spec.buttonFlags : `${spec.buttonFlags ?? ""}m`;
+  const buttonRe = compile2(spec.buttonPattern, flags);
+  const labelGroup = Number.isInteger(spec.buttonLabelGroup) && (spec.buttonLabelGroup ?? 0) > 0 ? spec.buttonLabelGroup : 1;
+  const out = [];
+  for (const line of text.split("\n")) {
+    buttonRe.lastIndex = 0;
+    const m = buttonRe.exec(line);
+    if (!m) continue;
+    const captured = m[labelGroup] ?? (labelGroup === 1 && m.length > 2 ? m[m.length - 1] : void 0);
+    if (captured && captured.trim()) out.push(captured.trim());
+  }
+  return out;
+}
+function buttonBlockApprovalCue(spec, text) {
+  const labels = extractButtonLabels(spec, text);
+  if (labels.length < 2) return false;
+  if (pickApprovalButton(labels).index < 0) return false;
+  return hasNegativeApprovalOption(labels);
+}
 function modalMatches(spec, input) {
   const text = input.screenText ?? "";
   const question = compile2(spec.questionPattern, spec.questionFlags ?? "i");
@@ -15599,6 +15844,7 @@ function modalMatches(spec, input) {
     const re = compile2(variant.regex, variant.flags ?? "i");
     if (re.test(text)) return true;
   }
+  if (buttonBlockApprovalCue(spec, text)) return true;
   return false;
 }
 function evaluateGroup(group, spec, input, compiled) {
@@ -15653,6 +15899,7 @@ var init_detect_status = __esm({
   "src/providers/sdk/v1/builders/cli/detect-status.ts"() {
     "use strict";
     init_visible_region();
+    init_approval_utils();
     DEFAULT_ORDER = ["spinner", "modal", "settled-prompt"];
   }
 });
@@ -20098,6 +20345,7 @@ __export(index_exports, {
   createNativeHistoryDispatcher: () => createNativeHistoryDispatcher,
   createSessionDelivery: () => createSessionDelivery,
   createWorktree: () => createWorktree,
+  daemonIdsEquivalent: () => daemonIdsEquivalent,
   deleteDirectDispatchesByTaskId: () => deleteDirectDispatchesByTaskId,
   deleteMesh: () => deleteMesh,
   deriveMeshReviewInboxItems: () => deriveMeshReviewInboxItems,
@@ -20111,6 +20359,7 @@ __export(index_exports, {
   ensureSessionHostReady: () => ensureSessionHostReady,
   evaluateFsm: () => evaluateFsm,
   execNpmCommandSync: () => execNpmCommandSync,
+  expandDaemonIdForms: () => expandDaemonIdForms,
   fastForwardMeshNode: () => fastForwardMeshNode,
   filterActivityChatMessages: () => filterActivityChatMessages,
   filterChatMessagesByVisibility: () => filterChatMessagesByVisibility,
@@ -20201,6 +20450,7 @@ __export(index_exports, {
   loadMeshWorktreeBootstrapConfig: () => loadMeshWorktreeBootstrapConfig,
   loadState: () => loadState,
   logCommand: () => logCommand,
+  machineCoreFromDaemonId: () => machineCoreFromDaemonId,
   markSessionDeliveriesTerminal: () => markSessionDeliveriesTerminal,
   markSetupComplete: () => markSetupComplete,
   markStaleDirectDispatches: () => markStaleDirectDispatches,
@@ -21559,6 +21809,7 @@ function getSavedProviderSessions(state, filters) {
 
 // src/index.ts
 init_mesh_config();
+init_dist();
 init_coordinator_prompt();
 init_mesh_missions();
 init_mesh_task_stats();
@@ -26111,76 +26362,8 @@ function validateReadChatResultPayload(raw, source = "read_chat") {
   return normalized;
 }
 
-// src/providers/approval-utils.ts
-var DEFAULT_APPROVAL_POSITIVE_HINTS = [
-  "yes",
-  "allow once",
-  "approve",
-  "accept",
-  "continue",
-  "run",
-  "proceed",
-  "confirm",
-  "save",
-  "ok",
-  "trust",
-  "allow",
-  "always allow"
-];
-function normalizeApprovalLabel(value) {
-  return String(value || "").toLowerCase().replace(/^[\s\[(<{]*\d+(?:\s*[.)\]}>:-]|\s)+/, "").replace(/[^\p{L}\p{N}]+/gu, " ").trim();
-}
-function isNegativeApprovalLabel(value) {
-  const label = normalizeApprovalLabel(value);
-  return /^(no|deny|reject|cancel|skip|exit|stop)\b/.test(label) || /\bwithout\b/.test(label) || /\bdo not\b/.test(label);
-}
-function getApprovalPositiveHints(provider) {
-  const customHints = Array.isArray(provider?.approvalPositiveHints) ? provider.approvalPositiveHints.map((hint) => normalizeApprovalLabel(String(hint || ""))).filter(Boolean) : [];
-  return customHints.length > 0 ? customHints : DEFAULT_APPROVAL_POSITIVE_HINTS;
-}
-function pickApprovalButton(buttons, provider) {
-  const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
-  if (labels.length === 0) {
-    return { index: -1, label: "" };
-  }
-  const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
-  const hints = getApprovalPositiveHints(provider);
-  for (const hint of hints) {
-    const exactIndex = normalizedButtons.findIndex((label, index) => label === hint && !isNegativeApprovalLabel(labels[index]));
-    if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
-    const prefixIndex = normalizedButtons.findIndex((label, index) => label.startsWith(hint) && !isNegativeApprovalLabel(labels[index]));
-    if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
-    const includeIndex = normalizedButtons.findIndex((label, index) => label.includes(hint) && !isNegativeApprovalLabel(labels[index]));
-    if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
-  }
-  return { index: -1, label: "" };
-}
-function pickAutoApprovalButton(buttons) {
-  const labels = (buttons || []).map((button) => String(button || "").trim());
-  const index = labels.findIndex(Boolean);
-  return index >= 0 ? { index, label: labels[index] } : { index: -1, label: "" };
-}
-function formatAutoApprovalMessage(modalMessage, buttonLabel) {
-  const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ""}`];
-  const cleanMessage = String(modalMessage || "").trim();
-  if (cleanMessage) lines.push(cleanMessage);
-  return lines.join("\n");
-}
-function looksLikeActiveApprovalPromptText(content) {
-  const text = content.trim();
-  if (!text || text.length > 2e3) return false;
-  const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text) || /this command requires approval/i.test(text) || /quick safety check/i.test(text) || /is this a project you trust/i.test(text);
-  const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text) || /^\s*1[.)]\s+yes\b/im.test(text);
-  if (hasApprovalQuestion && hasNumberedChoices) return true;
-  const lastLines = text.split(/\r?\n/).slice(-12).join("\n");
-  const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines) || /yes.*always allow/i.test(lastLines);
-  const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
-  if (hasDontAskAgain && hasNoOption) return true;
-  if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
-  return false;
-}
-
 // src/providers/ide-provider-instance.ts
+init_approval_utils();
 init_provider_patch_state();
 init_chat_message_normalization();
 init_open_panel_support();
@@ -27264,6 +27447,7 @@ var path16 = __toESM(require("path"));
 var import_node_crypto3 = require("crypto");
 init_contracts();
 init_provider_input_support();
+init_approval_utils();
 init_coordinator_registry();
 init_logger();
 
@@ -35252,6 +35436,7 @@ function createCliAdapter(provider, workingDir, cliArgs, extraEnv, transportFact
 // src/providers/cli-provider-instance.ts
 init_logger();
 init_control_effects();
+init_approval_utils();
 init_provider_patch_state();
 
 // src/providers/provider-session-id.ts
@@ -35513,6 +35698,20 @@ var CliProviderInstance = class _CliProviderInstance {
    * keystroke until the modal *content* has settled.
    */
   static AUTO_APPROVE_SETTLE_MS = 600;
+  /**
+   * Busy-side hysteresis for the settle gate. A momentary `generating` flip
+   * while the SAME approval modal's button block is still on screen (its
+   * question line scrolled out of the captured frame, only the buttons + a
+   * residual `esc to interrupt` spinner remain) briefly reports
+   * status!=waiting_approval. Without hysteresis that flip wipes the settle
+   * clock, and the modal→generating→modal flap restarts the 600ms window
+   * every time so auto-approve never fires. We keep the in-progress settle
+   * gate warm across an inactive blip up to this bound; only once the modal
+   * has genuinely stayed gone this long (a real resolution → idle) is the
+   * gate cleared. Bounded so a genuinely new, later approval still re-settles
+   * from scratch rather than firing on a stale timestamp.
+   */
+  static AUTO_APPROVE_GATE_HYSTERESIS_MS = 1500;
   adapter;
   context = null;
   events = [];
@@ -35534,6 +35733,10 @@ var CliProviderInstance = class _CliProviderInstance {
   pendingAutoApprovalSignature = "";
   pendingAutoApprovalSince = 0;
   autoApproveSettleTimer = null;
+  // Wall-clock when auto-approve first observed status!=waiting_approval while
+  // a settle gate was in progress. Drives AUTO_APPROVE_GATE_HYSTERESIS_MS so a
+  // brief generating flip does not immediately wipe the settle clock.
+  autoApproveInactiveSince = 0;
   controlValues = {};
   summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
@@ -36354,14 +36557,28 @@ var CliProviderInstance = class _CliProviderInstance {
     const autoApproveActive = adapterStatus?.status === "waiting_approval" && this.shouldAutoApprove();
     if (!autoApproveActive) {
       this.lastAutoApprovalSignature = "";
+      if (this.pendingAutoApprovalSince) {
+        if (!this.autoApproveInactiveSince) this.autoApproveInactiveSince = now;
+        const goneForMs = now - this.autoApproveInactiveSince;
+        if (goneForMs < _CliProviderInstance.AUTO_APPROVE_GATE_HYSTERESIS_MS) {
+          if (this.autoApproveSettleTimer) clearTimeout(this.autoApproveSettleTimer);
+          this.autoApproveSettleTimer = setTimeout(() => {
+            this.autoApproveSettleTimer = null;
+            this.recheckAutoApproveSettled();
+          }, _CliProviderInstance.AUTO_APPROVE_GATE_HYSTERESIS_MS - goneForMs + 20);
+          return autoApproveActive;
+        }
+      }
       this.pendingAutoApprovalSignature = "";
       this.pendingAutoApprovalSince = 0;
+      this.autoApproveInactiveSince = 0;
       if (this.autoApproveSettleTimer) {
         clearTimeout(this.autoApproveSettleTimer);
         this.autoApproveSettleTimer = null;
       }
       return autoApproveActive;
     }
+    this.autoApproveInactiveSince = 0;
     const modal = adapterStatus.activeModal;
     const buttons = Array.isArray(modal?.buttons) ? modal.buttons.map((b) => String(b || "").trim()).filter(Boolean) : [];
     if (!modal || buttons.length === 0) {
@@ -36371,18 +36588,18 @@ var CliProviderInstance = class _CliProviderInstance {
     if (buttonIndex < 0) {
       return autoApproveActive;
     }
-    const approvalEntrySeq = typeof adapterStatus?.approvalEntrySeq === "number" ? adapterStatus.approvalEntrySeq : 0;
-    const signature = [
-      approvalEntrySeq,
+    const modalSignature = [
       typeof modal?.message === "string" ? modal.message.trim() : "",
       buttons.join("|"),
       buttonIndex
     ].join("::");
-    if (this.autoApproveBusy && signature === this.lastAutoApprovalSignature) {
+    const approvalEntrySeq = typeof adapterStatus?.approvalEntrySeq === "number" ? adapterStatus.approvalEntrySeq : 0;
+    const busySignature = `${approvalEntrySeq}::${modalSignature}`;
+    if (this.autoApproveBusy && busySignature === this.lastAutoApprovalSignature) {
       return autoApproveActive;
     }
-    if (signature !== this.pendingAutoApprovalSignature) {
-      this.pendingAutoApprovalSignature = signature;
+    if (modalSignature !== this.pendingAutoApprovalSignature) {
+      this.pendingAutoApprovalSignature = modalSignature;
       this.pendingAutoApprovalSince = now;
     }
     const settledForMs = now - this.pendingAutoApprovalSince;
@@ -36399,9 +36616,10 @@ var CliProviderInstance = class _CliProviderInstance {
       this.autoApproveSettleTimer = null;
     }
     this.autoApproveBusy = true;
-    this.lastAutoApprovalSignature = signature;
+    this.lastAutoApprovalSignature = busySignature;
     this.pendingAutoApprovalSignature = "";
     this.pendingAutoApprovalSince = 0;
+    this.autoApproveInactiveSince = 0;
     if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
     this.autoApproveBusyTimer = setTimeout(() => {
       this.autoApproveBusy = false;
@@ -39183,9 +39401,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
       }
     }
-    for (const [k, a] of this.adapters) {
-      if (a.cliType === agentType) {
-        return { adapter: a, key: k };
+    if (!opts?.instanceKey) {
+      for (const [k, a] of this.adapters) {
+        if (a.cliType === agentType) {
+          return { adapter: a, key: k };
+        }
       }
     }
     return null;
@@ -43288,7 +43508,8 @@ init_logger();
 var fs23 = __toESM(require("fs"));
 var path35 = __toESM(require("path"));
 var os26 = __toESM(require("os"));
-var LOG_DIR2 = process.platform === "win32" ? path35.join(process.env.LOCALAPPDATA || process.env.APPDATA || path35.join(os26.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path35.join(os26.homedir(), "Library", "Logs", "adhdev") : path35.join(os26.homedir(), ".local", "share", "adhdev", "logs");
+var ADHDEV_HOME2 = process.env.ADHDEV_CONFIG_DIR && process.env.ADHDEV_CONFIG_DIR.trim() ? process.env.ADHDEV_CONFIG_DIR.trim() : path35.join(os26.homedir(), ".adhdev");
+var LOG_DIR2 = path35.join(ADHDEV_HOME2, "logs");
 var MAX_FILE_SIZE = 5 * 1024 * 1024;
 var MAX_DAYS = 7;
 try {
@@ -44143,13 +44364,14 @@ async function waitForPidExit(pid, timeoutMs) {
     }
   }
 }
-function stopSessionHostProcesses(appName) {
+async function stopSessionHostProcesses(appName) {
   const pidFile = path36.join(os27.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  let killedPid = null;
   try {
     if (fs25.existsSync(pidFile)) {
       const pid = Number.parseInt(fs25.readFileSync(pidFile, "utf8").trim(), 10);
       if (Number.isFinite(pid) && pid !== process.pid && isManagedSessionHostPid(pid)) {
-        killPid(pid);
+        if (killPid(pid)) killedPid = pid;
       }
     }
   } catch {
@@ -44159,6 +44381,15 @@ function stopSessionHostProcesses(appName) {
     } catch {
     }
   }
+  if (killedPid !== null) {
+    await waitForPidExit(killedPid, 15e3);
+  }
+}
+function isRetriableInstallLockError(error) {
+  const code = error?.code;
+  if (code === "EBUSY" || code === "EPERM") return true;
+  const text = `${error?.message || ""} ${error?.stderr || ""}`;
+  return /\bEBUSY\b|\bEPERM\b|resource busy or locked/i.test(text);
 }
 function removeDaemonPidFile() {
   const pidFile = path36.join(os27.homedir(), ".adhdev", "daemon.pid");
@@ -44238,22 +44469,37 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(`Waiting for parent pid ${payload.parentPid} to exit`);
     await waitForPidExit(payload.parentPid, 15e3);
   }
-  stopSessionHostProcesses(sessionHostAppName);
+  await stopSessionHostProcesses(sessionHostAppName);
   removeDaemonPidFile();
   cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
   const spec = `${payload.packageName}@${payload.targetVersion || "latest"}`;
   appendUpgradeLog(`Installing ${spec}`);
-  const installOutput = (0, import_child_process8.execFileSync)(
-    installCommand.command,
-    installCommand.args,
-    {
-      encoding: "utf8",
-      stdio: "pipe",
-      maxBuffer: 20 * 1024 * 1024,
-      env: buildInstallEnvWithNodeOnPath(),
-      ...installCommand.execOptions
+  const maxInstallAttempts = process.platform === "win32" ? 3 : 1;
+  let installOutput = "";
+  for (let attempt = 1; attempt <= maxInstallAttempts; attempt++) {
+    try {
+      installOutput = String((0, import_child_process8.execFileSync)(
+        installCommand.command,
+        installCommand.args,
+        {
+          encoding: "utf8",
+          stdio: "pipe",
+          maxBuffer: 20 * 1024 * 1024,
+          env: buildInstallEnvWithNodeOnPath(),
+          ...installCommand.execOptions
+        }
+      ));
+      break;
+    } catch (error) {
+      if (attempt < maxInstallAttempts && isRetriableInstallLockError(error)) {
+        appendUpgradeLog(`Install attempt ${attempt} hit a file lock (${error?.code || "lock"}); cleaning staging and retrying after backoff`);
+        cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
+        await new Promise((resolve24) => setTimeout(resolve24, attempt * 1500));
+        continue;
+      }
+      throw error;
     }
-  );
+  }
   if (installOutput.trim()) {
     appendUpgradeLog(installOutput.trim());
   }
@@ -46516,7 +46762,14 @@ var MESH_FORWARDABLE_SESSION_COMMANDS = /* @__PURE__ */ new Set([
   "resolve_action",
   "set_mode",
   "change_model",
-  "set_thought_level"
+  "set_thought_level",
+  // agent_command (send_chat / clear_history / stop) is session-scoped too: a command
+  // explicitly naming a targetSessionId MUST reach that session wherever it lives, never a
+  // different local session. Without forwarding, a misrouted/relayed send_chat for a REMOTE
+  // worker session that reaches the wrong daemon used to fuzzy-inject the task body into that
+  // daemon's own CLI session (TASKECHO coordinator self-echo). Forwarding to the owning daemon
+  // delivers it to the real worker instead. (findAdapter is also fail-closed as the backstop.)
+  "agent_command"
 ]);
 var READ_DEBUG_ENABLED2 = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
 function normalizeCommandSource(source) {
@@ -46869,7 +47122,7 @@ var DaemonCommandRouter = class {
       if (!collectMeshNodeHostedSessionIds(node).has(trimmed)) continue;
       const nodeDaemonId = readMeshNodeDaemonId(readObjectRecord(node));
       if (!nodeDaemonId) continue;
-      if (selfDaemonId && nodeDaemonId === selfDaemonId) return void 0;
+      if (selfDaemonId && daemonIdsEquivalent(nodeDaemonId, selfDaemonId)) return void 0;
       return nodeDaemonId;
     }
     return void 0;
@@ -47024,6 +47277,38 @@ var DaemonCommandRouter = class {
     if (record?.meta?.meshNodeId === nodeId) return true;
     return false;
   }
+  /**
+   * Best-effort recursive removal of a managed worktree directory.
+   *
+   * The git-registry de-registration is the safety-critical step of worktree
+   * teardown; a leftover directory must never gate dropping the node from the
+   * mesh. On Windows, `fs.rmSync` can throw EINVAL/EPERM/EBUSY on submodule
+   * gitlink (`.git`) files, long paths, junctions, or while a just-stopped
+   * delegate session is still releasing a handle/cwd on the directory. This
+   * helper absorbs those errors (never throws), with bounded retries + backoff
+   * to give handles time to release, and reports whether residue remains.
+   */
+  async bestEffortRemoveWorktreeDir(dir) {
+    if (!dir || !fs26.existsSync(dir)) return { removed: true, residue: false };
+    const sleep3 = (ms) => new Promise((resolve24) => setTimeout(resolve24, ms));
+    const ABSORB = /* @__PURE__ */ new Set(["EINVAL", "EPERM", "EBUSY", "ENOTEMPTY", "EACCES", "EMFILE", "ENFILE"]);
+    let lastErr;
+    for (let attempt = 0; attempt < 4; attempt++) {
+      try {
+        fs26.rmSync(dir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+        if (!fs26.existsSync(dir)) return { removed: true, residue: false };
+        lastErr = new Error("directory still present after rmSync");
+      } catch (e) {
+        lastErr = e;
+        const code = typeof e?.code === "string" ? e.code : "";
+        if (code && !ABSORB.has(code)) {
+          break;
+        }
+      }
+      await sleep3(150 * (attempt + 1));
+    }
+    return fs26.existsSync(dir) ? { removed: false, residue: true, error: String(lastErr?.message || lastErr || "unknown rm error") } : { removed: true, residue: false };
+  }
   async cleanupLocalWorktreeNode(args) {
     const workspace = typeof args.node?.workspace === "string" ? args.node.workspace.trim() : "";
     if (!workspace) {
@@ -47078,11 +47363,31 @@ var DaemonCommandRouter = class {
     const entries = await listWorktrees2(repoRoot);
     const managedEntry = entries.find((entry) => normalizePath(entry.path) === actualPath);
     if (!managedEntry) {
+      try {
+        const { execFile: execFile5 } = await import("child_process");
+        const { promisify: promisify8 } = await import("util");
+        const execFileAsync4 = promisify8(execFile5);
+        await execFileAsync4("git", ["worktree", "prune"], {
+          cwd: repoRoot,
+          encoding: "utf8",
+          timeout: 3e4,
+          maxBuffer: 4 * 1024 * 1024,
+          windowsHide: true
+        });
+      } catch {
+      }
+      const rm = await this.bestEffortRemoveWorktreeDir(workspace);
       return {
-        success: false,
-        code: "mesh_worktree_cleanup_not_registered",
-        error: `Refusing to remove '${workspace}' because it is not registered in git worktree list for '${repoRoot}'`,
-        recoveryHint: "Inspect git worktree list --porcelain from the source repo. If the path was already removed, prune git worktrees before retrying."
+        success: true,
+        removedPath: workspace,
+        repoRoot,
+        reason: "worktree_unregistered_residue_recovered",
+        recovered: true,
+        ...rm.residue ? {
+          residue: true,
+          residueWarning: `Worktree was already de-registered from git but the directory could not be fully removed (leftover residue at '${workspace}'): ${rm.error || "unknown error"}. The node will be dropped from the mesh; remove the directory manually if needed.`,
+          residueError: rm.error
+        } : {}
       };
     }
     if (managedEntry.branch && managedEntry.branch !== args.node.worktreeBranch) {
@@ -47145,8 +47450,8 @@ var DaemonCommandRouter = class {
             convergence: forceFallbackConvergence
           };
         } catch (deinitError) {
+          const rm = await this.bestEffortRemoveWorktreeDir(workspace);
           try {
-            fs26.rmSync(workspace, { recursive: true, force: true });
             await execFileAsync4("git", ["worktree", "prune"], {
               cwd: repoRoot,
               encoding: "utf8",
@@ -47154,23 +47459,22 @@ var DaemonCommandRouter = class {
               maxBuffer: GIT_MAX_BUFFER_CLEANUP,
               windowsHide: true
             });
-            return {
-              success: true,
-              removedPath: workspace,
-              repoRoot,
-              fallback: "fs_rm_worktree_prune",
-              forced: true,
-              reason: "working_trees_containing_submodules",
-              convergence: forceFallbackConvergence
-            };
-          } catch (rmError) {
-            return {
-              success: false,
-              code: "mesh_worktree_cleanup_failed",
-              error: `All removal fallbacks exhausted. deinit+remove: ${deinitError?.message || deinitError}; rmSync+prune: ${rmError?.message || rmError}`,
-              recoveryHint: "Manually remove the worktree directory and run git worktree prune from the source repo."
-            };
+          } catch {
           }
+          return {
+            success: true,
+            removedPath: workspace,
+            repoRoot,
+            fallback: "fs_rm_worktree_prune",
+            forced: true,
+            reason: "working_trees_containing_submodules",
+            convergence: forceFallbackConvergence,
+            ...rm.residue ? {
+              residue: true,
+              residueWarning: `Worktree was de-registered from git but the directory could not be fully removed (leftover residue at '${workspace}'): ${rm.error || "unknown error"}; deinit+remove first failed with: ${deinitError?.message || deinitError}. The node will be dropped from the mesh; remove the directory manually if needed.`,
+              residueError: rm.error
+            } : {}
+          };
         }
       }
       return {
@@ -50569,7 +50873,14 @@ ${hintLines.join("\n")}` : "",
             } catch {
             }
           }
-          return { success: true, removed, ...sessionCleanup ? { sessionCleanup } : {}, ...worktreeCleanup ? { worktreeCleanup } : {} };
+          const residueWarning = worktreeCleanup?.residue === true && typeof worktreeCleanup?.residueWarning === "string" ? worktreeCleanup.residueWarning : void 0;
+          return {
+            success: true,
+            removed,
+            ...residueWarning ? { residueWarning } : {},
+            ...sessionCleanup ? { sessionCleanup } : {},
+            ...worktreeCleanup ? { worktreeCleanup } : {}
+          };
         } catch (e) {
           return { success: false, error: e.message };
         }
@@ -53015,6 +53326,7 @@ var DaemonAgentStreamManager = class {
 
 // src/agent-stream/poller.ts
 init_logger();
+init_approval_utils();
 init_chat_message_normalization();
 var AgentStreamPoller = class {
   deps;
@@ -60562,6 +60874,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   createNativeHistoryDispatcher,
   createSessionDelivery,
   createWorktree,
+  daemonIdsEquivalent,
   deleteDirectDispatchesByTaskId,
   deleteMesh,
   deriveMeshReviewInboxItems,
@@ -60575,6 +60888,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   ensureSessionHostReady,
   evaluateFsm,
   execNpmCommandSync,
+  expandDaemonIdForms,
   fastForwardMeshNode,
   filterActivityChatMessages,
   filterChatMessagesByVisibility,
@@ -60665,6 +60979,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   loadMeshWorktreeBootstrapConfig,
   loadState,
   logCommand,
+  machineCoreFromDaemonId,
   markSessionDeliveriesTerminal,
   markSetupComplete,
   markStaleDirectDispatches,