@adhdev/daemon-standalone 0.9.82-rc.25 → 0.9.82-rc.26

package/dist/index.js

@@ -46072,49 +46072,7 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
       }).filter((entry) => entry !== null);
       return submodules.length > 0 ? submodules : void 0;
     }
-    function buildCachedInlineMeshGitStatus(node) {
-      const cachedStatus = readObjectRecord(node?.cachedStatus);
-      const cachedGit = readObjectRecord(cachedStatus.git);
-      if (Object.keys(cachedGit).length) {
-        const conflictFiles2 = Array.isArray(cachedGit.conflictFiles) ? cachedGit.conflictFiles.filter((value) => typeof value === "string") : [];
-        const conflictCount2 = readNumberValue(cachedGit.conflicts) ?? conflictFiles2.length;
-        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,
-            isGitRepo: isGitRepo2,
-            branch: readStringValue(cachedGit.branch) ?? null,
-            headCommit: readStringValue(cachedGit.headCommit) ?? null,
-            headMessage: readStringValue(cachedGit.headMessage) ?? null,
-            upstream: readStringValue(cachedGit.upstream) ?? null,
-            ahead: readNumberValue(cachedGit.ahead) ?? 0,
-            behind: readNumberValue(cachedGit.behind) ?? 0,
-            staged: readNumberValue(cachedGit.staged) ?? 0,
-            modified: readNumberValue(cachedGit.modified) ?? 0,
-            untracked: readNumberValue(cachedGit.untracked) ?? 0,
-            deleted: readNumberValue(cachedGit.deleted) ?? 0,
-            renamed: readNumberValue(cachedGit.renamed) ?? 0,
-            hasConflicts: hasConflicts2,
-            conflictFiles: conflictFiles2,
-            stashCount: readNumberValue(cachedGit.stashCount) ?? 0,
-            lastCheckedAt: readNumberValue(cachedGit.lastCheckedAt) ?? Date.now(),
-            ...submodules2 ? { submodules: submodules2 } : {}
-          };
-        }
-      }
-      const rawGit = readObjectRecord(node?.lastGit ?? node?.last_git);
-      const gitResult = readObjectRecord(rawGit.result);
-      const directStatus = readObjectRecord(rawGit.status);
-      const nestedStatus = readObjectRecord(gitResult.status);
-      const rawProbe = readObjectRecord(node?.lastProbe ?? node?.last_probe);
-      const probeGit = readObjectRecord(rawProbe.git);
-      const probeGitResult = readObjectRecord(probeGit.result);
-      const probeDirectStatus = readObjectRecord(probeGit.status);
-      const probeNestedStatus = readObjectRecord(probeGitResult.status);
-      const status = Object.keys(directStatus).length ? directStatus : Object.keys(nestedStatus).length ? nestedStatus : Object.keys(probeDirectStatus).length ? probeDirectStatus : Object.keys(probeNestedStatus).length ? probeNestedStatus : {};
+    function normalizeInlineMeshGitStatus(status, node, options) {
       const isGitRepo = readBooleanValue(status.isGitRepo);
       if (!Object.keys(status).length || isGitRepo === void 0) return void 0;
       const conflictFiles = Array.isArray(status.conflictFiles) ? status.conflictFiles.filter((value) => typeof value === "string") : [];
@@ -46139,10 +46097,31 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
         hasConflicts,
         conflictFiles,
         stashCount: readNumberValue(status.stashCount) ?? 0,
-        lastCheckedAt: Date.now(),
+        lastCheckedAt: options?.lastCheckedAt ?? readNumberValue(status.lastCheckedAt) ?? Date.now(),
         ...submodules ? { submodules } : {}
       };
     }
+    function buildInlineMeshTransitGitStatus(node) {
+      const rawGit = readObjectRecord(node?.lastGit ?? node?.last_git);
+      const gitResult = readObjectRecord(rawGit.result);
+      const directStatus = readObjectRecord(rawGit.status);
+      const nestedStatus = readObjectRecord(gitResult.status);
+      const rawProbe = readObjectRecord(node?.lastProbe ?? node?.last_probe);
+      const probeGit = readObjectRecord(rawProbe.git);
+      const probeGitResult = readObjectRecord(probeGit.result);
+      const probeDirectStatus = readObjectRecord(probeGit.status);
+      const probeNestedStatus = readObjectRecord(probeGitResult.status);
+      const status = Object.keys(directStatus).length ? directStatus : Object.keys(nestedStatus).length ? nestedStatus : Object.keys(probeDirectStatus).length ? probeDirectStatus : Object.keys(probeNestedStatus).length ? probeNestedStatus : {};
+      return normalizeInlineMeshGitStatus(status, node, { lastCheckedAt: Date.now() });
+    }
+    function buildCachedInlineMeshGitStatus(node) {
+      const liveGit = buildInlineMeshTransitGitStatus(node);
+      if (liveGit) return liveGit;
+      const cachedStatus = readObjectRecord(node?.cachedStatus);
+      const cachedGit = readObjectRecord(cachedStatus.git);
+      if (!Object.keys(cachedGit).length) return void 0;
+      return normalizeInlineMeshGitStatus(cachedGit, node);
+    }
     function shouldDiscardCachedInlineMeshStatus(node) {
       const cachedStatus = readObjectRecord(node?.cachedStatus);
       if (!Object.keys(cachedStatus).length) return false;
@@ -46371,9 +46350,10 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
     }
     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 liveGit = buildInlineMeshTransitGitStatus(node);
+      const git = liveGit ?? buildCachedInlineMeshGitStatus(node);
+      const error48 = liveGit ? void 0 : readStringValue(cachedStatus.error, node?.error);
+      const health = liveGit ? void 0 : readStringValue(cachedStatus.health, node?.health);
       const machineStatus = readStringValue(cachedStatus.machineStatus, node?.machineStatus);
       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);