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

package/dist/index.js

@@ -30075,10 +30075,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "930909642b3f28668483159d3a8f39d0a796c61a" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "93090964" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = 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:33.672Z" : 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 version2 = 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:56:20.224Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -30402,14 +30402,79 @@ var require_dist3 = __commonJS({
     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"], {
@@ -30424,28 +30489,6 @@ var require_dist3 = __commonJS({
         submodule.error = formatGitError(error48);
       }
     }
-    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;
     var DAEMON_RUNTIME_PACKAGES;
     var WEB_ONLY_PACKAGES;
@@ -33713,6 +33756,18 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         `).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.
@@ -38660,7 +38715,7 @@ Next step: ${nextStep}`;
       }
       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 });
@@ -39475,6 +39530,21 @@ Next step: ${nextStep}`;
           }
         }
       }
+      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) {
+          LOG2.warn("MeshReconcile", `Pending-claim recovery trigger failed for mesh ${mesh.id}: ${e?.message || e}`);
+        }
+      }
       const coordinators = findLiveCoordinators(components);
       if (coordinators.length === 0) {
         return;
@@ -72844,7 +72914,15 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
     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);