@adhdev/daemon-standalone 0.9.82-rc.8 → 0.9.82-rc.9

package/dist/index.js

@@ -28062,8 +28062,14 @@ ${lastSnapshot}`;
       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;
@@ -28078,6 +28084,9 @@ ${lastSnapshot}`;
           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,
@@ -28102,6 +28111,60 @@ ${lastSnapshot}`;
         );
       }
     }
+    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,
@@ -28196,6 +28259,7 @@ ${lastSnapshot}`;
         headCommit: null,
         headMessage: null,
         upstream: null,
+        upstreamStatus: "unavailable",
         ahead: 0,
         behind: 0,
         staged: 0,
@@ -28472,6 +28536,9 @@ ${lastSnapshot}`;
         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,
@@ -28810,7 +28877,7 @@ ${lastSnapshot}`;
     });
     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({
@@ -28896,7 +28963,7 @@ ${lastSnapshot}`;
       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": {
@@ -48342,7 +48409,7 @@ ${block}`);
                     continue;
                   }
                   try {
-                    const gitStatus = await getGitRepoStatus(node.workspace, { timeoutMs: 1e4 });
+                    const gitStatus = await getGitRepoStatus(node.workspace, { timeoutMs: 1e4, refreshUpstream: true });
                     status.git = gitStatus;
                     if (gitStatus.isGitRepo) {
                       status.health = deriveMeshNodeHealthFromGit(gitStatus);