@agent-native/dispatch 0.40.0 → 0.40.2

package/src/components/layout/Layout.tsx

@@ -1,14 +1,9 @@
 import {
   CHAT_FIRST_MODE_CHANGED_EVENT,
-  AgentChatSurface,
-  AgentToggleButton,
   chatFirstSurfaceTabId,
-  AgentSidebar,
-  ChatFirstSurfacePanelToggle,
   closeChatFirstSessionWatch,
   emitChatFirstSessionWatch,
   getChatFirstSurfaceTabsStore,
-  focusAgentChat,
   navigateWithAgentChatViewTransition,
   readChatFirstAppLayout,
   readChatFirstMode,
@@ -39,6 +34,20 @@ import {
   readClientAppState,
   writeClientAppState,
 } from "@agent-native/core/client/application-state";
+import {
+  useFeatureFlagState,
+  type FeatureFlagState,
+} from "@agent-native/core/client/feature-flags";
+import { useActionQuery } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
+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,
@@ -56,23 +65,21 @@ import {
   type ChatFirstCopy,
   type ChatFirstEmbedTarget,
   type ChatFirstPrimaryTab,
-} from "@agent-native/core/client/chat-first";
-import { writeClipboardText } from "@agent-native/core/client/clipboard";
-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";
+} 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,
-  FeedbackButton,
-} from "@agent-native/core/client/ui";
+  openCommandMenu,
+} from "@agent-native/toolkit/app/shared";
 import {
   ChatHistoryRail,
   type ChatHistoryItem,
 } from "@agent-native/toolkit/chat-history";
+import { writeClipboardText } from "@agent-native/toolkit/clipboard";
 import {
   IconApps,
   IconBrandSlack,
@@ -113,8 +120,6 @@ import {
   isPathMountedWorkspaceApp,
   isWorkspaceAppVisibleInDefaultLaunchers,
   isWorkspaceSsoApp,
-  mergeChatFirstWorkspaceApps,
-  workspaceAppSourceFromConnected,
   navigateToWorkspaceApp,
   shouldOpenWorkspaceAppInTopWindow,
   workspaceAppIdFromRoute,
@@ -261,15 +266,6 @@ interface DispatchChatFirstPane {
   view?: string;
 }
 
-interface ChatFirstConnectedAppSummary {
-  id: string;
-  name: string;
-  description?: string | null;
-  url?: string | null;
-  homeUrl?: string | null;
-  source?: string;
-}
-
 interface DispatchAgentThreadSummary {
   id: string;
   title: string;
@@ -286,7 +282,6 @@ const DispatchExtensionsContext = createContext<
   DispatchExtensionConfig | undefined
 >(undefined);
 interface DispatchWorkspaceAppLauncher {
-  apps: readonly ChatFirstAppItem[];
   workspaceApps: readonly WorkspaceAppSummary[];
   isLoading: boolean;
   error?: unknown;
@@ -361,11 +356,18 @@ export function shouldQueryChatFirstApps(
 }
 
 /**
- * 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: string): boolean {
-  return isSettingsPathname(localDispatchPath(pathname));
+export function isRedesignedSettingsPath(
+  pathname: string,
+  settingsRedesign: FeatureFlagState,
+): boolean {
+  return (
+    isSettingsPathname(localDispatchPath(pathname)) &&
+    (settingsRedesign.enabled || settingsRedesign.status === "loading")
+  );
 }
 
 function chatFirstPrimaryTabForPath(
@@ -1391,7 +1393,10 @@ export function Layout({
   );
   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,
@@ -1432,94 +1437,43 @@ export function Layout({
   const chatFirstAppsQuery = useActionQuery<WorkspaceAppSummary[]>(
     "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<
-    ChatFirstConnectedAppSummary[]
-  >(
-    "list-connected-agents",
-    {},
-    { enabled: shouldQueryChatFirstApps(isChatRoute, chatFirstMode) },
-  );
-  const chatFirstEnabledBuiltinAppIds = useMemo(
-    () =>
-      chatFirstConnectedAppsQuery.data
-        ?.filter((app) => app.source === "builtin")
-        .map((app) => app.id),
-    [chatFirstConnectedAppsQuery.data],
+    {
+      enabled:
+        shouldQueryChatFirstApps(isChatRoute, chatFirstMode) ||
+        workspaceAppRouteActive,
+    },
   );
   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(
+      (chatFirstAppsQuery.data ?? []).filter(
         (app) =>
           app.status !== "pending" &&
           app.archived !== true &&
           isWorkspaceAppVisibleInDefaultLaunchers(app),
       ),
-    [
-      chatFirstConnectedAppsQuery.data,
-      chatFirstEnabledBuiltinAppIds,
-      chatFirstWorkspaceApps,
-    ],
+    [chatFirstAppsQuery.data],
   );
   const chatFirstAppRegistrations = useMemo<ChatFirstAppRegistration[]>(() => {
-    const registrations = new Map<string, ChatFirstAppRegistration>();
-    for (const app of chatFirstWorkspaceApps) {
-      registrations.set(app.id.toLowerCase(), {
+    return (chatFirstAppsQuery.data ?? [])
+      .filter((app) => app.status !== "pending" && app.archived !== true)
+      .map((app) => ({
         id: app.id,
         name: app.name,
-        source: app.source,
+        source: app.source ?? "workspace",
         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]);
+      }));
+  }, [chatFirstAppsQuery.data]);
   const chatFirstAppItems = useMemo<ChatFirstAppItem[]>(
     () =>
-      chatFirstAppRegistrations
-        .filter(
-          (app) => app.enabled && isWorkspaceAppVisibleInDefaultLaunchers(app),
-        )
-        .map((app) => ({
-          id: app.id,
-          name: app.name ?? app.id,
-          source: app.source,
-        })),
-    [chatFirstAppRegistrations],
+      chatFirstWorkspaceApps.map((app) => ({
+        id: app.id,
+        name: app.name,
+        source: app.source ?? "workspace",
+      })),
+    [chatFirstWorkspaceApps],
   );
   const openChatFirstApp = useCallback(
     (app: ChatFirstAppItem) => {
@@ -1553,32 +1507,18 @@ export function Layout({
   );
   const chatHomeAppLauncher = useMemo<DispatchWorkspaceAppLauncher>(
     () => ({
-      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,
     ],
   );
@@ -1776,10 +1716,7 @@ export function Layout({
   );
   const resolveChatFirstOpenApp = useCallback(
     (detail: ChatFirstOpenAppDetail) => {
-      if (
-        chatFirstAppsQuery.isLoading ||
-        chatFirstConnectedAppsQuery.isLoading
-      ) {
+      if (chatFirstAppsQuery.isLoading) {
         pendingChatFirstOpenAppRef.current = detail;
         return;
       }
@@ -1823,7 +1760,6 @@ export function Layout({
       chatFirstAppRegistrations,
       chatFirstAppsQuery.isError,
       chatFirstAppsQuery.isLoading,
-      chatFirstConnectedAppsQuery.isLoading,
       chatFirstSurfaceTabsStore,
       openChatFirstPane,
       navigate,
@@ -2032,19 +1968,12 @@ export function Layout({
 
   useEffect(() => {
     const pending = pendingChatFirstOpenAppRef.current;
-    if (
-      !pending ||
-      chatFirstAppsQuery.isLoading ||
-      chatFirstConnectedAppsQuery.isLoading
-    )
-      return;
+    if (!pending || chatFirstAppsQuery.isLoading) return;
     resolveChatFirstOpenApp(pending);
   }, [
     chatFirstAppsQuery.data,
     chatFirstAppsQuery.isError,
     chatFirstAppsQuery.isLoading,
-    chatFirstConnectedAppsQuery.data,
-    chatFirstConnectedAppsQuery.isLoading,
     resolveChatFirstOpenApp,
   ]);
 
@@ -2302,6 +2231,51 @@ export function Layout({
     ],
   );
 
+  const chatFirstSurfaceTabsBar =
+    activeChatFirstSurfaceTab?.kind === "app" ? null : (
+      <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) => (
+          <AppIcon
+            id={app.id}
+            name={app.name}
+            size="sm"
+            className="size-7 rounded-lg"
+          />
+        )}
+        copy={chatFirstCopy}
+      />
+    );
+  const chatFirstSurfaceContent =
+    chatFirstSurfaceTabs.tabs.length > 0 ? (
+      <ChatFirstSurfaceContent
+        tabs={chatFirstSurfaceTabs.tabs}
+        activeTabId={chatFirstSurfaceTabs.activeTabId}
+        renderTab={renderChatFirstSurfaceTab}
+      />
+    ) : null;
+
   if (CHROMELESS_PATHS.some((path) => localPathname === path)) {
     return <>{children}</>;
   }
@@ -2320,10 +2294,32 @@ export function Layout({
               <div className="relative flex min-w-0 flex-1 flex-col overflow-hidden">
                 <Header showAgentToggle={false} />
                 <InvitationBanner />
-                <main className="flex-1 overflow-y-auto">
-                  <div className="mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6">
-                    {children}
+                <main className="relative flex min-h-0 flex-1 overflow-hidden">
+                  <div className="min-w-0 flex-1 overflow-y-auto">
+                    <div className="mx-auto max-w-7xl space-y-10 px-4 py-6 sm:px-6">
+                      {children}
+                    </div>
                   </div>
+                  {isChatRoute &&
+                  chatFirstMode &&
+                  chatFirstHasActiveChat &&
+                  chatFirstSurfacePanel.open ? (
+                    <ChatFirstSurfacePanel
+                      width={chatFirstSurfaceResize.width}
+                      onResizePointerDown={chatFirstSurfaceResize.onPointerDown}
+                      copy={chatFirstCopy}
+                    >
+                      {chatFirstSurfaceTabsBar}
+                      {chatFirstSurfaceContent}
+                    </ChatFirstSurfacePanel>
+                  ) : null}
+                  {isChatRoute && chatFirstMode && chatFirstHasActiveChat ? (
+                    <ChatFirstSurfacePanelToggle
+                      open={chatFirstSurfacePanel.open}
+                      onToggle={chatFirstSurfacePanel.toggle}
+                      className={CHAT_FIRST_SURFACE_PANEL_TOGGLE_CLASS_NAME}
+                    />
+                  ) : null}
                 </main>
               </div>
             </div>
@@ -2349,7 +2345,9 @@ export function Layout({
   }
 
   const showAgentControls =
-    !isChatRoute && !isSettingsShellRoute && !pageOwnsToolbar(localPathname);
+    !isChatRoute &&
+    !isRedesignedSettingsRoute &&
+    !pageOwnsToolbar(localPathname);
   function openAskAgentFullscreen() {
     focusAgentChat();
     navigateWithAgentChatViewTransition(
@@ -2382,13 +2380,6 @@ export function Layout({
   const appContent = (
     <div className="relative flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden">
       <InvitationBanner />
-      {isChatRoute && chatFirstMode && chatFirstHasActiveChat ? (
-        <ChatFirstSurfacePanelToggle
-          open={chatFirstSurfacePanel.open}
-          onToggle={chatFirstSurfacePanel.toggle}
-          className={CHAT_FIRST_SURFACE_PANEL_TOGGLE_CLASS_NAME}
-        />
-      ) : null}
       {isChatRoute && chatFirstMode && chatFirstNotice ? (
         <div
           className="dispatch-chat-first-notice"
@@ -2450,68 +2441,25 @@ export function Layout({
       </main>
     </div>
   );
-  const chatFirstSurfaceTabsBar =
-    activeChatFirstSurfaceTab?.kind === "app" ? null : (
-      <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) => (
-          <AppIcon
-            id={app.id}
-            name={app.name}
-            size="sm"
-            className="size-7 rounded-lg"
-          />
-        )}
-        copy={chatFirstCopy}
-      />
-    );
-  const chatFirstSurfaceContent =
-    chatFirstSurfaceTabs.tabs.length > 0 ? (
-      <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 workspaceAppChatRegistration = workspaceAppId
+    ? chatFirstAppRegistrations.find(
+        (app) => app.id.toLowerCase() === workspaceAppId.toLowerCase(),
+      )
+    : undefined;
   const workspaceAppContent =
     workspaceAppRouteActive && workspaceAppId ? (
-      <WorkspaceAppChatRail
-        appId={workspaceAppId}
-        appName={workspaceAppChatName}
-        agentPageHref={agentPageHref}
-        onFullscreenRequest={openAskAgentFullscreen}
-      >
+      workspaceAppChatRegistration ? (
+        <WorkspaceAppChatRail
+          appId={workspaceAppId}
+          appName={workspaceAppChatRegistration.name ?? workspaceAppId}
+          agentPageHref={agentPageHref}
+          onFullscreenRequest={openAskAgentFullscreen}
+        >
+          <WorkspaceAppKeepAlive activeAppId={workspaceAppId} />
+        </WorkspaceAppChatRail>
+      ) : (
         <WorkspaceAppKeepAlive activeAppId={workspaceAppId} />
-      </WorkspaceAppChatRail>
+      )
     ) : (
       <WorkspaceAppKeepAlive
         activeAppId={workspaceAppRouteActive ? workspaceAppId : null}
@@ -2572,7 +2520,7 @@ export function Layout({
       <DispatchWorkspaceAppLauncherContext.Provider value={chatHomeAppLauncher}>
         <HeaderActionsProvider>
           <div className="agent-layout-shell flex h-screen w-full overflow-hidden bg-background">
-            {isSettingsShellRoute ? null : (
+            {isRedesignedSettingsRoute ? null : (
               <aside
                 data-collapsed={sidebarCollapsed ? "true" : "false"}
                 className={cn(

package/src/components/layout/workspace-apps-rail.spec.tsx

@@ -0,0 +1,79 @@
+// @vitest-environment happy-dom
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { MemoryRouter } from "react-router";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const clientState = vi.hoisted(() => ({
+  actions: [] as string[],
+}));
+
+vi.mock("@agent-native/core/client/hooks", () => ({
+  useActionQuery: (action: string) => {
+    clientState.actions.push(action);
+    return {
+      data:
+        action === "list-workspace-apps"
+          ? [
+              {
+                id: "reports",
+                name: "Reports",
+                path: "/reports",
+                url: "/reports",
+                status: "ready",
+              },
+            ]
+          : [
+              {
+                id: "internal-app",
+                name: "Internal app",
+                url: "https://internal.example.test",
+                homeUrl: "https://internal.example.test",
+                source: "builtin",
+              },
+            ],
+      isError: false,
+    };
+  },
+}));
+
+vi.mock("@agent-native/core/client/i18n", () => ({
+  useT: () => (_key: string, values?: { defaultValue?: string }) =>
+    values?.defaultValue ?? "Workspace apps",
+}));
+
+import { WorkspaceAppsRail } from "./workspace-apps-rail";
+
+describe("WorkspaceAppsRail", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    clientState.actions = [];
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  it("lists mounted workspace apps without connected agents", async () => {
+    await act(async () => {
+      root.render(
+        <MemoryRouter initialEntries={["/overview"]}>
+          <WorkspaceAppsRail />
+        </MemoryRouter>,
+      );
+    });
+
+    expect(container.textContent).toContain("Reports");
+    expect(container.textContent).not.toContain("Internal app");
+    expect(container.querySelector('a[href="/apps/reports"]')).not.toBeNull();
+    expect(clientState.actions).toEqual(["list-workspace-apps"]);
+  });
+});

package/src/components/layout/workspace-apps-rail.tsx

@@ -3,10 +3,6 @@ import { useT } from "@agent-native/core/client/i18n";
 import { IconApps } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router";
 
-import {
-  filterOtherApps,
-  type ConnectedAppSummary,
-} from "../../lib/other-apps";
 import { cn } from "../../lib/utils";
 import {
   isWorkspaceAppVisibleInDefaultLaunchers,
@@ -26,7 +22,7 @@ function appLabel(app: WorkspaceAppSummary): string {
   return app.name.trim() || app.id;
 }
 
-type RailApp = WorkspaceAppSummary & { external?: boolean };
+type RailApp = WorkspaceAppSummary;
 
 export function WorkspaceAppsRail({
   collapsed = false,
@@ -43,33 +39,17 @@ export function WorkspaceAppsRail({
       includeAgentCards: false,
     },
   );
-  const connectedAppsQuery = useActionQuery<ConnectedAppSummary[]>(
-    "list-connected-agents",
-    {},
-  );
   if (appsQuery.isError || !appsQuery.data) return null;
 
-  const workspaceApps = appsQuery.data;
-  const apps: RailApp[] = [
-    ...workspaceApps.filter(
+  const apps: RailApp[] = appsQuery.data
+    .filter(
       (app) =>
         isWorkspaceAppVisibleInDefaultLaunchers(app) &&
         !app.archived &&
         app.status !== "pending" &&
         !!workspaceAppHref(app),
-    ),
-    ...filterOtherApps(connectedAppsQuery.data ?? [], workspaceApps).map(
-      (app) => ({
-        id: app.id,
-        name: app.name,
-        description: app.description,
-        path: "",
-        url: app.homeUrl ?? app.url,
-        status: "ready" as const,
-        external: true,
-      }),
-    ),
-  ].sort((a, b) => appLabel(a).localeCompare(appLabel(b)));
+    )
+    .sort((a, b) => appLabel(a).localeCompare(appLabel(b)));
 
   if (apps.length === 0) return null;
 
@@ -102,11 +82,7 @@ export function WorkspaceAppsRail({
         {!collapsed ? <span className="truncate">{label}</span> : null}
       </>
     );
-    const link = app.external ? (
-      <a href={href} {...linkProps}>
-        {linkContent}
-      </a>
-    ) : (
+    const link = (
       <Link to={workspaceAppRoute(app.id)} {...linkProps}>
         {linkContent}
       </Link>