@agent-native/core 0.144.2 → 0.145.0

package/corpus/templates/clips/server/jobs/brain-export.ts

@@ -18,6 +18,7 @@ const SWEEP_LIMIT = 4;
 const DISCOVERY_LIMIT = 20;
 const BACKFILL_DAYS = 7;
 let skippingLogged = false;
+let running = false;
 
 async function seedRecentBrainExports(): Promise<void> {
   const now = new Date();
@@ -173,12 +174,18 @@ export default function registerBrainExportJob(): void {
     return;
   }
   setInterval(() => {
-    reapExpiredUploads().catch((error) =>
-      console.error("[uploads] lease reaper interval failed:", error),
-    );
-    runBrainExportSweepOnce().catch((error) =>
-      console.error("[brain-export] interval failed:", error),
-    );
+    if (running) return;
+    running = true;
+    Promise.allSettled([
+      reapExpiredUploads().catch((error) =>
+        console.error("[uploads] lease reaper interval failed:", error),
+      ),
+      runBrainExportSweepOnce().catch((error) =>
+        console.error("[brain-export] interval failed:", error),
+      ),
+    ]).finally(() => {
+      running = false;
+    });
   }, SWEEP_INTERVAL_MS);
   console.log(
     `[brain-export] Recurring recovery sweep every ${SWEEP_INTERVAL_MS / 1000}s.`,

package/corpus/templates/clips/server/jobs/builder-media-compression.ts

@@ -13,6 +13,7 @@ import { runBuilderMediaCompressionSweepOnce } from "../lib/builder-media-compre
 
 const SWEEP_INTERVAL_MS = 5 * 60 * 1000;
 let skippingLogged = false;
+let running = false;
 
 export { runBuilderMediaCompressionSweepOnce };
 
@@ -31,9 +32,15 @@ export default function registerBuilderMediaCompressionJob(): void {
   }
 
   setInterval(() => {
-    runBuilderMediaCompressionSweepOnce().catch((err) =>
-      console.error("[builder-media-compression] interval failed:", err),
-    );
+    if (running) return;
+    running = true;
+    runBuilderMediaCompressionSweepOnce()
+      .catch((err) =>
+        console.error("[builder-media-compression] interval failed:", err),
+      )
+      .finally(() => {
+        running = false;
+      });
   }, SWEEP_INTERVAL_MS);
   console.log(
     `[builder-media-compression] Recurring compression sweep every ${SWEEP_INTERVAL_MS / 1000}s.`,

package/corpus/templates/clips/server/jobs/meeting-reminders.ts

@@ -29,6 +29,7 @@ import { getDb, schema } from "../db/index.js";
 const REMINDER_INTERVAL_MS = 60 * 1000;
 const REMINDER_WINDOW_MS = 5 * 60 * 1000;
 let skippingLogged = false;
+let running = false;
 
 const meetingReminderSchema = z.object({
   meetingId: z.string(),
@@ -114,9 +115,15 @@ export default function registerMeetingRemindersJob(): void {
     return;
   }
   setInterval(() => {
-    runMeetingRemindersOnce().catch((err) =>
-      console.error("[meeting-reminders] interval failed:", err),
-    );
+    if (running) return;
+    running = true;
+    runMeetingRemindersOnce()
+      .catch((err) =>
+        console.error("[meeting-reminders] interval failed:", err),
+      )
+      .finally(() => {
+        running = false;
+      });
   }, REMINDER_INTERVAL_MS);
   console.log(
     `[meeting-reminders] Recurring meeting reminders every ${REMINDER_INTERVAL_MS / 1000}s.`,

package/corpus/templates/clips/server/jobs/poll-calendars.ts

@@ -2,15 +2,16 @@
  * poll-calendars — recurring job (every 5 min).
  *
  * Sweeps every connected calendar_accounts row and refreshes its events.
- * Runs as a Nitro plugin via `setInterval` (matches the mail-jobs pattern
- * — works on every host that keeps a long-lived process; on serverless
- * the deployment plugin should call `runPollCalendarsOnce` from a
- * scheduled function instead).
+ * Runs as a Nitro plugin via `startIntervalJob` (matches the mail-jobs
+ * pattern — works on every host that keeps a long-lived process; on
+ * serverless the deployment plugin should call `runPollCalendarsOnce` from
+ * a scheduled function instead).
  *
  * Token refresh + per-account error capture happens inside the
  * `sync-calendars` action; this job is just a thin scheduler.
  */
 
+import { startIntervalJob } from "@agent-native/core/server/interval-job";
 import { runWithRequestContext } from "@agent-native/core/server/request-context";
 
 import syncCalendars from "../../actions/sync-calendars.js";
@@ -21,24 +22,21 @@ let skippingLogged = false;
 /**
  * Run a single poll pass. Exported so deployment-specific schedulers
  * (e.g. Netlify Scheduled Functions) can invoke it directly without
- * relying on a long-lived process.
+ * relying on a long-lived process. Throws on failure so a scheduled
+ * invocation records a failed run rather than a silent empty one.
  */
 export async function runPollCalendarsOnce(): Promise<void> {
   // No request context — this job runs as the system. The sync-calendars
   // action accepts `allAccounts: true` to skip the per-user accessFilter.
   await runWithRequestContext({}, async () => {
-    try {
-      const result = await syncCalendars.run(
-        { allAccounts: true } as any,
-        {} as any,
+    const result = await syncCalendars.run(
+      { allAccounts: true } as any,
+      {} as any,
+    );
+    if (result?.synced) {
+      console.log(
+        `[poll-calendars] synced ${result.synced} accounts, ${result.events ?? 0} events, ${result.meetings ?? 0} meetings`,
       );
-      if (result?.synced) {
-        console.log(
-          `[poll-calendars] synced ${result.synced} accounts, ${result.events ?? 0} events, ${result.meetings ?? 0} meetings`,
-        );
-      }
-    } catch (err: any) {
-      console.error(`[poll-calendars] sync failed:`, err?.message ?? err);
     }
   });
 }
@@ -62,11 +60,15 @@ export default function registerPollCalendarsJob(): void {
     }
     return;
   }
-  setInterval(() => {
-    runPollCalendarsOnce().catch((err) =>
-      console.error("[poll-calendars] interval failed:", err),
-    );
-  }, POLL_INTERVAL_MS);
+  // sync-calendars calls Google's Calendar API with no fetch-level timeout of
+  // its own, so the overlap guard and the hung-sweep timeout both come from
+  // startIntervalJob rather than a module-level `running` flag here.
+  startIntervalJob(() => runPollCalendarsOnce(), {
+    intervalMs: POLL_INTERVAL_MS,
+    leading: false,
+    onError: (err: any) =>
+      console.error("[poll-calendars] sync failed:", err?.message ?? err),
+  });
   console.log(
     `[poll-calendars] Recurring calendar sync every ${POLL_INTERVAL_MS / 1000}s.`,
   );

package/corpus/templates/clips/server/jobs/stale-meeting-sweeper.ts

@@ -46,6 +46,7 @@ const STALE_THRESHOLD_MS = 60 * 60 * 1000; // 60 min of zero transcript activity
 // a slow Gemini call. Mirrors finalize-meeting.ts's force-takeover window.
 const PENDING_STALE_MS = 2 * 60 * 1000; // 2 min
 let skippingLogged = false;
+let running = false;
 
 /**
  * Close out a single stranded-live meeting row: stamp actualEnd, set
@@ -284,9 +285,15 @@ export default function registerStaleMeetingSweeperJob(): void {
     return;
   }
   setInterval(() => {
-    runStaleMeetingSweepOnce().catch((err) =>
-      console.error("[stale-meeting-sweeper] interval failed:", err),
-    );
+    if (running) return;
+    running = true;
+    runStaleMeetingSweepOnce()
+      .catch((err) =>
+        console.error("[stale-meeting-sweeper] interval failed:", err),
+      )
+      .finally(() => {
+        running = false;
+      });
   }, SWEEP_INTERVAL_MS);
   console.log(
     `[stale-meeting-sweeper] Recurring stale-meeting reconciliation every ${SWEEP_INTERVAL_MS / 1000}s.`,

package/corpus/templates/clips/server/jobs/transactional-emails.ts

@@ -49,6 +49,7 @@ const SENDING_LEASE_MS = 2 * 60 * 1000;
 const MAX_ATTEMPTS = 3;
 const RETRY_BASE_DELAY_MS = 60_000;
 let skippingLogged = false;
+let running = false;
 
 type DirectShare = {
   id: string;
@@ -1304,9 +1305,15 @@ export default function registerTransactionalEmailsJob(): void {
     return;
   }
   setInterval(() => {
-    runTransactionalEmailsOnce().catch((error) =>
-      console.error("[transactional-emails] interval failed:", error),
-    );
+    if (running) return;
+    running = true;
+    runTransactionalEmailsOnce()
+      .catch((error) =>
+        console.error("[transactional-emails] interval failed:", error),
+      )
+      .finally(() => {
+        running = false;
+      });
   }, JOB_INTERVAL_MS);
   console.log(
     `[transactional-emails] Recurring reconciliation and delivery every ${JOB_INTERVAL_MS / 1000}s.`,

package/corpus/templates/content/app/components/sidebar/NotionButton.tsx

@@ -167,6 +167,7 @@ export function NotionButton() {
 
     // Poll for connection
     pollRef.current = setInterval(async () => {
+      if (document.hidden) return;
       const result = await refetch();
       if (result.data?.connected) {
         clearInterval(pollRef.current);

package/corpus/templates/design/app/components/design/FusionAppBanner.tsx

@@ -83,11 +83,24 @@ export function FusionAppBanner({
   // ── Building: poll sync-fusion-app on mount + every ~8s while building ────
   const syncMutateRef = useRef(syncMutation.mutate);
   syncMutateRef.current = syncMutation.mutate;
+  const syncInFlightRef = useRef(false);
   useEffect(() => {
     if (status !== "building") return;
-    syncMutateRef.current({ designId } as any);
+    // The leading sync goes through the same guard as the interval ticks: a
+    // container check still pending at the first tick would otherwise let a
+    // second status sync start and race the provisioning/screen-upsert work.
+    const runSync = (): void => {
+      if (syncInFlightRef.current) return;
+      syncInFlightRef.current = true;
+      syncMutateRef.current(
+        { designId } as any,
+        { onSettled: () => (syncInFlightRef.current = false) } as any,
+      );
+    };
+    runSync();
     const interval = window.setInterval(() => {
-      syncMutateRef.current({ designId } as any);
+      if (document.hidden) return;
+      runSync();
     }, SYNC_POLL_INTERVAL_MS);
     return () => window.clearInterval(interval);
   }, [designId, status]);

package/corpus/templates/design/app/components/design/MultiScreenCanvas.tsx

@@ -182,6 +182,19 @@ const MAX_WHEEL_PAN_DELTA = 140;
 const CHROME_SCALE_CSS_VAR = "--an-chrome-scale";
 const PIXEL_GRID_ZOOM = 800;
 
+function hasScreenChildLayers(content: string): boolean {
+  const body = content.match(/<body\b[^>]*>([\s\S]*?)<\/body\s*>/i)?.[1] ?? "";
+  const editableMarkup = body
+    .replace(/<!--[\s\S]*?-->/g, "")
+    .replace(
+      /<(script|style|template)\b[^>]*>[\s\S]*?<\/\1\s*>|<(link|meta|base)\b[^>]*>/gi, // i18n-ignore regex removes non-rendered document elements
+      "",
+    )
+    .trim();
+
+  return editableMarkup.length > 0;
+}
+
 import {
   BOARD_SURFACE_BACKGROUND,
   getBoardContentKey,
@@ -3430,6 +3443,7 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
       const originCanvas = getCanvasPoint(e.clientX, e.clientY);
       let latestRect = normalizeRectFromPoints(originCanvas, originCanvas);
       let layerCandidates: CanvasLayerMarqueeCandidate[] = [];
+      let lastLayerSelectionSignature: string | null = null;
       const marqueeState: MarqueeDragState = {
         type: "marquee",
         originClient: { x: e.clientX, y: e.clientY },
@@ -3469,6 +3483,14 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             screenId: candidate.screenId,
             info: candidate.info,
           }));
+        const signature = selection
+          .map(
+            (item) =>
+              `${item.screenId}:${item.info.sourceId ?? item.info.pendingNodeId ?? item.info.selector ?? item.info.id ?? ""}`,
+          )
+          .join("|");
+        if (signature === lastLayerSelectionSignature) return;
+        lastLayerSelectionSignature = signature;
         onLayerMarqueeSelectionChange?.(selection, {
           source: "marquee",
           additive: state.additive,
@@ -3513,6 +3535,7 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
           additive: false,
           shiftKey: false,
         });
+        lastLayerSelectionSignature = "";
       }
       setIsDragging(true);
       // Seed collection with whatever the zero-size origin rect already
@@ -8236,6 +8259,9 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             onStartRotate={(event) =>
               beginRotate(singleSelectedFrame.id, event)
             }
+            onStartDrag={(event) =>
+              beginFrameDrag(singleSelectedFrame.id, event)
+            }
           />
         ) : null}
 
@@ -8259,6 +8285,9 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             chromeScale={chromeScale}
             chromeSettling={chromeSettling}
             handlesEnabled={!readOnly}
+            onStartDrag={(event) =>
+              beginFrameDrag(selectedFrameEntries[0]!.id, event)
+            }
             onStartResize={beginGroupResize}
             onStartRotate={beginGroupRotate}
           />
@@ -8270,6 +8299,9 @@ export const MultiScreenCanvas = memo(function MultiScreenCanvas({
             chromeScale={chromeScale}
             chromeSettling={chromeSettling}
             handlesEnabled={!readOnly}
+            onStartDrag={(event) =>
+              beginDraftDrag(selectedDraftEntries[0]!.id, event)
+            }
             onStartResize={beginDraftGroupResize}
           />
         ) : null}
@@ -9563,6 +9595,7 @@ const Screen = memo(function Screen({
     !suppressFrameChromeForChild;
   const screenContentInteractive =
     Boolean(screenContent) &&
+    (isSelected || hasScreenChildLayers(screen.content)) &&
     !locked &&
     !penActive &&
     !creationToolActive &&
@@ -9771,16 +9804,14 @@ const Screen = memo(function Screen({
         role="button"
         tabIndex={0}
         onClick={(e) => {
-          if (isInteractiveScreenContentTarget(e.target)) {
-            e.stopPropagation();
-            return;
-          }
+          const interactiveContent = isInteractiveScreenContentTarget(e.target);
           e.stopPropagation();
           if (suppressNextClick.current) {
             suppressNextClick.current = false;
             return;
           }
           if (e.detail > 1) return;
+          if (interactiveContent && isSelected) return;
           onPick(screen.id, e);
         }}
         onDoubleClick={(e) => {
@@ -10672,6 +10703,7 @@ function GroupSelectionBox({
   bounds,
   chromeScale,
   chromeSettling,
+  onStartDrag,
   onStartResize,
   onStartRotate,
   handlesEnabled = true,
@@ -10679,6 +10711,7 @@ function GroupSelectionBox({
   bounds: NonNullable<ReturnType<typeof getFrameGroupBounds>>;
   chromeScale: number;
   chromeSettling: boolean;
+  onStartDrag?: (e: React.MouseEvent) => void;
   onStartResize: (handle: ResizeHandle, e: React.MouseEvent) => void;
   /** Multi-selection rotate (CV14). Omit to keep the previous behavior (no
    *  rotate handle shown) — used by callers whose selection kind doesn't
@@ -10699,6 +10732,7 @@ function GroupSelectionBox({
       showRotate={!!onStartRotate}
       handlesEnabled={handlesEnabled}
       filled
+      onStartDrag={onStartDrag}
       onStartResize={onStartResize}
       onStartRotate={onStartRotate ?? (() => {})}
     />
@@ -10765,6 +10799,7 @@ function SelectionBox({
   handlesEnabled = true,
   onStartResize,
   onStartRotate,
+  onStartDrag,
 }: {
   geometry: FrameGeometry;
   chromeScale: number;
@@ -10774,6 +10809,7 @@ function SelectionBox({
   handlesEnabled?: boolean;
   onStartResize: (handle: ResizeHandle, e: React.MouseEvent) => void;
   onStartRotate: (e: React.MouseEvent) => void;
+  onStartDrag?: (e: React.MouseEvent) => void;
 }) {
   return (
     <div
@@ -10798,6 +10834,13 @@ function SelectionBox({
         zIndex: 1_000_000,
       }}
     >
+      {onStartDrag ? (
+        <span
+          data-frame-drag-surface
+          className="pointer-events-auto absolute inset-0 z-[5] cursor-move"
+          onMouseDown={onStartDrag}
+        />
+      ) : null}
       <ResizeHandles
         active
         enabled={handlesEnabled}

package/corpus/templates/forms/server/plugins/agent-chat.ts

@@ -56,7 +56,7 @@ export default createAgentChatPlugin({
   actions: loadActionsFromStaticRegistry(actionsRegistry),
   nativeActionsInDev: true,
   skipFilesContext: true,
-  databaseTools: false,
+  frameworkTools: { database: "off" },
   resolveOrgId: async (event) => (await getOrgContext(event)).orgId,
   mentionProviders: async () => {
     const { getDb } = await import("../db/index.js");

package/corpus/templates/mail/app/components/GoogleConnectBanner.tsx

@@ -66,6 +66,16 @@ const STEPS = [
   },
 ];
 
+const DESKTOP_POLL_INTERVAL_MS = 1500;
+const ADD_ACCOUNT_POLL_INTERVAL_MS = 2000;
+// Bounds each poll's fetches so a hung request can't leave its in-flight
+// guard stuck and stall the interval forever.
+const DESKTOP_POLL_ABORT_MS = Math.max(10_000, DESKTOP_POLL_INTERVAL_MS * 4);
+const ADD_ACCOUNT_POLL_ABORT_MS = Math.max(
+  10_000,
+  ADD_ACCOUNT_POLL_INTERVAL_MS * 4,
+);
+
 interface GoogleConnectBannerProps {
   variant?: "banner" | "hero";
 }
@@ -104,6 +114,8 @@ export function GoogleConnectBanner({
   );
   const desktopPollRef = useRef<ReturnType<typeof setInterval> | null>(null);
   const addAccountPollRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const desktopPollInFlightRef = useRef(false);
+  const addAccountPollInFlightRef = useRef(false);
   useEffect(() => {
     return () => {
       if (desktopPollRef.current) clearInterval(desktopPollRef.current);
@@ -130,40 +142,54 @@ export function GoogleConnectBanner({
     const start = Date.now();
     if (desktopPollRef.current) clearInterval(desktopPollRef.current);
     desktopPollRef.current = setInterval(async () => {
+      if (document.hidden || desktopPollInFlightRef.current) return;
+      desktopPollInFlightRef.current = true;
+      const controller = new AbortController();
+      const abortTimer = setTimeout(
+        () => controller.abort(),
+        DESKTOP_POLL_ABORT_MS,
+      );
       try {
-        const res = await fetch(
-          agentNativePath(
-            `/_agent-native/auth/desktop-exchange?flow_id=${flowId}`,
-          ),
-        );
-        const data = await res.json();
-        if (data?.error) {
-          clearInterval(desktopPollRef.current!);
-          desktopPollRef.current = null;
-          setDesktopAuthIssue(data);
-        } else if (data?.token) {
-          clearInterval(desktopPollRef.current!);
-          desktopPollRef.current = null;
-          await fetch(
+        try {
+          const res = await fetch(
             agentNativePath(
-              `/_agent-native/auth/session?_session=${data.token}`,
+              `/_agent-native/auth/desktop-exchange?flow_id=${flowId}`,
             ),
-            {
-              credentials: "include",
-            },
+            { signal: controller.signal },
           );
-          window.location.reload();
-        } else if (Date.now() - start > 120_000) {
-          clearInterval(desktopPollRef.current!);
-          desktopPollRef.current = null;
-        }
-      } catch {
-        if (Date.now() - start > 120_000) {
-          clearInterval(desktopPollRef.current!);
-          desktopPollRef.current = null;
+          const data = await res.json();
+          if (data?.error) {
+            clearInterval(desktopPollRef.current!);
+            desktopPollRef.current = null;
+            setDesktopAuthIssue(data);
+          } else if (data?.token) {
+            clearInterval(desktopPollRef.current!);
+            desktopPollRef.current = null;
+            await fetch(
+              agentNativePath(
+                `/_agent-native/auth/session?_session=${data.token}`,
+              ),
+              {
+                credentials: "include",
+                signal: controller.signal,
+              },
+            );
+            window.location.reload();
+          } else if (Date.now() - start > 120_000) {
+            clearInterval(desktopPollRef.current!);
+            desktopPollRef.current = null;
+          }
+        } catch {
+          if (Date.now() - start > 120_000) {
+            clearInterval(desktopPollRef.current!);
+            desktopPollRef.current = null;
+          }
         }
+      } finally {
+        clearTimeout(abortTimer);
+        desktopPollInFlightRef.current = false;
       }
-    }, 1500);
+    }, DESKTOP_POLL_INTERVAL_MS);
   }
 
   const [authError, setAuthError] = useState<string | null>(null);
@@ -274,20 +300,37 @@ export function GoogleConnectBanner({
     const prevCount = accounts.length;
     if (addAccountPollRef.current) clearInterval(addAccountPollRef.current);
     addAccountPollRef.current = setInterval(async () => {
-      const res = await fetch(
-        agentNativePath("/_agent-native/google/status"),
-      ).catch(() => null);
-      if (res?.ok) {
-        const data = await res.json();
-        if (data.accounts?.length > prevCount) {
-          if (addAccountPollRef.current) {
-            clearInterval(addAccountPollRef.current);
-            addAccountPollRef.current = null;
+      if (document.hidden || addAccountPollInFlightRef.current) return;
+      addAccountPollInFlightRef.current = true;
+      const controller = new AbortController();
+      const abortTimer = setTimeout(
+        () => controller.abort(),
+        ADD_ACCOUNT_POLL_ABORT_MS,
+      );
+      try {
+        const res = await fetch(
+          agentNativePath("/_agent-native/google/status"),
+          { signal: controller.signal },
+        )
+          // coercion-ok: a failed probe and a not-yet-added-account response
+          // both mean "keep waiting"; this loop only acts on an observed
+          // account-count increase.
+          .catch(() => null);
+        if (res?.ok) {
+          const data = await res.json();
+          if (data.accounts?.length > prevCount) {
+            if (addAccountPollRef.current) {
+              clearInterval(addAccountPollRef.current);
+              addAccountPollRef.current = null;
+            }
+            window.location.reload();
           }
-          window.location.reload();
         }
+      } finally {
+        clearTimeout(abortTimer);
+        addAccountPollInFlightRef.current = false;
       }
-    }, 2000);
+    }, ADD_ACCOUNT_POLL_INTERVAL_MS);
     // accounts.length is captured into prevCount above; including it in deps
     // would tear down and recreate the interval whenever the count changes.
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/corpus/templates/mail/app/components/layout/AppLayout.tsx

@@ -96,6 +96,10 @@ type SnoozeTarget = {
 };
 const COMPOSE_FULLSCREEN_PARAM = "composeFullscreen";
 const SIDEBAR_COLLAPSE_KEY = "mail-sidebar-collapsed";
+const ACCOUNT_POLL_INTERVAL_MS = 2000;
+// Bounds the account-status poll so a hung fetch can't leave the in-flight
+// guard stuck and stall the interval forever.
+const ACCOUNT_POLL_ABORT_MS = Math.max(10_000, ACCOUNT_POLL_INTERVAL_MS * 4);
 
 function AccountAvatar({
   email,
@@ -2491,18 +2495,36 @@ function AccountPopover({
     setWantAuthUrl(false);
     window.open(authUrl.data.url, "_blank");
 
+    let inFlight = false;
     const interval = setInterval(async () => {
-      const res = await fetch(
-        agentNativePath("/_agent-native/google/status"),
-      ).catch(() => null);
-      if (res?.ok) {
-        const data = await res.json();
-        if (data.accounts?.length > accounts.length) {
-          clearInterval(interval);
-          window.location.reload();
+      if (document.hidden || inFlight) return;
+      inFlight = true;
+      const controller = new AbortController();
+      const abortTimer = setTimeout(
+        () => controller.abort(),
+        ACCOUNT_POLL_ABORT_MS,
+      );
+      try {
+        const res = await fetch(
+          agentNativePath("/_agent-native/google/status"),
+          { signal: controller.signal },
+        )
+          // coercion-ok: a failed probe and a not-yet-added-account response
+          // both mean "keep waiting"; this loop only acts on an observed
+          // account-count increase.
+          .catch(() => null);
+        if (res?.ok) {
+          const data = await res.json();
+          if (data.accounts?.length > accounts.length) {
+            clearInterval(interval);
+            window.location.reload();
+          }
         }
+      } finally {
+        clearTimeout(abortTimer);
+        inFlight = false;
       }
-    }, 2000);
+    }, ACCOUNT_POLL_INTERVAL_MS);
 
     return () => clearInterval(interval);
   }, [wantAuthUrl, authUrl.data, accounts.length]);