fix: scope PR Inbox refresh to visibility

Co-authored-by: Jon Tirsen <tirsen@squareup.com>
Signed-off-by: Jon Tirsen <tirsen@squareup.com>

Author: tirsen

docs/work-status-platform-surfaces.md

@@ -7,13 +7,13 @@ without coupling the implementations.
 
 | Track | User-facing name | Implementation term |
 | --- | --- | --- |
-| Berd top bar | PR tracker | Pull Requests popover |
+| Berd top bar | PR Inbox | PR Inbox popover |
 | macOS | Work Status | menu bar popover |
 | Windows | Work Status | system tray flyout |
 
 ## 1. In-app PR tracker
 
-The in-app popover shows open pull requests only. Berd already exposes chat
+The PR Inbox popover shows open pull requests only. Berd already exposes chat
 status in its left sidebar, so duplicating chats inside the app would add noise.
 The PR tracker groups a pull request under the Berd project of the session that
 created it when that association can be recovered; otherwise it uses **No

src-tauri/src/commands/pr_tracker.rs

@@ -34,33 +34,42 @@ const MAX_REPOSITORY_LENGTH: usize = 256;
 const MAX_BRANCH_LENGTH: usize = 512;
 const GIT_PROBE_CONCURRENCY: usize = 4;
 const WORKSPACE_CANDIDATES_QUERY: &str = r#"
-WITH session_activity AS (
+WITH recent_messages AS (
+  SELECT session_id, created_timestamp
+  FROM messages
+  ORDER BY id DESC
+  LIMIT ?
+), recent_message_activity AS (
+  SELECT session_id,
+         MAX(
+           CASE
+             WHEN created_timestamp > 10000000000
+               THEN created_timestamp / 1000
+             ELSE created_timestamp
+           END
+         ) AS activity_at
+  FROM recent_messages
+  GROUP BY session_id
+), session_activity AS (
   SELECT s.id,
          s.working_dir,
          s.project_id,
          COALESCE(
-           MAX(
-             CASE
-               WHEN m.created_timestamp > 10000000000
-                 THEN m.created_timestamp / 1000
-               ELSE m.created_timestamp
-             END
-           ),
+           m.activity_at,
            CASE
              WHEN unixepoch(s.updated_at) >= unixepoch(s.created_at)
                THEN unixepoch(s.updated_at)
              ELSE COALESCE(unixepoch(s.created_at), unixepoch(s.updated_at))
            END
          ) AS activity_at
   FROM sessions s
-  LEFT JOIN messages m ON m.session_id = s.id
+  LEFT JOIN recent_message_activity m ON m.session_id = s.id
   WHERE s.archived_at IS NULL
     AND COALESCE(s.session_type, 'user') IN ('user', 'acp')
     AND s.project_id IS NOT NULL
     AND TRIM(s.project_id) != ''
     AND s.working_dir IS NOT NULL
     AND TRIM(s.working_dir) != ''
-  GROUP BY s.id, s.working_dir, s.project_id, s.created_at, s.updated_at
 ), ranked_workspaces AS (
   SELECT id,
          working_dir,
@@ -232,6 +241,7 @@ async fn resolve_pr_tracker_projects_inner(
         .await
         .map_err(|error| format!("Failed to open Berd chat database: {error}"))?;
     let rows = sqlx::query(WORKSPACE_CANDIDATES_QUERY)
+        .bind(MAX_MESSAGE_CANDIDATES)
         .bind(MAX_WORKSPACE_CANDIDATES as i64)
         .fetch_all(&pool)
         .await
@@ -579,7 +589,8 @@ mod tests {
               id INTEGER PRIMARY KEY,
               session_id TEXT NOT NULL,
               created_timestamp INTEGER NOT NULL
-            )
+            );
+            CREATE INDEX idx_messages_session ON messages(session_id);
             "#,
         )
         .execute(&pool)
@@ -624,6 +635,7 @@ mod tests {
             .unwrap();
 
         let rows = sqlx::query(WORKSPACE_CANDIDATES_QUERY)
+            .bind(MAX_MESSAGE_CANDIDATES)
             .bind(MAX_WORKSPACE_CANDIDATES as i64)
             .fetch_all(&pool)
             .await

src/app/App.tsx

@@ -6,7 +6,6 @@ import { SelectedTextContextMenu } from "@/app/ui/SelectedTextContextMenu";
 import { StartupLoadingView } from "@/app/ui/StartupLoadingView";
 import { useAuthGate } from "@/features/auth/hooks/useAuthGate";
 import { GlobalShortcutBridge } from "@/features/global-shortcut/GlobalShortcutBridge";
-import { WorkStatusBridge } from "@/features/work-status/WorkStatusBridge";
 import { LoginView } from "@/features/auth/ui/LoginView";
 import { getBuildFeatureState } from "@/shared/profile/buildProfile";
 import { useZoom } from "@/shared/hooks/useZoom";
@@ -49,7 +48,6 @@ export function App() {
     content = (
       <TopBarActionsProvider>
         <GlobalShortcutBridge />
-        <WorkStatusBridge />
         <AppShell
           authStatus={authGate.authStatus}
           onLoggedOut={authGate.completeLogin}

src/app/ui/TopBar.tsx

@@ -10,7 +10,7 @@ import {
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useTopBarActions } from "@/app/contexts/TopBarActionsContext";
-import { WORK_STATUS_EXPERIMENT_ID } from "@/features/experiments/experimentDefinitions";
+import { RELATED_PULL_REQUESTS_EXPERIMENT_ID } from "@/features/experiments/experimentDefinitions";
 import { useExperiment } from "@/features/experiments/experimentPreferences";
 import { BetaBadge } from "@/features/updates/ui/BetaBadge";
 import { PullRequestsPopover } from "@/features/work-status/PullRequestsPopover";
@@ -68,8 +68,8 @@ export function TopBar({
 }: TopBarProps) {
   const { t } = useTranslation(["sidebar", "feedback"]);
   const viewActions = useTopBarActions();
-  const workStatusEnabled =
-    useExperiment(WORK_STATUS_EXPERIMENT_ID)?.enabled === true;
+  const pullRequestsEnabled =
+    useExperiment(RELATED_PULL_REQUESTS_EXPERIMENT_ID)?.enabled === true;
   const topBarTitle =
     breadcrumbs.find((breadcrumb) => breadcrumb.id === "chat-session")?.label ??
     breadcrumbs.find((breadcrumb) => breadcrumb.id === "skills")?.label ??
@@ -155,7 +155,7 @@ export function TopBar({
         ) : null}
       </div>
       <div className="flex shrink-0 items-center gap-3 text-app-top-bar-control-fg [&_svg]:size-[length:var(--text-app-top-bar-icon)]">
-        {workStatusEnabled ? <PullRequestsPopover /> : null}
+        {pullRequestsEnabled ? <PullRequestsPopover /> : null}
         {viewActions}
         <BetaBadge />
 

src/features/experiments/__tests__/ExperimentsSettings.test.tsx

@@ -13,7 +13,6 @@ import {
   STARTER_TASKS_EXPERIMENT_ID,
   TRANSCRIPT_VIRTUAL_RENDERER_EXPERIMENT_ID,
   VOICE_CONVERSATION_EXPERIMENT_ID,
-  WORK_STATUS_EXPERIMENT_ID,
   type ExperimentDefinition,
 } from "../experimentDefinitions";
 import { ExperimentsSettings } from "../ExperimentsSettings";
@@ -130,26 +129,11 @@ describe("ExperimentsSettings", () => {
     ).toBeInTheDocument();
   });
 
-  it("enables Work Status by default and lets users turn it off", async () => {
-    vi.stubEnv("DEV", false);
-    const user = userEvent.setup();
-    renderWithProviders(<ExperimentsSettings />);
-
-    const toggle = screen.getByRole("switch", {
-      name: i18n.t("experiments.workStatus.title", { ns: "settings" }),
-    });
-    expect(toggle).toBeChecked();
-
-    await user.click(toggle);
-    expect(toggle).not.toBeChecked();
-  });
-
   it("registers only the currently supported experiments", () => {
     expect(EXPERIMENT_DEFINITIONS.map(({ id }) => id)).toEqual([
       BUILDERBOT_SURFACE_EXPERIMENT_ID,
       TRANSCRIPT_VIRTUAL_RENDERER_EXPERIMENT_ID,
       SKILL_DISCOVERY_EXPERIMENT_ID,
-      WORK_STATUS_EXPERIMENT_ID,
       STARTER_TASKS_EXPERIMENT_ID,
       VOICE_CONVERSATION_EXPERIMENT_ID,
       CHAT_ON_CANVAS_EXPERIMENT_ID,

src/features/experiments/experimentDefinitions.ts

@@ -67,7 +67,6 @@ export const SKILL_DISCOVERY_EXPERIMENT_ID = "skill-discovery";
 
 export const RELATED_PULL_REQUESTS_EXPERIMENT_ID = "related-pull-requests";
 
-export const WORK_STATUS_EXPERIMENT_ID = "work-status";
 export const EXPERIMENT_DEFINITIONS = [
   {
     id: BUILDERBOT_SURFACE_EXPERIMENT_ID,
@@ -88,12 +87,6 @@ export const EXPERIMENT_DEFINITIONS = [
     // sq-agents CLI and can make remote catalog requests.
     defaultEnabled: false,
   },
-  {
-    id: WORK_STATUS_EXPERIMENT_ID,
-    titleKey: "experiments.workStatus.title",
-    descriptionKey: "experiments.workStatus.description",
-    defaultEnabled: true,
-  },
   {
     id: STARTER_TASKS_EXPERIMENT_ID,
     titleKey: "experiments.starterTasks.title",

src/features/work-status/PullRequestsPopover.tsx

@@ -11,6 +11,7 @@ import { GitPullRequest } from "lucide-react";
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { TopBarIconButton } from "@/shared/ui/top-bar-icon-button";
 import { PullRequestsPanel } from "./PullRequestsPanel";
+import { WorkStatusBridge } from "./WorkStatusBridge";
 import { useWorkStatusStore } from "./workStatusStore";
 
 const DEFAULT_POPOVER_HEIGHT = 480;
@@ -114,48 +115,53 @@ export function PullRequestsPopover() {
   };
 
   return (
-    <Popover open={open} onOpenChange={handleOpenChange}>
-      <PopoverTrigger asChild>
-        <TopBarIconButton
-          type="button"
-          size="icon-top-bar"
-          className="relative"
-          aria-label={t("workStatus.topBarLabel", { count: pullRequestCount })}
-          tooltip={t("workStatus.title")}
+    <>
+      <WorkStatusBridge active={open} />
+      <Popover open={open} onOpenChange={handleOpenChange}>
+        <PopoverTrigger asChild>
+          <TopBarIconButton
+            type="button"
+            size="icon-top-bar"
+            className="relative"
+            aria-label={t("workStatus.topBarLabel", {
+              count: pullRequestCount,
+            })}
+            tooltip={t("workStatus.title")}
+          >
+            <GitPullRequest aria-hidden />
+            {pullRequestCount > 0 ? (
+              <span
+                aria-hidden="true"
+                className="pointer-events-none absolute -right-1 -top-1 flex h-4 min-w-4 items-center justify-center rounded-full bg-foreground px-1 font-medium text-[9px] leading-none text-background tabular-nums"
+              >
+                {formatCount(pullRequestCount)}
+              </span>
+            ) : null}
+          </TopBarIconButton>
+        </PopoverTrigger>
+        <PopoverContent
+          align="end"
+          sideOffset={8}
+          style={{ height }}
+          className="relative w-[min(460px,calc(100vw-2rem))] max-w-[calc(100vw-2rem)] overflow-visible border-0 bg-transparent p-0 shadow-none"
         >
-          <GitPullRequest aria-hidden />
-          {pullRequestCount > 0 ? (
-            <span
-              aria-hidden="true"
-              className="pointer-events-none absolute -right-1 -top-1 flex h-4 min-w-4 items-center justify-center rounded-full bg-foreground px-1 font-medium text-[9px] leading-none text-background tabular-nums"
-            >
-              {formatCount(pullRequestCount)}
-            </span>
-          ) : null}
-        </TopBarIconButton>
-      </PopoverTrigger>
-      <PopoverContent
-        align="end"
-        sideOffset={8}
-        style={{ height }}
-        className="relative w-[min(460px,calc(100vw-2rem))] max-w-[calc(100vw-2rem)] overflow-visible border-0 bg-transparent p-0 shadow-none"
-      >
-        <PullRequestsPanel />
-        <hr
-          tabIndex={0}
-          aria-label={t("workStatus.resize")}
-          aria-orientation="horizontal"
-          aria-valuemin={minAvailableHeight()}
-          aria-valuemax={maxAvailableHeight()}
-          aria-valuenow={Math.round(height)}
-          onKeyDown={handleResizeKeyDown}
-          onPointerDown={handleResizePointerDown}
-          onPointerMove={handleResizePointerMove}
-          onPointerUp={handleResizePointerUp}
-          onPointerCancel={handleResizePointerUp}
-          className="absolute right-3 bottom-0 left-3 z-10 h-3 translate-y-1/2 cursor-ns-resize touch-none rounded-sm border-0 bg-transparent outline-none focus-visible:ring-2 focus-visible:ring-ring"
-        />
-      </PopoverContent>
-    </Popover>
+          <PullRequestsPanel />
+          <hr
+            tabIndex={0}
+            aria-label={t("workStatus.resize")}
+            aria-orientation="horizontal"
+            aria-valuemin={minAvailableHeight()}
+            aria-valuemax={maxAvailableHeight()}
+            aria-valuenow={Math.round(height)}
+            onKeyDown={handleResizeKeyDown}
+            onPointerDown={handleResizePointerDown}
+            onPointerMove={handleResizePointerMove}
+            onPointerUp={handleResizePointerUp}
+            onPointerCancel={handleResizePointerUp}
+            className="absolute right-3 bottom-0 left-3 z-10 h-3 translate-y-1/2 cursor-ns-resize touch-none rounded-sm border-0 bg-transparent outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          />
+        </PopoverContent>
+      </Popover>
+    </>
   );
 }