@adhdev/daemon-standalone 0.9.82-rc.290 → 0.9.82-rc.292

package/dist/index.js

@@ -29983,10 +29983,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "396cb9c4084ea658cd3606b76948987cd875f138" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "396cb9c4" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.290" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-16T06:40:12.704Z" : void 0);
+      const commit = readInjected(true ? "7b5b620e2df42c7c3beb8a2983e3cc076c25f832" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "7b5b620e" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.292" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-16T09:16:52.266Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -35944,10 +35944,222 @@ ${rendered}`, "utf-8");
         STATUS_OPTIONS = { refreshUpstream: true, includeSubmodules: true, timeoutMs: 15e3 };
       }
     });
+    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 path40 = readString5(submodule.path);
+        const commit = readString5(submodule.commit);
+        const repoPath = readString5(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path40);
+        if (!path40 || !commit) return null;
+        const result = {
+          path: path40,
+          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 error48 = readString5(submodule.error);
+        if (error48) result.error = error48;
+        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 error48 = 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 } : {},
+        ...error48 ? { error: error48 } : {}
+      };
+    }
+    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 record2 = node && typeof node === "object" ? node : {};
+      return readString5(record2.id, record2.nodeId, record2.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 record2 = readRecord3(status);
+      if (!Object.keys(record2).length) return null;
+      const submodules = Array.isArray(record2.submodules) ? record2.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(record2.isGitRepo),
+        workspace: readString5(record2.workspace) ?? null,
+        repoRoot: readString5(record2.repoRoot, record2.repo_root) ?? null,
+        branch: readString5(record2.branch) ?? null,
+        upstream: readString5(record2.upstream) ?? null,
+        upstreamStatus: readString5(record2.upstreamStatus, record2.upstream_status) ?? null,
+        headCommit: readString5(record2.headCommit, record2.head_commit)?.slice(0, 12) ?? null,
+        ahead: readNumber(record2.ahead) ?? null,
+        behind: readNumber(record2.behind) ?? null,
+        dirtyCounts: {
+          staged: readNumber(record2.staged) ?? 0,
+          modified: readNumber(record2.modified) ?? 0,
+          untracked: readNumber(record2.untracked) ?? 0,
+          deleted: readNumber(record2.deleted) ?? 0,
+          renamed: readNumber(record2.renamed) ?? 0
+        },
+        lastCheckedAt: readNumber(record2.lastCheckedAt, record2.last_checked_at) ?? null,
+        submoduleCount: submodules.length,
+        submodules
+      };
+    }
+    var init_dist = __esm2({
+      "../mesh-shared/dist/index.mjs"() {
+        "use strict";
+      }
+    });
     function readNonEmptyString2(value) {
       return typeof value === "string" && value.trim() ? value.trim() : "";
     }
-    function readRecord3(value) {
+    function readRecord4(value) {
       return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
     }
     function buildMeshWorkerRelayStamp(currentSettings, meshContext) {
@@ -35971,13 +36183,13 @@ ${rendered}`, "utf-8");
       return readNonEmptyString2(event.targetSessionId) || readNonEmptyString2(event.sessionId) || readNonEmptyString2(event.instanceId) || readNonEmptyString2(fallback);
     }
     function readRefineJobId(event) {
-      const metadata = readRecord3(event.metadataEvent) || event;
-      const result = readRecord3(metadata.result);
-      const refineJob = readRecord3(result?.refineJob);
+      const metadata = readRecord4(event.metadataEvent) || event;
+      const result = readRecord4(metadata.result);
+      const refineJob = readRecord4(result?.refineJob);
       return readNonEmptyString2(metadata.jobId) || readNonEmptyString2(refineJob?.jobId);
     }
     function readWorkerResultMetadata(event) {
-      return readRecord3(event.workerResult) || readRecord3(event.meshWorkerResult) || readRecord3(event.structuredResult);
+      return readRecord4(event.workerResult) || readRecord4(event.meshWorkerResult) || readRecord4(event.structuredResult);
     }
     function formatCompletionMetadata(event) {
       const completionDiagnostic = event.completionDiagnostic && typeof event.completionDiagnostic === "object" ? event.completionDiagnostic : null;
@@ -36055,10 +36267,10 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
       }
       if (args.event === "refine:completed") {
         const jobId = readRefineJobId({ metadataEvent: args.metadataEvent });
-        const result = readRecord3(args.metadataEvent.result);
-        const validationSummary = readRecord3(result?.validationSummary);
-        const patchEquivalence = readRecord3(result?.patchEquivalence);
-        const finalConvergence = readRecord3(result?.finalBranchConvergenceState);
+        const result = readRecord4(args.metadataEvent.result);
+        const validationSummary = readRecord4(result?.validationSummary);
+        const patchEquivalence = readRecord4(result?.patchEquivalence);
+        const finalConvergence = readRecord4(result?.finalBranchConvergenceState);
         const validationStatus = readNonEmptyString2(validationSummary?.status);
         const patchStatus = readNonEmptyString2(patchEquivalence?.status) || (patchEquivalence?.equivalent === true ? "passed" : "");
         const into = readNonEmptyString2(result?.into);
@@ -36079,10 +36291,10 @@ Next step: ${nextStep}`;
       }
       if (args.event === "refine:failed") {
         const jobId = readRefineJobId({ metadataEvent: args.metadataEvent });
-        const result = readRecord3(args.metadataEvent.result);
-        const validationSummary = readRecord3(result?.validationSummary);
-        const patchEquivalence = readRecord3(result?.patchEquivalence);
-        const finalConvergence = readRecord3(result?.finalBranchConvergenceState);
+        const result = readRecord4(args.metadataEvent.result);
+        const validationSummary = readRecord4(result?.validationSummary);
+        const patchEquivalence = readRecord4(result?.patchEquivalence);
+        const finalConvergence = readRecord4(result?.finalBranchConvergenceState);
         const code = readNonEmptyString2(result?.code);
         const error48 = readNonEmptyString2(result?.error);
         const validationStatus = readNonEmptyString2(validationSummary?.status);
@@ -36127,9 +36339,9 @@ Next step: ${nextStep}`;
       return out;
     }
     function readRefineJobId2(event) {
-      const metadata = readRecord3(event.metadataEvent) || event;
-      const result = readRecord3(metadata.result);
-      const refineJob = readRecord3(result?.refineJob);
+      const metadata = readRecord4(event.metadataEvent) || event;
+      const result = readRecord4(metadata.result);
+      const refineJob = readRecord4(result?.refineJob);
       return readNonEmptyString2(metadata.jobId) || readNonEmptyString2(refineJob?.jobId);
     }
     function hasPendingRefineTerminalEventDuplicate(event) {
@@ -36141,13 +36353,13 @@ Next step: ${nextStep}`;
       );
     }
     function buildPendingEventFingerprint(event) {
-      const metadata = readRecord3(event.metadataEvent) || {};
+      const metadata = readRecord4(event.metadataEvent) || {};
       if (event.event === "worktree_bootstrap_complete" || event.event === "worktree_bootstrap_failed") {
         return [event.meshId, event.event, event.nodeId || ""].join("::");
       }
       const sessionId = resolveEventSessionId(metadata);
       const providerSessionId = readNonEmptyString2(metadata.providerSessionId);
-      const taskId = readNonEmptyString2(metadata.taskId) || readNonEmptyString2(readRecord3(metadata.payload)?.taskId);
+      const taskId = readNonEmptyString2(metadata.taskId) || readNonEmptyString2(readRecord4(metadata.payload)?.taskId);
       const jobId = readRefineJobId2(event);
       const timestamp = metadata.timestamp !== void 0 && metadata.timestamp !== null ? String(metadata.timestamp) : "";
       return [
@@ -36215,15 +36427,15 @@ Next step: ${nextStep}`;
       for (let i = entries.length - 1; i >= 0; i--) {
         const entry = entries[i];
         if (entry.kind !== "task_completed" && entry.kind !== "task_failed") continue;
-        const payload = readRecord3(entry.payload);
+        const payload = readRecord4(entry.payload);
         if (payload?.source !== "refine_mesh_node_async_job") continue;
-        const refineJob = readRecord3(payload.refineJob);
+        const refineJob = readRecord4(payload.refineJob);
         const jobId = readNonEmptyString2(refineJob?.jobId);
         if (!jobId || !acceptedJobIds.has(jobId)) continue;
         const eventName = entry.kind === "task_completed" ? "refine:completed" : "refine:failed";
         if (existingTerminalJobIds.has(`${eventName}:${jobId}`)) continue;
         existingTerminalJobIds.add(`${eventName}:${jobId}`);
-        const result = readRecord3(payload.result);
+        const result = readRecord4(payload.result);
         const metadataEvent = {
           source: "refine_mesh_node_async_job",
           jobId,
@@ -36835,7 +37047,7 @@ Next step: ${nextStep}`;
       const providerType = readNonEmptyString2(args.metadataEvent.providerType);
       const providerSessionId = readNonEmptyString2(args.metadataEvent.providerSessionId);
       const workerResult = readWorkerResultMetadata(args.metadataEvent);
-      const completionDiagnostic = readRecord3(args.metadataEvent.completionDiagnostic);
+      const completionDiagnostic = readRecord4(args.metadataEvent.completionDiagnostic);
       const finalSummary = readNonEmptyString2(args.metadataEvent.finalSummary);
       const status = readNonEmptyString2(args.metadataEvent.status).toLowerCase();
       const explicitCompletionEvidence = Boolean(
@@ -37554,7 +37766,7 @@ Next step: ${nextStep}`;
       return { reason: `provider_priority_unusable: ${failed.join("; ") || nodeId}` };
     }
     function readMeshNodeId(node) {
-      return readNonEmptyString2(node?.id) || readNonEmptyString2(node?.nodeId) || readNonEmptyString2(node?.node_id);
+      return normalizeMeshNodeId(node) ?? "";
     }
     async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       const queue = getQueue(meshId);
@@ -37783,7 +37995,7 @@ Next step: ${nextStep}`;
     }
     async function maybeAutoFastForwardIdleNode(components, args) {
       const mesh = getMeshWithCache(components, args.meshId);
-      const node = mesh?.nodes?.find((candidate) => candidate?.id === args.nodeId || candidate?.nodeId === args.nodeId);
+      const node = mesh?.nodes?.find((candidate) => meshNodeIdMatches(candidate, args.nodeId));
       const workspace = readNonEmptyString2(node?.workspace);
       if (!workspace) return;
       if (!(0, import_fs10.existsSync)(workspace)) return;
@@ -38385,6 +38597,7 @@ Next step: ${nextStep}`;
         init_mesh_events_pending();
         init_mesh_routing();
         init_repo_mesh_types();
+        init_dist();
         init_mesh_events_stale();
         init_mesh_events_utils();
         REMOTE_IDLE_SESSION_TTL_MS = 5 * 60 * 1e3;
@@ -47252,9 +47465,10 @@ ${lastSnapshot}`;
       };
     }
     init_mesh_work_queue();
+    init_dist();
     var DIRECT_DISPATCH_VIA = /* @__PURE__ */ new Set(["p2p_direct", "local_direct", "mesh_send_task"]);
     var TERMINAL_LEDGER_KINDS = /* @__PURE__ */ new Set(["task_completed", "task_failed", "task_stalled"]);
-    function readString5(value) {
+    function readString6(value) {
       return typeof value === "string" && value.trim() ? value.trim() : void 0;
     }
     function summarizeMessage(message) {
@@ -47269,7 +47483,7 @@ ${lastSnapshot}`;
     function sessionStatusFromNodes(nodes, nodeId, sessionId) {
       if (!Array.isArray(nodes)) return {};
       if (!nodeId) return { staleReason: "direct task has no node id" };
-      const node = nodes.find((item) => readString5(item?.id) === nodeId || readString5(item?.nodeId) === nodeId || readString5(item?.node_id) === nodeId);
+      const node = nodes.find((item) => meshNodeIdMatches(item, nodeId));
       if (!node) return { staleReason: "direct task node is no longer in the live mesh" };
       if (!sessionId) return {};
       const candidates = [];
@@ -47293,12 +47507,12 @@ ${lastSnapshot}`;
       }
       const session = candidates.find((item) => {
         if (typeof item === "string") return item === sessionId;
-        const id = readString5(item?.id) || readString5(item?.sessionId) || readString5(item?.session_id) || readString5(item?.runtimeSessionId) || readString5(item?.instanceId);
+        const id = readString6(item?.id) || readString6(item?.sessionId) || readString6(item?.session_id) || readString6(item?.runtimeSessionId) || readString6(item?.instanceId);
         return id === sessionId;
       });
       if (!session) return { staleReason: "direct task session is not present in live session records" };
       if (typeof session === "string") return {};
-      const raw = `${readString5(session.status) || ""} ${readString5(session.lifecycle) || ""} ${readString5(session.state) || ""} ${readString5(session.activeChat?.status) || ""}`.toLowerCase();
+      const raw = `${readString6(session.status) || ""} ${readString6(session.lifecycle) || ""} ${readString6(session.state) || ""} ${readString6(session.activeChat?.status) || ""}`.toLowerCase();
       if (raw.includes("approval")) return { status: "awaiting_approval" };
       if (raw.includes("generating") || raw.includes("running") || raw.includes("busy")) return { status: "generating" };
       if (raw.includes("failed") || raw.includes("stopped") || raw.includes("terminated") || raw.includes("exited")) return { status: "failed" };
@@ -47309,14 +47523,14 @@ ${lastSnapshot}`;
       if (entry.kind !== "task_dispatched") return false;
       const payload = entry.payload || {};
       if (payload.source === "direct") return true;
-      const via = readString5(payload.via);
+      const via = readString6(payload.via);
       return Boolean(via && DIRECT_DISPATCH_VIA.has(via) && payload.source !== "queue");
     }
     function directDispatchTaskId(entry) {
-      return readString5(entry.payload?.taskId) || entry.id;
+      return readString6(entry.payload?.taskId) || entry.id;
     }
     function terminalMatchesDispatch(terminal, dispatch, taskId) {
-      const terminalTaskId = readString5(terminal.payload?.taskId);
+      const terminalTaskId = readString6(terminal.payload?.taskId);
       if (terminalTaskId && terminalTaskId === taskId) return true;
       if (terminalTaskId && terminalTaskId !== taskId) return false;
       if (dispatch.sessionId && terminal.sessionId === dispatch.sessionId) return true;
@@ -47439,7 +47653,7 @@ ${lastSnapshot}`;
           const isNoTransition = !terminalStatus && !live.status;
           const isIdleUnacknowledged = status === "idle";
           const ledgerOnlyStaleReason = !terminalRow && (isIdleUnacknowledged || isNoTransition || dispatchedToIdleSession && isIdleUnacknowledged) ? "direct task dispatch has no provider acknowledgement, transcript append, or active runtime transition" : void 0;
-          const message = readString5(dispatch.payload?.message) || readString5(dispatch.payload?.summary) || "";
+          const message = readString6(dispatch.payload?.message) || readString6(dispatch.payload?.summary) || "";
           const { title, summary: summary2 } = summarizeMessage(message);
           const isFreshUnacknowledged = Boolean(ledgerOnlyStaleReason && !live.staleReason);
           const record2 = {
@@ -47448,11 +47662,11 @@ ${lastSnapshot}`;
             status,
             nodeId: dispatch.nodeId,
             sessionId: dispatch.sessionId,
-            providerType: dispatch.providerType || readString5(dispatch.payload?.providerType),
-            taskTitle: readString5(dispatch.payload?.taskTitle) || title,
-            taskSummary: readString5(dispatch.payload?.taskSummary) || summary2,
+            providerType: dispatch.providerType || readString6(dispatch.payload?.providerType),
+            taskTitle: readString6(dispatch.payload?.taskTitle) || title,
+            taskSummary: readString6(dispatch.payload?.taskSummary) || summary2,
             message,
-            taskMode: readString5(dispatch.payload?.taskMode),
+            taskMode: readString6(dispatch.payload?.taskMode),
             createdAt: dispatch.timestamp,
             updatedAt: terminal?.timestamp || dispatch.timestamp,
             dispatchedAt: dispatch.timestamp,
@@ -47487,7 +47701,7 @@ ${lastSnapshot}`;
           const isNoTransition = !terminalStatus && !live.status;
           const isIdleUnacknowledged = status === "idle";
           const ledgerOnlyStaleReason = !terminalRow && (isIdleUnacknowledged || isNoTransition || dispatchedToIdleSession && isIdleUnacknowledged) ? "direct task dispatch has no provider acknowledgement, transcript append, or active runtime transition" : void 0;
-          const message = readString5(dispatch.payload?.message) || readString5(dispatch.payload?.summary) || "";
+          const message = readString6(dispatch.payload?.message) || readString6(dispatch.payload?.summary) || "";
           const { title, summary: summary2 } = summarizeMessage(message);
           const isFreshUnacknowledged = Boolean(ledgerOnlyStaleReason && !live.staleReason);
           const record2 = {
@@ -47496,11 +47710,11 @@ ${lastSnapshot}`;
             status,
             nodeId: dispatch.nodeId,
             sessionId: dispatch.sessionId,
-            providerType: dispatch.providerType || readString5(dispatch.payload?.providerType),
-            taskTitle: readString5(dispatch.payload?.taskTitle) || title,
-            taskSummary: readString5(dispatch.payload?.taskSummary) || summary2,
+            providerType: dispatch.providerType || readString6(dispatch.payload?.providerType),
+            taskTitle: readString6(dispatch.payload?.taskTitle) || title,
+            taskSummary: readString6(dispatch.payload?.taskSummary) || summary2,
             message,
-            taskMode: readString5(dispatch.payload?.taskMode),
+            taskMode: readString6(dispatch.payload?.taskMode),
             createdAt: dispatch.timestamp,
             updatedAt: terminal?.timestamp || dispatch.timestamp,
             dispatchedAt: dispatch.timestamp,
@@ -69237,203 +69451,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
     init_config();
     init_cli_detector();
     init_git_status();
-    function readRecord5(value) {
-      return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-    }
-    function readString6(...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 = readRecord5(entry);
-        const path40 = readString6(submodule.path);
-        const commit = readString6(submodule.commit);
-        const repoPath = readString6(submodule.repoPath, submodule.repo_root) ?? joinRepoPath(parentRepoRoot, path40);
-        if (!path40 || !commit) return null;
-        const result = {
-          path: path40,
-          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 error48 = readString6(submodule.error);
-        if (error48) result.error = error48;
-        return result;
-      }).filter((entry) => entry !== null);
-      return submodules.length > 0 ? submodules : void 0;
-    }
-    function hasGitStatusEvidence(status) {
-      return readBoolean(status.isGitRepo) !== void 0 || Boolean(readString6(status.branch, status.upstream, status.upstreamStatus, status.upstream_status, status.headCommit)) || Boolean(readString6(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 = readString6(status.repoRoot, status.repo_root, node.repoRoot, node.repo_root, status.workspace, node.workspace) || void 0;
-      const submodules = readGitSubmodules(status.submodules, repoRoot);
-      const upstreamStatus = readString6(status.upstreamStatus, status.upstream_status);
-      const upstreamFetchedAt = readNumber(status.upstreamFetchedAt, status.upstream_fetched_at);
-      const upstreamFetchError = readString6(status.upstreamFetchError, status.upstream_fetch_error);
-      const error48 = readString6(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: readString6(status.workspace, node.workspace) || "",
-        repoRoot: repoRoot ?? null,
-        isGitRepo,
-        branch: readString6(status.branch) ?? null,
-        headCommit: readString6(status.headCommit) ?? null,
-        headMessage: readString6(status.headMessage) ?? null,
-        upstream: readString6(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 } : {},
-        ...error48 ? { error: error48 } : {}
-      };
-    }
-    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 = readRecord5(node.lastGit ?? node.last_git);
-      const gitResult = readRecord5(rawGit.result);
-      const directStatus = readRecord5(rawGit.status);
-      const nestedStatus = readRecord5(gitResult.status);
-      const rawProbe = readRecord5(node.lastProbe ?? node.last_probe);
-      const probeGit = readRecord5(rawProbe.git);
-      const probeGitResult = readRecord5(probeGit.result);
-      const probeDirectStatus = readRecord5(probeGit.status);
-      const probeNestedStatus = readRecord5(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 summarizeGitShape(status) {
-      const record2 = readRecord5(status);
-      if (!Object.keys(record2).length) return null;
-      const submodules = Array.isArray(record2.submodules) ? record2.submodules.map((entry) => {
-        const sub = readRecord5(entry);
-        return {
-          path: readString6(sub.path) ?? null,
-          commit: readString6(sub.commit)?.slice(0, 12) ?? null,
-          dirty: readBoolean(sub.dirty) ?? false,
-          outOfSync: readBoolean(sub.outOfSync, sub.out_of_sync) ?? false
-        };
-      }) : [];
-      return {
-        isGitRepo: readBoolean(record2.isGitRepo),
-        workspace: readString6(record2.workspace) ?? null,
-        repoRoot: readString6(record2.repoRoot, record2.repo_root) ?? null,
-        branch: readString6(record2.branch) ?? null,
-        upstream: readString6(record2.upstream) ?? null,
-        upstreamStatus: readString6(record2.upstreamStatus, record2.upstream_status) ?? null,
-        headCommit: readString6(record2.headCommit, record2.head_commit)?.slice(0, 12) ?? null,
-        ahead: readNumber(record2.ahead) ?? null,
-        behind: readNumber(record2.behind) ?? null,
-        dirtyCounts: {
-          staged: readNumber(record2.staged) ?? 0,
-          modified: readNumber(record2.modified) ?? 0,
-          untracked: readNumber(record2.untracked) ?? 0,
-          deleted: readNumber(record2.deleted) ?? 0,
-          renamed: readNumber(record2.renamed) ?? 0
-        },
-        lastCheckedAt: readNumber(record2.lastCheckedAt, record2.last_checked_at) ?? null,
-        submoduleCount: submodules.length,
-        submodules
-      };
-    }
+    init_dist();
     init_logger();
     var fs222 = __toESM2(require("fs"));
     var path33 = __toESM2(require("path"));
@@ -70495,7 +70513,10 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
         branchConvergenceSummary: status?.branchConvergenceSummary ?? status?.branch_convergence_summary ?? null,
         nodeCount: nodes.length,
         nodes: nodes.map((node) => ({
-          nodeId: readStringValue(node?.nodeId, node?.id) ?? null,
+          // Status emits the id under `nodeId` (3-way input absorbed). The
+          // inline cache keeps `id` and `nodeId` equal, so this serialized form
+          // round-trips back through the cache without flipping shape.
+          nodeId: normalizeMeshNodeId(node) ?? null,
           daemonId: readStringValue(node?.daemonId, node?.daemon_id) ?? null,
           workspace: readStringValue(node?.workspace, node?.git?.workspace) ?? null,
           health: readStringValue(node?.health) ?? null,
@@ -70740,7 +70761,23 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       return inlineMesh.nodes.some((node) => hasInlineMeshTransientNodeState(node));
     }
     function readInlineMeshNodeId(node) {
-      return readStringValue(node?.id, node?.nodeId) || "";
+      return normalizeMeshNodeId(node) ?? "";
+    }
+    function foldMeshNodeIdentityToCanonical(node) {
+      if (!node || typeof node !== "object" || Array.isArray(node)) return node;
+      const canonical = normalizeMeshNodeId(node);
+      if (canonical === void 0) return node;
+      if (node.id === canonical && node.nodeId === canonical && node.node_id === void 0) return node;
+      node.id = canonical;
+      node.nodeId = canonical;
+      if ("node_id" in node) delete node.node_id;
+      return node;
+    }
+    function normalizeInlineMeshNodeIdentity(inlineMesh) {
+      if (!inlineMesh || typeof inlineMesh !== "object" || Array.isArray(inlineMesh)) return inlineMesh;
+      if (!Array.isArray(inlineMesh.nodes) || inlineMesh.nodes.length === 0) return inlineMesh;
+      for (const node of inlineMesh.nodes) foldMeshNodeIdentityToCanonical(node);
+      return inlineMesh;
     }
     function sanitizeInlineMesh(inlineMesh) {
       if (!inlineMesh || typeof inlineMesh !== "object" || Array.isArray(inlineMesh)) return inlineMesh;
@@ -70842,7 +70879,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       return "online";
     }
     function readMeshNodeLabel(status, node) {
-      return readStringValue(status.nodeId, node?.id, node?.nodeId) ?? "unknown";
+      return readStringValue(status.nodeId, normalizeMeshNodeId(node)) ?? "unknown";
     }
     function buildInlineMeshBranchConvergence(args) {
       const git = readObjectRecord(args.status.git);
@@ -71121,7 +71158,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       let peerConfirmedCount = 0;
       const unavailableNodeIds = [];
       for (const [nodeIndex, node] of nodes.entries()) {
-        const nodeId = readStringValue(node?.id, node?.nodeId) || `node_${nodeIndex}`;
+        const nodeId = normalizeMeshNodeId(node) || `node_${nodeIndex}`;
         const workspace = readStringValue(node?.workspace);
         const daemonId = readStringValue(node?.daemonId);
         const isSelfNode = Boolean(
@@ -71252,7 +71289,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const liveWorkspaces = /* @__PURE__ */ new Set();
       const missingLocalWorktreeNodeIds = /* @__PURE__ */ new Set();
       for (const node of args.nodes || []) {
-        const nodeId = readStringValue(node?.id, node?.nodeId);
+        const nodeId = normalizeMeshNodeId(node);
         const workspace = readStringValue(node?.workspace);
         if (nodeId) liveNodeIds.add(nodeId);
         if (workspace) liveWorkspaces.add(workspace);
@@ -71377,9 +71414,13 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
       return { enabled: false };
     }
-    async function computeGitPatchId(cwd, fromRef, toRef) {
+    async function computeGitPatchId(cwd, fromRef, toRef, excludePaths = []) {
       const { execFileSync: execFileSync6 } = await import("child_process");
-      const diff = execFileSync6("git", ["diff", "--patch", "--full-index", fromRef, toRef], {
+      const diffArgs = ["diff", "--patch", "--full-index", fromRef, toRef];
+      if (excludePaths.length > 0) {
+        diffArgs.push("--", ".", ...excludePaths.map((path40) => `:(exclude)${path40}`));
+      }
+      const diff = execFileSync6("git", diffArgs, {
         cwd,
         encoding: "utf8",
         maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
@@ -71448,8 +71489,9 @@ ${mergeTreeErr?.stderr || ""}`;
             gitlinkTrivialFastForward
           };
         }
-        const expectedPatchId = await computeGitPatchId(repoRoot, mergeBase, branchHead);
-        const actualPatchId = await computeGitPatchId(repoRoot, baseHead, mergedTree);
+        const ffGitlinkExcludePaths = collectFastForwardGitlinkPaths(repoRoot, baseHead, branchHead);
+        const expectedPatchId = await computeGitPatchId(repoRoot, mergeBase, branchHead, ffGitlinkExcludePaths);
+        const actualPatchId = await computeGitPatchId(repoRoot, baseHead, mergedTree, ffGitlinkExcludePaths);
         const equivalent = expectedPatchId === actualPatchId;
         return {
           status: equivalent ? "passed" : "failed",
@@ -71645,6 +71687,14 @@ ${e?.stderr || ""}`
         return [];
       }
     }
+    function collectFastForwardGitlinkPaths(repoRoot, baseHead, branchHead) {
+      return readChangedGitlinkPaths(repoRoot, baseHead, branchHead).filter((path40) => {
+        const baseCommit = readTreeObject(repoRoot, baseHead, path40);
+        const branchCommit = readTreeObject(repoRoot, branchHead, path40);
+        if (!baseCommit || !branchCommit) return false;
+        return isSubmoduleFastForward((0, import_path10.resolve)(repoRoot, path40), baseCommit, branchCommit);
+      });
+    }
     function evaluateGitlinkTrivialFastForward(repoRoot, baseHead, branchHead) {
       const changedGitlinks = readChangedGitlinkPaths(repoRoot, baseHead, branchHead).map((path40) => {
         const baseCommit = readTreeObject(repoRoot, baseHead, path40);
@@ -71694,20 +71744,95 @@ ${e?.stderr || ""}`
       }
       return { trivial: true, gitlinks: changedGitlinks };
     }
+    function buildTreeWithGitlinksEqualized(repoRoot, commitish, paths, placeholderCommit) {
+      try {
+        const tree = (0, import_node_child_process6.execFileSync)("git", ["rev-parse", `${commitish}^{tree}`], {
+          cwd: repoRoot,
+          encoding: "utf8",
+          maxBuffer: 1024 * 1024
+        }).trim();
+        if (!tree) return void 0;
+        const updates = paths.map((path40) => `160000 commit ${placeholderCommit}	${path40}`).join("\n");
+        if (!updates) return tree;
+        const tmpIndex = (0, import_path10.join)(resolveGitDir(repoRoot), `adhdev-refine-eq-${commitish.slice(0, 12)}.index`);
+        const env2 = { ...process.env, GIT_INDEX_FILE: tmpIndex };
+        try {
+          (0, import_node_child_process6.execFileSync)("git", ["read-tree", tree], { cwd: repoRoot, env: env2, stdio: "ignore" });
+          (0, import_node_child_process6.execFileSync)("git", ["update-index", "--index-info"], {
+            cwd: repoRoot,
+            env: env2,
+            input: `${updates}
+`,
+            encoding: "utf8",
+            stdio: ["pipe", "ignore", "ignore"]
+          });
+          const newTree = (0, import_node_child_process6.execFileSync)("git", ["write-tree"], { cwd: repoRoot, env: env2, encoding: "utf8" }).trim();
+          return newTree || void 0;
+        } finally {
+          try {
+            fs24.rmSync(tmpIndex, { force: true });
+          } catch {
+          }
+        }
+      } catch {
+        return void 0;
+      }
+    }
     function synthesizeTrivialFastForwardMergeTree(repoRoot, baseHead, branchHead, gitlinks) {
       try {
-        const baseTree = (0, import_node_child_process6.execFileSync)("git", ["rev-parse", `${baseHead}^{tree}`], {
+        const branchGitlinks = gitlinks.filter((entry) => entry.branchCommit);
+        const gitlinkPaths = branchGitlinks.map((entry) => entry.path);
+        const mergeBase = (0, import_node_child_process6.execFileSync)("git", ["merge-base", baseHead, branchHead], {
+          cwd: repoRoot,
+          encoding: "utf8",
+          maxBuffer: 1024 * 1024
+        }).trim();
+        let mergedContentTree;
+        if (mergeBase && gitlinkPaths.length > 0) {
+          const placeholder = readTreeObject(repoRoot, mergeBase, gitlinkPaths[0]) || branchGitlinks[0].branchCommit;
+          const baseEqTree = buildTreeWithGitlinksEqualized(repoRoot, mergeBase, gitlinkPaths, placeholder);
+          const oursEqTree = buildTreeWithGitlinksEqualized(repoRoot, baseHead, gitlinkPaths, placeholder);
+          const theirsEqTree = buildTreeWithGitlinksEqualized(repoRoot, branchHead, gitlinkPaths, placeholder);
+          if (baseEqTree && oursEqTree && theirsEqTree) {
+            try {
+              const baseEqCommit = (0, import_node_child_process6.execFileSync)("git", ["commit-tree", baseEqTree, "-m", "refine-ff-base"], {
+                cwd: repoRoot,
+                encoding: "utf8",
+                maxBuffer: 1024 * 1024
+              }).trim();
+              const oursEqCommit = (0, import_node_child_process6.execFileSync)("git", ["commit-tree", oursEqTree, "-p", baseEqCommit, "-m", "refine-ff-ours"], {
+                cwd: repoRoot,
+                encoding: "utf8",
+                maxBuffer: 1024 * 1024
+              }).trim();
+              const theirsEqCommit = (0, import_node_child_process6.execFileSync)("git", ["commit-tree", theirsEqTree, "-p", baseEqCommit, "-m", "refine-ff-theirs"], {
+                cwd: repoRoot,
+                encoding: "utf8",
+                maxBuffer: 1024 * 1024
+              }).trim();
+              const mergeOut = (0, import_node_child_process6.execFileSync)("git", ["merge-tree", "--write-tree", oursEqCommit, theirsEqCommit], {
+                cwd: repoRoot,
+                encoding: "utf8",
+                maxBuffer: REFINE_PATCH_EQUIVALENCE_OUTPUT_LIMIT_BYTES
+              }).trim();
+              mergedContentTree = mergeOut.split(/\s+/)[0] || void 0;
+            } catch {
+              mergedContentTree = void 0;
+            }
+          }
+        }
+        const contentTree = mergedContentTree || (0, import_node_child_process6.execFileSync)("git", ["rev-parse", `${baseHead}^{tree}`], {
           cwd: repoRoot,
           encoding: "utf8",
           maxBuffer: 1024 * 1024
         }).trim();
-        if (!baseTree) return void 0;
-        const updates = gitlinks.filter((entry) => entry.branchCommit).map((entry) => `160000 commit ${entry.branchCommit}	${entry.path}`).join("\n");
-        if (!updates) return baseTree;
+        if (!contentTree) return void 0;
+        const updates = branchGitlinks.map((entry) => `160000 commit ${entry.branchCommit}	${entry.path}`).join("\n");
+        if (!updates) return contentTree;
         const tmpIndex = (0, import_path10.join)(resolveGitDir(repoRoot), `adhdev-refine-ff-${baseHead.slice(0, 12)}-${branchHead.slice(0, 12)}.index`);
         const env2 = { ...process.env, GIT_INDEX_FILE: tmpIndex };
         try {
-          (0, import_node_child_process6.execFileSync)("git", ["read-tree", baseTree], { cwd: repoRoot, env: env2, stdio: "ignore" });
+          (0, import_node_child_process6.execFileSync)("git", ["read-tree", contentTree], { cwd: repoRoot, env: env2, stdio: "ignore" });
           (0, import_node_child_process6.execFileSync)("git", ["update-index", "--index-info"], {
             cwd: repoRoot,
             env: env2,
@@ -72367,7 +72492,7 @@ ${e?.stderr || ""}`
     function buildMemberJoinNode(mesh, args, fallbackDaemonId) {
       const requestedNodeId = typeof args?.memberNodeId === "string" ? args.memberNodeId.trim() : "";
       const explicit = args?.memberNode && typeof args.memberNode === "object" && !Array.isArray(args.memberNode) ? args.memberNode : null;
-      const configured = Array.isArray(mesh?.nodes) ? requestedNodeId ? mesh.nodes.find((node) => node?.id === requestedNodeId || node?.nodeId === requestedNodeId) : mesh.nodes[0] : null;
+      const configured = Array.isArray(mesh?.nodes) ? requestedNodeId ? mesh.nodes.find((node) => meshNodeIdMatches(node, requestedNodeId)) : mesh.nodes[0] : null;
       const source = explicit || configured;
       const workspace = typeof source?.workspace === "string" && source.workspace.trim() ? source.workspace.trim() : typeof args?.workspace === "string" && args.workspace.trim() ? args.workspace.trim() : process.cwd();
       if (!workspace) return null;
@@ -72423,7 +72548,7 @@ ${e?.stderr || ""}`
           if (nodeId) unavailableNodeIds.add(nodeId);
         }
         const nodes = snapshot.nodes.map((statusNode) => {
-          const nodeId = readStringValue(statusNode?.nodeId, statusNode?.id);
+          const nodeId = normalizeMeshNodeId(statusNode);
           const inlineNode = nodeId ? inlineNodesById.get(nodeId) : void 0;
           if (!inlineNode) return statusNode;
           const liveGit = buildInlineMeshTransitGitStatus(inlineNode);
@@ -72536,7 +72661,7 @@ ${e?.stderr || ""}`
       }
       warmInlineMeshCache(meshId, inlineMesh) {
         if (!inlineMesh || typeof inlineMesh !== "object") return void 0;
-        const sanitizedInlineMesh = sanitizeInlineMesh(inlineMesh);
+        const sanitizedInlineMesh = sanitizeInlineMesh(normalizeInlineMeshNodeIdentity(inlineMesh));
         const cached22 = this.inlineMeshCache.get(meshId);
         if (cached22) {
           const merged = reconcileInlineMeshCache(cached22, sanitizedInlineMesh);
@@ -72553,7 +72678,7 @@ ${e?.stderr || ""}`
           if (cached3) {
             if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
               const merged = reconcileInlineMeshCache(cached3, inlineMesh);
-              this.inlineMeshCache.set(meshId, sanitizeInlineMesh(merged));
+              this.inlineMeshCache.set(meshId, sanitizeInlineMesh(normalizeInlineMeshNodeIdentity(merged)));
               return { mesh: merged, inline: true, source: "inline_cache" };
             }
             return { mesh: cached3, inline: true, source: "inline_cache" };
@@ -72589,17 +72714,19 @@ ${e?.stderr || ""}`
         return null;
       }
       updateInlineMeshNode(meshId, mesh, node) {
-        if (!mesh || !Array.isArray(mesh.nodes) || !node?.id) return;
-        const idx = mesh.nodes.findIndex((entry) => entry?.id === node.id || entry?.nodeId === node.id);
+        const incomingId = normalizeMeshNodeId(node);
+        if (!mesh || !Array.isArray(mesh.nodes) || !incomingId) return;
+        const idx = mesh.nodes.findIndex((entry) => meshNodeIdMatches(entry, incomingId));
         if (idx >= 0) mesh.nodes[idx] = node;
         else mesh.nodes.push(node);
         mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+        for (const entry of mesh.nodes) foldMeshNodeIdentityToCanonical(entry);
         this.inlineMeshCache.set(meshId, mesh);
         this.invalidateAggregateMeshStatus(meshId);
       }
       removeInlineMeshNode(meshId, mesh, nodeId) {
         if (!mesh || !Array.isArray(mesh.nodes)) return false;
-        const idx = mesh.nodes.findIndex((entry) => entry?.id === nodeId || entry?.nodeId === nodeId);
+        const idx = mesh.nodes.findIndex((entry) => meshNodeIdMatches(entry, nodeId));
         if (idx === -1) return false;
         mesh.nodes.splice(idx, 1);
         mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -72630,7 +72757,7 @@ ${e?.stderr || ""}`
           };
         }
         const worktreeExists = fs24.existsSync(workspace);
-        const sourceNode = args.node?.clonedFromNodeId ? args.mesh?.nodes?.find((n) => n.id === args.node.clonedFromNodeId || n.nodeId === args.node.clonedFromNodeId) : args.mesh?.nodes?.find((n) => !n.isLocalWorktree);
+        const sourceNode = args.node?.clonedFromNodeId ? args.mesh?.nodes?.find((n) => meshNodeIdMatches(n, args.node.clonedFromNodeId)) : args.mesh?.nodes?.find((n) => !n.isLocalWorktree);
         const repoRoot = typeof sourceNode?.repoRoot === "string" && sourceNode.repoRoot.trim() ? sourceNode.repoRoot.trim() : typeof sourceNode?.workspace === "string" && sourceNode.workspace.trim() ? sourceNode.workspace.trim() : "";
         if (!worktreeExists) {
           return { success: true, skipped: true, removedPath: workspace, repoRoot: repoRoot || void 0, reason: "worktree_path_missing" };
@@ -73273,12 +73400,12 @@ ${e?.stderr || ""}`
         try {
           const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
           const mesh = meshRecord?.mesh;
-          const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+          const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
           if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh`, refineStages };
           if (!node.isLocalWorktree || !node.workspace) {
             return { success: false, error: `Refinery requires a local worktree node`, refineStages };
           }
-          const sourceNode = node.clonedFromNodeId ? mesh?.nodes.find((n) => n.id === node.clonedFromNodeId || n.nodeId === node.clonedFromNodeId) : mesh?.nodes.find((n) => !n.isLocalWorktree);
+          const sourceNode = node.clonedFromNodeId ? mesh?.nodes.find((n) => meshNodeIdMatches(n, node.clonedFromNodeId)) : mesh?.nodes.find((n) => !n.isLocalWorktree);
           const repoRoot = sourceNode?.repoRoot || sourceNode?.workspace;
           if (!repoRoot) return { success: false, error: "Source node repoRoot not found", refineStages };
           const { execFile: execFile5 } = await import("child_process");
@@ -73913,7 +74040,7 @@ ${hintLines.join("\n")}` : "",
           const missing = [];
           const nonWorktree = [];
           for (const nodeId of requestedNodeIds) {
-            const node = allNodes.find((n) => n.id === nodeId || n.nodeId === nodeId);
+            const node = allNodes.find((n) => meshNodeIdMatches(n, nodeId));
             if (!node) {
               missing.push(nodeId);
               continue;
@@ -73942,7 +74069,7 @@ ${hintLines.join("\n")}` : "",
         const { promisify: promisify8 } = await import("util");
         const execFileAsync4 = promisify8(execFile5);
         const resolveRepoRootFor = (node) => {
-          const sourceNode = node.clonedFromNodeId ? allNodes.find((n) => n.id === node.clonedFromNodeId || n.nodeId === node.clonedFromNodeId) : allNodes.find((n) => !n.isLocalWorktree);
+          const sourceNode = node.clonedFromNodeId ? allNodes.find((n) => meshNodeIdMatches(n, node.clonedFromNodeId)) : allNodes.find((n) => !n.isLocalWorktree);
           return sourceNode?.repoRoot || sourceNode?.workspace;
         };
         const repoRootBaseRef = /* @__PURE__ */ new Map();
@@ -74031,7 +74158,7 @@ ${hintLines.join("\n")}` : "",
           }));
         }
         const ordering = orderMeshRefineBatchNodes(changeAreas);
-        const orderedNodes = ordering.order.map((nodeId) => targetNodes.find((n) => n.id === nodeId || n.nodeId === nodeId)).filter((n) => !!n);
+        const orderedNodes = ordering.order.map((nodeId) => targetNodes.find((n) => meshNodeIdMatches(n, nodeId))).filter((n) => !!n);
         const dryRun = args?.dryRun !== false && args?.execute !== true;
         if (dryRun) {
           return {
@@ -74290,7 +74417,7 @@ ${hintLines.join("\n")}` : "",
         const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
         const mesh = meshRecord?.mesh;
         const allNodes = Array.isArray(mesh?.nodes) ? mesh.nodes : [];
-        const orderedNodes = nodeIds.map((id) => allNodes.find((n) => n.id === id || n.nodeId === id)).filter((n) => !!n);
+        const orderedNodes = nodeIds.map((id) => allNodes.find((n) => meshNodeIdMatches(n, id))).filter((n) => !!n);
         if (orderedNodes.length === 0) {
           return { success: false, error: "Batch nodes no longer resolvable in mesh", batch: true };
         }
@@ -74396,7 +74523,7 @@ ${hintLines.join("\n")}` : "",
         const terminal = this.terminalRefineJobs.get(key);
         const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
         const mesh = meshRecord?.mesh;
-        const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+        const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
         if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
         if (!node.isLocalWorktree || !node.workspace) return { success: false, error: `Refinery requires a local worktree node` };
         const coordinatorDaemonId = typeof args?.coordinatorDaemonId === "string" && args.coordinatorDaemonId.trim() ? args.coordinatorDaemonId.trim() : this.deps.statusInstanceId || void 0;
@@ -74443,7 +74570,7 @@ ${hintLines.join("\n")}` : "",
               try {
                 const { getMesh: getMesh2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
                 const meshObj = getMesh2(meshId) ?? this.getCachedInlineMesh(meshId);
-                const nodeObj = Array.isArray(meshObj?.nodes) ? meshObj.nodes.find((n) => n.id === meshNodeId || n.nodeId === meshNodeId) : void 0;
+                const nodeObj = Array.isArray(meshObj?.nodes) ? meshObj.nodes.find((n) => meshNodeIdMatches(n, meshNodeId)) : void 0;
                 const bootstrapStatus = readStringValue(nodeObj?.worktreeBootstrap?.status);
                 if (bootstrapStatus === "running") {
                   return { success: true, ...launchResult, bootstrapPending: true };
@@ -74488,7 +74615,7 @@ ${hintLines.join("\n")}` : "",
               try {
                 const { getMesh: getMesh2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
                 const meshObj = getMesh2(dispatchMeshId) ?? this.getCachedInlineMesh(dispatchMeshId);
-                const nodeObj = Array.isArray(meshObj?.nodes) ? meshObj.nodes.find((n) => n.id === dispatchNodeId || n.nodeId === dispatchNodeId) : void 0;
+                const nodeObj = Array.isArray(meshObj?.nodes) ? meshObj.nodes.find((n) => meshNodeIdMatches(n, dispatchNodeId)) : void 0;
                 const bootstrapStatus = readStringValue(nodeObj?.worktreeBootstrap?.status);
                 if (bootstrapStatus === "running") {
                   return {
@@ -75753,7 +75880,7 @@ ${hintLines.join("\n")}` : "",
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
               if (!mesh) return { success: false, error: "Mesh not found" };
-              const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
               const mode = this.normalizeMeshSessionCleanupMode(args?.mode ?? mesh?.policy?.sessionCleanupOnNodeRemove);
               const sessionIds = Array.isArray(args?.sessionIds) ? args.sessionIds.map((id) => typeof id === "string" ? id.trim() : "").filter(Boolean) : void 0;
@@ -75808,7 +75935,7 @@ ${hintLines.join("\n")}` : "",
             if (!meshId || !nodeId) return { success: false, error: "meshId and nodeId required" };
             const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
             const mesh = meshRecord?.mesh;
-            const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+            const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
             if (!node?.workspace) return { success: false, error: `Node '${nodeId}' workspace not found` };
             return {
               success: true,
@@ -75830,7 +75957,7 @@ ${hintLines.join("\n")}` : "",
             if (meshId && nodeId) {
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
-              const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               if (!workspace) {
                 workspace = typeof node?.workspace === "string" ? node.workspace.trim() : "";
               }
@@ -75873,7 +76000,7 @@ ${hintLines.join("\n")}` : "",
             if (isDryRun) {
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
-              const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               if (!node?.workspace) return { success: false, error: `Node '${nodeId}' workspace not found` };
               return {
                 success: true,
@@ -75903,7 +76030,7 @@ ${hintLines.join("\n")}` : "",
             try {
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
-              const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              const node = mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               if (node && !args?._meshDirectDispatch && node.isLocalWorktree !== true && args?.force !== true) {
                 const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : "";
                 const nodeMachineId = readMeshNodeMachineId(node) || "";
@@ -76017,7 +76144,7 @@ ${hintLines.join("\n")}` : "",
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
               if (!mesh) return { success: false, error: "Mesh not found" };
-              const sourceNode = mesh.nodes?.find((n) => n.id === sourceNodeId || n.nodeId === sourceNodeId);
+              const sourceNode = mesh.nodes?.find((n) => meshNodeIdMatches(n, sourceNodeId));
               if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
               const sourceDaemonId = typeof sourceNode.daemonId === "string" ? sourceNode.daemonId.trim() : void 0;
               if (sourceDaemonId && sourceDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
@@ -76258,7 +76385,7 @@ ${hintLines.join("\n")}` : "",
               const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
               const mesh = meshRecord?.mesh;
               if (!mesh) return { success: false, error: "Mesh not found" };
-              const node = mesh.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              const node = mesh.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
               if (!node.isLocalWorktree) return { success: false, error: "Node is not a local worktree node" };
               const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
@@ -76395,14 +76522,14 @@ ${hintLines.join("\n")}` : "",
               const liveMeshSessions = partitionSessionHostRecords(Array.isArray(sessionHostRecords) ? sessionHostRecords : []).liveRuntimes;
               const workspace = readLiveMeshNodeWorkspace({
                 meshId,
-                nodeId: String(coordinatorNode.id || coordinatorNode.nodeId || preferredCoordinatorNodeId || ""),
+                nodeId: String(normalizeMeshNodeId(coordinatorNode) || preferredCoordinatorNodeId || ""),
                 liveSessionRecords: liveMeshSessions,
                 allowCoordinatorSession: true
               }) || (typeof coordinatorNode.workspace === "string" ? coordinatorNode.workspace.trim() : "");
               if (!workspace) return { success: false, error: "Coordinator node workspace required", meshId, cliType };
               if (!cliType) {
                 const resolved = await resolveProviderTypeFromPriority({
-                  nodeId: String(coordinatorNode.id || coordinatorNode.nodeId || preferredCoordinatorNodeId || "coordinator"),
+                  nodeId: String(normalizeMeshNodeId(coordinatorNode) || preferredCoordinatorNodeId || "coordinator"),
                   providerPriority: readProviderPriorityFromPolicy(coordinatorNode.policy),
                   providerLoader: this.deps.providerLoader,
                   onStatusChange: this.deps.onStatusChange
@@ -76856,7 +76983,7 @@ ${ptyResult.output.slice(-2e3)}`);
               const passivePeerTruthNotAttempted = requireDirectPeerTruth && !refreshRequested && directTruth.directEvidenceCount > 0 && directTruth.peerAttemptedCount === 0;
               const effectiveDirectTruth = passivePeerTruthNotAttempted ? { ...directTruth, unavailableNodeIds: [] } : directTruth;
               const unavailableDirectTruthNodeIds = new Set(effectiveDirectTruth.unavailableNodeIds);
-              const unavailableNodesAreOnlyRemovedWorktrees = unavailableDirectTruthNodeIds.size > 0 && Array.isArray(mesh.nodes) && mesh.nodes.filter((node) => unavailableDirectTruthNodeIds.has(String(node.id || node.nodeId || ""))).every((node) => node?.isLocalWorktree === true);
+              const unavailableNodesAreOnlyRemovedWorktrees = unavailableDirectTruthNodeIds.size > 0 && Array.isArray(mesh.nodes) && mesh.nodes.filter((node) => unavailableDirectTruthNodeIds.has(normalizeMeshNodeId(node) ?? "")).every((node) => node?.isLocalWorktree === true);
               const directTruthSatisfied = !requireDirectPeerTruth || effectiveDirectTruth.directEvidenceCount > 0 && (effectiveDirectTruth.unavailableNodeIds.length === 0 || unavailableNodesAreOnlyRemovedWorktrees);
               if (requireDirectPeerTruth && !directTruthSatisfied) {
                 const failureResult = {
@@ -76891,14 +77018,13 @@ ${ptyResult.output.slice(-2e3)}`);
               const coordinatorHostname = (0, import_os3.hostname)();
               const selectedCoordinatorNodeId = readStringValue(
                 mesh.coordinator?.preferredNodeId,
-                mesh.nodes?.[0]?.id,
-                mesh.nodes?.[0]?.nodeId
+                normalizeMeshNodeId(mesh.nodes?.[0])
               );
               const inlineCoordinatorNodeId = meshRecord?.inline && Array.isArray(mesh.nodes) ? selectedCoordinatorNodeId : void 0;
               const refreshedAt = (/* @__PURE__ */ new Date()).toISOString();
               const nodeStatuses = [];
               for (const [nodeIndex, node] of (mesh.nodes || []).entries()) {
-                const nodeId = String(node.id || node.nodeId || "");
+                const nodeId = normalizeMeshNodeId(node) ?? "";
                 const daemonId = readStringValue(node.daemonId);
                 const nodeMachineId = readMeshNodeMachineId(node);
                 const nodeHostname = readMeshNodeHostname(node);