adhdev 0.9.82-rc.2 → 0.9.82-rc.21

package/dist/index.js

@@ -264,8 +264,14 @@ async function getGitRepoStatus(workspace, options = {}) {
   const includeSubmodules = options.includeSubmodules !== false;
   try {
     const repo = await resolveGitRepository(workspace, options);
-    const statusOutput = await runGit(repo, ["status", "--porcelain=v2", "--branch"], options);
-    const parsed = parsePorcelainV2Status(statusOutput.stdout);
+    let parsed = await readPorcelainStatus(repo, options);
+    let upstreamProbe = getInitialUpstreamProbe(parsed);
+    if (options.refreshUpstream) {
+      upstreamProbe = await refreshTrackedUpstream(repo, parsed, options);
+      if (upstreamProbe.upstreamStatus === "fresh") {
+        parsed = await readPorcelainStatus(repo, options);
+      }
+    }
     const head = await readHead(repo, options);
     const stashCount = await readStashCount(repo, options);
     let submodules;
@@ -280,6 +286,9 @@ async function getGitRepoStatus(workspace, options = {}) {
       headCommit: head.commit,
       headMessage: head.message,
       upstream: parsed.upstream,
+      upstreamStatus: parsed.upstream ? upstreamProbe.upstreamStatus : "no_upstream",
+      upstreamFetchedAt: upstreamProbe.upstreamFetchedAt,
+      upstreamFetchError: upstreamProbe.upstreamFetchError,
       ahead: parsed.ahead,
       behind: parsed.behind,
       staged: parsed.staged,
@@ -304,6 +313,60 @@ async function getGitRepoStatus(workspace, options = {}) {
     );
   }
 }
+async function readPorcelainStatus(repo, options) {
+  const statusOutput = await runGit(repo, ["status", "--porcelain=v2", "--branch"], options);
+  return parsePorcelainV2Status(statusOutput.stdout);
+}
+function getInitialUpstreamProbe(parsed) {
+  return {
+    upstreamStatus: parsed.upstream ? "unchecked" : "no_upstream"
+  };
+}
+async function refreshTrackedUpstream(repo, parsed, options) {
+  if (!parsed.upstream || !parsed.branch) {
+    return { upstreamStatus: "no_upstream" };
+  }
+  const remoteName = await readBranchRemote(repo, parsed.branch, options) ?? inferRemoteName(parsed.upstream);
+  if (!remoteName) {
+    return {
+      upstreamStatus: "stale",
+      upstreamFetchError: `Unable to resolve remote for upstream '${parsed.upstream}'`
+    };
+  }
+  try {
+    await runGit(repo, ["fetch", "--quiet", "--prune", "--no-tags", remoteName], options);
+    return {
+      upstreamStatus: "fresh",
+      upstreamFetchedAt: Date.now()
+    };
+  } catch (error48) {
+    return {
+      upstreamStatus: "stale",
+      upstreamFetchError: formatGitError(error48)
+    };
+  }
+}
+async function readBranchRemote(repo, branch, options) {
+  try {
+    const result = await runGit(repo, ["config", "--get", `branch.${branch}.remote`], options);
+    return result.stdout.trim() || null;
+  } catch {
+    return null;
+  }
+}
+function inferRemoteName(upstream) {
+  const [remoteName] = upstream.split("/");
+  return remoteName?.trim() || null;
+}
+function formatGitError(error48) {
+  if (error48 instanceof GitCommandError) {
+    return error48.stderr || error48.message;
+  }
+  if (error48 instanceof Error) {
+    return error48.message;
+  }
+  return String(error48);
+}
 function parsePorcelainV2Status(output) {
   const parsed = {
     branch: null,
@@ -398,6 +461,7 @@ function emptyStatus(workspace, lastCheckedAt, error48) {
     headCommit: null,
     headMessage: null,
     upstream: null,
+    upstreamStatus: "unavailable",
     ahead: 0,
     behind: 0,
     staged: 0,
@@ -690,6 +754,9 @@ function createGitCompactSummary(status, diffSummary) {
     isGitRepo: status.isGitRepo,
     repoRoot: status.repoRoot,
     branch: status.branch,
+    upstreamStatus: status.upstreamStatus,
+    upstreamFetchedAt: status.upstreamFetchedAt,
+    upstreamFetchError: status.upstreamFetchError,
     dirty: status.staged > 0 || status.modified > 0 || status.untracked > 0 || status.deleted > 0 || status.renamed > 0 || conflictCount > 0 || changedFiles > 0,
     changedFiles,
     ahead: status.ahead,
@@ -1017,7 +1084,7 @@ function serviceNotImplemented(command) {
 }
 function createDefaultGitCommandServices() {
   return {
-    getStatus: ({ workspace }) => getGitRepoStatus(workspace),
+    getStatus: ({ workspace, refreshUpstream }) => getGitRepoStatus(workspace, { refreshUpstream }),
     getDiffSummary: ({ workspace }) => getGitDiffSummary(workspace),
     getDiffFile: ({ workspace, path: filePath }) => getGitFileDiff(workspace, filePath),
     createSnapshot: ({ workspace, reason, sessionId, turnId }) => defaultSnapshotStore.create({
@@ -1102,7 +1169,7 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
   switch (command) {
     case "git_status": {
       if (!services.getStatus) return serviceNotImplemented(command);
-      const status = await runService(() => services.getStatus({ workspace }));
+      const status = await runService(() => services.getStatus({ workspace, refreshUpstream: optionalBoolean(args?.refreshUpstream) }));
       return "success" in status ? status : { success: true, status };
     }
     case "git_diff_summary": {
@@ -3759,10 +3826,18 @@ __export(mesh_events_exports, {
   drainPendingMeshCoordinatorEvents: () => drainPendingMeshCoordinatorEvents,
   getPendingMeshCoordinatorEvents: () => getPendingMeshCoordinatorEvents,
   handleMeshForwardEvent: () => handleMeshForwardEvent,
+  queuePendingMeshCoordinatorEvent: () => queuePendingMeshCoordinatorEvent,
   setupMeshEventForwarding: () => setupMeshEventForwarding,
   triggerMeshQueue: () => triggerMeshQueue,
   tryAssignQueueTask: () => tryAssignQueueTask
 });
+function queuePendingMeshCoordinatorEvent(event) {
+  if (pendingMeshCoordinatorEvents.length >= MAX_PENDING_EVENTS) {
+    return false;
+  }
+  pendingMeshCoordinatorEvents.push(event);
+  return true;
+}
 function drainPendingMeshCoordinatorEvents() {
   return pendingMeshCoordinatorEvents.splice(0);
 }
@@ -4334,17 +4409,18 @@ function injectMeshSystemMessage(components, args) {
     return true;
   });
   if (coordinatorInstances.length === 0) {
-    if (pendingMeshCoordinatorEvents.length < MAX_PENDING_EVENTS) {
-      pendingMeshCoordinatorEvents.push({
-        event: args.event,
-        meshId: args.meshId,
-        nodeLabel: args.nodeLabel,
-        metadataEvent: {
-          ...args.metadataEvent,
-          ...recoveryContext ? { recoveryContext } : {}
-        },
-        queuedAt: Date.now()
-      });
+    if (queuePendingMeshCoordinatorEvent({
+      event: args.event,
+      meshId: args.meshId,
+      nodeLabel: args.nodeLabel,
+      nodeId: args.nodeId || void 0,
+      workspace: readNonEmptyString(args.metadataEvent.workspace),
+      metadataEvent: {
+        ...args.metadataEvent,
+        ...recoveryContext ? { recoveryContext } : {}
+      },
+      queuedAt: Date.now()
+    })) {
       LOG.info("MeshEvents", `Queued ${args.event} for MCP coordinator (mesh ${args.meshId})`);
     }
     return { success: true, forwarded: 0 };
@@ -6679,7 +6755,7 @@ var init_status_monitor = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/chat-message-normalization.ts
-function extractFinalSummaryFromMessages(messages, maxChars = 500) {
+function extractFinalSummaryFromMessages(messages, maxChars = DEFAULT_FINAL_SUMMARY_MAX_CHARS) {
   if (!Array.isArray(messages) || messages.length === 0) return "";
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];
@@ -6981,11 +7057,12 @@ function filterInternalChatMessages(messages) {
 function filterChatMessagesByVisibility(messages, surface) {
   return (Array.isArray(messages) ? messages : []).filter((message) => classifyChatMessageVisibility(message).surface === surface);
 }
-var BUILTIN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_VISIBILITIES, CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES, CHAT_MESSAGE_AUDIENCES, CHAT_MESSAGE_SOURCES, CHAT_MESSAGE_ACTIVITY_SOURCES, CHAT_MESSAGE_INTERNAL_SOURCES, KNOWN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_KIND_ALIASES, EXPLICIT_HIDDEN_VISIBILITIES, EXPLICIT_VISIBLE_VISIBILITIES, HIDDEN_AUDIENCES, ACTIVITY_SOURCE_SET, INTERNAL_SOURCE_SET;
+var DEFAULT_FINAL_SUMMARY_MAX_CHARS, BUILTIN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_VISIBILITIES, CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES, CHAT_MESSAGE_AUDIENCES, CHAT_MESSAGE_SOURCES, CHAT_MESSAGE_ACTIVITY_SOURCES, CHAT_MESSAGE_INTERNAL_SOURCES, KNOWN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_KIND_ALIASES, EXPLICIT_HIDDEN_VISIBILITIES, EXPLICIT_VISIBLE_VISIBILITIES, HIDDEN_AUDIENCES, ACTIVITY_SOURCE_SET, INTERNAL_SOURCE_SET;
 var init_chat_message_normalization = __esm({
   "../../oss/packages/daemon-core/src/providers/chat-message-normalization.ts"() {
     "use strict";
     init_contracts();
+    DEFAULT_FINAL_SUMMARY_MAX_CHARS = 4e3;
     BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
     CHAT_MESSAGE_VISIBILITIES = ["user", "debug", "internal", "hidden"];
     CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES = ["visible", "chat", "user", "debug", "internal", "hidden"];
@@ -45414,6 +45491,26 @@ function readBooleanValue(...values) {
   }
   return void 0;
 }
+function readGitSubmodules(value) {
+  if (!Array.isArray(value)) return void 0;
+  const submodules = value.map((entry) => {
+    const submodule = readObjectRecord(entry);
+    const path35 = readStringValue(submodule.path);
+    const commit = readStringValue(submodule.commit);
+    const repoPath = readStringValue(submodule.repoPath, submodule.repo_root);
+    if (!path35 || !commit || !repoPath) return null;
+    return {
+      path: path35,
+      commit,
+      repoPath,
+      dirty: readBooleanValue(submodule.dirty) ?? false,
+      outOfSync: readBooleanValue(submodule.outOfSync, submodule.out_of_sync) ?? false,
+      lastCheckedAt: readNumberValue(submodule.lastCheckedAt, submodule.last_checked_at) ?? Date.now(),
+      ...readStringValue(submodule.error) ? { error: readStringValue(submodule.error) } : {}
+    };
+  }).filter((entry) => entry !== null);
+  return submodules.length > 0 ? submodules : void 0;
+}
 function buildCachedInlineMeshGitStatus(node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
   const cachedGit = readObjectRecord(cachedStatus.git);
@@ -45423,6 +45520,7 @@ function buildCachedInlineMeshGitStatus(node) {
     const hasConflicts2 = readBooleanValue(cachedGit.hasConflicts) ?? conflictCount2 > 0;
     const isGitRepo2 = readBooleanValue(cachedGit.isGitRepo);
     if (isGitRepo2 !== void 0) {
+      const submodules2 = readGitSubmodules(cachedGit.submodules);
       return {
         workspace: readStringValue(cachedGit.workspace, node?.workspace) || "",
         repoRoot: readStringValue(cachedGit.repoRoot, node?.repoRoot, node?.workspace) || null,
@@ -45441,7 +45539,8 @@ function buildCachedInlineMeshGitStatus(node) {
         hasConflicts: hasConflicts2,
         conflictFiles: conflictFiles2,
         stashCount: readNumberValue(cachedGit.stashCount) ?? 0,
-        lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now()
+        lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now(),
+        ...submodules2 ? { submodules: submodules2 } : {}
       };
     }
   }
@@ -45460,6 +45559,7 @@ function buildCachedInlineMeshGitStatus(node) {
   const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((value) => typeof value === "string") : [];
   const conflictCount = readNumberValue(status.conflicts) ?? conflictFiles.length;
   const hasConflicts = readBooleanValue(status.hasConflicts) ?? conflictCount > 0;
+  const submodules = readGitSubmodules(status.submodules);
   return {
     workspace: readStringValue(status.workspace, node?.workspace) || "",
     repoRoot: readStringValue(status.repoRoot, node?.repoRoot, node?.workspace) || null,
@@ -45478,29 +45578,161 @@ function buildCachedInlineMeshGitStatus(node) {
     hasConflicts,
     conflictFiles,
     stashCount: readNumberValue(status.stashCount) ?? 0,
-    lastCheckedAt: Date.now()
+    lastCheckedAt: Date.now(),
+    ...submodules ? { submodules } : {}
   };
 }
+function hasGitWorktreeChanges(git) {
+  if (!git) return false;
+  return Number(git.staged || 0) + Number(git.modified || 0) + Number(git.untracked || 0) + Number(git.deleted || 0) + Number(git.renamed || 0) > 0;
+}
+function getGitSubmoduleDriftState(git) {
+  const submodules = Array.isArray(git?.submodules) ? git.submodules : [];
+  let dirty = false;
+  let outOfSync = false;
+  for (const entry of submodules) {
+    const submodule = readObjectRecord(entry);
+    if (readBooleanValue(submodule.dirty) === true) dirty = true;
+    if (readBooleanValue(submodule.outOfSync) === true || !!readStringValue(submodule.error)) outOfSync = true;
+  }
+  return { dirty, outOfSync };
+}
+function deriveMeshNodeHealthFromGit(git) {
+  if (!git || readBooleanValue(git.isGitRepo) === false) return "degraded";
+  const branch = readStringValue(git.branch);
+  if (!branch) return "degraded";
+  const submoduleDrift = getGitSubmoduleDriftState(git);
+  if (submoduleDrift.outOfSync) return "degraded";
+  if (submoduleDrift.dirty || hasGitWorktreeChanges(git)) return "dirty";
+  return "online";
+}
+function readCachedInlineMeshActiveSessions(node) {
+  const cachedStatus = readObjectRecord(node?.cachedStatus);
+  const activeSession = readObjectRecord(cachedStatus.activeSession);
+  const fallbackSession = Object.keys(activeSession).length ? activeSession : readObjectRecord(node?.activeSession ?? node?.active_session);
+  const sessionId = readStringValue(fallbackSession.id, fallbackSession.sessionId, fallbackSession.session_id, node?.activeSessionId, node?.active_session_id, node?.sessionId, node?.session_id);
+  return sessionId ? [sessionId] : [];
+}
+function readCachedInlineMeshActiveSessionDetails(node) {
+  const cachedStatus = readObjectRecord(node?.cachedStatus);
+  const activeSession = readObjectRecord(cachedStatus.activeSession);
+  const fallbackSession = Object.keys(activeSession).length ? activeSession : readObjectRecord(node?.activeSession ?? node?.active_session);
+  const sessionId = readStringValue(
+    fallbackSession.id,
+    fallbackSession.sessionId,
+    fallbackSession.session_id,
+    node?.activeSessionId,
+    node?.active_session_id,
+    node?.sessionId,
+    node?.session_id
+  );
+  if (!sessionId) return [];
+  return [{
+    sessionId,
+    providerType: readStringValue(
+      fallbackSession.providerType,
+      fallbackSession.provider_type,
+      fallbackSession.cliType,
+      fallbackSession.cli_type,
+      fallbackSession.provider,
+      node?.providerType,
+      node?.provider_type
+    ),
+    state: readStringValue(fallbackSession.status, fallbackSession.state, fallbackSession.lifecycle),
+    lifecycle: readStringValue(fallbackSession.lifecycle),
+    title: readStringValue(fallbackSession.title, fallbackSession.displayName, fallbackSession.display_name) ?? null,
+    workspace: readStringValue(fallbackSession.workspace, node?.workspace) ?? null,
+    lastActivityAt: readStringValue(fallbackSession.lastActivityAt, fallbackSession.last_activity_at) ?? null,
+    recoveryState: readStringValue(fallbackSession.recoveryState, fallbackSession.recovery_state) ?? null,
+    isCached: true
+  }];
+}
+function readLiveMeshSessionState(record2) {
+  return readStringValue(
+    record2?.meta?.sessionStatus,
+    record2?.meta?.status,
+    record2?.meta?.providerStatus,
+    record2?.status,
+    record2?.state,
+    record2?.lifecycle
+  );
+}
+function toIsoTimestamp(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return new Date(value).toISOString();
+  const stringValue = readStringValue(value);
+  return stringValue || null;
+}
+function summarizeMeshSessionRecord(record2) {
+  return {
+    sessionId: readStringValue(record2?.sessionId) || "unknown",
+    providerType: readStringValue(record2?.providerType),
+    state: readLiveMeshSessionState(record2),
+    lifecycle: readStringValue(record2?.lifecycle),
+    surfaceKind: getSessionHostSurfaceKind(record2),
+    recoveryState: readStringValue(record2?.meta?.runtimeRecoveryState) ?? null,
+    workspace: readStringValue(record2?.workspace) ?? null,
+    title: readStringValue(record2?.displayName, record2?.workspaceLabel) ?? null,
+    lastActivityAt: toIsoTimestamp(record2?.updatedAt ?? record2?.lastActivityAt ?? record2?.last_activity_at),
+    isCached: false
+  };
+}
+function readLiveMeshNodeWorkspace(args) {
+  const directNodeWorkspace = args.liveSessionRecords.find((record2) => readStringValue(record2?.meta?.meshNodeId) === args.nodeId && readStringValue(record2?.workspace));
+  if (directNodeWorkspace) {
+    return readStringValue(directNodeWorkspace.workspace) || "";
+  }
+  if (args.allowCoordinatorSession) {
+    const coordinatorWorkspace = args.liveSessionRecords.find((record2) => readStringValue(record2?.meta?.meshCoordinatorFor) === args.meshId && readStringValue(record2?.workspace));
+    if (coordinatorWorkspace) {
+      return readStringValue(coordinatorWorkspace.workspace) || "";
+    }
+  }
+  return "";
+}
+function collectLiveMeshSessionRecords(args) {
+  const matches = args.liveSessionRecords.filter((record2) => {
+    if (readStringValue(record2?.meta?.meshNodeId) === args.nodeId) return true;
+    const recordWorkspace = readStringValue(record2?.workspace);
+    const nodeWorkspace = readStringValue(args.node?.workspace);
+    return !!recordWorkspace && !!nodeWorkspace && recordWorkspace === nodeWorkspace;
+  });
+  if (args.allowCoordinatorSession) {
+    for (const record2 of args.liveSessionRecords) {
+      if (readStringValue(record2?.meta?.meshCoordinatorFor) !== args.meshId) continue;
+      const sessionId = readStringValue(record2?.sessionId);
+      if (sessionId && matches.some((entry) => readStringValue(entry?.sessionId) === sessionId)) continue;
+      matches.push(record2);
+    }
+  }
+  return matches;
+}
 function applyCachedInlineMeshNodeStatus(status, node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
   const git = buildCachedInlineMeshGitStatus(node);
   const error48 = readStringValue(cachedStatus.error, node?.error);
   const health = readStringValue(cachedStatus.health, node?.health);
   const machineStatus = readStringValue(cachedStatus.machineStatus, node?.machineStatus);
-  if (!git && !error48 && !health) return false;
-  if (!machineStatus && !git && !error48) return false;
+  const lastSeenAt = toIsoTimestamp(cachedStatus.lastSeenAt ?? cachedStatus.last_seen_at ?? node?.lastSeenAt ?? node?.last_seen_at);
+  const updatedAt = toIsoTimestamp(cachedStatus.updatedAt ?? cachedStatus.updated_at ?? node?.updatedAt ?? node?.updated_at);
+  const activeSessions = readCachedInlineMeshActiveSessions(node);
+  const activeSessionDetails = readCachedInlineMeshActiveSessionDetails(node);
+  if (!git && !error48 && !health && !machineStatus && !lastSeenAt && !updatedAt && activeSessions.length === 0) return false;
   if (git) status.git = git;
   if (error48) status.error = error48;
+  if (machineStatus) status.machineStatus = machineStatus;
+  if (lastSeenAt) status.lastSeenAt = lastSeenAt;
+  if (updatedAt) status.updatedAt = updatedAt;
+  if (activeSessions.length > 0) status.activeSessions = activeSessions;
+  if (activeSessionDetails.length > 0) status.activeSessionDetails = activeSessionDetails;
   if (health) {
     status.health = health;
     return true;
   }
   if (git) {
-    const dirty = Number(git.staged || 0) + Number(git.modified || 0) + Number(git.untracked || 0) + Number(git.deleted || 0) + Number(git.renamed || 0) > 0;
-    status.health = git.isGitRepo === false ? "degraded" : dirty ? "dirty" : "online";
+    status.health = deriveMeshNodeHealthFromGit(git);
     return true;
   }
-  return false;
+  return activeSessions.length > 0 || !!machineStatus || !!lastSeenAt || !!updatedAt;
 }
 async function resolveProviderTypeFromPriority(args) {
   if (!args.providerPriority.length) {
@@ -45890,6 +46122,7 @@ var init_router = __esm({
     init_chat_history();
     init_ide_detector();
     init_cli_detector();
+    init_git_status();
     init_logger();
     init_command_log();
     init_js_yaml();
@@ -45934,25 +46167,35 @@ var init_router = __esm({
       }
       getCachedInlineMesh(meshId, inlineMesh) {
         if (inlineMesh && typeof inlineMesh === "object") {
-          this.inlineMeshCache.set(meshId, inlineMesh);
-          return inlineMesh;
+          return this.warmInlineMeshCache(meshId, inlineMesh);
         }
         return this.inlineMeshCache.get(meshId);
       }
+      warmInlineMeshCache(meshId, inlineMesh) {
+        if (!inlineMesh || typeof inlineMesh !== "object") return void 0;
+        const cached2 = this.inlineMeshCache.get(meshId);
+        if (cached2) return cached2;
+        this.inlineMeshCache.set(meshId, inlineMesh);
+        return inlineMesh;
+      }
       async getMeshForCommand(meshId, inlineMesh, options) {
         const preferInline = options?.preferInline === true;
         if (preferInline) {
-          const cached3 = this.getCachedInlineMesh(meshId, inlineMesh);
-          if (cached3) return { mesh: cached3, inline: true };
+          const cached3 = this.getCachedInlineMesh(meshId);
+          if (cached3) return { mesh: cached3, inline: true, source: "inline_cache" };
+          const warmedInline2 = this.warmInlineMeshCache(meshId, inlineMesh);
+          if (warmedInline2) return { mesh: warmedInline2, inline: true, source: "inline_bootstrap" };
         }
         try {
           const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
           const mesh = getMesh3(meshId);
-          if (mesh) return { mesh, inline: false };
+          if (mesh) return { mesh, inline: false, source: "local_config" };
         } catch {
         }
-        const cached2 = this.getCachedInlineMesh(meshId, inlineMesh);
-        return cached2 ? { mesh: cached2, inline: true } : null;
+        const cached2 = this.getCachedInlineMesh(meshId);
+        if (cached2) return { mesh: cached2, inline: true, source: "inline_cache" };
+        const warmedInline = this.warmInlineMeshCache(meshId, inlineMesh);
+        return warmedInline ? { mesh: warmedInline, inline: true, source: "inline_bootstrap" } : null;
       }
       updateInlineMeshNode(meshId, mesh, node) {
         if (!mesh || !Array.isArray(mesh.nodes) || !node?.id) return;
@@ -46181,6 +46424,7 @@ var init_router = __esm({
         const deletedSessionIds = [];
         const skippedSessionIds = [];
         const skippedLiveSessionIds = [];
+        const skippedCoordinatorSessionIds = [];
         const deleteUnsupportedSessionIds = [];
         const recordsRemainSessionIds = [];
         const errors = [];
@@ -46213,6 +46457,12 @@ var init_router = __esm({
           const completed = this.isCompletedHostedSession(record2);
           const surfaceKind = getSessionHostSurfaceKind(record2);
           const liveRuntime = surfaceKind === "live_runtime";
+          const coordinatorSession = readStringValue(record2?.meta?.meshCoordinatorFor) === args.meshId;
+          if (!hasExplicitSessionIds && coordinatorSession) {
+            skippedSessionIds.push(sessionId);
+            skippedCoordinatorSessionIds.push(sessionId);
+            continue;
+          }
           if (!hasExplicitSessionIds && liveRuntime) {
             skippedSessionIds.push(sessionId);
             skippedLiveSessionIds.push(sessionId);
@@ -46278,6 +46528,7 @@ var init_router = __esm({
           deletedSessionIds,
           skippedSessionIds,
           skippedLiveSessionIds,
+          skippedCoordinatorSessionIds,
           ...deleteUnsupported ? {
             deleteUnsupported: true,
             effectiveCleanup: args.mode === "stop_and_delete" ? "stopped_only_records_remain" : "delete_unsupported_records_remain",
@@ -46939,14 +47190,8 @@ var init_router = __esm({
           case "get_mesh": {
             const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
             if (!meshId) return { success: false, error: "meshId required" };
-            try {
-              const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
-              const mesh = getMesh3(meshId);
-              if (mesh) return { success: true, mesh };
-            } catch {
-            }
-            const cached2 = this.inlineMeshCache.get(meshId);
-            if (cached2) return { success: true, mesh: cached2 };
+            const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+            if (meshRecord?.mesh) return { success: true, mesh: meshRecord.mesh };
             return { success: false, error: "Mesh not found" };
           }
           case "create_mesh": {
@@ -47468,7 +47713,14 @@ var init_router = __esm({
                   cliType
                 };
               }
-              const workspace = typeof coordinatorNode.workspace === "string" ? coordinatorNode.workspace.trim() : "";
+              const sessionHostRecords = this.deps.sessionHostControl?.listSessions ? await this.deps.sessionHostControl.listSessions().catch(() => []) : [];
+              const liveMeshSessions = partitionSessionHostRecords(Array.isArray(sessionHostRecords) ? sessionHostRecords : []).liveRuntimes;
+              const workspace = readLiveMeshNodeWorkspace({
+                meshId,
+                nodeId: String(coordinatorNode.id || coordinatorNode.nodeId || 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({
@@ -47776,84 +48028,111 @@ ${block}`);
               const { readLedgerEntries: readLedgerEntries2, getLedgerSummary: getLedgerSummary2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
               const ledgerEntries = readLedgerEntries2(meshId, { tail: 20 });
               const ledgerSummary = getLedgerSummary2(meshId);
+              const sessionHostRecords = this.deps.sessionHostControl?.listSessions ? await this.deps.sessionHostControl.listSessions().catch(() => []) : [];
+              const liveMeshSessions = partitionSessionHostRecords(Array.isArray(sessionHostRecords) ? sessionHostRecords : []).liveRuntimes;
+              const localMachineId = loadConfig().machineId || "";
+              const selectedCoordinatorNodeId = readStringValue(
+                mesh.coordinator?.preferredNodeId,
+                mesh.nodes?.[0]?.id,
+                mesh.nodes?.[0]?.nodeId
+              );
+              const inlineCoordinatorNodeId = meshRecord?.inline && Array.isArray(mesh.nodes) ? selectedCoordinatorNodeId : void 0;
+              const refreshedAt = (/* @__PURE__ */ new Date()).toISOString();
               const nodeStatuses = [];
-              for (const node of mesh.nodes || []) {
+              for (const [nodeIndex, node] of (mesh.nodes || []).entries()) {
+                const nodeId = String(node.id || node.nodeId || "");
+                const daemonId = readStringValue(node.daemonId);
+                const providerPriority = readProviderPriorityFromPolicy(node.policy);
+                const isSelfNode = Boolean(
+                  nodeId && inlineCoordinatorNodeId && nodeId === inlineCoordinatorNodeId
+                ) || Boolean(
+                  daemonId && (daemonId === localMachineId || daemonId === this.deps.statusInstanceId)
+                ) || Boolean(meshRecord?.inline && nodeIndex === 0);
                 const status = {
-                  nodeId: node.id || node.nodeId,
+                  nodeId,
                   machineLabel: node.machineLabel || node.id || node.nodeId,
                   workspace: node.workspace,
                   repoRoot: node.repoRoot,
                   isLocalWorktree: node.isLocalWorktree,
                   worktreeBranch: node.worktreeBranch,
-                  daemonId: node.daemonId,
+                  daemonId,
                   machineId: node.machineId,
+                  machineStatus: node.machineStatus,
                   health: "unknown",
                   providers: node.providers || [],
-                  activeSessions: []
+                  providerPriority,
+                  activeSessions: [],
+                  activeSessionDetails: [],
+                  launchReady: false
                 };
-                if (node.workspace && typeof node.workspace === "string") {
-                  if (!fs10.existsSync(node.workspace) && applyCachedInlineMeshNodeStatus(status, node)) {
+                if (isSelfNode) {
+                  status.connection = {
+                    perspective: "selected_coordinator",
+                    source: "mesh_peer_status",
+                    state: "self",
+                    transport: "local",
+                    reported: true,
+                    reason: "Selected coordinator daemon",
+                    lastStateChangeAt: refreshedAt
+                  };
+                } else if (daemonId) {
+                  const connection = this.deps.getMeshPeerConnectionStatus?.(daemonId);
+                  status.connection = connection ?? {
+                    perspective: "selected_coordinator",
+                    source: "not_reported",
+                    state: "unknown",
+                    transport: "unknown",
+                    reported: false,
+                    reason: "No live mesh peer telemetry reported by the selected coordinator yet."
+                  };
+                } else {
+                  status.connection = {
+                    perspective: "selected_coordinator",
+                    source: "not_reported",
+                    state: "unknown",
+                    transport: "unknown",
+                    reported: false,
+                    reason: "Node has no daemon id, so mesh transport cannot be reported from the selected coordinator."
+                  };
+                }
+                const matchedLiveSessionRecords = collectLiveMeshSessionRecords({
+                  meshId,
+                  node,
+                  nodeId,
+                  liveSessionRecords: liveMeshSessions,
+                  allowCoordinatorSession: nodeId === selectedCoordinatorNodeId
+                });
+                const workspace = readLiveMeshNodeWorkspace({
+                  meshId,
+                  nodeId,
+                  liveSessionRecords: matchedLiveSessionRecords,
+                  allowCoordinatorSession: nodeId === selectedCoordinatorNodeId
+                }) || (typeof node.workspace === "string" ? node.workspace : "");
+                status.workspace = workspace || node.workspace;
+                if (matchedLiveSessionRecords.length > 0) {
+                  const sessionIds = matchedLiveSessionRecords.map((record2) => typeof record2?.sessionId === "string" ? record2.sessionId : "").filter(Boolean);
+                  const providerTypes = matchedLiveSessionRecords.map((record2) => readStringValue(record2?.providerType)).filter(Boolean);
+                  status.activeSessions = sessionIds;
+                  status.activeSessionDetails = matchedLiveSessionRecords.map(summarizeMeshSessionRecord);
+                  if (providerTypes.length > 0) {
+                    status.providers = Array.from(/* @__PURE__ */ new Set([...Array.isArray(status.providers) ? status.providers : [], ...providerTypes]));
+                  }
+                }
+                if (workspace) {
+                  if (!fs10.existsSync(workspace) && applyCachedInlineMeshNodeStatus(status, node)) {
+                    status.launchReady = !!daemonId && (readStringValue(status.machineStatus) === "online" || isSelfNode);
                     nodeStatuses.push(status);
                     continue;
                   }
                   try {
-                    const { execFile: execFile3 } = await import("child_process");
-                    const { promisify: promisify3 } = await import("util");
-                    const execFileAsync3 = promisify3(execFile3);
-                    const runGit2 = async (args2) => {
-                      const result = await execFileAsync3("git", ["-C", node.workspace, ...args2], {
-                        encoding: "utf8",
-                        timeout: 1e4
-                      });
-                      return result.stdout.trim();
-                    };
-                    const branch = await runGit2(["branch", "--show-current"]).catch(() => "");
-                    const porc = await runGit2(["status", "--porcelain"]).catch(() => "");
-                    const headCommit = await runGit2(["rev-parse", "--short", "HEAD"]).catch(() => null);
-                    const headMessage = await runGit2(["log", "-1", "--format=%s"]).catch(() => null);
-                    const upstream = await runGit2(["rev-parse", "--abbrev-ref", "@{upstream}"]).catch(() => null);
-                    const aheadBehind = await runGit2(["rev-list", "--left-right", "--count", "@{upstream}...HEAD"]).catch(() => "");
-                    const stashCount = await runGit2(["stash", "list"]).catch(() => "");
-                    let ahead = 0, behind = 0;
-                    if (aheadBehind) {
-                      const parts = aheadBehind.split(/\s+/);
-                      if (parts.length >= 2) {
-                        behind = parseInt(parts[0], 10) || 0;
-                        ahead = parseInt(parts[1], 10) || 0;
-                      }
-                    }
-                    const dirty = porc.length > 0;
-                    const lines = porc ? porc.split("\n").filter(Boolean) : [];
-                    let staged = 0, modified = 0, untracked = 0, deleted = 0, renamed2 = 0;
-                    for (const line of lines) {
-                      const xy = line.slice(0, 2);
-                      if (xy[0] !== " " && xy[0] !== "?") staged++;
-                      if (xy[1] === "M") modified++;
-                      if (xy[1] === "D") deleted++;
-                      if (xy[0] === "R" || xy[1] === "R") renamed2++;
-                      if (xy === "??") untracked++;
+                    const gitStatus = await getGitRepoStatus(workspace, { timeoutMs: 1e4, refreshUpstream: true });
+                    status.git = gitStatus;
+                    if (gitStatus.isGitRepo) {
+                      status.health = deriveMeshNodeHealthFromGit(gitStatus);
+                    } else {
+                      status.health = "degraded";
+                      if (gitStatus.error && !status.error) status.error = gitStatus.error;
                     }
-                    status.git = {
-                      workspace: node.workspace,
-                      repoRoot: node.workspace,
-                      isGitRepo: true,
-                      branch: branch || null,
-                      headCommit,
-                      headMessage,
-                      upstream,
-                      ahead,
-                      behind,
-                      staged,
-                      modified,
-                      untracked,
-                      deleted,
-                      renamed: renamed2,
-                      hasConflicts: false,
-                      conflictFiles: [],
-                      stashCount: stashCount ? stashCount.split("\n").filter(Boolean).length : 0,
-                      lastCheckedAt: Date.now()
-                    };
-                    status.health = branch ? dirty ? "dirty" : "online" : "degraded";
                   } catch {
                     if (!applyCachedInlineMeshNodeStatus(status, node)) {
                       status.health = "degraded";
@@ -47862,6 +48141,7 @@ ${block}`);
                 } else {
                   applyCachedInlineMeshNodeStatus(status, node);
                 }
+                status.launchReady = !!daemonId && (readStringValue(status.machineStatus) === "online" || isSelfNode);
                 nodeStatuses.push(status);
               }
               return {
@@ -47870,6 +48150,12 @@ ${block}`);
                 meshName: mesh.name,
                 repoIdentity: mesh.repoIdentity,
                 defaultBranch: mesh.defaultBranch,
+                refreshedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                sourceOfTruth: {
+                  membership: meshRecord?.source === "inline_cache" ? "coordinator_inline_mesh_cache" : meshRecord?.source === "local_config" ? "local_mesh_config" : "inline_bootstrap_snapshot",
+                  coordinatorOwnsLiveTruth: meshRecord?.source !== "inline_bootstrap",
+                  historicalEvidenceOnly: ["recoveryHints", "ledger.summary", "queue.summary"]
+                },
                 nodes: nodeStatuses,
                 queue: { tasks: queue, summary: queueSummary },
                 ledger: { entries: ledgerEntries, summary: ledgerSummary }
@@ -55948,6 +56234,7 @@ async function initDaemonComponents(config2) {
     sessionHostControl: config2.sessionHostControl,
     statusInstanceId: config2.statusInstanceId,
     statusVersion: config2.statusVersion,
+    getMeshPeerConnectionStatus: config2.getMeshPeerConnectionStatus,
     getCdpLogFn: config2.getCdpLogFn || ((ideType) => LOG.forComponent(`CDP:${ideType}`).asLogFn())
   });
   poller = new AgentStreamPoller({
@@ -56249,6 +56536,7 @@ __export(src_exports, {
   prepareSessionChatTailUpdate: () => prepareSessionChatTailUpdate,
   prepareSessionModalUpdate: () => prepareSessionModalUpdate,
   probeCdpPort: () => probeCdpPort,
+  queuePendingMeshCoordinatorEvent: () => queuePendingMeshCoordinatorEvent,
   readChatHistory: () => readChatHistory,
   readLedgerEntries: () => readLedgerEntries,
   readLedgerSlice: () => readLedgerSlice,
@@ -66040,11 +66328,30 @@ var init_daemon_mesh_manager = __esm({
       nodeDatachannel = null;
       peers = /* @__PURE__ */ new Map();
       // Map<targetDaemonId, PeerEntry>
+      peerSnapshots = /* @__PURE__ */ new Map();
       pendingRequests = /* @__PURE__ */ new Map();
       commandCallback;
       p2pFailure(message, command, targetDaemonId) {
         return new P2pRelayFailureError(message, { command, targetDaemonId });
       }
+      updatePeerSnapshot(targetDaemonId, state, patch = {}) {
+        const previous = this.peerSnapshots.get(targetDaemonId);
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        this.peerSnapshots.set(targetDaemonId, {
+          perspective: "selected_coordinator",
+          source: "mesh_peer_status",
+          reported: true,
+          state,
+          transport: patch.transport ?? previous?.transport ?? "unknown",
+          reason: patch.reason ?? previous?.reason,
+          lastStateChangeAt: now,
+          lastConnectedAt: patch.lastConnectedAt ?? previous?.lastConnectedAt,
+          lastCommandAt: patch.lastCommandAt ?? previous?.lastCommandAt
+        });
+      }
+      getPeerConnectionStatus(targetDaemonId) {
+        return this.peerSnapshots.get(targetDaemonId) ?? null;
+      }
       invalidatePeer(targetDaemonId, reason, options = {}) {
         const peer = this.peers.get(targetDaemonId);
         if (peer?.commandQueue) {
@@ -66059,6 +66366,11 @@ var init_daemon_mesh_manager = __esm({
             pending.reject(this.p2pFailure(reason, pending.command, targetDaemonId));
           }
         }
+        const snapshotState = peer?.state === "closed" ? "closed" : peer?.state === "disconnected" ? "disconnected" : "failed";
+        this.updatePeerSnapshot(targetDaemonId, snapshotState, {
+          reason,
+          transport: peer?.isRelay === true ? "relay" : peer?.isRelay === false ? "direct" : "unknown"
+        });
         if (options.closeResources !== false && peer) {
           try {
             peer.dataChannel?.close?.();
@@ -66091,6 +66403,7 @@ var init_daemon_mesh_manager = __esm({
         "send_chat",
         "read_chat",
         "get_chat_debug_bundle",
+        "get_pending_mesh_events",
         "git_status",
         "git_diff_summary",
         "launch_cli",
@@ -66178,6 +66491,20 @@ var init_daemon_mesh_manager = __esm({
         if (!peer) {
           throw this.p2pFailure("Failed to initiate P2P connection entry", command, targetDaemonId);
         }
+        const lastCommandAt = (/* @__PURE__ */ new Date()).toISOString();
+        if (peer.state === "connected") {
+          this.updatePeerSnapshot(targetDaemonId, "connected", {
+            transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown",
+            lastConnectedAt: this.peerSnapshots.get(targetDaemonId)?.lastConnectedAt,
+            lastCommandAt
+          });
+        } else {
+          this.updatePeerSnapshot(targetDaemonId, "connecting", {
+            transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown",
+            reason: "Waiting for mesh DataChannel to open.",
+            lastCommandAt
+          });
+        }
         return new Promise((resolve20, reject) => {
           const requestId = `req_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
           const timer = setTimeout(() => {
@@ -66321,6 +66648,9 @@ var init_daemon_mesh_manager = __esm({
           remoteDescriptionSet: false
         };
         this.peers.set(targetDaemonId, entry);
+        this.updatePeerSnapshot(targetDaemonId, "connecting", {
+          reason: isInitiator ? "P2P mesh connection initiated by the selected coordinator." : "Waiting for the remote daemon to finish the mesh DataChannel handshake."
+        });
         pc.onLocalDescription((sdp, type2) => {
           this.serverConn.sendMeshCommand(targetDaemonId, type2 === "offer" ? "mesh_p2p_offer" : "mesh_p2p_answer", { sdp, type: type2 });
         });
@@ -66331,7 +66661,26 @@ var init_daemon_mesh_manager = __esm({
           LOG.info("Mesh", `[Mesh] P2P state with ${targetDaemonId.slice(0, 12)}: ${state}`);
           if (state === "connected") {
             entry.state = "connected";
+            let transport = "unknown";
+            try {
+              const pair = pc.getSelectedCandidatePair?.();
+              if (pair) {
+                const localType = pair.local?.type || "unknown";
+                const remoteType = pair.remote?.type || "unknown";
+                entry.isRelay = localType === "relay" || remoteType === "relay";
+                transport = entry.isRelay ? "relay" : "direct";
+                LOG.info("Mesh", `[Mesh] Candidate pair with ${targetDaemonId.slice(0, 12)}: local=${localType} remote=${remoteType} \u2192 ${transport}`);
+              }
+            } catch {
+              transport = entry.isRelay === true ? "relay" : entry.isRelay === false ? "direct" : "unknown";
+            }
+            this.updatePeerSnapshot(targetDaemonId, "connected", {
+              transport,
+              reason: transport === "relay" ? "Connected over TURN relay." : transport === "direct" ? "Connected directly peer-to-peer." : "Connected, but selected candidate pair details are unavailable.",
+              lastConnectedAt: (/* @__PURE__ */ new Date()).toISOString()
+            });
           } else if (state === "failed" || state === "closed" || state === "disconnected") {
+            entry.state = state;
             this.invalidatePeer(targetDaemonId, `P2P state changed to ${state}`, { rejectPending: true, closeResources: false });
           }
         });
@@ -66349,6 +66698,11 @@ var init_daemon_mesh_manager = __esm({
         dc.onOpen(() => {
           LOG.info("Mesh", `[Mesh] DataChannel OPEN with ${targetDaemonId.slice(0, 12)}`);
           entry.state = "connected";
+          this.updatePeerSnapshot(targetDaemonId, "connected", {
+            transport: entry.isRelay === true ? "relay" : entry.isRelay === false ? "direct" : "unknown",
+            reason: entry.isRelay === true ? "Connected over TURN relay." : entry.isRelay === false ? "Connected directly peer-to-peer." : "DataChannel open; transport details not reported yet.",
+            lastConnectedAt: (/* @__PURE__ */ new Date()).toISOString()
+          });
           if (entry.commandQueue) {
             const queue = entry.commandQueue;
             entry.commandQueue = [];
@@ -66628,6 +66982,7 @@ var init_adhdev_daemon = __esm({
     "use strict";
     init_server_connection();
     init_src();
+    init_mesh_events();
     init_daemon_p2p2();
     init_screenshot_controller();
     init_session_host();
@@ -66644,7 +66999,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.2" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.21" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -67168,6 +67523,7 @@ ${err?.stack || ""}`);
               if (!this.meshManager) throw new Error("Mesh manager not initialized");
               return this.meshManager.sendCommand(daemonId, command, args);
             },
+            getMeshPeerConnectionStatus: (daemonId) => this.meshManager?.getPeerConnectionStatus(daemonId) ?? null,
             onStatusChange: () => {
               this.invalidateHotChatSnapshotCache();
               this.statusReporter?.onStatusChange();
@@ -67560,6 +67916,21 @@ ${err?.stack || ""}`);
           await this.meshManager.sendCommand(coordinatorDaemonId, "mesh_forward_event", payload);
           LOG.info("MeshEvents", `Relayed ${payload.event} for mesh ${meshId} to coordinator daemon ${coordinatorDaemonId.slice(0, 12)}\u2026`);
         } catch (error48) {
+          queuePendingMeshCoordinatorEvent({
+            event: payload.event,
+            meshId,
+            nodeLabel: payload.nodeId ? `Node '${payload.nodeId}'` : payload.workspace ? `Agent at ${payload.workspace}` : "Remote agent",
+            nodeId: payload.nodeId || void 0,
+            workspace: payload.workspace || void 0,
+            metadataEvent: {
+              targetSessionId: payload.targetSessionId,
+              providerType: payload.providerType,
+              providerSessionId: payload.providerSessionId,
+              finalSummary: payload.finalSummary,
+              workspace: payload.workspace
+            },
+            queuedAt: Date.now()
+          });
           LOG.warn("MeshEvents", `Failed to relay ${payload.event} for mesh ${meshId}: ${error48?.message || error48}`);
         }
       }
@@ -68162,7 +68533,7 @@ var require_yoctocolors_cjs = __commonJS({
   }
 });
 
-// ../../node_modules/@inquirer/figures/dist/esm/index.js
+// ../../node_modules/@inquirer/figures/dist/esm/index.mjs
 function isUnicodeSupported() {
   if (import_node_process3.default.platform !== "win32") {
     return import_node_process3.default.env["TERM"] !== "linux";
@@ -68174,7 +68545,7 @@ function isUnicodeSupported() {
 }
 var import_node_process3, common2, specialMainSymbols, specialFallbackSymbols, mainSymbols, fallbackSymbols, shouldUseMain, figures, esm_default, replacements;
 var init_esm3 = __esm({
-  "../../node_modules/@inquirer/figures/dist/esm/index.js"() {
+  "../../node_modules/@inquirer/figures/dist/esm/index.mjs"() {
     "use strict";
     import_node_process3 = __toESM(require("process"), 1);
     common2 = {
@@ -68445,10 +68816,7 @@ var init_esm3 = __esm({
       oneNinth: "1/9",
       oneTenth: "1/10"
     };
-    mainSymbols = {
-      ...common2,
-      ...specialMainSymbols
-    };
+    mainSymbols = { ...common2, ...specialMainSymbols };
     fallbackSymbols = {
       ...common2,
       ...specialFallbackSymbols