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

package/dist/index.mjs

@@ -311,10 +311,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "ca5f944b7763a621357fc28a9f62ac398b0ced6c" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "ca5f944b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.352" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-22T07:17:05.715Z" : 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;
 }
@@ -2703,6 +2703,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, {
@@ -6310,10 +6561,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) {
@@ -6336,7 +6587,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";
@@ -6354,54 +6605,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()
     });
@@ -6462,10 +6713,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) {
@@ -6475,20 +6726,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) {
@@ -6496,15 +6747,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
   };
@@ -6518,43 +6769,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;
   }
@@ -6564,11 +6815,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;
 }
@@ -6577,7 +6828,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);
@@ -6599,8 +6850,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,
@@ -7811,251 +8062,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 machineCoreFromDaemonId(id) {
-  const trimmed = readString5(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 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(readString5(raw));
-  for (const raw of list) {
-    const core = machineCoreFromDaemonId(readString5(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 = 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 DAEMON_ID_PREFIXES;
-var init_dist = __esm({
-  "../mesh-shared/dist/index.mjs"() {
-    "use strict";
-    DAEMON_ID_PREFIXES = ["daemon_", "standalone_"];
-  }
-});
-
 // src/mesh/mesh-active-work.ts
 function readString6(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
@@ -21435,6 +21441,7 @@ function getSavedProviderSessions(state, filters) {
 
 // src/index.ts
 init_mesh_config();
+init_dist();
 init_coordinator_prompt();
 init_mesh_missions();
 init_mesh_task_stats();
@@ -39031,9 +39038,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;
@@ -46390,7 +46399,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) {
@@ -46743,7 +46759,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;
@@ -46898,6 +46914,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) {
@@ -46952,11 +47000,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) {
@@ -47019,8 +47087,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",
@@ -47028,23 +47096,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 {
@@ -50443,7 +50510,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 };
         }
@@ -60443,6 +60517,7 @@ export {
   createNativeHistoryDispatcher,
   createSessionDelivery,
   createWorktree,
+  daemonIdsEquivalent,
   deleteDirectDispatchesByTaskId,
   deleteMesh,
   deriveMeshReviewInboxItems,
@@ -60456,6 +60531,7 @@ export {
   ensureSessionHostReady,
   evaluateFsm,
   execNpmCommandSync,
+  expandDaemonIdForms,
   fastForwardMeshNode,
   filterActivityChatMessages,
   filterChatMessagesByVisibility,
@@ -60546,6 +60622,7 @@ export {
   loadMeshWorktreeBootstrapConfig,
   loadState,
   logCommand,
+  machineCoreFromDaemonId,
   markSessionDeliveriesTerminal,
   markSetupComplete,
   markStaleDirectDispatches,