@@ -204,6 +204,31 @@ describe("VcsStatusBroadcaster", () => {
     }).pipe(Effect.provide(layerTestFor(state)));
   });
 
+  it.effect(
+    "preserves cached remote status when a local-only refresh stays on the same branch",
+    () => {
+      const state = {
+        currentLocalStatus: baseLocalStatus,
+        currentRemoteStatus: { ...remoteStatusWithPr, aheadCount: 2, behindCount: 3 },
+        localStatusCalls: 0,
+        remoteStatusCalls: 0,
+        localInvalidationCalls: 0,
+        remoteInvalidationCalls: 0,
+      };
+
+      return Effect.gen(function* () {
+        const broadcaster = yield* VcsStatusBroadcaster.VcsStatusBroadcaster;
+        const initial = yield* broadcaster.getStatus({ cwd: "/repo" });
+        const refreshed = yield* broadcaster.refreshStatus("/repo", { localOnly: true });
+        assert.deepStrictEqual(refreshed, initial);
+        assert.deepStrictEqual(yield* broadcaster.getStatus({ cwd: "/repo" }), refreshed);
+        assert.equal(state.localInvalidationCalls, 1);
+        assert.equal(state.remoteInvalidationCalls, 0);
+        assert.equal(state.remoteStatusCalls, 1);
+      }).pipe(Effect.provide(layerTestFor(state)));
+    },
+  );
+
   it.effect("clears the previous branch's remote status after an in-flight PR refresh", () => {
     const remoteReadStarted = Deferred.makeUnsafe<void>();
     const releaseRemoteRead = Deferred.makeUnsafe<void>();
 
@@ -524,7 +524,7 @@ export const make = Effect.gen(function* () {
             return yield* updateCachedStatus(cwd, local, null, { publish: true });
           }
           yield* updateCachedLocalStatus(cwd, local, { publish: true });
-          return mergeGitStatusParts(local, null);
+          return mergeGitStatusParts(local, previous?.remote?.value ?? null);
         }),
       );
     }
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ export const make = Effect.gen(function* () {`
`524`	`524`	`return yield* updateCachedStatus(cwd, local, null, { publish: true });`
`525`	`525`	`}`
`526`	`526`	`yield* updateCachedLocalStatus(cwd, local, { publish: true });`
`527`		`- return mergeGitStatusParts(local, null);`
	`527`	`+ return mergeGitStatusParts(local, previous?.remote?.value ?? null);`
`528`	`528`	`}),`
`529`	`529`	`);`
`530`	`530`	`}`