@agent-native/core 0.109.4 → 0.110.1

package/corpus/templates/plan/.agents/skills/upgrade-agent-native/SKILL.md

@@ -28,18 +28,20 @@ install → refresh scaffold skills → verify, then fix **app** code only.
 
 ## How
 
-1. **Doctor first (optional but recommended)**
+1. **Preview migration codemods first**
 
    ```bash
-   npx @agent-native/core@latest upgrade check
+   npx @agent-native/core@latest upgrade --codemods
    ```
 
-   This reports framework overrides/patches and pending `@agent-native/*`
-   bumps. If overrides/patches are present, remove them before continuing.
+   Codemods are preview-by-default: read the diff before applying it. Do not
+   manually edit imports before running this command; the migration manifest is
+   the source of truth for renamed specifiers and symbols.
 
-2. **Run the upgrade**
+2. **Apply the reviewed codemods, then run the upgrade**
 
    ```bash
+   npx @agent-native/core@latest upgrade --codemods --yes
    npx @agent-native/core@latest upgrade
    ```
 
@@ -67,8 +69,13 @@ install → refresh scaffold skills → verify, then fix **app** code only.
    agent-native upgrade --dry-run
    agent-native upgrade --skip-verify
    agent-native upgrade --skip-install   # package.json bumps only
+   agent-native doctor --only migration-manifest
    ```
 
+   `migration-manifest` has no opt-out. Run it in CI before upgrading to find
+   imports that will break, then use `npx @agent-native/core@latest upgrade --codemods`
+   to preview the supported rewrite.
+
 ## Don't
 
 - Don't add `pnpm.overrides`, `overrides`, `resolutions`, or

package/corpus/templates/plan/app/components/editor/PlanBlockNode.tsx

@@ -1,9 +1,9 @@
 import {
   createRegistryBlockNode,
   RegistryBlockDataProvider,
-  useRegistryBlockData,
   type RegistryBlockDataValue,
-} from "@agent-native/core/client";
+  useRegistryBlockData,
+} from "@agent-native/core/client/rich-markdown-editor";
 import { createPlanBlockId, type PlanBlock } from "@shared/plan-content";
 import type { ReactNode } from "react";
 

package/corpus/templates/plan/app/components/editor/PlanDocumentEditor.tsx

@@ -3,12 +3,12 @@ import {
   type BlockRegistry,
   type BlockDataChangeMeta,
 } from "@agent-native/core/blocks";
+import { generateTabId } from "@agent-native/core/client/agent-chat";
 import {
-  generateTabId,
-  useT,
   useCollaborativeDoc,
   type UseCollaborativeDocResult,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/collab";
+import { useT } from "@agent-native/core/client/i18n";
 import {
   applyDocSurgically,
   DragHandle,

package/corpus/templates/plan/app/components/editor/planSlashCommands.ts

@@ -3,7 +3,7 @@ import {
   buildRegistryBlockSlashItems,
   getRegistryBlockSlashDescription,
   getRegistryBlockSlashSearchText,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/rich-markdown-editor";
 import type { SlashCommandItem } from "@agent-native/toolkit/editor";
 import { isNotionCompatibleBlockType } from "@shared/notion-compat";
 import { createPlanBlockId } from "@shared/plan-content";

package/corpus/templates/plan/app/components/layout/Header.tsx

@@ -1,4 +1,5 @@
-import { AgentToggleButton, useT } from "@agent-native/core/client";
+import { AgentToggleButton } from "@agent-native/core/client/agent-chat";
+import { useT } from "@agent-native/core/client/i18n";
 import {
   useHeaderTitle,
   useHeaderActions,

package/corpus/templates/plan/app/components/layout/Layout.tsx

@@ -2,8 +2,8 @@ import {
   AgentSidebar,
   useAgentChatHomeHandoff,
   useAgentChatHomeHandoffLinks,
-  useT,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
+import { useT } from "@agent-native/core/client/i18n";
 import { HeaderActionsProvider } from "@agent-native/toolkit/app-shell";
 import { IconMenu2 } from "@tabler/icons-react";
 import { useState, useEffect } from "react";

package/corpus/templates/plan/app/components/layout/Sidebar.tsx

@@ -1,22 +1,21 @@
 import {
-  agentNativePath,
-  DevDatabaseLink,
-  FeedbackButton,
-  appPath,
   isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
-  PromptComposer,
   sendToAgentChat,
-  useCodeMode,
   useChatThreads,
   useSendToAgentChat,
-  useSession,
-  useT,
   type ChatThreadSummary,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
+import { useCodeMode } from "@agent-native/core/client/agent-chat";
+import { agentNativePath, appPath } from "@agent-native/core/client/api-path";
+import { PromptComposer } from "@agent-native/core/client/composer";
+import { DevDatabaseLink } from "@agent-native/core/client/db-admin";
 import { ExtensionsSidebarSection } from "@agent-native/core/client/extensions";
+import { useSession } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
 import { OrgSwitcher } from "@agent-native/core/client/org";
+import { FeedbackButton } from "@agent-native/core/client/ui";
 import {
   IconArchive,
   IconBrain,

package/corpus/templates/plan/app/components/plan/CanvasArea.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type {
   PlanAnnotation,
   PlanAnnotationPlacement,

package/corpus/templates/plan/app/components/plan/DocumentArea.tsx

@@ -4,11 +4,9 @@ import {
   blockEditSurface,
   useOptionalBlockRegistry,
 } from "@agent-native/core/blocks";
-import {
-  uploadEditorImage,
-  useT,
-  type RichMarkdownCollabUser,
-} from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
+import { uploadEditorImage } from "@agent-native/core/client/rich-markdown-editor";
+import { type RichMarkdownCollabUser } from "@agent-native/toolkit/editor";
 import { imageDataSchema, type PlanBlock } from "@shared/plan-content";
 import {
   IconAlertTriangle,

package/corpus/templates/plan/app/components/plan/GuestModeBanner.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import { IconCloudUpload } from "@tabler/icons-react";
 
 import { Button } from "@/components/ui/button";

package/corpus/templates/plan/app/components/plan/LocalCodebasePicker.tsx

@@ -1,4 +1,5 @@
-import { setClientAppState, useT } from "@agent-native/core/client";
+import { setClientAppState } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
 import {
   IconAlertCircle,
   IconCircleCheck,

package/corpus/templates/plan/app/components/plan/PlanContentRenderer.tsx

@@ -3,13 +3,15 @@ import {
   type BlockRenderContext,
 } from "@agent-native/core/blocks";
 import {
-  PresenceBar,
-  RecentEditHighlights,
-  useT,
   type AttributedRecentEdit,
   type CollabUser,
-  type RichMarkdownCollabUser,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/collab";
+import { useT } from "@agent-native/core/client/i18n";
+import {
+  PresenceBar,
+  RecentEditHighlights,
+} from "@agent-native/toolkit/collab-ui";
+import { type RichMarkdownCollabUser } from "@agent-native/toolkit/editor";
 import { Button } from "@agent-native/toolkit/ui/button";
 import type { PlanFileTreeBlock } from "@shared/plan-content";
 import type {

package/corpus/templates/plan/app/components/plan/PlanImageNode.tsx

@@ -1,4 +1,5 @@
-import { uploadEditorImage, useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
+import { uploadEditorImage } from "@agent-native/core/client/rich-markdown-editor";
 import { SharedImage } from "@agent-native/toolkit/editor";
 import {
   NodeViewWrapper,

package/corpus/templates/plan/app/components/plan/PlanImageViewer.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import {
   IconCopy,
   IconDownload,

package/corpus/templates/plan/app/components/plan/PlanMarkdownEditor.tsx

@@ -1,9 +1,9 @@
+import { generateTabId } from "@agent-native/core/client/agent-chat";
 import {
-  generateTabId,
-  uploadEditorImage,
   useCollaborativeDoc,
   type CollabUser,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/collab";
+import { uploadEditorImage } from "@agent-native/core/client/rich-markdown-editor";
 import {
   createImageSlashCommand,
   DEFAULT_SLASH_COMMANDS,

package/corpus/templates/plan/app/components/plan/PlanMarkdownReader.tsx

@@ -1,5 +1,5 @@
 import { CodeSurface } from "@agent-native/core/blocks";
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import { IconLink } from "@tabler/icons-react";
 import type { ComponentPropsWithoutRef, ElementType, ReactNode } from "react";
 import { isValidElement, useCallback, useRef } from "react";

package/corpus/templates/plan/app/components/plan/PlanTableOfContents.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type { PlanContent } from "@shared/plan-content";
 import { IconChevronRight } from "@tabler/icons-react";
 import { useEffect, useMemo, useRef, useState, type MouseEvent } from "react";

package/corpus/templates/plan/app/components/plan/PlanVisualSurface.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type { PlanBlock, PlanContent } from "@shared/plan-content";
 import type { PlanAnnotation } from "@shared/plan-content";
 import {

package/corpus/templates/plan/app/components/plan/PrototypeViewer.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type { PlanPrototype } from "@shared/plan-content";
 import { useCallback, useEffect, useMemo, useState } from "react";
 

package/corpus/templates/plan/app/components/plan/VisualAnswerInline.tsx

@@ -1,5 +1,5 @@
 import { BlockRegistryProvider } from "@agent-native/core/blocks";
-import type { ToolRendererProps } from "@agent-native/core/client";
+import { type ToolRendererProps } from "@agent-native/core/client/agent-chat";
 import type { PlanBlock, PlanContent } from "@shared/plan-content";
 import { IconArrowUpRight, IconLayoutDashboard } from "@tabler/icons-react";
 

package/corpus/templates/plan/app/components/plan/planBlocks.tsx

@@ -12,11 +12,9 @@ import {
   type NestedBlock,
   type BlockAiFieldActionProps,
 } from "@agent-native/core/blocks";
-import {
-  sendToAgentChat,
-  useT,
-  type RichMarkdownCollabUser,
-} from "@agent-native/core/client";
+import { sendToAgentChat } from "@agent-native/core/client/agent-chat";
+import { useT } from "@agent-native/core/client/i18n";
+import { type RichMarkdownCollabUser } from "@agent-native/toolkit/editor";
 import type { PlanBlock } from "@shared/plan-content";
 import { lazy, Suspense, useEffect, useRef, useState } from "react";
 

package/corpus/templates/plan/app/components/plan/wireframe/LegacyRegionWireframe.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type {
   PlanLegacyWireframeBlock,
   PlanWireframeRegion,

package/corpus/templates/plan/app/components/plan/wireframe/Wireframe.tsx

@@ -1,4 +1,4 @@
-import { useT } from "@agent-native/core/client";
+import { useT } from "@agent-native/core/client/i18n";
 import type {
   PlanDiagramBlock,
   PlanLegacyWireframeBlock,

package/corpus/templates/plan/app/hooks/use-navigation-state.ts

@@ -1,9 +1,11 @@
 import {
-  agentNativePath,
-  appBasePath,
   isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
+import {
+  agentNativePath,
+  appBasePath,
+} from "@agent-native/core/client/api-path";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useEffect, useRef } from "react";
 import { useLocation, useNavigate } from "react-router";

package/corpus/templates/plan/app/hooks/use-plan-presence.ts

@@ -1,12 +1,12 @@
+import { generateTabId } from "@agent-native/core/client/agent-chat";
 import {
   useCollaborativeDoc,
   usePresence,
   useRecentEdits,
-  generateTabId,
   type AttributedRecentEdit,
   type CollabUser,
   type UseCollaborativeDocResult,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/collab";
 
 /** One tab id per browser tab, shared by every plan presence hook instance. */
 const TAB_ID = generateTabId();

package/corpus/templates/plan/app/hooks/use-plans.ts

@@ -1,4 +1,7 @@
-import { useActionMutation, useActionQuery } from "@agent-native/core/client";
+import {
+  useActionMutation,
+  useActionQuery,
+} from "@agent-native/core/client/hooks";
 import type { PlanContent, PlanContentPatch } from "@shared/plan-content";
 import type {
   PlanAuthor,

package/corpus/templates/plan/app/i18n/ar-SA.ts

@@ -45,6 +45,10 @@ const messages = {
     suggestionUi: "كيف تبدو هذه الواجهة؟",
     suggestionApi: "ما شكل واجهة API هذه؟",
   },
+  contextXray: {
+    panelTitle: "الأشعة السينية للسياق",
+    snapshotsTitle: "اللقطات",
+  },
   sidebar: {
     openNavigation: "فتح التنقل",
     navigation: "التنقل",

package/corpus/templates/plan/app/i18n/de-DE.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "Wie sieht diese Oberfläche aus?",
     suggestionApi: "Welche Struktur hat diese API?",
   },
+  contextXray: {
+    panelTitle: "Kontext-Röntgen",
+    snapshotsTitle: "Momentaufnahmen",
+  },
   sidebar: {
     openNavigation: "Navigation öffnen",
     navigation: "Navigation",

package/corpus/templates/plan/app/i18n/en-US.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "What does this UI look like?",
     suggestionApi: "What is the shape of this API?",
   },
+  contextXray: {
+    panelTitle: "Context X-Ray",
+    snapshotsTitle: "Snapshots",
+  },
   sidebar: {
     openNavigation: "Open navigation",
     navigation: "Navigation",

package/corpus/templates/plan/app/i18n/es-ES.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "¿Cómo se ve esta interfaz?",
     suggestionApi: "¿Cuál es la forma de esta API?",
   },
+  contextXray: {
+    panelTitle: "Radiografía de contexto",
+    snapshotsTitle: "Instantáneas",
+  },
   sidebar: {
     openNavigation: "Abrir navegación",
     navigation: "Navegación",

package/corpus/templates/plan/app/i18n/fr-FR.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "À quoi ressemble cette interface ?",
     suggestionApi: "Quelle est la structure de cette API ?",
   },
+  contextXray: {
+    panelTitle: "Radiographie du contexte",
+    snapshotsTitle: "Instantanés",
+  },
   sidebar: {
     openNavigation: "Ouvrir la navigation",
     navigation: "Navigation",

package/corpus/templates/plan/app/i18n/hi-IN.ts

@@ -45,6 +45,10 @@ const messages = {
     suggestionUi: "यह UI कैसा दिखता है?",
     suggestionApi: "इस API की संरचना क्या है?",
   },
+  contextXray: {
+    panelTitle: "संदर्भ एक्स-रे",
+    snapshotsTitle: "स्नैपशॉट",
+  },
   sidebar: {
     openNavigation: "नेविगेशन खोलें",
     navigation: "नेविगेशन",

package/corpus/templates/plan/app/i18n/index.ts

@@ -1,4 +1,4 @@
-import type { AgentNativeI18nCatalog } from "@agent-native/core/client";
+import { type AgentNativeI18nCatalog } from "@agent-native/core/client/i18n";
 
 import enUS from "./en-US";
 

package/corpus/templates/plan/app/i18n/ja-JP.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "この UI はどのように見えますか？",
     suggestionApi: "この API の形は？",
   },
+  contextXray: {
+    panelTitle: "コンテキスト X 線",
+    snapshotsTitle: "スナップショット",
+  },
   sidebar: {
     openNavigation: "ナビゲーションを開く",
     navigation: "ナビゲーション",

package/corpus/templates/plan/app/i18n/ko-KR.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "이 UI는 어떻게 보이나요?",
     suggestionApi: "이 API의 구조는 무엇인가요?",
   },
+  contextXray: {
+    panelTitle: "컨텍스트 X-레이",
+    snapshotsTitle: "스냅샷",
+  },
   sidebar: {
     openNavigation: "탐색 열기",
     navigation: "탐색",

package/corpus/templates/plan/app/i18n/pt-BR.ts

@@ -46,6 +46,10 @@ const messages = {
     suggestionUi: "Como esta interface aparece?",
     suggestionApi: "Qual é a estrutura desta API?",
   },
+  contextXray: {
+    panelTitle: "Raio X de contexto",
+    snapshotsTitle: "Instantâneos",
+  },
   sidebar: {
     openNavigation: "Abrir navegação",
     navigation: "Navegação",

package/corpus/templates/plan/app/i18n/zh-CN.ts

@@ -44,6 +44,10 @@ const messages = {
     suggestionUi: "这个界面现在是什么样？",
     suggestionApi: "这个 API 的结构是什么？",
   },
+  contextXray: {
+    panelTitle: "上下文 X 光",
+    snapshotsTitle: "快照",
+  },
   sidebar: {
     openNavigation: "打开导航",
     navigation: "导航",

package/corpus/templates/plan/app/i18n/zh-TW.ts

@@ -44,6 +44,10 @@ const messages = {
     suggestionUi: "這個介面現在是什麼樣？",
     suggestionApi: "這個 API 的結構是什麼？",
   },
+  contextXray: {
+    panelTitle: "脈絡 X 光",
+    snapshotsTitle: "快照",
+  },
   sidebar: {
     openNavigation: "開啟導覽",
     navigation: "導覽",

package/corpus/templates/plan/app/lib/local-codebase-context.ts

@@ -1,4 +1,4 @@
-import { agentNativePath } from "@agent-native/core/client";
+import { agentNativePath } from "@agent-native/core/client/api-path";
 
 import { collectLocalControlResourceFiles } from "./local-control-resources";
 

package/corpus/templates/plan/app/lib/local-control-resources.ts

@@ -1,4 +1,4 @@
-import { agentNativePath } from "@agent-native/core/client";
+import { agentNativePath } from "@agent-native/core/client/api-path";
 
 type LocalControlFileHandle = {
   kind: "file";

package/corpus/templates/plan/app/lib/plan-comment-editor-helpers.ts

@@ -1,4 +1,4 @@
-import { emailToName } from "@agent-native/core/client";
+import { emailToName } from "@agent-native/core/client/collab";
 import {
   formatPlanCommentMentionToken,
   type PlanCommentMention,

package/corpus/templates/plan/app/lib/plan-local-bridge.ts

@@ -1,4 +1,4 @@
-import { appPath } from "@agent-native/core/client";
+import { appPath } from "@agent-native/core/client/api-path";
 import { mimeTypeFromFilename } from "@shared/plan-assets";
 import type { PlanBlock, PlanContent } from "@shared/plan-content";
 import type { PlanBundle, PlanKind } from "@shared/types";

package/corpus/templates/plan/app/lib/register-chat-renderers.tsx

@@ -1,7 +1,7 @@
 import {
   registerActionChatRenderer,
   type ToolRendererProps,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
 import { lazy, Suspense } from "react";
 
 // Heavy plan-block rendering bundle (diagram/wireframe/api-spec/data-model/…) is

package/corpus/templates/plan/app/lib/utils.ts

@@ -1 +1 @@
-export { cn } from "@agent-native/core/client";
+export { cn } from "@agent-native/toolkit/utils";

package/corpus/templates/plan/app/pages/PlanChatPage.tsx

@@ -1,8 +1,8 @@
 import {
   AgentChatHome,
   markAgentChatHomeHandoff,
-  useT,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
+import { useT } from "@agent-native/core/client/i18n";
 import { useEffect } from "react";
 
 import { LocalCodebasePicker } from "@/components/plan/LocalCodebasePicker";

package/corpus/templates/plan/app/pages/PlansPage.tsx

@@ -1,33 +1,32 @@
 import {
   SIDEBAR_STATE_CHANGE_EVENT,
-  PromptComposer,
   BuilderSetupCard,
-  ErrorReportActions,
-  ShareButton,
-  appPath,
-  agentNativePath,
   sendToAgentChat,
   setAgentChatContextItem,
   useAgentEngineConfigured,
-  useActionQuery,
-  useT,
-  useSession,
-  track,
-  emailToColor,
-  emailToName,
   type AgentSidebarStateChangeDetail,
-  type ErrorReportDebugItem,
-  type RichMarkdownCollabUser,
-} from "@agent-native/core/client";
+} from "@agent-native/core/client/agent-chat";
+import { track } from "@agent-native/core/client/analytics";
+import { appPath, agentNativePath } from "@agent-native/core/client/api-path";
+import { emailToColor, emailToName } from "@agent-native/core/client/collab";
+import { PromptComposer } from "@agent-native/core/client/composer";
+import { useActionQuery, useSession } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
 import {
   useAcceptInvitation,
   useJoinByDomain,
   useOrg,
 } from "@agent-native/core/client/org";
+import { ShareButton } from "@agent-native/core/client/sharing";
+import {
+  ErrorReportActions,
+  type ErrorReportDebugItem,
+} from "@agent-native/core/client/ui";
 import {
   useSetHeaderActions,
   useSetPageTitle,
 } from "@agent-native/toolkit/app-shell";
+import { type RichMarkdownCollabUser } from "@agent-native/toolkit/editor";
 import {
   SOURCE_AUTHOR_COMMENT_MENTION_EMAIL,
   extractCommentMentions,

package/corpus/templates/plan/app/root.tsx

@@ -1,16 +1,17 @@
-import { useDbSync } from "@agent-native/core/client";
+import { navigateWithAgentChatViewTransition } from "@agent-native/core/client/agent-chat";
+import { configureTracking } from "@agent-native/core/client/analytics";
+import { appPath } from "@agent-native/core/client/api-path";
+import { useDbSync } from "@agent-native/core/client/hooks";
 import {
   AppProviders,
-  CommandMenu,
-  appPath,
   createAgentNativeQueryClient,
-  getLocaleInitScript,
-  getThemeInitScript,
-  navigateWithAgentChatViewTransition,
+} from "@agent-native/core/client/hooks";
+import { getLocaleInitScript, useT } from "@agent-native/core/client/i18n";
+import {
+  CommandMenu,
   useCommandMenuShortcut,
-  useT,
-} from "@agent-native/core/client";
-import { configureTracking } from "@agent-native/core/client";
+} from "@agent-native/core/client/navigation";
+import { getThemeInitScript } from "@agent-native/core/client/ui";
 import {
   IconBrain,
   IconMoon,
@@ -255,4 +256,4 @@ export default function Root() {
   );
 }
 
-export { ErrorBoundary } from "@agent-native/core/client";
+export { ErrorBoundary } from "@agent-native/core/client/ui";

package/corpus/templates/plan/app/routes/agent.tsx

@@ -1,4 +1,5 @@
-import { AgentTabsPage, useT } from "@agent-native/core/client";
+import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
+import { useT } from "@agent-native/core/client/i18n";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 
 import messages from "@/i18n/en-US";

package/corpus/templates/plan/app/routes/settings.tsx

@@ -1,12 +1,11 @@
+import { ChangelogSettingsCard } from "@agent-native/core/client/changelog";
+import { LanguagePicker, useT } from "@agent-native/core/client/i18n";
+import { TeamPage } from "@agent-native/core/client/org";
 import {
-  ChangelogSettingsCard,
-  LanguagePicker,
   SettingsTabsPage,
   useAgentSettingsTabs,
-  useT,
   type SettingsSearchEntry,
-} from "@agent-native/core/client";
-import { TeamPage } from "@agent-native/core/client/org";
+} from "@agent-native/core/client/settings";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";