@agent-native/toolkit 0.198.7-nightly-20260930213124 → 0.198.7

package/dist/composer/use-composer-panel-placement.d.ts

@@ -1,6 +1,5 @@
 import { type RefObject } from "react";
 export declare function useComposerPanelPlacement(triggerRef: RefObject<HTMLElement | null>, open: boolean): {
-    width: number;
     maxHeight: number;
     side: "top" | "bottom";
     sideOffset: number;

package/dist/composer/use-composer-panel-placement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-composer-panel-placement.d.ts","sourceRoot":"","sources":["../../src/composer/use-composer-panel-placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAKlE,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EACzC,IAAI,EAAE,OAAO;;;UAKI,KAAK,GAAG,QAAQ;;;eAGX,KAAK,GAAG,KAAK;EAsDpC"}
+{"version":3,"file":"use-composer-panel-placement.d.ts","sourceRoot":"","sources":["../../src/composer/use-composer-panel-placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAMlE,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EACzC,IAAI,EAAE,OAAO;;UAII,KAAK,GAAG,QAAQ;;;eAGX,KAAK,GAAG,KAAK;EAwDpC"}

package/dist/composer/use-composer-panel-placement.js

@@ -1,10 +1,10 @@
 import { useLayoutEffect, useState } from "react";
-// Leave room for the search field, group label, and at least one action.
+// Keep the compact menu's actions reachable in short viewports.
 const MIN_USABLE_PANEL_HEIGHT = 120;
+const MAX_COMPOSER_PANEL_HEIGHT = 280;
 export function useComposerPanelPlacement(triggerRef, open) {
     const [placement, setPlacement] = useState({
-        width: 320,
-        maxHeight: 440,
+        maxHeight: MAX_COMPOSER_PANEL_HEIGHT,
         side: "top",
         sideOffset: 8,
         alignOffset: 0,
@@ -30,10 +30,9 @@ export function useComposerPanelPlacement(triggerRef, open) {
                 ? "bottom"
                 : "top";
             setPlacement({
-                width: bounds.width,
                 direction: rtl ? "rtl" : "ltr",
                 side,
-                maxHeight: Math.min(440, side === "top" ? spaceAbove : spaceBelow),
+                maxHeight: Math.min(MAX_COMPOSER_PANEL_HEIGHT, side === "top" ? spaceAbove : spaceBelow),
                 sideOffset: side === "top"
                     ? button.top - bounds.top + 8
                     : bounds.bottom - button.bottom + 8,

package/dist/composer/use-composer-panel-placement.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-composer-panel-placement.js","sourceRoot":"","sources":["../../src/composer/use-composer-panel-placement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-composer-panel-placement.js","sourceRoot":"","sources":["../../src/composer/use-composer-panel-placement.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/toolkit",
-  "version": "0.198.7-nightly-20260930213124",
+  "version": "0.198.7",
   "description": "Reusable app-building UI and helpers for Agent-Native apps.",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -665,7 +665,7 @@
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.198.7-nightly-20260930213124"
+    "@agent-native/agentkit": "^0.198.7"
   },
   "devDependencies": {
     "@excalidraw/excalidraw": "0.18.1",
@@ -686,10 +686,10 @@
     "typescript-7": "npm:typescript@^7.0.2",
     "vite": "8.1.0",
     "vitest": "^4.1.5",
-    "@agent-native/core": "^0.198.7-nightly-20260930213124"
+    "@agent-native/core": "^0.198.7"
   },
   "peerDependencies": {
-    "@agent-native/core": "0.198.7-nightly-20260930213124",
+    "@agent-native/core": ">=0.196.0",
     "@excalidraw/excalidraw": ">=0.18",
     "@excalidraw/mermaid-to-excalidraw": ">=2",
     "@tanstack/react-query": "^5.99.2",

package/src/app/chat/AgentPanel.header.spec.ts

@@ -907,47 +907,45 @@ describe("AgentSidebar toggle routing", () => {
 });
 
 describe("AgentPanel header overflow actions", () => {
-  it("closes the menu before opening a sibling overlay", () => {
-    const requestAnimationFrame = window.requestAnimationFrame;
-    const frames: Array<() => void> = [];
-    window.requestAnimationFrame = ((callback: FrameRequestCallback) => {
-      frames.push(() => callback(0));
-      return frames.length;
-    }) as typeof window.requestAnimationFrame;
+  it("opens a sibling overlay only after the menu closes", () => {
+    const pendingOverlayRef = { current: null as (() => void) | null };
+    const event = { preventDefault: vi.fn() };
+    const focusRestoreEvent = { preventDefault: vi.fn() };
+    const events: string[] = [];
 
-    try {
-      const event = { preventDefault: vi.fn() };
-      const events: string[] = [];
+    deferAgentPanelOverlayOpen(
+      event,
+      () => events.push("menu closed"),
+      () => events.push("overlay opened"),
+      pendingOverlayRef,
+    );
 
-      deferAgentPanelOverlayOpen(
-        event,
-        () => events.push("menu closed"),
-        () => events.push("overlay opened"),
-      );
+    expect(event.preventDefault).toHaveBeenCalledOnce();
+    expect(events).toEqual(["menu closed"]);
+    expect(pendingOverlayRef.current).toBeTypeOf("function");
 
-      expect(event.preventDefault).toHaveBeenCalledOnce();
-      expect(events).toEqual(["menu closed"]);
-      expect(frames).toHaveLength(1);
+    consumeAgentPanelOverlayFocusRestore(pendingOverlayRef, focusRestoreEvent);
 
-      frames[0]!();
-      expect(events).toEqual(["menu closed", "overlay opened"]);
-    } finally {
-      window.requestAnimationFrame = requestAnimationFrame;
-    }
+    expect(focusRestoreEvent.preventDefault).toHaveBeenCalledOnce();
+    expect(events).toEqual(["menu closed", "overlay opened"]);
+    expect(pendingOverlayRef.current).toBeNull();
   });
 
   it("consumes the pending menu focus restore for the sibling overlay", () => {
-    const pendingOverlayRef = { current: true };
+    const openOverlay = vi.fn();
+    const pendingOverlayRef = { current: openOverlay };
     const event = { preventDefault: vi.fn() };
 
     consumeAgentPanelOverlayFocusRestore(pendingOverlayRef, event);
 
     expect(event.preventDefault).toHaveBeenCalledOnce();
-    expect(pendingOverlayRef.current).toBe(false);
+    expect(openOverlay).toHaveBeenCalledOnce();
+    expect(pendingOverlayRef.current).toBeNull();
 
     const secondEvent = { preventDefault: vi.fn() };
     consumeAgentPanelOverlayFocusRestore(pendingOverlayRef, secondEvent);
     expect(secondEvent.preventDefault).not.toHaveBeenCalled();
+    expect(openOverlay).toHaveBeenCalledOnce();
   });
 
   it("keeps width and full-view actions out of the icon row", () => {
@@ -978,7 +976,7 @@ describe("AgentPanel header overflow actions", () => {
     expect(overflowMenu.match(/deferAgentPanelOverlayOpen/g)).toHaveLength(3);
     expect(source).toContain("event.preventDefault();");
     expect(overflowMenu).toContain(
-      'toggleHistory,\n                    "timeout"',
+      "toggleHistory,\n                    pendingHeaderOverlayRef",
     );
     expect(overflowMenu).toContain("onCloseAutoFocus");
     expect(
@@ -1024,7 +1022,7 @@ describe("AgentPanel header overflow actions", () => {
     expect(source).toContain("defaultOpen={onCollapse && shareFromMenuOpen}");
     expect(source).toContain("onCollapse ? setShareFromMenuOpen : undefined");
     expect(overflowMenu).toContain(
-      'setShareFromMenuOpen(true),\n                        "timeout"',
+      "setShareFromMenuOpen(true),\n                        pendingHeaderOverlayRef",
     );
   });
 

package/src/app/chat/AgentPanel.overlay.spec.tsx

@@ -25,10 +25,9 @@ function OverlayHandoffHarness({
   const [feedbackOpen, setFeedbackOpen] = useState(false);
   const [historyOpen, setHistoryOpen] = useState(false);
   const [shareFromMenuOpen, setShareFromMenuOpen] = useState(false);
-  const pendingOverlayRef = useRef(false);
+  const pendingOverlayRef = useRef<(() => void) | null>(null);
 
   const closeMenuForOverlay = () => {
-    pendingOverlayRef.current = true;
     setMenuOpen(false);
   };
 
@@ -53,7 +52,7 @@ function OverlayHandoffHarness({
                 event,
                 closeMenuForOverlay,
                 () => setHistoryOpen(true),
-                "timeout",
+                pendingOverlayRef,
               )
             }
           >
@@ -62,8 +61,11 @@ function OverlayHandoffHarness({
           <DropdownMenuItem
             data-testid="feedback-item"
             onSelect={(event) =>
-              deferAgentPanelOverlayOpen(event, closeMenuForOverlay, () =>
-                setFeedbackOpen(true),
+              deferAgentPanelOverlayOpen(
+                event,
+                closeMenuForOverlay,
+                () => setFeedbackOpen(true),
+                pendingOverlayRef,
               )
             }
           >
@@ -76,7 +78,7 @@ function OverlayHandoffHarness({
                 event,
                 closeMenuForOverlay,
                 () => setShareFromMenuOpen(true),
-                "timeout",
+                pendingOverlayRef,
               )
             }
           >
@@ -139,32 +141,23 @@ function OverlayHandoffHarness({
 describe("AgentPanel sibling overlay handoff", () => {
   let container: HTMLDivElement;
   let root: Root;
-  let frames: Array<FrameRequestCallback>;
-  let requestAnimationFrame: typeof window.requestAnimationFrame;
 
   beforeEach(() => {
     vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
     container = document.createElement("div");
     document.body.appendChild(container);
     root = createRoot(container);
-    frames = [];
-    requestAnimationFrame = window.requestAnimationFrame;
-    window.requestAnimationFrame = ((callback: FrameRequestCallback) => {
-      frames.push(callback);
-      return frames.length;
-    }) as typeof window.requestAnimationFrame;
   });
 
   afterEach(() => {
     act(() => root.unmount());
     container.remove();
     document.body.innerHTML = "";
-    window.requestAnimationFrame = requestAnimationFrame;
     vi.useRealTimers();
     vi.unstubAllGlobals();
   });
 
-  it("keeps feedback open after the menu restores focus", async () => {
+  it("opens feedback after the menu closes", async () => {
     const focusRestorePrevented = vi.fn();
 
     await act(async () => {
@@ -204,20 +197,14 @@ describe("AgentPanel sibling overlay handoff", () => {
     });
 
     expect(focusRestorePrevented).toHaveBeenCalledWith(true);
-    expect(frames).toHaveLength(1);
-
-    await act(async () => {
-      frames[0]!(0);
-    });
 
     expect(
       document.body.querySelector('[data-testid="feedback-content"]'),
     ).toBeTruthy();
   });
 
-  it("keeps All chats open after the menu restores focus", async () => {
+  it("keeps All chats open after the menu closes", async () => {
     const focusRestorePrevented = vi.fn();
-    vi.useFakeTimers();
 
     await act(async () => {
       root.render(
@@ -251,19 +238,8 @@ describe("AgentPanel sibling overlay handoff", () => {
         );
     });
 
-    expect(
-      document.body.querySelector('[data-testid="history-content"]'),
-    ).toBeNull();
-
-    act(() => {
-      vi.advanceTimersByTime(99);
-    });
-    expect(
-      document.body.querySelector('[data-testid="history-content"]'),
-    ).toBeNull();
-
-    act(() => {
-      vi.advanceTimersByTime(1);
+    await act(async () => {
+      await new Promise<void>((resolve) => setTimeout(resolve, 150));
     });
 
     expect(focusRestorePrevented).toHaveBeenCalledWith(true);
@@ -274,7 +250,6 @@ describe("AgentPanel sibling overlay handoff", () => {
 
   it("opens the share popover after clicking Share in the overflow menu", async () => {
     const focusRestorePrevented = vi.fn();
-    vi.useFakeTimers();
 
     await act(async () => {
       root.render(
@@ -309,20 +284,8 @@ describe("AgentPanel sibling overlay handoff", () => {
         );
     });
 
-    expect(frames).toHaveLength(0);
-    expect(
-      document.body.querySelector('[data-testid="share-content"]'),
-    ).toBeNull();
-
-    act(() => {
-      vi.advanceTimersByTime(99);
-    });
-    expect(
-      document.body.querySelector('[data-testid="share-content"]'),
-    ).toBeNull();
-
-    act(() => {
-      vi.advanceTimersByTime(1);
+    await act(async () => {
+      await new Promise<void>((resolve) => setTimeout(resolve, 150));
     });
 
     expect(focusRestorePrevented).toHaveBeenCalledWith(true);

package/src/app/chat/AgentPanel.tsx

@@ -287,38 +287,27 @@ const AGENT_PANEL_CONTROL_STYLE = {
   lineHeight: 1,
 } satisfies React.CSSProperties;
 const ACTIVATE_KEYS = new Set(["Enter", " "]);
-const AGENT_PANEL_MENU_EXIT_DURATION_MS = 100;
-type AgentPanelOverlayOpenTiming = "animation-frame" | "timeout";
 
 export function deferAgentPanelOverlayOpen(
   event: { preventDefault: () => void },
   closeMenu: () => void,
   openOverlay: () => void,
-  timing: AgentPanelOverlayOpenTiming = "animation-frame",
+  pendingOverlayRef: { current: (() => void) | null },
 ): void {
   event.preventDefault();
+  pendingOverlayRef.current = openOverlay;
   closeMenu();
-  if (timing === "timeout") {
-    setTimeout(openOverlay, AGENT_PANEL_MENU_EXIT_DURATION_MS);
-    return;
-  }
-  if (
-    typeof window !== "undefined" &&
-    typeof window.requestAnimationFrame === "function"
-  ) {
-    window.requestAnimationFrame(() => openOverlay());
-  } else {
-    setTimeout(openOverlay, 0);
-  }
 }
 
 export function consumeAgentPanelOverlayFocusRestore(
-  pendingOverlayRef: { current: boolean },
+  pendingOverlayRef: { current: (() => void) | null },
   event: { preventDefault: () => void },
 ): void {
-  if (!pendingOverlayRef.current) return;
-  pendingOverlayRef.current = false;
+  const openOverlay = pendingOverlayRef.current;
+  if (!openOverlay) return;
+  pendingOverlayRef.current = null;
   event.preventDefault();
+  openOverlay();
 }
 
 interface AvailableCli {
@@ -1209,9 +1198,8 @@ function AgentPanelInner({
   const [headerMenuOpen, setHeaderMenuOpen] = useState(false);
   const [feedbackOpen, setFeedbackOpen] = useState(false);
   const [shareFromMenuOpen, setShareFromMenuOpen] = useState(false);
-  const preventHeaderMenuFocusRestoreRef = useRef(false);
+  const pendingHeaderOverlayRef = useRef<(() => void) | null>(null);
   const closeHeaderMenuForOverlay = useCallback(() => {
-    preventHeaderMenuFocusRestoreRef.current = true;
     setHeaderMenuOpen(false);
   }, []);
 
@@ -1402,7 +1390,7 @@ function AgentPanelInner({
             className="max-h-[var(--radix-dropdown-menu-content-available-height)] w-48 overflow-y-auto"
             onCloseAutoFocus={(event) => {
               consumeAgentPanelOverlayFocusRestore(
-                preventHeaderMenuFocusRestoreRef,
+                pendingHeaderOverlayRef,
                 event,
               );
             }}
@@ -1515,7 +1503,7 @@ function AgentPanelInner({
                         event,
                         closeHeaderMenuForOverlay,
                         () => setShareFromMenuOpen(true),
-                        "timeout",
+                        pendingHeaderOverlayRef,
                       )
                     }
                   >
@@ -1531,7 +1519,7 @@ function AgentPanelInner({
                     event,
                     closeHeaderMenuForOverlay,
                     toggleHistory,
-                    "timeout",
+                    pendingHeaderOverlayRef,
                   )
                 }
               >
@@ -1580,6 +1568,7 @@ function AgentPanelInner({
                     event,
                     closeHeaderMenuForOverlay,
                     () => setFeedbackOpen(true),
+                    pendingHeaderOverlayRef,
                   )
                 }
               >
@@ -1777,7 +1766,7 @@ function AgentPanelInner({
                       className="w-44"
                       onCloseAutoFocus={(event) => {
                         consumeAgentPanelOverlayFocusRestore(
-                          preventHeaderMenuFocusRestoreRef,
+                          pendingHeaderOverlayRef,
                           event,
                         );
                       }}
@@ -1789,7 +1778,7 @@ function AgentPanelInner({
                               event,
                               closeHeaderMenuForOverlay,
                               toggleHistory,
-                              "timeout",
+                              pendingHeaderOverlayRef,
                             )
                           }
                         >
@@ -1854,7 +1843,7 @@ function AgentPanelInner({
       onPageHeaderVisibilityChange,
       pageHeaderLeadingSlot,
       pageToolbarSlot,
-      preventHeaderMenuFocusRestoreRef,
+      pendingHeaderOverlayRef,
       setHeaderMenuOpen,
       showPageNewChatButton,
       t,

package/src/app/chat/ConnectBuilderCard.spec.tsx

@@ -293,6 +293,51 @@ describe("ConnectBuilderCard", () => {
     window.removeEventListener("agent-panel:open-settings", handleOpenSettings);
   });
 
+  it("shows Builder.io for the legacy Fusion connection label and preserves org names", () => {
+    mocks.useBuilderConnectFlow.mockReturnValue({
+      hasFetchedStatus: true,
+      statusResolved: true,
+      configured: true,
+      codeChangeConfigured: false,
+      builderEnabled: false,
+      orgName: "Fusion",
+      envManaged: false,
+      connecting: false,
+      error: null,
+      start: mocks.start,
+    });
+
+    act(() => {
+      root.render(
+        <ConnectBuilderCard configured builderEnabled={false} connectUrl="" />,
+      );
+    });
+
+    expect(container.textContent).toContain("Connected to Builder.io.");
+    expect(container.textContent).not.toContain("Connected to Fusion");
+
+    mocks.useBuilderConnectFlow.mockReturnValue({
+      hasFetchedStatus: true,
+      statusResolved: true,
+      configured: true,
+      codeChangeConfigured: false,
+      builderEnabled: false,
+      orgName: "Acme workspace",
+      envManaged: false,
+      connecting: false,
+      error: null,
+      start: mocks.start,
+    });
+
+    act(() => {
+      root.render(
+        <ConnectBuilderCard configured builderEnabled={false} connectUrl="" />,
+      );
+    });
+
+    expect(container.textContent).toContain("Connected to Acme workspace.");
+  });
+
   it("keeps cloud code-change send when OAuth and legacy keys both exist", () => {
     mocks.useBuilderConnectFlow.mockReturnValue({
       hasFetchedStatus: true,

package/src/app/chat/ConnectBuilderCard.tsx

@@ -82,6 +82,7 @@ export function ConnectBuilderCard({
     ? flow.builderEnabled
     : initialBuilderEnabled;
   const orgName = flow.statusResolved ? flow.orgName : (initialOrgName ?? null);
+  const connectedToName = orgName === "Fusion" ? "Builder.io" : orgName;
   const connecting = flow.connecting;
 
   const [waitlistJoined, setWaitlistJoined] = useState(false);
@@ -303,10 +304,10 @@ export function ConnectBuilderCard({
         Managed by this deployment — every user of this app uses the same
         Builder identity. {connectedCapabilityText} {connectedCapabilityAction}
       </>
-    ) : orgName ? (
+    ) : connectedToName ? (
       <>
         Connected to{" "}
-        <span className="font-medium text-foreground">{orgName}</span>.{" "}
+        <span className="font-medium text-foreground">{connectedToName}</span>.{" "}
         {connectedCapabilityText} {connectedCapabilityAction}
       </>
     ) : (

package/src/app/chat/MultiTabAssistantChat.spec.tsx

@@ -2966,6 +2966,9 @@ describe("MultiTabAssistantChat tab close/open lifecycle", () => {
 
   it("replaces an active missing thread with a fresh chat", async () => {
     const replacementId = "thread-replacement";
+    window.history.replaceState({}, "", "/?thread=missing-thread");
+    threadMocks.activeThreadId = "missing-thread";
+    threadMocks.threads = [makeThread("missing-thread")];
     threadMocks.createThread.mockImplementationOnce(async () => {
       threadMocks.activeThreadId = replacementId;
       threadMocks.threads = [makeThread(replacementId), ...threadMocks.threads];
@@ -3000,6 +3003,15 @@ describe("MultiTabAssistantChat tab close/open lifecycle", () => {
     });
 
     expect(headerProps?.tabs.map((tab) => tab.id)).toEqual([replacementId]);
+    expect(new URL(window.location.href).searchParams.has("thread")).toBe(
+      false,
+    );
+    expect(chatThreadHookMocks.useChatThreads).toHaveBeenLastCalledWith(
+      expect.any(String),
+      "missing-thread-test",
+      null,
+      expect.objectContaining({ routeThreadId: undefined }),
+    );
   });
 
   it("does not replace a desktop thread before identity restore settles", async () => {

package/src/app/chat/MultiTabAssistantChat.tsx

@@ -989,9 +989,32 @@ export function MultiTabAssistantChat({
 
   const writeThreadUrl = useCallback(
     (threadId: string | null, options: { replace?: boolean } = {}): void => {
-      if (!threadUrlSyncEnabled || typeof window === "undefined") return;
+      if (typeof window === "undefined") return;
+      const normalizedThreadId = normalizeUrlThreadId(threadId);
+      if (!threadUrlSyncEnabled) {
+        if (
+          !activeDeepLinkedThreadId ||
+          normalizedThreadId === activeDeepLinkedThreadId
+        ) {
+          return;
+        }
+        setActiveDeepLinkedThreadId(null);
+        try {
+          const url = new URL(window.location.href);
+          url.searchParams.delete(DEFAULT_THREAD_URL_PARAM);
+          url.searchParams.delete("threadId");
+          window.history.replaceState(
+            window.history.state,
+            "",
+            `${url.pathname}${url.search}${url.hash}`,
+          );
+        } catch (error) {
+          console.error("Could not clear the stale thread URL:", error);
+        }
+        window.dispatchEvent(new Event(THREAD_URL_CHANGED_EVENT));
+        return;
+      }
       try {
-        const normalizedThreadId = normalizeUrlThreadId(threadId);
         let next: string;
         if (getThreadPath) {
           next = getThreadPath(normalizedThreadId);
@@ -1035,6 +1058,7 @@ export function MultiTabAssistantChat({
     [
       getThreadPath,
       navigateThreadUrl,
+      activeDeepLinkedThreadId,
       threadUrlParamName,
       threadUrlSyncEnabled,
     ],

package/src/app/chat/composer/use-agentkit-integration-menu.spec.tsx

@@ -93,6 +93,7 @@ describe("shared AgentKit integration submenu", () => {
       container.querySelector('button[aria-label="Add context"]')!,
       "ArrowDown",
     );
+    await key(row("Add context"), "ArrowRight");
     expect(row("Integrations").getAttribute("aria-haspopup")).toBe("menu");
     await key(row("Integrations"), "ArrowRight");
   }
@@ -100,7 +101,7 @@ describe("shared AgentKit integration submenu", () => {
     await render();
     await open();
     expect(pathname).toBe("/home");
-    expect(document.querySelectorAll('[role="menu"]')).toHaveLength(2);
+    expect(document.querySelectorAll('[role="menu"]')).toHaveLength(3);
     expect(document.body.textContent).toContain(
       "No integrations available for this app.",
     );
@@ -129,6 +130,7 @@ describe("shared AgentKit integration submenu", () => {
       "ArrowDown",
     );
     expect(document.body.textContent).not.toContain("GitHub");
+    await key(row("Add context"), "ArrowRight");
     await key(row("Integrations"), "ArrowRight");
     expect(row("GitHub").querySelector("svg")).toBeNull();
     expect(row("Slack")).toBeDefined();
@@ -172,7 +174,7 @@ describe("shared AgentKit integration submenu", () => {
     await render();
     await open();
     await key(row("Connect an integration…"), "Escape");
-    expect(document.querySelectorAll('[role="menu"]')).toHaveLength(1);
+    expect(document.querySelectorAll('[role="menu"]')).toHaveLength(2);
     expect(document.activeElement).toBe(row("Integrations"));
     expect(pathname).toBe("/home");
   });