@adhdev/daemon-core 0.9.82-rc.316 → 0.9.82-rc.317

package/dist/index.js

@@ -353,10 +353,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "930909642b3f28668483159d3a8f39d0a796c61a" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "93090964" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.316" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-18T07:23:07.242Z" : void 0);
+  const commit = readInjected(true ? "b4484284652748bf8096f40a00eb5cb463963576" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "b4484284" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.317" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-18T08:55:18.955Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -682,14 +682,79 @@ function emptyStatus(workspace, lastCheckedAt, error) {
 async function getSubmoduleStatuses(repo, options) {
   if (!repo.repoRoot) return [];
   try {
-    const result = await runGit(repo, ["submodule", "status"], options);
-    const submodules = parseSubmoduleStatusOutput(result.stdout, repo.repoRoot, options.submoduleIgnorePaths);
+    const submodules = await deriveSubmoduleGitlinkStatuses(repo, options);
     await Promise.all(submodules.map((submodule) => enrichSubmoduleWorktreeStatus(repo, submodule, options)));
     return submodules;
   } catch {
     return [];
   }
 }
+async function deriveSubmoduleGitlinkStatuses(repo, options) {
+  if (!repo.repoRoot) return [];
+  const paths = await readSubmodulePaths(repo, options);
+  const ignoreSet = new Set(options.submoduleIgnorePaths || []);
+  const lastCheckedAt = Date.now();
+  const entries = await Promise.all(
+    paths.filter((path41) => !ignoreSet.has(path41)).map(async (path41) => {
+      const repoPath = repo.repoRoot + "/" + path41;
+      const expected = await readGitlinkExpectedSha(repo, path41, options);
+      const actual = await readSubmoduleHeadSha(repo, repoPath, options);
+      const outOfSync = actual === null ? true : expected !== null && expected !== actual;
+      return {
+        path: path41,
+        // Prefer the recorded gitlink SHA (matches the legacy column); fall back
+        // to the checked-out SHA so the field is never empty when both are known.
+        commit: expected ?? actual ?? "",
+        repoPath,
+        dirty: false,
+        outOfSync,
+        lastCheckedAt
+      };
+    })
+  );
+  return entries;
+}
+async function readSubmodulePaths(repo, options) {
+  if (!repo.repoRoot) return [];
+  const gitmodulesPath = repo.repoRoot + "/.gitmodules";
+  try {
+    const result = await runGit(
+      repo,
+      ["config", "--file", gitmodulesPath, "--get-regexp", "^submodule\\..*\\.path$"],
+      options
+    );
+    const paths = [];
+    for (const line of result.stdout.split("\n")) {
+      const spaceIdx = line.indexOf(" ");
+      if (spaceIdx < 0) continue;
+      const value = line.slice(spaceIdx + 1).trim();
+      if (value) paths.push(value);
+    }
+    return paths;
+  } catch {
+    return [];
+  }
+}
+async function readGitlinkExpectedSha(repo, submodulePath, options) {
+  try {
+    const result = await runGit(repo, ["ls-tree", "HEAD", submodulePath], options);
+    const line = result.stdout.split("\n").find((l) => l.trim().length > 0);
+    if (!line) return null;
+    const match = line.match(/^\s*\d+\s+commit\s+([0-9a-f]{40})\b/);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
+async function readSubmoduleHeadSha(repo, repoPath, options) {
+  try {
+    const result = await runGit(repo, ["rev-parse", "HEAD"], { ...options, cwd: repoPath });
+    const sha = result.stdout.trim();
+    return /^[0-9a-f]{40}$/.test(sha) ? sha : null;
+  } catch {
+    return null;
+  }
+}
 async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
   try {
     const result = await runGit(repo, ["status", "--porcelain=v2", "--branch"], {
@@ -704,28 +769,6 @@ async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
     submodule.error = formatGitError(error);
   }
 }
-function parseSubmoduleStatusOutput(output, repoRoot, ignorePaths) {
-  const submodules = [];
-  const ignoreSet = new Set(ignorePaths || []);
-  for (const line of output.split("\n")) {
-    if (!line.trim()) continue;
-    const match = line.match(/^([\-+U\s])([0-9a-f]{40})\s+(\S+)(?:\s+\(([^)]+)\))?/);
-    if (!match) continue;
-    const prefix = match[1];
-    const commit = match[2];
-    const path41 = match[3];
-    if (ignoreSet.has(path41)) continue;
-    submodules.push({
-      path: path41,
-      commit,
-      repoPath: repoRoot + "/" + path41,
-      dirty: prefix === "U",
-      outOfSync: prefix === "-" || prefix === "+",
-      lastCheckedAt: Date.now()
-    });
-  }
-  return submodules;
-}
 var lastKnownGoodStatus, DAEMON_RUNTIME_PACKAGES, WEB_ONLY_PACKAGES;
 var init_git_status = __esm({
   "src/git/git-status.ts"() {
@@ -3955,6 +3998,18 @@ var init_mesh_runtime_store = __esm({
         `).get(meshId, nodeId);
         return row?.count ?? 0;
       }
+      /**
+       * O(1) count of queue tasks in 'pending' status for a mesh. A COUNT(*) over the
+       * indexed status column, so it avoids JSON.parse-ing every queue row — used as a
+       * cheap guard before the reconcile loop runs a full triggerMeshQueue scan.
+       */
+      pendingQueueTaskCount(meshId) {
+        const row = this.db.prepare(`
+            SELECT COUNT(*) as count FROM mesh_queue
+            WHERE mesh_id = ? AND status = 'pending'
+        `).get(meshId);
+        return row?.count ?? 0;
+      }
       /**
        * Read the current per-mesh round-robin cursor (0 when unset). Used to rotate
        * the tie-break winner among nodes tied at the least load.
@@ -8888,7 +8943,7 @@ async function triggerMeshQueue(components, meshId) {
   }
   const remoteCandidates = [];
   for (const idle of remoteSessions) {
-    const node = mesh.nodes.find((n) => n.id === idle.nodeId);
+    const node = mesh.nodes.find((n) => meshNodeIdMatches(n, idle.nodeId));
     if (node) {
       remoteIdleSessionsChecked += 1;
       remoteCandidates.push({ nodeId: idle.nodeId, sessionId: idle.sessionId, providerType: idle.providerType, origin: "remote", node });
@@ -9692,6 +9747,21 @@ async function runMeshReconcileTick(components) {
       }
     }
   }
+  for (const mesh of listMeshes()) {
+    const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
+    if (!daemonHostsMesh(mesh, selfIds)) continue;
+    if (store) {
+      try {
+        if (store.pendingQueueTaskCount(mesh.id) === 0) continue;
+      } catch {
+      }
+    }
+    try {
+      await triggerMeshQueue(components, mesh.id);
+    } catch (e) {
+      LOG.warn("MeshReconcile", `Pending-claim recovery trigger failed for mesh ${mesh.id}: ${e?.message || e}`);
+    }
+  }
   const coordinators = findLiveCoordinators(components);
   if (coordinators.length === 0) {
     return;
@@ -43297,7 +43367,15 @@ var MESH_DIRECT_PROBE_MAX_RETRIES = 2;
 function readMeshConnectionState(connection) {
   return readStringValue(connection?.state);
 }
+function isMeshConnectionDefinitivelyDown(connection) {
+  if (!connection) return true;
+  const state = readMeshConnectionState(connection);
+  return state === "failed" || state === "closed" || state === "disconnected";
+}
 async function probeRemoteMeshGitStatusWithRetry(args) {
+  if (args.getConnection && isMeshConnectionDefinitivelyDown(args.getConnection(args.daemonId))) {
+    return null;
+  }
   for (let attempt = 0; attempt <= MESH_DIRECT_PROBE_MAX_RETRIES; attempt += 1) {
     if (attempt > 0) {
       const connection = args.getConnection?.(args.daemonId);