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

package/dist/git/git-commands.d.ts

@@ -42,6 +42,7 @@ export interface GitPushResult extends GitRepoIdentity {
 export interface GitCommandServices {
     getStatus?: (params: {
         workspace: string;
+        refreshUpstream?: boolean;
     }) => Promise<GitRepoStatus> | GitRepoStatus;
     getDiffSummary?: (params: {
         workspace: string;

package/dist/git/git-status.d.ts

@@ -5,6 +5,11 @@ export interface GitStatusOptions {
     includeSubmodules?: boolean;
     /** Optional filter to exclude specific submodule paths from status */
     submoduleIgnorePaths?: string[];
+    /**
+     * When true, refresh the tracked remote before trusting ahead/behind.
+     * Callers should opt into this only for convergence-critical surfaces.
+     */
+    refreshUpstream?: boolean;
 }
 export declare function getGitRepoStatus(workspace: string, options?: GitStatusOptions): Promise<GitRepoStatus>;
 interface ParsedPorcelainStatus {

package/dist/git/git-types.d.ts

@@ -27,11 +27,18 @@ export interface GitSubmoduleStatus {
     /** Error message if submodule status could not be read */
     error?: string;
 }
+export type GitUpstreamFreshness = 'fresh' | 'unchecked' | 'stale' | 'no_upstream' | 'unavailable';
 export interface GitRepoStatus extends GitRepoIdentity {
     branch: string | null;
     headCommit: string | null;
     headMessage: string | null;
     upstream: string | null;
+    /** Whether ahead/behind was verified against a freshly fetched upstream ref. */
+    upstreamStatus: GitUpstreamFreshness;
+    /** Timestamp for the fetch that refreshed upstream refs when upstreamStatus === 'fresh'. */
+    upstreamFetchedAt?: number;
+    /** Error from the last refresh attempt when upstreamStatus === 'stale'. */
+    upstreamFetchError?: string;
     ahead: number;
     behind: number;
     staged: number;
@@ -105,6 +112,9 @@ export interface GitCompactSummary {
     isGitRepo: boolean;
     repoRoot: string | null;
     branch: string | null;
+    upstreamStatus: GitUpstreamFreshness;
+    upstreamFetchedAt?: number;
+    upstreamFetchError?: string;
     dirty: boolean;
     changedFiles: number;
     ahead: number;

package/dist/index.js

@@ -5913,8 +5913,14 @@ async function getGitRepoStatus(workspace, options = {}) {
   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;
@@ -5929,6 +5935,9 @@ async function getGitRepoStatus(workspace, options = {}) {
       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,
@@ -5953,6 +5962,60 @@ async function getGitRepoStatus(workspace, options = {}) {
     );
   }
 }
+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 (error) {
+    return {
+      upstreamStatus: "stale",
+      upstreamFetchError: formatGitError(error)
+    };
+  }
+}
+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(error) {
+  if (error instanceof GitCommandError) {
+    return error.stderr || error.message;
+  }
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
 function parsePorcelainV2Status(output) {
   const parsed = {
     branch: null,
@@ -6047,6 +6110,7 @@ function emptyStatus(workspace, lastCheckedAt, error) {
     headCommit: null,
     headMessage: null,
     upstream: null,
+    upstreamStatus: "unavailable",
     ahead: 0,
     behind: 0,
     staged: 0,
@@ -6327,6 +6391,9 @@ function createGitCompactSummary(status, diffSummary) {
     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,
@@ -6671,7 +6738,7 @@ var defaultSnapshotStore = createGitSnapshotStore({
 });
 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({
@@ -6757,7 +6824,7 @@ async function handleGitCommand(command, args, services = defaultGitCommandServi
   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": {
@@ -26365,7 +26432,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);