@agent-native/toolkit 0.198.3 → 0.198.5

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

@@ -2,16 +2,16 @@
 
 import { readFileSync } from "node:fs";
 
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from "@agent-native/toolkit/ui/dropdown-menu";
 import React, { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { MemoryRouter, useLocation } from "react-router";
 import { describe, expect, it, vi } from "vitest";
 
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
-} from "../../ui/dropdown-menu.js";
 import {
   AgentChatSurface,
   AgentPanelFullViewMenuItem,
@@ -51,6 +51,13 @@ import {
   preloadAgentChatSurface,
 } from "./AgentSidebar.js";
 
+function readSource(
+  path: string,
+  _options?: "utf8" | { encoding: "utf8" },
+): string {
+  return readFileSync(path, "utf8").replace(/\r\n/g, "\n");
+}
+
 describe("AgentPanel compatibility exports", () => {
   it("preserves the legacy sidebar entry point", () => {
     expect(LegacyAgentSidebar).toBe(AgentSidebar);
@@ -60,7 +67,7 @@ describe("AgentPanel compatibility exports", () => {
   });
 
   it("uses a stable-ref link in the full-view menu item", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", "utf8").replace(
+    const source = readSource("src/app/chat/AgentPanel.tsx", "utf8").replace(
       /\s+/g,
       " ",
     );
@@ -150,7 +157,7 @@ describe("AgentPanel fullscreen menu", () => {
 
 describe("AgentPanel suggestion placement", () => {
   it("forwards explicit placement and defaults to context chips", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -323,7 +330,7 @@ describe("AgentPanel header tab visibility", () => {
   });
 
   it("exposes page header composition without moving it into app chrome", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", "utf8");
+    const source = readSource("src/app/chat/AgentPanel.tsx", "utf8");
 
     expect(source).toContain('data-agent-page-chat-header=""');
     expect(source).toContain("pageHeaderLeadingSlot");
@@ -699,7 +706,7 @@ describe("AgentPanel Integrations link", () => {
   });
 
   it("sits right after Open full view and shares its separator", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
     const overflowMenu = source.slice(
@@ -820,6 +827,36 @@ describe("AgentSidebar composer focus", () => {
     }
   });
 
+  it("stops retrying when the document is torn down", () => {
+    vi.useFakeTimers();
+    const previousRequestAnimationFrame = window.requestAnimationFrame;
+    const frames: Array<FrameRequestCallback> = [];
+    const panel = document.createElement("div");
+    panel.className = "agent-sidebar-panel";
+    panel.dataset.agentSidebarState = "open";
+    document.body.appendChild(panel);
+
+    window.requestAnimationFrame = ((callback: FrameRequestCallback) => {
+      frames.push(callback);
+      return frames.length;
+    }) as typeof window.requestAnimationFrame;
+
+    try {
+      focusAgentChat();
+      frames[0]!(0);
+      vi.stubGlobal("document", undefined);
+
+      expect(() => vi.advanceTimersByTime(50)).not.toThrow();
+      expect(vi.getTimerCount()).toBe(0);
+    } finally {
+      vi.unstubAllGlobals();
+      window.requestAnimationFrame = previousRequestAnimationFrame;
+      panel.remove();
+      vi.clearAllTimers();
+      vi.useRealTimers();
+    }
+  });
+
   it("focuses a frame-owned composer", () => {
     const previousRequestAnimationFrame = window.requestAnimationFrame;
     const frames: Array<FrameRequestCallback> = [];
@@ -914,10 +951,10 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("keeps width and full-view actions out of the icon row", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
-    const sidebarSource = readFileSync("src/app/chat/AgentSidebar.tsx", {
+    const sidebarSource = readSource("src/app/chat/AgentSidebar.tsx", {
       encoding: "utf8",
     });
     const headerActions = source.slice(
@@ -957,7 +994,7 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("keeps the overflow menu scrollable within the viewport", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
     const overflowMenu = source.slice(
@@ -972,7 +1009,7 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("offers sharing from the sidebar overflow for an active chat", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
     const overflowMenu = source.slice(
@@ -992,7 +1029,7 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("keeps chat headers persistent while switching app surfaces", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -1002,10 +1039,10 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("supports a persistent two-state sidebar toggle", () => {
-    const source = readFileSync("src/app/chat/AgentSidebar.tsx", {
+    const source = readSource("src/app/chat/AgentSidebar.tsx", {
       encoding: "utf8",
     });
-    const panelSource = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const panelSource = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -1021,7 +1058,7 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("keeps host CLI tabs mounted while chat is active", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -1035,7 +1072,7 @@ describe("AgentPanel header overflow actions", () => {
   });
 
   it("only shows tabs for the active desktop surface", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -1046,7 +1083,7 @@ describe("AgentPanel header overflow actions", () => {
 
 describe("AgentSidebar wide drawer layout", () => {
   it("can disable the panel without unmounting the app surface", () => {
-    const source = readFileSync("src/app/chat/AgentSidebar.tsx", {
+    const source = readSource("src/app/chat/AgentSidebar.tsx", {
       encoding: "utf8",
     });
 
@@ -1058,7 +1095,7 @@ describe("AgentSidebar wide drawer layout", () => {
   });
 
   it("does not reserve the drawer placeholder after the panel closes", () => {
-    const source = readFileSync("src/app/chat/AgentSidebar.tsx", {
+    const source = readSource("src/app/chat/AgentSidebar.tsx", {
       encoding: "utf8",
     });
     const placeholderStart = source.indexOf("const drawerPlaceholder");
@@ -1083,7 +1120,7 @@ describe("AgentChatSurface chrome defaults", () => {
   });
 
   it("keeps settings out of every chat surface", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
 
@@ -1117,7 +1154,7 @@ describe("AgentChatSurface chrome defaults", () => {
 
 describe("AgentPanel stale lazy chunk recovery", () => {
   it("uses the guarded reload path before the panel reset fallback", () => {
-    const source = readFileSync("src/app/chat/AgentPanel.tsx", {
+    const source = readSource("src/app/chat/AgentPanel.tsx", {
       encoding: "utf8",
     });
     const componentDidCatch = source.slice(

package/src/app/chat/AgentSidebar.tsx

@@ -1331,6 +1331,8 @@ export function focusAgentChat() {
 
 function focusAgentChatComposer() {
   const focusComposer = (attempt = 0) => {
+    if (typeof window === "undefined" || typeof document === "undefined")
+      return;
     const panel = document.querySelector(
       ".agent-sidebar-panel[data-agent-sidebar-state='open'], " +
         ".agent-frame-sidebar[data-agent-frame-sidebar-state='open']",

package/src/app/chat/FileStorageSetupPopover.tsx

@@ -8,8 +8,8 @@ import {
 import { IconCloudUpload } from "@tabler/icons-react";
 import { useRef, type RefObject } from "react";
 
-import { BuilderConnectPopover } from "../settings/index.js";
-import { BuilderConnectCard } from "../setup-connections/index.js";
+import { DeferredBuilderConnectPopover as BuilderConnectPopover } from "../settings/deferred-builder-connect-popover.js";
+import { BuilderConnectCard } from "../setup-connections/BuilderConnectCard.js";
 
 type FileStorageSetupPopoverCommonProps = {
   open: boolean;

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

@@ -1,6 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
 
-import MultiTabSource from "./MultiTabAssistantChat.tsx?raw";
+import rawMultiTabSource from "./MultiTabAssistantChat.tsx?raw";
+
+const MultiTabSource = rawMultiTabSource.replace(/\r\n/g, "\n");
 
 describe("MultiTabAssistantChat message count", () => {
   it("forwards the host callback instead of only counting tabs", () => {

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

@@ -210,9 +210,11 @@ const modelCatalogMocks = vi.hoisted(() => ({
   load: null as null | (() => Promise<unknown>),
 }));
 
-vi.mock("@agent-native/core/client/hooks", async (importOriginal) => {
+vi.mock("@agent-native/core/client/use-action", async (importOriginal) => {
   const actual =
-    await importOriginal<typeof import("@agent-native/core/client/hooks")>();
+    await importOriginal<
+      typeof import("@agent-native/core/client/use-action")
+    >();
   return { ...actual, ...actionMocks };
 });
 
@@ -433,6 +435,8 @@ describe("MultiTabAssistantChat postMessage bridge", () => {
   beforeEach(async () => {
     vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
     resetThreadMocks();
+    actionMocks.callAction.mockReset();
+    actionMocks.callAction.mockResolvedValue(null as never);
     ensureLocalStorage();
     vi.stubGlobal(
       "fetch",
@@ -3345,7 +3349,7 @@ describe("MultiTabAssistantChat page overlay", () => {
     ).not.toBeNull();
   });
 
-  it("reserves the page top bar even when its actions are temporarily empty", async () => {
+  it("reserves one page-header height when its actions are temporarily empty", async () => {
     await act(async () => {
       root.render(
         <MultiTabAssistantChat
@@ -3359,7 +3363,7 @@ describe("MultiTabAssistantChat page overlay", () => {
       "[data-agent-page-chat-topbar]",
     );
     expect(topbar).not.toBeNull();
-    expect(topbar?.className).toContain("pt-14");
+    expect(topbar?.className).toContain("pt-12");
   });
 });
 

package/src/app/chat/MultiTabAssistantChat.tsx

@@ -3090,7 +3090,7 @@ export function MultiTabAssistantChat({
       <div
         className={cn(
           "relative flex-1 flex flex-col min-h-0",
-          renderOverlay && "pt-14",
+          renderOverlay && "pt-12",
         )}
         data-agent-page-chat-topbar={renderOverlay ? "" : undefined}
         data-agent-page-chat-scrolled={

package/src/app/chat/agentkit-chat/action-widget.spec.tsx

@@ -11,10 +11,7 @@ import {
   ACTION_CHAT_UI_DATA_WIDGET_RENDERER,
   ACTION_CHAT_UI_RECORD_CHANGE_RENDERER,
 } from "@agent-native/core/action-ui";
-import {
-  AgentNativeI18nProvider as CoreAgentNativeI18nProvider,
-  type AgentNativeI18nProviderProps,
-} from "@agent-native/core/client/i18n";
+import { AgentNativeI18nProvider } from "@agent-native/core/client/i18n";
 import {
   createDataInsightsWidgetResult,
   createDataTableWidgetResult,
@@ -32,16 +29,7 @@ import {
 } from "../chat/tool-render-registry.js";
 import { AgentKitActionWidget } from "./action-widget.js";
 
-const toolkitI18nCatalog = createToolkitI18nCatalog({ messages: {} });
-
-function AgentNativeI18nProvider(props: AgentNativeI18nProviderProps) {
-  return (
-    <CoreAgentNativeI18nProvider
-      {...props}
-      catalog={props.catalog ?? toolkitI18nCatalog}
-    />
-  );
-}
+const catalog = createToolkitI18nCatalog({ messages: {} });
 
 describe("AgentKitActionWidget", () => {
   it("resolves the renderer with stored action args and structured result", async () => {
@@ -229,7 +217,7 @@ describe("AgentKitActionWidget", () => {
     try {
       await act(async () => {
         root.render(
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <AgentKitProvider controller={client} threadId="thread-1">
               <>
                 <AgentKitActionWidget value={formsWidget} threadId="thread-1" />
@@ -316,7 +304,7 @@ describe("AgentKitActionWidget", () => {
     try {
       await act(async () => {
         root.render(
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <AgentKitProvider controller={client} threadId="thread-1">
               <>
                 {widgets.map((widget) => (
@@ -399,7 +387,7 @@ describe("AgentKitActionWidget", () => {
     try {
       await act(async () => {
         root.render(
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <AgentKitProvider controller={client} threadId="thread-1">
               {widgets.map((widget) => (
                 <AgentKitActionWidget

package/src/app/chat/agentkit-chat/connections.spec.tsx

@@ -1,6 +1,8 @@
 // @vitest-environment happy-dom
 
 import {
+  clearMcpConnectionResume,
+  getPendingMcpConnectionResume,
   notifyMcpConnectionComplete,
   saveMcpConnectionResume,
 } from "@agent-native/core/client/resources/mcp-connection-resume";
@@ -16,6 +18,7 @@ afterEach(() => {
   if (root) act(() => root?.unmount());
   root = undefined;
   window.sessionStorage.clear();
+  window.localStorage.clear();
   window.history.replaceState({}, "", "/chat/thread-1");
 });
 
@@ -78,4 +81,138 @@ describe("McpAgentKitConnectionResume", () => {
     );
     expect(onMessageResume).not.toHaveBeenCalled();
   });
+
+  it("shows a failure and keeps the saved request when resuming fails", async () => {
+    const target = { threadId: "thread-1", runId: "run-1", requestId: "req-1" };
+    saveMcpConnectionResume("Restore the request.", target);
+    const onResume = vi.fn().mockRejectedValue(new Error("offline"));
+    const container = document.createElement("div");
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(<McpAgentKitConnectionResume onResume={onResume} />);
+      await Promise.resolve();
+    });
+
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+    expect(getPendingMcpConnectionResume()).toMatchObject({
+      message: "Restore the request.",
+      agentKit: target,
+    });
+  });
+
+  it("resumes a completed popup after remount and continues when the run is gone", async () => {
+    window.history.replaceState({}, "", "/chat/thread-1");
+    const target = {
+      threadId: "thread-1",
+      runId: "run-1",
+      requestId: "req-1",
+    };
+    const completionId = "8d1bd7cf-419e-4ff0-8545-19dedb819154";
+    saveMcpConnectionResume("Restore the request.", target, completionId);
+    const onResume = vi
+      .fn()
+      .mockRejectedValue(new Error(`Unknown AgentKit run: ${target.runId}`));
+    const onMessageResume = vi.fn();
+    const container = document.createElement("div");
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(
+        <McpAgentKitConnectionResume
+          onResume={onResume}
+          onMessageResume={onMessageResume}
+        />,
+      );
+    });
+    expect(onResume).not.toHaveBeenCalled();
+    expect(getPendingMcpConnectionResume()).toBeNull();
+
+    act(() => {
+      root?.unmount();
+    });
+    root = undefined;
+    window.localStorage.setItem(
+      `agent-native:mcp-connection-completion:${completionId}`,
+      "1",
+    );
+
+    const remountedContainer = document.createElement("div");
+    root = createRoot(remountedContainer);
+    await act(async () => {
+      root?.render(
+        <McpAgentKitConnectionResume
+          onResume={onResume}
+          onMessageResume={onMessageResume}
+        />,
+      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    expect(onResume).toHaveBeenCalledOnce();
+    expect(onResume).toHaveBeenCalledWith(
+      target,
+      expect.objectContaining({ message: "Restore the request." }),
+    );
+    expect(onMessageResume).toHaveBeenCalledOnce();
+    expect(onMessageResume).toHaveBeenCalledWith(
+      expect.objectContaining({ message: "Restore the request." }),
+    );
+    expect(getPendingMcpConnectionResume()).toBeNull();
+    clearMcpConnectionResume();
+  });
+
+  it("keeps the saved request when the fallback chat submission fails", async () => {
+    const target = { threadId: "thread-1", runId: "run-1", requestId: "req-1" };
+    saveMcpConnectionResume("Restore the request.", target);
+    const onResume = vi
+      .fn()
+      .mockRejectedValue(new Error(`Unknown AgentKit run: ${target.runId}`));
+    const onMessageResume = vi.fn().mockRejectedValue(new Error("offline"));
+    const container = document.createElement("div");
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(
+        <McpAgentKitConnectionResume
+          onResume={onResume}
+          onMessageResume={onMessageResume}
+        />,
+      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    expect(onMessageResume).toHaveBeenCalledOnce();
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+    expect(getPendingMcpConnectionResume()).toMatchObject({
+      message: "Restore the request.",
+      agentKit: target,
+    });
+  });
+
+  it("clears a stale failure alert after a later successful retry", async () => {
+    const target = { threadId: "thread-1", runId: "run-1", requestId: "req-1" };
+    saveMcpConnectionResume("Restore the request.", target);
+    const onResume = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("offline"))
+      .mockResolvedValue(undefined);
+    const container = document.createElement("div");
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(<McpAgentKitConnectionResume onResume={onResume} />);
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+
+    await act(async () => {
+      notifyMcpConnectionComplete();
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    expect(onResume).toHaveBeenCalledTimes(2);
+    expect(container.querySelector('[role="alert"]')).toBeNull();
+    expect(getPendingMcpConnectionResume()).toBeNull();
+  });
 });

package/src/app/chat/agentkit-chat/connections.ts

@@ -1,39 +1,4 @@
-import {
-  addMcpConnectionCompleteListener,
-  consumeMcpConnectionResume,
-} from "@agent-native/core/client/resources/mcp-connection-resume";
-import { useEffect, useRef } from "react";
-
-import {
+export {
   McpAgentKitConnectionRequestCard,
-  type McpAgentKitConnectionResumeProps,
+  McpAgentKitConnectionResume,
 } from "../../resources/index.js";
-
-export { McpAgentKitConnectionRequestCard };
-
-/** Consumes OAuth resumes once and routes them to the matching chat submit API. */
-export function McpAgentKitConnectionResume({
-  onResume,
-  onMessageResume,
-}: McpAgentKitConnectionResumeProps) {
-  const onResumeRef = useRef(onResume);
-  const onMessageResumeRef = useRef(onMessageResume);
-  onResumeRef.current = onResume;
-  onMessageResumeRef.current = onMessageResume;
-
-  // Chat callbacks change with render state; one listener must own each stored resume.
-  useEffect(() => {
-    const resumePending = () => {
-      const request = consumeMcpConnectionResume();
-      if (!request) return;
-      const operation = request.agentKit
-        ? onResumeRef.current(request.agentKit, request)
-        : onMessageResumeRef.current?.(request);
-      void Promise.resolve(operation).catch(() => {});
-    };
-
-    resumePending();
-    return addMcpConnectionCompleteListener(resumePending);
-  }, []);
-  return null;
-}

package/src/app/chat/agentkit-chat/history.tsx

@@ -79,7 +79,7 @@ export interface AgentKitHistoryConfig<
     args?:
       | Record<string, unknown>
       | ((threadId: ThreadId) => Record<string, unknown>);
-    getVersions: (result: TListResult) => readonly TVersion[];
+    getVersions: (result: TListResult) => readonly TVersion[] | null;
   };
   restore: {
     action: string;
@@ -108,6 +108,8 @@ export interface AgentKitHistoryConfig<
 
 export interface AgentKitHistoryContextValue {
   beginningVersion: AgentKitHistoryVersion | null;
+  historyLoadFailed: boolean;
+  isRetryingHistory: boolean;
   isBusy: boolean;
   isRestoring: boolean;
   isSubmissionInFlight: boolean;
@@ -117,6 +119,7 @@ export interface AgentKitHistoryContextValue {
   beginSubmission: () => Promise<(() => void) | null>;
   /** Wait until an in-flight restore has finished before mutating the host. */
   waitForRestore: () => Promise<void>;
+  retryHistory: () => void;
   findVersion: (
     message: AgentKitHistoryMessage,
   ) => AgentKitHistoryVersion | null;
@@ -711,15 +714,18 @@ export function AgentKitHistoryProvider<
   const currentThreadRef = useRef(threadId);
   const initializedRef = useRef(false);
 
-  const versions = useMemo(() => {
-    if (listQuery.data == null) return [];
+  const loadedVersions = useMemo(() => {
+    if (listQuery.data == null) return null;
     const result = history.list.getVersions(listQuery.data);
-    return Array.isArray(result)
-      ? result.filter((version): version is TVersion =>
-          isAssistantChatHistoryVersion(version),
-        )
-      : [];
+    if (!Array.isArray(result)) return null;
+    return result.filter((version): version is TVersion =>
+      isAssistantChatHistoryVersion(version),
+    );
   }, [history.list, listQuery.data]);
+  const versions = loadedVersions ?? [];
+  const retryHistory = useCallback(() => {
+    void listQuery.refetch();
+  }, [listQuery.refetch]);
   const historyMessages = useMemo(
     () => getAgentKitHistoryMessages(threadId, thread, history.scope),
     [history.scope, thread, threadId],
@@ -918,6 +924,9 @@ export function AgentKitHistoryProvider<
         threadId,
         history.isEditable,
       ),
+      historyLoadFailed:
+        listQuery.isError || (listQuery.isSuccess && loadedVersions == null),
+      isRetryingHistory: listQuery.isFetching,
       isBusy:
         thread.activeRunIds.length > 0 ||
         isRestoring ||
@@ -930,6 +939,7 @@ export function AgentKitHistoryProvider<
       findVersion,
       toHistoryMessage,
       restoreVersion,
+      retryHistory,
     }),
     [
       findVersion,
@@ -937,8 +947,13 @@ export function AgentKitHistoryProvider<
       beginSubmission,
       waitForRestore,
       history.isEditable,
+      listQuery.isError,
+      listQuery.isFetching,
+      listQuery.isSuccess,
+      loadedVersions,
       isRestoring,
       restoreVersion,
+      retryHistory,
       submissionsInFlight,
       submissionCountsByThread,
       thread.activeRunIds.length,

package/src/app/chat/chat/history-types.ts

@@ -38,7 +38,7 @@ export interface AssistantChatHistoryConfig<
     args?:
       | Record<string, unknown>
       | ((threadId?: string) => Record<string, unknown>);
-    getVersions: (result: TListResult) => readonly TVersion[];
+    getVersions: (result: TListResult) => readonly TVersion[] | null;
   };
   restore: {
     action: string;

package/src/app/chat/chat/tool-call-display.spec.tsx

@@ -990,7 +990,7 @@ describe("ToolCallDisplay native renderers", () => {
     await act(async () => {
       root.render(
         <AgentNativeI18nProvider
-          catalog={{
+          catalog={createToolkitI18nCatalog({
             sourceLocale: "en-US",
             messages: {
               agentChat: {
@@ -1001,7 +1001,7 @@ describe("ToolCallDisplay native renderers", () => {
                 },
               },
             },
-          }}
+          })}
           initialLocale="en-US"
           initialPreference="en-US"
           persistPreference={false}