@agent-native/dispatch 0.40.0 → 0.40.2

package/dist/components/layout/Layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layout.d.ts","sourceRoot":"","sources":["../../../src/components/layout/Layout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Layout.d.ts","sourceRoot":"","sources":["../../../src/components/layout/Layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAiBL,KAAK,wBAAwB,EAC7B,KAAK,4BAA4B,EAYlC,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,yCAAyC,CAAC;AAWjD,OAAO,EAaL,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAElB,KAAK,mBAAmB,EACzB,MAAM,2CAA2C,CAAC;AAiCnD,OAAO,EAQL,KAAK,aAAa,EAClB,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAOf,OAAO,EAYL,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAoBlC,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAExE,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,YAAY,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG,aAAa,CAAC;IAC1C,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IACtC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/B;AAmDD,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,yBAAyB;IACxE,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,4BAA4B,CAAC;IAClD,0BAA0B,CAAC,EAAE,CAAC,MAAM,EAAE,4BAA4B,KAAK,IAAI,CAAC;IAC5E,aAAa,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC5C,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yBAAyB,CAAC,EAAE,mBAAmB,CAAC;IAChD,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACrD,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,mBAAoB,SAAQ,yBAAyB;IACpE,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAKD,eAAO,MAAM,0CAA0C,gCACxB,CAAC;AAwBhC,UAAU,4BAA4B;IACpC,aAAa,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC9C,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACzC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAKD,wBAAgB,qBAAqB,IAAI,uBAAuB,GAAG,SAAS,CAE3E;AAED,wBAAgB,+BAA+B,wCAE9C;AA0CD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE3E;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,GACrB,OAAO,CAET;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAKT;AA2BD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQ1D;AA4KD,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAa,UAWlE;AAwaD,wBAAgB,UAAU,CAAC,EACzB,UAAU,EACV,UAAU,EACV,SAAkC,EAClC,SAAS,EACT,aAAqB,EACrB,iBAAyB,EACzB,SAAiB,EACjB,WAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC1B,aAAkB,EAClB,oBAA4B,EAC5B,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,GACrB,EAAE,uBAAuB,mDAsRzB;AAED,wBAAgB,4BAA4B,CAAC,EAC3C,YAAY,EACZ,SAAS,EACT,OAAO,EACP,eAAe,EACf,IAAI,GACL,EAAE;IACD,YAAY,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,aAAa,CAAC;CACrB,GAAG,SAAS,CAuCZ;AAED,wBAAgB,MAAM,CAAC,EACrB,QAAQ,EACR,UAAU,EACV,aAAa,EACb,SAAS,EACT,SAAS,GACV,EAAE,mBAAmB,mDAguCrB"}

package/dist/components/layout/Layout.js

@@ -1,17 +1,21 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { CHAT_FIRST_MODE_CHANGED_EVENT, AgentChatSurface, AgentToggleButton, chatFirstSurfaceTabId, AgentSidebar, ChatFirstSurfacePanelToggle, closeChatFirstSessionWatch, emitChatFirstSessionWatch, getChatFirstSurfaceTabsStore, focusAgentChat, navigateWithAgentChatViewTransition, readChatFirstAppLayout, readChatFirstMode, resolveChatFirstBrowserTarget, resolveChatFirstAppTarget, subscribeChatFirstOpenBrowser, subscribeChatFirstOpenApp, useChatFirstSessionWatch, useChatFirstSurfacePanel, useChatFirstSurfaceResize, useChatFirstSurfaceTabs, useAgentChatHomeHandoff, useAgentChatHomeHandoffLinks, useChatThreads, } from "@agent-native/core/client/agent-chat";
+import { CHAT_FIRST_MODE_CHANGED_EVENT, chatFirstSurfaceTabId, closeChatFirstSessionWatch, emitChatFirstSessionWatch, getChatFirstSurfaceTabsStore, navigateWithAgentChatViewTransition, readChatFirstAppLayout, readChatFirstMode, resolveChatFirstBrowserTarget, resolveChatFirstAppTarget, subscribeChatFirstOpenBrowser, subscribeChatFirstOpenApp, useChatFirstSessionWatch, useChatFirstSurfacePanel, useChatFirstSurfaceResize, useChatFirstSurfaceTabs, useAgentChatHomeHandoff, useAgentChatHomeHandoffLinks, useChatThreads, } from "@agent-native/core/client/agent-chat";
 import { appBasePath, appPath } from "@agent-native/core/client/api-path";
 import { readClientAppState, writeClientAppState, } from "@agent-native/core/client/application-state";
-import { ChatFirstAgentsPane, ChatFirstAppPane, ChatFirstAppsRail, ChatFirstBrowserPane, ChatFirstChatHistory, ChatFirstPrimaryNavigation, ChatFirstSessionWatchPane, ChatFirstSurfacePanel, ChatFirstSurfaceContent, ChatFirstSurfaceTabs, defaultChatFirstCopy, } from "@agent-native/core/client/chat-first";
-import { writeClipboardText } from "@agent-native/core/client/clipboard";
+import { useFeatureFlagState, } from "@agent-native/core/client/feature-flags";
 import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
-import { openCommandMenu } from "@agent-native/core/client/navigation";
-import { InvitationBanner, OrgSwitcher } from "@agent-native/core/client/org";
-import { RunsTray } from "@agent-native/core/client/progress";
-import { isSettingsPathname } from "@agent-native/core/client/settings";
-import { AppSidebarFooter, AppSidebarHeader, FeedbackButton, } from "@agent-native/core/client/ui";
+import { SETTINGS_REDESIGN_FLAG } from "@agent-native/core/feature-flags/registry";
+import { AgentChatSurface, AgentToggleButton, AgentSidebar, focusAgentChat, } from "@agent-native/toolkit/app/chat";
+import { ChatFirstSurfacePanelToggle } from "@agent-native/toolkit/app/chat/chat-first";
+import { ChatFirstAgentsPane, ChatFirstAppPane, ChatFirstAppsRail, ChatFirstBrowserPane, ChatFirstChatHistory, ChatFirstPrimaryNavigation, ChatFirstSessionWatchPane, ChatFirstSurfacePanel, ChatFirstSurfaceContent, ChatFirstSurfaceTabs, defaultChatFirstCopy, } from "@agent-native/toolkit/app/chat/chat-first";
+import { FeedbackButton } from "@agent-native/toolkit/app/feedback";
+import { InvitationBanner, OrgSwitcher } from "@agent-native/toolkit/app/org";
+import { RunsTray } from "@agent-native/toolkit/app/progress";
+import { isSettingsPathname } from "@agent-native/toolkit/app/settings";
+import { AppSidebarFooter, AppSidebarHeader, openCommandMenu, } from "@agent-native/toolkit/app/shared";
 import { ChatHistoryRail, } from "@agent-native/toolkit/chat-history";
+import { writeClipboardText } from "@agent-native/toolkit/clipboard";
 import { IconApps, IconBrandSlack, IconBrandTelegram, IconCopy, IconEye, IconHierarchy2, IconMessageQuestion, IconBroadcast, IconLayoutSidebar, IconLayoutSidebarLeftCollapse, IconLayoutSidebarLeftExpand, IconSettings, IconShield, IconWorld, IconDeviceDesktop, IconPlus, } from "@tabler/icons-react";
 import { createContext, useEffect, useMemo, useRef, useState, useContext, useCallback, } from "react";
 import { Link, useLocation, useNavigate } from "react-router";
@@ -19,7 +23,7 @@ import { toast } from "sonner";
 import { useIsMobile } from "../../hooks/use-mobile.js";
 import { cn } from "../../lib/utils.js";
 import { normalizeWorkspaceAppLayout } from "../../lib/workspace-app-layout.js";
-import { isDispatchWorkspaceAppId, isPathMountedWorkspaceApp, isWorkspaceAppVisibleInDefaultLaunchers, isWorkspaceSsoApp, mergeChatFirstWorkspaceApps, workspaceAppSourceFromConnected, navigateToWorkspaceApp, shouldOpenWorkspaceAppInTopWindow, workspaceAppIdFromRoute, workspaceAppDirectHref, workspaceAppDirectLaunchHref, workspaceAppRoute, workspaceAppTargetPath, } from "../../lib/workspace-apps.js";
+import { isDispatchWorkspaceAppId, isPathMountedWorkspaceApp, isWorkspaceAppVisibleInDefaultLaunchers, isWorkspaceSsoApp, navigateToWorkspaceApp, shouldOpenWorkspaceAppInTopWindow, workspaceAppIdFromRoute, workspaceAppDirectHref, workspaceAppDirectLaunchHref, workspaceAppRoute, workspaceAppTargetPath, } from "../../lib/workspace-apps.js";
 import { CHAT_FIRST_PANE_STATE_KEY } from "../../shared/chat-first-pane.js";
 import { AppIcon } from "../app-icon.js";
 import { CreateAppPopover } from "../create-app-popover.js";
@@ -137,11 +141,13 @@ export function shouldQueryChatFirstApps(isChatRoute, chatFirstMode) {
     return isChatRoute || chatFirstMode;
 }
 /**
- * Settings brings its own navigation, header, and agent toggle, so it renders
- * full width.
+ * The redesigned Settings brings its own navigation, header, and agent
+ * toggle, so it renders full width. While the flag loads it shows the
+ * shell's skeleton, which needs the same frame.
  */
-export function isSettingsShellPath(pathname) {
-    return isSettingsPathname(localDispatchPath(pathname));
+export function isRedesignedSettingsPath(pathname, settingsRedesign) {
+    return (isSettingsPathname(localDispatchPath(pathname)) &&
+        (settingsRedesign.enabled || settingsRedesign.status === "loading"));
 }
 function chatFirstPrimaryTabForPath(pathname) {
     if (pathname === "/chat" || pathname.startsWith("/chat/")) {
@@ -657,7 +663,7 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         ? isElectronEmbeddedSearch(window.location.search)
         : false);
     const isChatRoute = localPathname === "/chat" || localPathname.startsWith("/chat/");
-    const isSettingsShellRoute = isSettingsShellPath(location.pathname);
+    const isRedesignedSettingsRoute = isRedesignedSettingsPath(location.pathname, useFeatureFlagState(SETTINGS_REDESIGN_FLAG.key));
     const chatFirstSurfaceScope = threadIdFromPath(localPathname) ?? "new";
     const isWorkspaceAppRoute = shouldAutoCollapseDispatchSidebar(location.pathname);
     const workspaceAppId = isWorkspaceAppRoute
@@ -683,61 +689,31 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
     }, [electronEmbedded, location.pathname, location.search]);
     const [chatFirstAppLayout, setChatFirstAppLayout] = useState(() => normalizeWorkspaceAppLayout(readChatFirstAppLayout()));
     const chatFirstAppLayoutHydratedRef = useRef(false);
-    const chatFirstAppsQuery = useActionQuery("list-workspace-apps", { includeAgentCards: false, includeArchived: true }, { enabled: shouldQueryChatFirstApps(isChatRoute, chatFirstMode) });
-    // Not list_apps: MCP app access restricts routing, not what the workspace
-    // shows. list-connected-agents already applies the built-in app config.
-    const chatFirstConnectedAppsQuery = useActionQuery("list-connected-agents", {}, { enabled: shouldQueryChatFirstApps(isChatRoute, chatFirstMode) });
-    const chatFirstEnabledBuiltinAppIds = useMemo(() => chatFirstConnectedAppsQuery.data
-        ?.filter((app) => app.source === "builtin")
-        .map((app) => app.id), [chatFirstConnectedAppsQuery.data]);
-    const chatFirstWorkspaceApps = useMemo(() => mergeChatFirstWorkspaceApps(chatFirstAppsQuery.data, chatFirstEnabledBuiltinAppIds), [chatFirstAppsQuery.data, chatFirstEnabledBuiltinAppIds]);
-    const chatHomeWorkspaceApps = useMemo(() => mergeChatFirstWorkspaceApps(chatFirstWorkspaceApps, chatFirstEnabledBuiltinAppIds, chatFirstConnectedAppsQuery.data?.map((app) => ({
-        id: app.id,
-        name: app.name,
-        description: app.description,
-        url: app.homeUrl?.trim() || app.url,
-        source: workspaceAppSourceFromConnected(app.source),
-    }))).filter((app) => app.status !== "pending" &&
+    const chatFirstAppsQuery = useActionQuery("list-workspace-apps", { includeAgentCards: false, includeArchived: true }, {
+        enabled: shouldQueryChatFirstApps(isChatRoute, chatFirstMode) ||
+            workspaceAppRouteActive,
+    });
+    const chatFirstWorkspaceApps = useMemo(() => (chatFirstAppsQuery.data ?? []).filter((app) => app.status !== "pending" &&
         app.archived !== true &&
-        isWorkspaceAppVisibleInDefaultLaunchers(app)), [
-        chatFirstConnectedAppsQuery.data,
-        chatFirstEnabledBuiltinAppIds,
-        chatFirstWorkspaceApps,
-    ]);
+        isWorkspaceAppVisibleInDefaultLaunchers(app)), [chatFirstAppsQuery.data]);
     const chatFirstAppRegistrations = useMemo(() => {
-        const registrations = new Map();
-        for (const app of chatFirstWorkspaceApps) {
-            registrations.set(app.id.toLowerCase(), {
-                id: app.id,
-                name: app.name,
-                source: app.source,
-                path: app.path,
-                url: app.url,
-                homePath: app.homePath,
-                enabled: app.status !== "pending" && app.archived !== true,
-            });
-        }
-        for (const app of chatFirstConnectedAppsQuery.data ?? []) {
-            const id = app.id.trim().toLowerCase();
-            if (!id || registrations.has(id))
-                continue;
-            registrations.set(id, {
-                id,
-                name: app.name,
-                source: workspaceAppSourceFromConnected(app.source),
-                url: app.homeUrl?.trim() || app.url,
-                enabled: true,
-            });
-        }
-        return [...registrations.values()];
-    }, [chatFirstConnectedAppsQuery.data, chatFirstWorkspaceApps]);
-    const chatFirstAppItems = useMemo(() => chatFirstAppRegistrations
-        .filter((app) => app.enabled && isWorkspaceAppVisibleInDefaultLaunchers(app))
-        .map((app) => ({
+        return (chatFirstAppsQuery.data ?? [])
+            .filter((app) => app.status !== "pending" && app.archived !== true)
+            .map((app) => ({
+            id: app.id,
+            name: app.name,
+            source: app.source ?? "workspace",
+            path: app.path,
+            url: app.url,
+            homePath: app.homePath,
+            enabled: true,
+        }));
+    }, [chatFirstAppsQuery.data]);
+    const chatFirstAppItems = useMemo(() => chatFirstWorkspaceApps.map((app) => ({
         id: app.id,
-        name: app.name ?? app.id,
-        source: app.source,
-    })), [chatFirstAppRegistrations]);
+        name: app.name,
+        source: app.source ?? "workspace",
+    })), [chatFirstWorkspaceApps]);
     const openChatFirstApp = useCallback((app) => {
         if (isDispatchWorkspaceAppId(app.id))
             return;
@@ -763,30 +739,17 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         void navigate(dispatchNavLinkTarget(workspaceAppRoute(app.id)));
     }, [chatFirstAppRegistrations, navigate]);
     const chatHomeAppLauncher = useMemo(() => ({
-        apps: chatFirstAppItems,
-        workspaceApps: chatHomeWorkspaceApps,
-        isLoading: chatFirstAppsQuery.isLoading || chatFirstConnectedAppsQuery.isLoading,
-        error: chatFirstAppsQuery.isError
-            ? chatFirstAppsQuery.error
-            : chatFirstConnectedAppsQuery.isError
-                ? chatFirstConnectedAppsQuery.error
-                : undefined,
+        workspaceApps: chatFirstWorkspaceApps,
+        isLoading: chatFirstAppsQuery.isLoading,
+        error: chatFirstAppsQuery.isError ? chatFirstAppsQuery.error : undefined,
         openApp: openChatFirstApp,
-        retry: () => {
-            void chatFirstAppsQuery.refetch();
-            void chatFirstConnectedAppsQuery.refetch();
-        },
+        retry: () => void chatFirstAppsQuery.refetch(),
     }), [
         chatFirstAppsQuery.error,
         chatFirstAppsQuery.isError,
         chatFirstAppsQuery.isLoading,
         chatFirstAppsQuery.refetch,
-        chatFirstConnectedAppsQuery.error,
-        chatFirstConnectedAppsQuery.isError,
-        chatFirstConnectedAppsQuery.isLoading,
-        chatFirstConnectedAppsQuery.refetch,
-        chatFirstAppItems,
-        chatHomeWorkspaceApps,
+        chatFirstWorkspaceApps,
         openChatFirstApp,
     ]);
     const chatFirstCopy = useMemo(() => createDispatchChatFirstCopy(t), [t]);
@@ -929,8 +892,7 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         });
     }, [chatFirstSurfaceTabsStore, persistChatFirstPane]);
     const resolveChatFirstOpenApp = useCallback((detail) => {
-        if (chatFirstAppsQuery.isLoading ||
-            chatFirstConnectedAppsQuery.isLoading) {
+        if (chatFirstAppsQuery.isLoading) {
             pendingChatFirstOpenAppRef.current = detail;
             return;
         }
@@ -962,7 +924,6 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         chatFirstAppRegistrations,
         chatFirstAppsQuery.isError,
         chatFirstAppsQuery.isLoading,
-        chatFirstConnectedAppsQuery.isLoading,
         chatFirstSurfaceTabsStore,
         openChatFirstPane,
         navigate,
@@ -1136,17 +1097,13 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
     }, [activeChatFirstSurfaceTab, chatFirstSessionWatch.target]);
     useEffect(() => {
         const pending = pendingChatFirstOpenAppRef.current;
-        if (!pending ||
-            chatFirstAppsQuery.isLoading ||
-            chatFirstConnectedAppsQuery.isLoading)
+        if (!pending || chatFirstAppsQuery.isLoading)
             return;
         resolveChatFirstOpenApp(pending);
     }, [
         chatFirstAppsQuery.data,
         chatFirstAppsQuery.isError,
         chatFirstAppsQuery.isLoading,
-        chatFirstConnectedAppsQuery.data,
-        chatFirstConnectedAppsQuery.isLoading,
         resolveChatFirstOpenApp,
     ]);
     useEffect(() => {
@@ -1317,16 +1274,32 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         isMobileSurface,
         renderChatFirstWatchChat,
     ]);
+    const chatFirstSurfaceTabsBar = activeChatFirstSurfaceTab?.kind === "app" ? null : (_jsx(ChatFirstSurfaceTabs, { tabs: chatFirstSurfaceTabs.tabs, activeTabId: chatFirstSurfaceTabs.activeTabId, onActivate: activateChatFirstSurfaceTab, onClose: closeChatFirstSurfaceTab, onCloseOthers: (tab) => {
+            activateChatFirstSurfaceTab(tab);
+            chatFirstSurfaceTabsStore.closeOthers(tab.id);
+        }, onCloseToRight: (tab) => {
+            const targetIndex = chatFirstSurfaceTabs.tabs.findIndex((candidate) => candidate.id === tab.id);
+            const activeIndex = chatFirstSurfaceTabs.tabs.findIndex((candidate) => candidate.id === chatFirstSurfaceTabs.activeTabId);
+            if (activeIndex > targetIndex)
+                activateChatFirstSurfaceTab(tab);
+            chatFirstSurfaceTabsStore.closeToRight(tab.id);
+        }, onCloseAll: closeAllChatFirstSurfaceTabs, onOpenSurface: openChatFirstSurface, apps: chatFirstAppItems, onOpenApp: (app) => openChatFirstPane({ appId: app.id }, "side"), renderAppIcon: (app) => (_jsx(AppIcon, { id: app.id, name: app.name, size: "sm", className: "size-7 rounded-lg" })), copy: chatFirstCopy }));
+    const chatFirstSurfaceContent = chatFirstSurfaceTabs.tabs.length > 0 ? (_jsx(ChatFirstSurfaceContent, { tabs: chatFirstSurfaceTabs.tabs, activeTabId: chatFirstSurfaceTabs.activeTabId, renderTab: renderChatFirstSurfaceTab })) : null;
     if (CHROMELESS_PATHS.some((path) => localPathname === path)) {
         return _jsx(_Fragment, { children: children });
     }
     if (electronEmbedded) {
-        return (_jsx(DispatchExtensionsContext.Provider, { value: extensions, children: _jsx(DispatchWorkspaceAppLauncherContext.Provider, { value: chatHomeAppLauncher, children: _jsx(HeaderActionsProvider, { children: _jsx("div", { "data-dispatch-electron-control-plane": true, className: "flex h-screen w-full overflow-hidden bg-background", children: _jsxs("div", { className: "relative flex min-w-0 flex-1 flex-col overflow-hidden", children: [_jsx(Header, { showAgentToggle: false }), _jsx(InvitationBanner, {}), _jsx("main", { className: "flex-1 overflow-y-auto", children: _jsx("div", { className: "mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6", children: children }) })] }) }) }) }) }));
+        return (_jsx(DispatchExtensionsContext.Provider, { value: extensions, children: _jsx(DispatchWorkspaceAppLauncherContext.Provider, { value: chatHomeAppLauncher, children: _jsx(HeaderActionsProvider, { children: _jsx("div", { "data-dispatch-electron-control-plane": true, className: "flex h-screen w-full overflow-hidden bg-background", children: _jsxs("div", { className: "relative flex min-w-0 flex-1 flex-col overflow-hidden", children: [_jsx(Header, { showAgentToggle: false }), _jsx(InvitationBanner, {}), _jsxs("main", { className: "relative flex min-h-0 flex-1 overflow-hidden", children: [_jsx("div", { className: "min-w-0 flex-1 overflow-y-auto", children: _jsx("div", { className: "mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6", children: children }) }), isChatRoute &&
+                                            chatFirstMode &&
+                                            chatFirstHasActiveChat &&
+                                            chatFirstSurfacePanel.open ? (_jsxs(ChatFirstSurfacePanel, { width: chatFirstSurfaceResize.width, onResizePointerDown: chatFirstSurfaceResize.onPointerDown, copy: chatFirstCopy, children: [chatFirstSurfaceTabsBar, chatFirstSurfaceContent] })) : null, isChatRoute && chatFirstMode && chatFirstHasActiveChat ? (_jsx(ChatFirstSurfacePanelToggle, { open: chatFirstSurfacePanel.open, onToggle: chatFirstSurfacePanel.toggle, className: CHAT_FIRST_SURFACE_PANEL_TOGGLE_CLASS_NAME })) : null] })] }) }) }) }) }));
     }
     if (isWorkspaceAppHostRoute) {
         return (_jsx(DispatchExtensionsContext.Provider, { value: extensions, children: _jsx(HeaderActionsProvider, { children: _jsx("div", { "data-dispatch-workspace-app-chrome-less": true, className: "h-screen w-full overflow-hidden bg-background", children: children }) }) }));
     }
-    const showAgentControls = !isChatRoute && !isSettingsShellRoute && !pageOwnsToolbar(localPathname);
+    const showAgentControls = !isChatRoute &&
+        !isRedesignedSettingsRoute &&
+        !pageOwnsToolbar(localPathname);
     function openAskAgentFullscreen() {
         focusAgentChat();
         navigateWithAgentChatViewTransition(navigate, dispatchNavLinkTarget("/chat"));
@@ -1351,30 +1324,17 @@ export function Layout({ children, extensions, agentPageHref, brandName, brandIc
         t("dispatch.sidebar.suggestionRouteSlack"),
         t("dispatch.sidebar.suggestionGrantKey"),
     ];
-    const appContent = (_jsxs("div", { className: "relative flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden", children: [_jsx(InvitationBanner, {}), isChatRoute && chatFirstMode && chatFirstHasActiveChat ? (_jsx(ChatFirstSurfacePanelToggle, { open: chatFirstSurfacePanel.open, onToggle: chatFirstSurfacePanel.toggle, className: CHAT_FIRST_SURFACE_PANEL_TOGGLE_CLASS_NAME })) : null, isChatRoute && chatFirstMode && chatFirstNotice ? (_jsxs("div", { className: "dispatch-chat-first-notice", role: "status", "aria-live": "polite", children: [_jsx("span", { children: chatFirstNotice }), _jsx("button", { type: "button", onClick: () => setChatFirstNotice(null), "aria-label": "Dismiss app notice", children: "Dismiss" })] })) : null, _jsx("main", { className: cn("min-h-0 flex-1", isChatRoute || isWorkspaceAppRoute
+    const appContent = (_jsxs("div", { className: "relative flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden", children: [_jsx(InvitationBanner, {}), isChatRoute && chatFirstMode && chatFirstNotice ? (_jsxs("div", { className: "dispatch-chat-first-notice", role: "status", "aria-live": "polite", children: [_jsx("span", { children: chatFirstNotice }), _jsx("button", { type: "button", onClick: () => setChatFirstNotice(null), "aria-label": "Dismiss app notice", children: "Dismiss" })] })) : null, _jsx("main", { className: cn("min-h-0 flex-1", isChatRoute || isWorkspaceAppRoute
                     ? "overflow-hidden"
                     : "overflow-y-auto"), children: showAgentControls ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "pointer-events-none sticky top-0 z-10 flex justify-end px-4 pt-2 lg:px-6", children: [_jsx(Button, { variant: "ghost", size: "icon-sm", className: "pointer-events-auto absolute start-4 top-2 lg:hidden", onClick: () => setMobileOpen(true), "aria-label": "Open navigation", children: _jsx(IconLayoutSidebar, { className: "h-4 w-4" }) }), _jsxs("div", { className: "pointer-events-auto flex items-center gap-1", children: [_jsx(RunsTray, { limit: 8, onOpenThread: openRunThread }), _jsx(AgentToggleButton, { className: "h-8 w-8 rounded-md bg-background/80 hover:bg-accent" })] })] }), _jsxs("div", { className: "mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6", children: [localPathname !== "/overview" && (pageTitle || headerActions) ? (_jsxs("div", { className: "flex min-w-0 items-center justify-between gap-3", children: [_jsx("div", { className: "min-w-0 flex-1", children: pageTitle }), headerActions ? (_jsx("div", { className: "flex shrink-0 items-center gap-2", children: headerActions })) : null] })) : null, children] })] })) : (children) })] }));
-    const chatFirstSurfaceTabsBar = activeChatFirstSurfaceTab?.kind === "app" ? null : (_jsx(ChatFirstSurfaceTabs, { tabs: chatFirstSurfaceTabs.tabs, activeTabId: chatFirstSurfaceTabs.activeTabId, onActivate: activateChatFirstSurfaceTab, onClose: closeChatFirstSurfaceTab, onCloseOthers: (tab) => {
-            activateChatFirstSurfaceTab(tab);
-            chatFirstSurfaceTabsStore.closeOthers(tab.id);
-        }, onCloseToRight: (tab) => {
-            const targetIndex = chatFirstSurfaceTabs.tabs.findIndex((candidate) => candidate.id === tab.id);
-            const activeIndex = chatFirstSurfaceTabs.tabs.findIndex((candidate) => candidate.id === chatFirstSurfaceTabs.activeTabId);
-            if (activeIndex > targetIndex)
-                activateChatFirstSurfaceTab(tab);
-            chatFirstSurfaceTabsStore.closeToRight(tab.id);
-        }, onCloseAll: closeAllChatFirstSurfaceTabs, onOpenSurface: openChatFirstSurface, apps: chatFirstAppItems, onOpenApp: (app) => openChatFirstPane({ appId: app.id }, "side"), renderAppIcon: (app) => (_jsx(AppIcon, { id: app.id, name: app.name, size: "sm", className: "size-7 rounded-lg" })), copy: chatFirstCopy }));
-    const chatFirstSurfaceContent = chatFirstSurfaceTabs.tabs.length > 0 ? (_jsx(ChatFirstSurfaceContent, { tabs: chatFirstSurfaceTabs.tabs, activeTabId: chatFirstSurfaceTabs.activeTabId, renderTab: renderChatFirstSurfaceTab })) : null;
-    const workspaceAppChatName = (workspaceAppId
-        ? chatFirstAppRegistrations.find((app) => app.id.toLowerCase() === workspaceAppId.toLowerCase())?.name
-        : null) ??
-        workspaceAppId ??
-        "Workspace app";
-    const workspaceAppContent = workspaceAppRouteActive && workspaceAppId ? (_jsx(WorkspaceAppChatRail, { appId: workspaceAppId, appName: workspaceAppChatName, agentPageHref: agentPageHref, onFullscreenRequest: openAskAgentFullscreen, children: _jsx(WorkspaceAppKeepAlive, { activeAppId: workspaceAppId }) })) : (_jsx(WorkspaceAppKeepAlive, { activeAppId: workspaceAppRouteActive ? workspaceAppId : null }));
+    const workspaceAppChatRegistration = workspaceAppId
+        ? chatFirstAppRegistrations.find((app) => app.id.toLowerCase() === workspaceAppId.toLowerCase())
+        : undefined;
+    const workspaceAppContent = workspaceAppRouteActive && workspaceAppId ? (workspaceAppChatRegistration ? (_jsx(WorkspaceAppChatRail, { appId: workspaceAppId, appName: workspaceAppChatRegistration.name ?? workspaceAppId, agentPageHref: agentPageHref, onFullscreenRequest: openAskAgentFullscreen, children: _jsx(WorkspaceAppKeepAlive, { activeAppId: workspaceAppId }) })) : (_jsx(WorkspaceAppKeepAlive, { activeAppId: workspaceAppId }))) : (_jsx(WorkspaceAppKeepAlive, { activeAppId: workspaceAppRouteActive ? workspaceAppId : null }));
     const content = isChatRoute ? (_jsx("div", { className: cn("agent-layout-main-surface flex h-full min-w-0 flex-1 overflow-hidden", chatFirstMode && "dispatch-chat-first-surface"), children: chatFirstAppTakesMain ? (_jsx("div", { className: "flex min-w-0 flex-1 flex-col overflow-hidden", "data-dispatch-chat-first-main-app": true, children: chatFirstSurfaceContent })) : (_jsxs(_Fragment, { children: [appContent, chatFirstMode &&
                     chatFirstHasActiveChat &&
                     chatFirstSurfacePanel.open ? (_jsxs(ChatFirstSurfacePanel, { width: chatFirstSurfaceResize.width, onResizePointerDown: chatFirstSurfaceResize.onPointerDown, copy: chatFirstCopy, children: [chatFirstSurfaceTabsBar, chatFirstSurfaceContent] })) : null] })) })) : workspaceAppRouteActive ? null : isWorkspaceAppRoute ? (appContent) : (_jsx(AgentSidebar, { position: "right", defaultOpen: false, agentPageHref: agentPageHref, chatViewTransition: true, storageKey: "dispatch", openOnChatRunning: chatHomeHandoffActive, onFullscreenRequest: openAskAgentFullscreen, emptyStateText: t("dispatch.sidebar.emptyAgentText"), suggestions: sidebarSuggestions, children: appContent }));
-    return (_jsx(DispatchExtensionsContext.Provider, { value: extensions, children: _jsx(DispatchWorkspaceAppLauncherContext.Provider, { value: chatHomeAppLauncher, children: _jsx(HeaderActionsProvider, { children: _jsxs("div", { className: "agent-layout-shell flex h-screen w-full overflow-hidden bg-background", children: [isSettingsShellRoute ? null : (_jsx("aside", { "data-collapsed": sidebarCollapsed ? "true" : "false", className: cn("agent-layout-left-drawer hidden shrink-0 flex-col border-e !border-e-sidebar-border bg-sidebar text-sidebar-foreground transition-[width] duration-200 ease-out lg:flex", sidebarCollapsed ? "w-14" : "w-[260px]"), children: _jsx(NavContent, { extensions: extensions, brandName: brandName, brandIcon: brandIcon, chatFirstMode: chatFirstMode, chatFirstEmbedded: chatFirstEmbedded, collapsed: sidebarCollapsed, chatFirstAppLayout: chatFirstAppLayout, onChatFirstAppLayoutChange: persistChatFirstAppLayout, chatFirstApps: chatFirstAppItems, chatFirstAppsLoading: chatFirstAppsQuery.isLoading, chatFirstAppsError: chatFirstAppsQuery.isError
+    return (_jsx(DispatchExtensionsContext.Provider, { value: extensions, children: _jsx(DispatchWorkspaceAppLauncherContext.Provider, { value: chatHomeAppLauncher, children: _jsx(HeaderActionsProvider, { children: _jsxs("div", { className: "agent-layout-shell flex h-screen w-full overflow-hidden bg-background", children: [isRedesignedSettingsRoute ? null : (_jsx("aside", { "data-collapsed": sidebarCollapsed ? "true" : "false", className: cn("agent-layout-left-drawer hidden shrink-0 flex-col border-e !border-e-sidebar-border bg-sidebar text-sidebar-foreground transition-[width] duration-200 ease-out lg:flex", sidebarCollapsed ? "w-14" : "w-[260px]"), children: _jsx(NavContent, { extensions: extensions, brandName: brandName, brandIcon: brandIcon, chatFirstMode: chatFirstMode, chatFirstEmbedded: chatFirstEmbedded, collapsed: sidebarCollapsed, chatFirstAppLayout: chatFirstAppLayout, onChatFirstAppLayoutChange: persistChatFirstAppLayout, chatFirstApps: chatFirstAppItems, chatFirstAppsLoading: chatFirstAppsQuery.isLoading, chatFirstAppsError: chatFirstAppsQuery.isError
                                     ? chatFirstCopy("appsLoadError")
                                     : null, chatFirstActiveAppId: chatFirstActiveAppId, chatFirstActivePrimaryTab: chatFirstActivePrimaryTab, onChatFirstNewChat: () => {
                                     closeChatFirstSessionWatch();