Persist base branch for Paseo worktrees and gate merge action

packages/app/src/hooks/use-checkout-status-query.ts

@@ -1,5 +1,8 @@
 import { useQuery } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { UnistylesRuntime } from "react-native-unistyles";
 import { useSessionStore } from "@/stores/session-store";
+import { usePanelStore } from "@/stores/panel-store";
 import type { CheckoutStatusResponse } from "@server/shared/messages";
 
 const CHECKOUT_STATUS_STALE_TIME = 15_000;
@@ -22,6 +25,12 @@ export function useCheckoutStatusQuery({ serverId, agentId }: UseCheckoutStatusQ
   const isConnected = useSessionStore(
     (state) => state.sessions[serverId]?.connection.isConnected ?? false
   );
+  const isMobile =
+    UnistylesRuntime.breakpoint === "xs" || UnistylesRuntime.breakpoint === "sm";
+  const mobileView = usePanelStore((state) => state.mobileView);
+  const desktopFileExplorerOpen = usePanelStore((state) => state.desktop.fileExplorerOpen);
+  const explorerTab = usePanelStore((state) => state.explorerTab);
+  const isOpen = isMobile ? mobileView === "file-explorer" : desktopFileExplorerOpen;
 
   const query = useQuery({
     queryKey: checkoutStatusQueryKey(serverId, agentId),
@@ -34,8 +43,18 @@ export function useCheckoutStatusQuery({ serverId, agentId }: UseCheckoutStatusQ
     enabled: !!client && isConnected && !!agentId,
     staleTime: CHECKOUT_STATUS_STALE_TIME,
     refetchInterval: 10_000,
+    refetchIntervalInBackground: true,
+    refetchOnMount: "always",
   });
 
+  // Revalidate when sidebar is open with "changes" tab active.
+  useEffect(() => {
+    if (!isOpen || explorerTab !== "changes" || !agentId) {
+      return;
+    }
+    void query.refetch();
+  }, [isOpen, explorerTab, agentId, query]);
+
   return {
     status: query.data ?? null,
     isLoading: query.isLoading,