fix(git): invalidate busy-state on git events; watch rebase/merge files

Without this, aborting/finishing a rebase or merge from outside the app
leaves the branch selector showing a stale "Rebasing" label until the
next 30s poll.

Generated-By: PostHog Code
Task-Id: c5674c04-c95c-4bfe-bfcf-248a921b4aae

Author: jonathanlab

apps/code/src/main/services/file-watcher/service.ts

@@ -214,6 +214,11 @@ export class FileWatcherService extends TypedEventEmitter<FileWatcherEvents> {
           (e) =>
             e.path.endsWith("/HEAD") ||
             e.path.endsWith("/index") ||
+            e.path.endsWith("/MERGE_HEAD") ||
+            e.path.endsWith("/CHERRY_PICK_HEAD") ||
+            e.path.endsWith("/REVERT_HEAD") ||
+            e.path.includes("/rebase-merge") ||
+            e.path.includes("/rebase-apply") ||
             e.path.includes("/refs/heads/"),
         );
         if (isRelevant) {

apps/code/src/renderer/features/git-interaction/utils/gitCacheKeys.ts

@@ -15,6 +15,7 @@ export function invalidateGitBranchQueries(repoPath: string) {
   const input = { directoryPath: repoPath };
   queryClient.invalidateQueries(trpc.git.getCurrentBranch.queryFilter(input));
   queryClient.invalidateQueries(trpc.git.getAllBranches.queryFilter(input));
+  queryClient.invalidateQueries(trpc.git.getGitBusyState.queryFilter(input));
   queryClient.invalidateQueries(trpc.git.getGitSyncStatus.queryFilter(input));
   queryClient.invalidateQueries(
     trpc.git.getChangedFilesHead.queryFilter(input),