@adhdev/daemon-standalone 0.9.82-rc.302 → 0.9.82-rc.304

package/dist/index.js

@@ -29784,6 +29784,7 @@ var require_dist3 = __commonJS({
     });
     var git_executor_exports = {};
     __export2(git_executor_exports, {
+      GIT_STATUS_TIMEOUT_MS: () => GIT_STATUS_TIMEOUT_MS,
       GitCommandError: () => GitCommandError,
       isPathInside: () => isPathInside,
       normalizeGitOutput: () => normalizeGitOutput,
@@ -29956,6 +29957,7 @@ var require_dist3 = __commonJS({
     var execFileAsync;
     var DEFAULT_TIMEOUT_MS;
     var DEFAULT_MAX_BUFFER;
+    var GIT_STATUS_TIMEOUT_MS;
     var GitCommandError;
     var init_git_executor = __esm2({
       "src/git/git-executor.ts"() {
@@ -29968,6 +29970,7 @@ var require_dist3 = __commonJS({
         execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
         DEFAULT_TIMEOUT_MS = 5e3;
         DEFAULT_MAX_BUFFER = 1024 * 1024;
+        GIT_STATUS_TIMEOUT_MS = process.platform === "win32" ? 3e4 : 2e4;
         GitCommandError = class extends Error {
           reason;
           stdout;
@@ -30001,10 +30004,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "850c147fda8183e55c145fcef876d2c25a22c8d2" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "850c147f" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.302" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-17T02:29:47.351Z" : void 0);
+      const commit = readInjected(true ? "1d8f7eabac25d169c6344185357519db0c0ffd13" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "1d8f7eab" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.304" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-17T05:27:28.772Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -30014,65 +30017,80 @@ var require_dist3 = __commonJS({
         "use strict";
       }
     });
+    function isTransientGitFailure(error48) {
+      return error48.reason === "timeout" || error48.reason === "git_command_failed";
+    }
     async function getGitRepoStatus(workspace, options = {}) {
       const lastCheckedAt = Date.now();
       const includeSubmodules = options.includeSubmodules !== false;
+      const effectiveOptions = options.timeoutMs === void 0 ? { ...options, timeoutMs: GIT_STATUS_TIMEOUT_MS } : options;
       try {
-        const repo = await resolveGitRepository(workspace, options);
-        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;
-        if (includeSubmodules) {
-          submodules = await getSubmoduleStatuses(repo, options);
-        }
-        const submoduleDirty = (submodules || []).some((submodule) => submodule.dirty || submodule.outOfSync || !!submodule.error);
-        const dirty = parsed.staged + parsed.modified + parsed.untracked + parsed.deleted + parsed.renamed > 0 || parsed.conflictFiles.length > 0 || stashCount > 0 || submoduleDirty;
-        const daemonBuildBehind = await detectDaemonBuildBehind(repo, submodules, options);
-        return {
-          workspace: repo.workspace,
-          repoRoot: repo.repoRoot,
-          isGitRepo: true,
-          branch: parsed.branch,
-          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,
-          modified: parsed.modified,
-          untracked: parsed.untracked,
-          deleted: parsed.deleted,
-          renamed: parsed.renamed,
-          dirty,
-          hasConflicts: parsed.conflictFiles.length > 0,
-          conflictFiles: parsed.conflictFiles,
-          stashCount,
-          lastCheckedAt,
-          submodules,
-          ...daemonBuildBehind ? { daemonBuildBehind } : {}
-        };
+        const repo = await resolveGitRepository(workspace, effectiveOptions);
+        const status = await collectGitRepoStatus(repo, includeSubmodules, lastCheckedAt, effectiveOptions);
+        lastKnownGoodStatus.set(workspace, status);
+        return status;
       } catch (error48) {
-        if (error48 instanceof GitCommandError) {
-          return emptyStatus(workspace, lastCheckedAt, error48);
+        const gitError = error48 instanceof GitCommandError ? error48 : new GitCommandError("git_command_failed", "Failed to read Git status", { cause: error48 });
+        if (isTransientGitFailure(gitError)) {
+          const cached22 = lastKnownGoodStatus.get(workspace);
+          if (cached22) {
+            return {
+              ...cached22,
+              lastCheckedAt,
+              upstreamStatus: "unavailable",
+              error: gitError.stderr || gitError.message,
+              reason: gitError.reason
+            };
+          }
         }
-        return emptyStatus(
-          workspace,
-          lastCheckedAt,
-          new GitCommandError("git_command_failed", "Failed to read Git status", { cause: error48 })
-        );
+        return emptyStatus(workspace, lastCheckedAt, gitError);
       }
     }
+    async function collectGitRepoStatus(repo, includeSubmodules, lastCheckedAt, options) {
+      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;
+      if (includeSubmodules) {
+        submodules = await getSubmoduleStatuses(repo, options);
+      }
+      const submoduleDirty = (submodules || []).some((submodule) => submodule.dirty || submodule.outOfSync || !!submodule.error);
+      const dirty = parsed.staged + parsed.modified + parsed.untracked + parsed.deleted + parsed.renamed > 0 || parsed.conflictFiles.length > 0 || stashCount > 0 || submoduleDirty;
+      const daemonBuildBehind = await detectDaemonBuildBehind(repo, submodules, options);
+      return {
+        workspace: repo.workspace,
+        repoRoot: repo.repoRoot,
+        isGitRepo: true,
+        branch: parsed.branch,
+        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,
+        modified: parsed.modified,
+        untracked: parsed.untracked,
+        deleted: parsed.deleted,
+        renamed: parsed.renamed,
+        dirty,
+        hasConflicts: parsed.conflictFiles.length > 0,
+        conflictFiles: parsed.conflictFiles,
+        stashCount,
+        lastCheckedAt,
+        submodules,
+        ...daemonBuildBehind ? { daemonBuildBehind } : {}
+      };
+    }
     function isNonRuntimeRootFile(file2) {
       const base = file2.slice(file2.lastIndexOf("/") + 1);
       if (/^\.(?:verify|marker|converge|ff-verify|patch-equiv|live-verify)\b/i.test(base)) return true;
@@ -30313,7 +30331,7 @@ var require_dist3 = __commonJS({
     async function getSubmoduleStatuses(repo, options) {
       if (!repo.repoRoot) return [];
       try {
-        const result = await runGit(repo, ["submodule", "status", "--recursive"], options);
+        const result = await runGit(repo, ["submodule", "status"], options);
         const submodules = parseSubmoduleStatusOutput(result.stdout, repo.repoRoot, options.submoduleIgnorePaths);
         await Promise.all(submodules.map((submodule) => enrichSubmoduleWorktreeStatus(repo, submodule, options)));
         return submodules;
@@ -30357,6 +30375,7 @@ var require_dist3 = __commonJS({
       }
       return submodules;
     }
+    var lastKnownGoodStatus;
     var DAEMON_RUNTIME_PACKAGES;
     var WEB_ONLY_PACKAGES;
     var init_git_status = __esm2({
@@ -30364,6 +30383,7 @@ var require_dist3 = __commonJS({
         "use strict";
         init_git_executor();
         init_build_info();
+        lastKnownGoodStatus = /* @__PURE__ */ new Map();
         DAEMON_RUNTIME_PACKAGES = /* @__PURE__ */ new Set([
           "daemon-core",
           "daemon-standalone",
@@ -71843,6 +71863,15 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       const connectionState = readStringValue(readObjectRecord(status.connection).state);
       status.launchReady = !!daemonId && (readStringValue(status.machineStatus) === "online" || connectionState === "connected" || isSelfNode);
     }
+    function readMeshTimeoutEnvMs(name, defaultMs) {
+      const raw = process.env[name]?.trim();
+      if (!raw) return defaultMs;
+      const parsed = Number.parseInt(raw, 10);
+      if (Number.isFinite(parsed) && parsed >= 1e3 && parsed <= 12e4) return parsed;
+      return defaultMs;
+    }
+    var MESH_DIRECT_PROBE_TIMEOUT_MS = readMeshTimeoutEnvMs("MESH_DIRECT_PROBE_TIMEOUT_MS", 25e3);
+    var MESH_DIRECT_PROBE_RETRY_TIMEOUT_MS = readMeshTimeoutEnvMs("MESH_DIRECT_PROBE_RETRY_TIMEOUT_MS", 25e3);
     async function probeRemoteMeshGitStatus(args) {
       if (!args.dispatchMeshCommand) return null;
       const remoteResult = await Promise.race([
@@ -71906,7 +71935,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             dispatchMeshCommand: args.dispatchMeshCommand,
             daemonId,
             workspace,
-            timeoutMs: 8e3
+            timeoutMs: MESH_DIRECT_PROBE_TIMEOUT_MS
           });
           if (remoteGit) {
             recordInlineMeshDirectGitTruth(node, remoteGit, "selected_coordinator_mesh_p2p_git");
@@ -77876,7 +77905,7 @@ ${ptyResult.output.slice(-2e3)}`);
                           dispatchMeshCommand: this.deps.dispatchMeshCommand,
                           daemonId,
                           workspace,
-                          timeoutMs: 8e3
+                          timeoutMs: MESH_DIRECT_PROBE_TIMEOUT_MS
                         });
                         if (remoteGit) {
                           status.git = remoteGit;
@@ -77900,7 +77929,7 @@ ${ptyResult.output.slice(-2e3)}`);
                               dispatchMeshCommand: this.deps.dispatchMeshCommand,
                               daemonId,
                               workspace,
-                              timeoutMs: 12e3
+                              timeoutMs: MESH_DIRECT_PROBE_RETRY_TIMEOUT_MS
                             });
                             if (remoteGit) {
                               status.git = remoteGit;