@agent-native/toolkit 0.198.3 → 0.198.4

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}

package/src/app/chat/chat/widgets/record-change-widget.spec.tsx

@@ -42,24 +42,12 @@ vi.mock("@agent-native/core/client/hooks", () => ({
 
 import { ACTION_CHAT_UI_RECORD_CHANGE_RENDERER } from "@agent-native/core/action-ui";
 import { normalizeActionChangeResult } 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 { createToolkitI18nCatalog } from "../../../i18n.js";
 import { RecordChangeWidget } from "./RecordChangeWidget.js";
 
-const toolkitI18nCatalog = createToolkitI18nCatalog({ messages: {} });
-
-function AgentNativeI18nProvider(props: AgentNativeI18nProviderProps) {
-  return (
-    <CoreAgentNativeI18nProvider
-      {...props}
-      catalog={props.catalog ?? toolkitI18nCatalog}
-    />
-  );
-}
+const catalog = createToolkitI18nCatalog({ messages: {} });
 
 describe("core.record-change", () => {
   let container: HTMLDivElement;
@@ -179,7 +167,7 @@ describe("core.record-change", () => {
     };
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget context={context} />
         </AgentNativeI18nProvider>,
       );
@@ -211,7 +199,7 @@ describe("core.record-change", () => {
 
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget context={context} />
         </AgentNativeI18nProvider>,
       );
@@ -248,7 +236,7 @@ describe("core.record-change", () => {
 
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget context={context} />
         </AgentNativeI18nProvider>,
       );
@@ -272,7 +260,7 @@ describe("core.record-change", () => {
     root = createRoot(container);
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget context={context} />
         </AgentNativeI18nProvider>,
       );
@@ -306,10 +294,10 @@ describe("core.record-change", () => {
     await act(async () => {
       root.render(
         <>
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <RecordChangeWidget context={context} />
           </AgentNativeI18nProvider>
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <RecordChangeWidget context={context} />
           </AgentNativeI18nProvider>
         </>,
@@ -382,7 +370,7 @@ describe("core.record-change", () => {
 
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget context={context} />
         </AgentNativeI18nProvider>,
       );
@@ -411,7 +399,7 @@ describe("core.record-change", () => {
   it("does not render unsafe change URLs as links", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "test-action",
@@ -438,7 +426,7 @@ describe("core.record-change", () => {
   it("shows saved drafts as awaiting review with a review and edit action", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "manage-draft",
@@ -473,7 +461,7 @@ describe("core.record-change", () => {
   it("uses the filter icon for Mail rule changes", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "manage-email-rules",
@@ -503,7 +491,7 @@ describe("core.record-change", () => {
   it("localizes sharing roles and visibility in action cards", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "share-resource",
@@ -537,7 +525,7 @@ describe("core.record-change", () => {
     ]) {
       await act(async () => {
         root.render(
-          <AgentNativeI18nProvider persistPreference={false}>
+          <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
             <RecordChangeWidget
               context={{
                 toolName: "set-resource-visibility",
@@ -566,7 +554,7 @@ describe("core.record-change", () => {
   it("renders an available Calendar time with a use-time action", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "find-a-time",
@@ -602,7 +590,7 @@ describe("core.record-change", () => {
     }).format(Date.parse(scheduledAt));
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "create-scheduled-send",
@@ -634,7 +622,7 @@ describe("core.record-change", () => {
   it("localizes booking-link fallback titles and durations", async () => {
     await act(async () => {
       root.render(
-        <AgentNativeI18nProvider persistPreference={false}>
+        <AgentNativeI18nProvider catalog={catalog} persistPreference={false}>
           <RecordChangeWidget
             context={{
               toolName: "create-booking-link",
@@ -666,6 +654,7 @@ describe("core.record-change", () => {
     await act(async () => {
       root.render(
         <AgentNativeI18nProvider
+          catalog={catalog}
           initialLocale="es-ES"
           initialPreference="es-ES"
           persistPreference={false}
@@ -697,6 +686,7 @@ describe("core.record-change", () => {
     await act(async () => {
       root.render(
         <AgentNativeI18nProvider
+          catalog={catalog}
           initialLocale="fr-FR"
           initialPreference="fr-FR"
           persistPreference={false}
@@ -730,6 +720,7 @@ describe("core.record-change", () => {
     await act(async () => {
       root.render(
         <AgentNativeI18nProvider
+          catalog={catalog}
           initialLocale="es-ES"
           initialPreference="es-ES"
           persistPreference={false}

package/src/app/chat/chat-first/copy.ts

@@ -1,133 +1 @@
-import type { ChatFirstSurfaceKind } from "@agent-native/core/client/agent-chat";
-
-import type { ChatFirstCopy } from "./types.js";
-
-const DEFAULT_COPY: Record<string, string> = {
-  newChat: "New chat",
-  search: "Search",
-  workspaceApps: "Apps",
-  allApps: "All apps",
-  integrations: "Integrations",
-  scheduled: "Scheduled",
-  createWorkspaceApp: "Create app",
-  openApp: "Open {name}",
-  appsLoadError: "Apps could not be loaded",
-  noWorkspaceApps: "No apps yet",
-  createApp: "Create app",
-  retry: "Retry",
-  dismiss: "Dismiss",
-  unpinApp: "Unpin this app",
-  pinApp: "Pin this app",
-  reloadApp: "Reload app",
-  removePinned: "Remove from pinned apps",
-  pinTop: "Pin app to the top",
-  moveUp: "Move up",
-  moveDown: "Move down",
-  removeApp: "Remove app from workspace",
-  showMore: "Show more",
-  showLess: "Show less",
-  appOrderUnavailable: "App order could not be saved on this device.",
-  openSideSurfaces: "Open side surfaces",
-  sideSurfaces: "Side surfaces",
-  resizeSideSurface: "Resize side surface",
-  closeTab: "Close {name}",
-  close: "Close",
-  closeOthers: "Close others",
-  closeToRight: "Close to the right",
-  closeAll: "Close all",
-  deferred: "Deferred",
-  openActivity: "Open activity",
-  unavailable: "This surface is not available here.",
-  browserBack: "Back",
-  browserForward: "Forward",
-  browserReload: "Reload page",
-  browserAddress: "Browser address",
-  browserOpenExternal: "Open in external browser",
-  browserClose: "Close browser",
-  browserPage: "Browser page",
-  browserInvalidUrl: "Enter a full http(s) URL to navigate.",
-  browserPreviewStarting: "Starting preview…",
-  browserPreviewError: "Preview unavailable",
-  appUnavailable: "This workspace app is no longer available.",
-  appLoadError: "This app could not be loaded",
-  appLoading: "Loading app",
-  agentActivityEyebrow: "Workspace",
-  agentActivityTitle: "Agent activity",
-  agentActivityDescription:
-    "Follow runs and open a second session beside this chat.",
-  refreshAgentActivity: "Refresh agent activity",
-  noAgentSessions: "No agent sessions yet",
-  startAgentSession: "Start an agent run and it will appear here.",
-  watchSession: "Watch",
-  copySessionId: "Copy session ID",
-  copySessionIdFor: "Copy session ID for {name}",
-  sessionIdCopied: "Session ID copied",
-  sessionIdShort: "ID",
-  copied: "Copied",
-  agentActivityStatusQueued: "Queued",
-  agentActivityStatusRunning: "Running",
-  agentActivityStatusPaused: "Paused",
-  agentActivityStatusNeedsApproval: "Needs approval",
-  agentActivityStatusCompleted: "Completed",
-  agentActivityStatusErrored: "Needs attention",
-  agentActivityStatusRecent: "Recent",
-  agentActivityStatusUnknown: "Unknown",
-  watchingSession: "Watching {name}",
-  session: "session",
-  stopWatchingSession: "Stop watching session",
-  stopWatching: "Stop watching",
-  watchedSession: "Watched session",
-  agentsTitle: "Subagents",
-};
-
-const SURFACE_COPY: Record<
-  ChatFirstSurfaceKind,
-  { label: string; reason: string }
-> = {
-  app: {
-    label: "App",
-    reason: "Open a workspace app beside the conversation.",
-  },
-  browser: {
-    label: "Browser",
-    reason: "Ask the agent to open a web URL.",
-  },
-  terminal: {
-    label: "Terminal",
-    reason:
-      "Deferred: an embedded PTY lifecycle is not connected in this release.",
-  },
-  files: {
-    label: "Files",
-    reason:
-      "Deferred: a bounded workspace tree is not connected in this release.",
-  },
-  diff: {
-    label: "Diff",
-    reason: "Deferred: changed-file data is not connected in this release.",
-  },
-  "side-chat": {
-    label: "Side chat",
-    reason: "Choose Watch and message from any chat row.",
-  },
-  agents: {
-    label: "Agents",
-    reason: "Review recent runs or watch one beside this conversation.",
-  },
-};
-
-function interpolate(value: string, values?: Record<string, string>): string {
-  if (!values) return value;
-  return value.replace(/\{(\w+)\}/g, (_, key: string) => values[key] ?? "");
-}
-
-export const defaultChatFirstCopy: ChatFirstCopy = (key, values) => {
-  if (key.startsWith("surface.")) {
-    const [, kind, field] = key.split(".");
-    const surface = SURFACE_COPY[kind as ChatFirstSurfaceKind];
-    if (surface && (field === "label" || field === "reason")) {
-      return surface[field];
-    }
-  }
-  return interpolate(DEFAULT_COPY[key] ?? key, values);
-};
+export { defaultChatFirstCopy } from "../chat-first-copy.js";