===================================================================
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -1,76 +1,50 @@
 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 { createAgentNativeQueryClient } from "@agent-native/core/client/hooks";
-import { getLocaleInitScript, useT } from "@agent-native/core/client/i18n";
-import { getThemeInitScript } from "@agent-native/core/client/theme";
+import { getThemeInitScript } from "@agent-native/core/client/ui";
 import { AppProviders } from "@agent-native/toolkit/app/providers";
-import { useCommandMenuShortcut } from "@agent-native/toolkit/app/shared";
-import { CommandMenu } from "@agent-native/toolkit/app/shared";
 import { useQueryClient } from "@tanstack/react-query";
-import { useTheme } from "next-themes";
-import { useCallback, useState } from "react";
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-  useLocation,
-  useNavigate,
-} from "react-router";
+import { useState } from "react";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 import type { LinksFunction } from "react-router";
 
 import { Layout as AppLayout } from "@/components/layout/Layout";
 import { AppToolkitProvider } from "@/components/ui/toolkit-provider";
 import { useNavigationState } from "@/hooks/use-navigation-state";
-import { APP_TITLE } from "@/lib/app-config";
-import {
-  HOME_PATH,
-  isChatPathname,
-  NEW_CHAT_PATH,
-  skeletonLayoutForPath,
-  threadIdFromPath,
-} from "@/lib/chat-paths";
+import { APP_NAME, APP_TITLE } from "@/lib/app-config";
 import { TAB_ID } from "@/lib/tab-id";
 
-import { i18nCatalog } from "./i18n";
-
 import stylesheet from "./global.css?url";
 
 configureTracking({
   getDefaultProps: (_name, properties) => ({
     ...properties,
-    app: "chat",
+    app: APP_NAME,
   }),
 });
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: stylesheet },
 ];
 
 const THEME_INIT_SCRIPT = getThemeInitScript();
-const LOCALE_INIT_SCRIPT = getLocaleInitScript();
 
 export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en" suppressHydrationWarning>
       <head>
         <meta charSet="utf-8" />
         <meta
           name="viewport"
-          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, interactive-widget=resizes-content"
+          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
         />
         <script
           suppressHydrationWarning
           dangerouslySetInnerHTML={{ __html: THEME_INIT_SCRIPT }}
         />
-        <script
-          data-agent-native-locale-init
-          suppressHydrationWarning
-          dangerouslySetInnerHTML={{ __html: LOCALE_INIT_SCRIPT }}
-        />
+        {/* guard:allow-raw-color - theme-color metadata requires a concrete browser-chrome color. */}
         <meta name="theme-color" content="#18181B" />
         <meta name="mobile-web-app-capable" content="yes" />
         <meta
           name="apple-mobile-web-app-status-bar-style"
@@ -100,97 +74,19 @@
   });
   return null;
 }
 
-function ThemeToggleItem() {
-  const { resolvedTheme, setTheme } = useTheme();
-  const t = useT();
-  const isDark = resolvedTheme === "dark";
-  return (
-    <CommandMenu.Item
-      onSelect={() => setTheme(isDark ? "light" : "dark")}
-      keywords={["theme", "dark", "light", "mode"]}
-    >
-      {t("root.toggleTheme")}
-    </CommandMenu.Item>
-  );
-}
-
-function AppContent() {
-  const [cmdkOpen, setCmdkOpen] = useState(false);
-  const navigate = useNavigate();
-  const t = useT();
-  const location = useLocation();
-  const isChatThread = threadIdFromPath(location.pathname) !== null;
-  useCommandMenuShortcut(useCallback(() => setCmdkOpen(true), []));
-  return (
-    <>
-      <CommandMenu
-        open={cmdkOpen}
-        onOpenChange={setCmdkOpen}
-        chatStorageKey="chat"
-      >
-        <CommandMenu.Group heading={t("root.commandActions")}>
-          {isChatThread ? (
-            <CommandMenu.Item
-              onSelect={() =>
-                window.dispatchEvent(new Event("agent-chat:new-chat"))
-              }
-            >
-              {t("chat.newChat")}
-            </CommandMenu.Item>
-          ) : null}
-          {location.pathname !== HOME_PATH ? (
-            <CommandMenu.Item onSelect={() => navigate(HOME_PATH)}>
-              {t("navigation.home")}
-            </CommandMenu.Item>
-          ) : null}
-          {!isChatPathname(location.pathname) ? (
-            <CommandMenu.Item onSelect={() => navigate(NEW_CHAT_PATH)}>
-              {t("navigation.chat")}
-            </CommandMenu.Item>
-          ) : null}
-          <CommandMenu.Item
-            onSelect={() => navigate("/settings/agent")}
-            keywords={[
-              "agent",
-              "context",
-              "files",
-              "connections",
-              "jobs",
-              "access",
-            ]}
-          >
-            {t("settings.openAgentSettings")}
-          </CommandMenu.Item>
-        </CommandMenu.Group>
-        <CommandMenu.Group heading={t("root.commandAppearance")}>
-          <ThemeToggleItem />
-        </CommandMenu.Group>
-      </CommandMenu>
-      <AppLayout>
-        <Outlet />
-      </AppLayout>
-    </>
-  );
-}
-
 export default function Root() {
   const [queryClient] = useState(() => createAgentNativeQueryClient());
-  // The path, not the visitor, picks the shell, so the SSR shell stays one
-  // cached page per URL.
-  const { pathname } = useLocation();
   return (
     <AppToolkitProvider>
-      <AppProviders
-        queryClient={queryClient}
-        skeletonLayout={skeletonLayoutForPath(pathname)}
-        i18n={{ catalog: i18nCatalog }}
-      >
+      <AppProviders queryClient={queryClient}>
         <DbSyncSetup />
-        <AppContent />
+        <AppLayout>
+          <Outlet />
+        </AppLayout>
       </AppProviders>
     </AppToolkitProvider>
   );
 }
 
-export { ErrorBoundary } from "@agent-native/toolkit/app/shared/ErrorBoundary";
+export { ErrorBoundary } from "@agent-native/toolkit/app/shared";