@nextclaw/ui 0.25.4 → 0.26.0

package/src/features/right-panel-resources/pages/resource-page.tsx

@@ -0,0 +1,114 @@
+import {
+  isDocsUrl,
+  normalizeDocUrl,
+} from "@/shared/components/doc-browser/utils/doc-browser-url.utils";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { useAppPresenter } from "@/app/components/app-presenter-provider";
+import { PAGE_RESOURCE_RENDERERS } from "@/app/configs/page-resource-renderers.config";
+import { DocBrowserFrameContent } from "@/shared/components/doc-browser/doc-browser-panel-parts";
+import { useDocBrowserScrollRestoration } from "@/shared/components/doc-browser/hooks/use-doc-browser-scroll-restoration";
+import { PageResourceActionsMenu } from "@/features/right-panel-resources/components/page-resource-actions-menu";
+import { PageResourceIcon } from "@/features/right-panel-resources/components/page-resource-icon";
+import { pageResourceTab } from "@/features/right-panel-resources/managers/page-resource.manager";
+import { pageResourceFromTarget } from "@/features/right-panel-resources/utils/page-resource-identity.utils";
+import type { PageResource } from "@/features/right-panel-resources/types/page-resource.types";
+import { t } from "@/shared/lib/i18n";
+
+function ResourcePageContent({ page }: { page: PageResource }) {
+  const app = useAppPresenter();
+  const navigate = useNavigate();
+  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const [revision, setRevision] = useState(0);
+  const tab = useMemo(() => pageResourceTab(page), [page]);
+  const renderer = PAGE_RESOURCE_RENDERERS[tab.kind];
+  const iframeInstanceId = `main:${page.uri}:${revision}`;
+  const restore = useDocBrowserScrollRestoration({
+    currentTab: tab,
+    iframeRef,
+    isEnabled: Boolean(renderer?.supportsScrollRestoration),
+  });
+  useEffect(() => {
+    const handler = (event: MessageEvent) => {
+      if (event.source !== iframeRef.current?.contentWindow) return;
+      if (
+        tab.kind === "docs" &&
+        event.data?.type === "docs-route-change" &&
+        typeof event.data.url === "string" &&
+        isDocsUrl(event.data.url) &&
+        normalizeDocUrl(event.data.url) !== normalizeDocUrl(tab.currentUrl)
+      ) {
+        const next = app.pageResourceManager.resolve(event.data.url);
+        if (next) app.pageResourceManager.open(next, "main", navigate);
+      }
+      renderer?.onIframeMessage?.({
+        event,
+        iframe: iframeRef.current,
+        iframeInstanceId,
+        tab,
+      });
+    };
+    window.addEventListener("message", handler);
+    return () => window.removeEventListener("message", handler);
+  }, [app, navigate, iframeInstanceId, renderer, tab]);
+  const params = {
+    tab,
+    currentUrl: tab.currentUrl,
+    refreshIframe: () => setRevision((value) => value + 1),
+    open: (uri?: string) => {
+      const next = uri ? app.pageResourceManager.resolve(uri) : null;
+      if (next) app.pageResourceManager.open(next, "main", navigate);
+    },
+    openTarget: (target: PageResource["target"]) =>
+      app.pageResourceManager.open(
+        pageResourceFromTarget(target),
+        "main",
+        navigate,
+      ),
+  };
+  return (
+    <div
+      className="flex h-full min-h-0 flex-col bg-background"
+      data-testid="resource-main-page"
+    >
+      <header className="flex min-h-10 shrink-0 items-center gap-2 border-b border-border/60 px-3">
+        <PageResourceIcon uri={page.uri} icon={page.target.dockIcon} />
+        <span className="min-w-0 flex-1 truncate text-sm">{page.title}</span>
+        <PageResourceActionsMenu page={page} />
+      </header>
+      {renderer?.renderToolbar?.(params)}
+      <DocBrowserFrameContent
+        currentTab={tab}
+        currentUrl={tab.currentUrl}
+        customContent={renderer?.renderContent?.(params)}
+        iframeRef={iframeRef}
+        iframeInstanceId={iframeInstanceId}
+        iframeSandbox={renderer?.getIframeSandbox?.(tab)}
+        isDragging={false}
+        isResizing={false}
+        onIframeLoad={restore}
+        onIframePointerOver={renderer?.onIframePointerOver}
+      />
+    </div>
+  );
+}
+
+export function ResourcePage() {
+  const app = useAppPresenter();
+  const [search] = useSearchParams();
+  const navigate = useNavigate();
+  const uri = search.get("uri") ?? "";
+  const page = useMemo(() => app.pageResourceManager.resolve(uri), [app, uri]);
+  useEffect(() => {
+    if (page?.target.kind === "workspace")
+      app.pageResourceManager.open(page, "main", navigate);
+  }, [app, navigate, page]);
+  if (page?.target.kind === "workspace") return null;
+  if (!page)
+    return (
+      <p role="status" className="p-4 text-sm text-muted-foreground">
+        {t("pageUnavailable")}
+      </p>
+    );
+  return <ResourcePageContent key={page.uri} page={page} />;
+}

package/src/features/right-panel-resources/stores/page-navigation.store.ts

@@ -0,0 +1,55 @@
+import { ViewMemoryStorage } from "@/shared/lib/navigation-history";
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
+import type { PageResource } from "@/features/right-panel-resources/types/page-resource.types";
+
+function safeTargetUrl(value: string): boolean {
+  if (/^\/(?!\/)/.test(value) && !value.includes("\\")) return true;
+  try {
+    return ["nextclaw:", "http:", "https:"].includes(new URL(value).protocol);
+  } catch {
+    return false;
+  }
+}
+
+function readPages(value: unknown): PageResource[] {
+  if (
+    !value ||
+    typeof value !== "object" ||
+    !("pinned" in value) ||
+    !Array.isArray(value.pinned)
+  )
+    return [];
+  return value.pinned
+    .filter((page): page is PageResource => {
+      if (!page || typeof page !== "object") return false;
+      return (
+        typeof page.uri === "string" &&
+        /^(nextclaw:\/\/|https?:\/\/)/.test(page.uri) &&
+        typeof page.title === "string" &&
+        typeof page.target?.url === "string" &&
+        safeTargetUrl(page.target.url) &&
+        (page.mainPath === undefined ||
+          (typeof page.mainPath === "string" &&
+            /^\/(?!\/)/.test(page.mainPath) &&
+            !page.mainPath.includes("\\"))) &&
+        typeof page.target?.kind === "string" &&
+        typeof page.target?.title === "string" &&
+        ["managed", "none"].includes(page.target.historyPolicy)
+      );
+    })
+    .filter(
+      (page, index, pages) =>
+        pages.findIndex((candidate) => candidate.uri === page.uri) === index,
+    )
+    .slice(-64);
+}
+
+export const usePageNavigationStore = create<{ pinned: PageResource[] }>()(
+  persist((): { pinned: PageResource[] } => ({ pinned: [] }), {
+    name: "nextclaw.page-navigation",
+    version: 1,
+    storage: createJSONStorage(() => new ViewMemoryStorage()),
+    merge: (saved, current) => ({ ...current, pinned: readPages(saved) }),
+  }),
+);

package/src/features/right-panel-resources/types/page-resource.types.ts

@@ -0,0 +1,11 @@
+import type { DocBrowserRouteTarget } from "@/shared/components/doc-browser/types/doc-browser.types";
+
+/** Resource identity is independent of the surface currently presenting it. */
+export type PageResource = {
+  uri: string;
+  title: string;
+  target: DocBrowserRouteTarget;
+  mainPath?: string;
+};
+
+export type PageOpenLocation = "default" | "main" | "sidebar" | "floating";

package/src/features/right-panel-resources/utils/__tests__/right-panel-resource-route-resolver.utils.test.ts

@@ -2,6 +2,16 @@ import { describe, expect, it } from 'vitest';
 import { RightPanelResourceRouteResolver } from '@/features/right-panel-resources';
 
 describe('RightPanelResourceRouteResolver', () => {
+  it.each(['cron-job', 'inbox-delivery', 'skill', 'agent', 'project'])('resolves %s as an object, not an unsupported website', (type) => {
+    const uri = 'nextclaw://objects/' + type + '/' + encodeURIComponent('workspace:项目/对象');
+    expect(new RightPanelResourceRouteResolver().resolve(uri)).toMatchObject({ kind: 'system-object', url: uri, resourceUri: uri });
+  });
+  it('distinguishes a marketplace skill detail from its collection', () => {
+    const resolver = new RightPanelResourceRouteResolver();
+    expect(resolver.resolve('nextclaw://marketplace-detail/skill%3Aexample')).toMatchObject({ kind:'marketplace-detail' });
+    expect(resolver.resolve('nextclaw://marketplace')).toMatchObject({ kind:'route', url:'/skills' });
+  });
+
   it('normalizes apps resources and keeps service apps distinct', () => {
     const resolver = new RightPanelResourceRouteResolver();
 

package/src/features/right-panel-resources/utils/page-resource-identity.utils.ts

@@ -0,0 +1,61 @@
+import { createSystemObjectReferenceUri } from "@nextclaw/shared";
+import type {
+  DocBrowserRouteTarget,
+  DocBrowserTab,
+} from "@/shared/components/doc-browser/types/doc-browser.types";
+import {
+  buildSessionPath,
+  parseSessionKeyFromPanelUrl,
+} from "@/features/chat";
+import { readPanelAppIdFromTab } from "./right-panel-resource-uri.utils";
+import type { PageResource } from "@/features/right-panel-resources/types/page-resource.types";
+
+export function pageResourceFromTarget(
+  target: DocBrowserRouteTarget,
+): PageResource {
+  const uri = target.resourceUri ?? target.url;
+  const sessionKey = parseSessionKeyFromPanelUrl(uri);
+  const appId = readPanelAppIdFromTab({
+    resourceUri: uri,
+    currentUrl: target.url,
+  });
+  return {
+    uri,
+    title: target.title,
+    target,
+    ...(target.kind === "route"
+      ? { mainPath: target.url }
+      : sessionKey
+        ? { mainPath: buildSessionPath(sessionKey) }
+        : appId
+          ? { mainPath: `/apps/panel/${encodeURIComponent(appId)}` }
+          : {}),
+  };
+}
+
+export function pageResourceFromTab(tab: DocBrowserTab): PageResource {
+  return pageResourceFromTarget({
+    ...tab,
+    url: tab.currentUrl,
+    historyPolicy: "managed",
+  });
+}
+
+export function pageResourceMainPath(page: PageResource): string {
+  return page.mainPath ?? `/resource?uri=${encodeURIComponent(page.uri)}`;
+}
+
+export function pageResourceFromSystemObject(
+  objectType: string,
+  objectId: string,
+  title: string,
+): PageResource {
+  const uri = createSystemObjectReferenceUri(objectType, objectId);
+  return pageResourceFromTarget({
+    kind: "system-object",
+    title,
+    url: uri,
+    resourceUri: uri,
+    historyPolicy: "none",
+  });
+}

package/src/features/right-panel-resources/utils/right-panel-resource-uri.utils.ts

@@ -1,3 +1,5 @@
+import { createPanelAppResourceUri } from '@nextclaw/shared';
+export { createPanelAppResourceUri } from '@nextclaw/shared';
 import {
   readChatUiResourceReference,
   type ChatUiResourceReference,
@@ -67,12 +69,6 @@ export function normalizeRightPanelAppsUrl(url: string): string {
   return createRightPanelAppsUrl(getRightPanelAppsTabFromUrl(url));
 }
 
-export function createPanelAppResourceUri(appId: string, sourcePath?: string): string {
-  const uri = `nextclaw://panel-app/${encodeURIComponent(appId)}`;
-  const path = sourcePath?.trim();
-  return path ? `${uri}?${new URLSearchParams({ path }).toString()}` : uri;
-}
-
 export function createPanelAppContentPath(appId: string, sourcePath?: string): string {
   const url = `/api/panel-apps/${encodeURIComponent(appId)}/content`;
   const path = sourcePath?.trim();

package/src/features/service-apps/components/__tests__/service-apps-panel.test.tsx

@@ -206,3 +206,5 @@ describe('ServiceAppsPanel', () => {
     });
   });
 });
+
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/service-apps/components/service-app-list-item.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionItems } from "@/features/right-panel-resources";
+import { pageResourceFromSystemObject } from "@/features/right-panel-resources";
 import { useState } from "react";
 import type {
   AgentProfileView,
@@ -165,7 +167,9 @@ export function ServiceAppListItem({
                   {t("serviceAppsMoreActions")}
                 </TooltipContent>
               </Tooltip>
-              <PopoverContent align="end" className="w-48 rounded-xl p-1.5">
+              <PopoverContent align="end" className="w-56 rounded-xl p-1.5">
+                <PageResourceActionItems page={pageResourceFromSystemObject("service-app", app.id, app.title)} onSelect={() => setIsMenuOpen(false)} />
+                <div className="my-1 h-px bg-border" />
                 <ServiceAppMenuItem
                   disabled={!canDisconnectRuntime}
                   icon={Unplug}

package/src/features/settings/pages/providers-config-page.tsx

@@ -1,5 +1,5 @@
 import { useMemo, useState } from 'react';
-import { KeyRound, MoreHorizontal, Plus, Search, Trash2 } from 'lucide-react';
+import { KeyRound, MoreVertical, Plus, Search, Trash2 } from 'lucide-react';
 import {
   useCreateProvider,
   useDeleteProvider,
@@ -304,7 +304,7 @@ export function ProvidersConfigPage() {
                             onClick={(event) => event.stopPropagation()}
                             title={t('more')}
                           >
-                            <MoreHorizontal className='h-4 w-4' />
+                            <MoreVertical className='h-4 w-4' />
                           </button>
                         </PopoverTrigger>
                         <PopoverContent className='w-40 p-1' align='end' onClick={(event) => event.stopPropagation()}>

package/src/features/side-dock/components/__tests__/side-dock.test.tsx

@@ -1,3 +1,4 @@
+import { WorkbenchSurfaceManager } from '@/shared/components/workbench/managers/workbench-surface.manager';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
@@ -23,7 +24,7 @@ describe('SideDock', () => {
   it('renders built-in entries and opens the selected resource', () => {
     const openItem = vi.fn();
     const manager = { openItem } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
 
     render(
       <DocBrowserProvider manager={docBrowserManager}>
@@ -47,7 +48,7 @@ describe('SideDock', () => {
 
   it('places the GitHub project shortcut in the utility section', () => {
     const manager = { openItem: vi.fn() } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
 
     render(
       <DocBrowserProvider manager={docBrowserManager}>
@@ -62,7 +63,7 @@ describe('SideDock', () => {
 
   it('confirms before hiding the dock and persists the visibility preference', async () => {
     const manager = { openItem: vi.fn() } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
 
     render(
       <DocBrowserProvider manager={docBrowserManager}>
@@ -85,7 +86,7 @@ describe('SideDock', () => {
 
   it('does not highlight the default docs tab while DocBrowser is closed', () => {
     const manager = { openItem: vi.fn() } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
 
     render(
       <DocBrowserProvider manager={docBrowserManager}>
@@ -105,7 +106,7 @@ describe('SideDock', () => {
       openItem: vi.fn(),
       unpinItem: vi.fn(),
     } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
     useSideDockStore.getState().setPinnedItems([
       {
         createdAt: '2026-06-02T00:00:00.000Z',
@@ -134,7 +135,7 @@ describe('SideDock', () => {
       openItem: vi.fn(),
       unpinItem: vi.fn(),
     } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
     useSideDockStore.getState().setPinnedItems([
       {
         createdAt: '2026-06-02T00:00:00.000Z',
@@ -159,7 +160,7 @@ describe('SideDock', () => {
       openItem: vi.fn(),
       unpinItem: vi.fn(),
     } as unknown as SideDockManager;
-    const docBrowserManager = new DocBrowserManager();
+    const docBrowserManager = new DocBrowserManager(new WorkbenchSurfaceManager(), );
     useSideDockStore.getState().setPinnedItems([
       {
         createdAt: '2026-06-02T00:00:00.000Z',
@@ -176,6 +177,6 @@ describe('SideDock', () => {
       </DocBrowserProvider>,
     );
 
-    expect(screen.getByText('🎨').className).toContain('text-[20px]');
+    expect(screen.getByText('🎨').parentElement?.className).toContain('text-xl');
   });
 });

package/src/features/side-dock/components/side-dock.tsx

@@ -1,4 +1,4 @@
-import { AppWindow, BookOpen, Boxes, Github, PanelRightClose, Plus, X } from 'lucide-react';
+import { PanelRightClose, X } from 'lucide-react';
 import type { LucideIcon } from 'lucide-react';
 import type { SideDockManager } from '@/features/side-dock/managers/side-dock.manager';
 import {
@@ -7,9 +7,7 @@ import {
 } from '@/features/side-dock/configs/side-dock-built-in-items.config';
 import { useSideDockStore } from '@/features/side-dock/stores/side-dock.store';
 import type {
-  SideDockIconName,
   SideDockItem,
-  SideDockItemIcon,
 } from '@/features/side-dock/types/side-dock.types';
 import { mergeSideDockItems } from '@/features/side-dock/utils/side-dock-item.utils';
 import {
@@ -26,56 +24,23 @@ import { useConfirmDialog } from '@/shared/hooks/use-confirm-dialog';
 import { t } from '@/shared/lib/i18n';
 import { cn } from '@/shared/lib/utils';
 
+import { PageResourceIcon } from '@/features/right-panel-resources';
+import { ContextMenu, type ContextMenuGroup } from '@/shared/components/ui/context-menu/context-menu';
+
 type SideDockProps = {
+  getItemMenuGroups?: (item: SideDockItem) => ContextMenuGroup[];
   manager: SideDockManager;
 };
 
-const SIDE_DOCK_ICON_COMPONENTS: Record<SideDockIconName, LucideIcon> = {
-  apps: Boxes,
-  docs: BookOpen,
-  github: Github,
-  'new-tab': Plus,
-  'panel-app': AppWindow,
-  'service-apps': AppWindow,
-};
-
-const SIDE_DOCK_UTILITY_ITEM_IDS = new Set<string>([SIDE_DOCK_GITHUB_PROJECT_ITEM_ID]);
-
-const SIDE_DOCK_EMOJI_ICON_PATTERN = /^\p{Extended_Pictographic}(?:\uFE0F|\uFE0E)?(?:\u200D\p{Extended_Pictographic}(?:\uFE0F|\uFE0E)?)*$/u;
-
-function isSideDockEmojiIcon(value: string): boolean {
-  return SIDE_DOCK_EMOJI_ICON_PATTERN.test(value.trim());
-}
-
-function SideDockItemIconView({ icon }: { icon: SideDockItemIcon }) {
-  if (icon.type === 'url') {
-    return <img src={icon.url} alt="" className="h-5 w-5 rounded object-cover" />;
-  }
-  if (icon.type === 'text') {
-    if (isSideDockEmojiIcon(icon.value)) {
-      return (
-        <span className="flex h-7 w-7 items-center justify-center text-[20px] leading-none" aria-hidden="true">
-          {icon.value}
-        </span>
-      );
-    }
-    return (
-      <span className="max-w-7 truncate text-center text-[13px] font-semibold leading-none" aria-hidden="true">
-        {icon.value}
-      </span>
-    );
-  }
-
-  const Icon = SIDE_DOCK_ICON_COMPONENTS[icon.name];
-  return <Icon className="h-5 w-5" aria-hidden="true" />;
-}
 
 function SideDockButton({
   active,
   item,
   onOpen,
   onUnpin,
+  menuGroups = [],
 }: {
+  menuGroups?: ContextMenuGroup[];
   active: boolean;
   item: SideDockItem;
   onOpen: (item: SideDockItem) => void;
@@ -85,7 +50,7 @@ function SideDockButton({
 
   return (
     <Tooltip>
-      <div className="group relative">
+      <ContextMenu groups={menuGroups} label={t('pageActions')}><div className="group relative">
         <TooltipTrigger asChild>
           <button
             type="button"
@@ -101,7 +66,7 @@ function SideDockButton({
                 : 'bg-transparent',
             )}
           >
-            <SideDockItemIconView icon={item.icon} />
+            <span className="flex items-center text-xl"><PageResourceIcon uri={getSideDockResourceUri(item) ?? ''} icon={item.icon} /></span>
           </button>
         </TooltipTrigger>
         {item.removable ? (
@@ -118,7 +83,7 @@ function SideDockButton({
             <X className="h-3 w-3" aria-hidden="true" />
           </button>
         ) : null}
-      </div>
+      </div></ContextMenu>
       <TooltipContent side="left">{label}</TooltipContent>
     </Tooltip>
   );
@@ -202,10 +167,10 @@ function hasExactActiveSideDockItem(items: SideDockItem[], currentTab?: DocBrows
 }
 
 function isSideDockUtilityItem(item: SideDockItem): boolean {
-  return SIDE_DOCK_UTILITY_ITEM_IDS.has(item.id);
+  return item.id === SIDE_DOCK_GITHUB_PROJECT_ITEM_ID;
 }
 
-export function SideDock({ manager }: SideDockProps) {
+export function SideDock({ manager, getItemMenuGroups }: SideDockProps) {
   const pinnedItems = useSideDockStore((state) => state.pinnedItems);
   const setSideDockVisible = useSideDockStore((state) => state.setVisible);
   const { currentTab, isOpen } = useDocBrowser();
@@ -237,6 +202,7 @@ export function SideDock({ manager }: SideDockProps) {
           {mainItems.map((item) => (
             <SideDockButton
               key={item.id}
+              menuGroups={getItemMenuGroups?.(item)}
               active={isSideDockItemActive(item, isOpen, currentTab, hasExactActiveItem)}
               item={item}
               onOpen={manager.openItem}
@@ -249,6 +215,7 @@ export function SideDock({ manager }: SideDockProps) {
             {utilityItems.map((item) => (
               <SideDockButton
                 key={item.id}
+              menuGroups={getItemMenuGroups?.(item)}
                 active={isSideDockItemActive(item, isOpen, currentTab, hasExactActiveItem)}
                 item={item}
                 onOpen={manager.openItem}

package/src/features/side-dock/managers/side-dock.manager.ts

@@ -176,6 +176,8 @@ export class SideDockManager {
   };
 
   private getTabResourceUri = (tab?: DocBrowserTab): string | null => {
+    // Snapshot-backed previews cannot be reconstructed from a shortcut URI alone.
+    if (tab?.viewState != null) return null;
     const uri = tab?.resourceUri ?? tab?.currentUrl;
     const normalized = uri ? normalizeSideDockResourceUri(uri) : '';
     return normalized.length > 0 ? normalized : null;

package/src/platforms/desktop/components/__tests__/desktop-app-shell.test.tsx

@@ -167,3 +167,6 @@ describe("DesktopAppShell", () => {
     expect(screen.getByTestId("app-content")).toBeTruthy();
   });
 });
+
+vi.mock("@/shared/components/doc-browser/doc-browser", () => ({ DocBrowser: () => null }));
+vi.mock("@/features/right-panel-resources/components/current-page-actions", () => ({ CurrentPageActions: () => null }));

package/src/platforms/desktop/components/desktop-app-shell.tsx

@@ -1,3 +1,4 @@
+import { CurrentPageActions } from '@/features/right-panel-resources';
 import { lazy, Suspense } from "react";
 import type { CSSProperties } from "react";
 import {
@@ -36,8 +37,6 @@ type DesktopAppShellProps = {
 export function DesktopAppShell({
   pathname,
   isMobileLayout = false,
-  isDocBrowserOpen,
-  docBrowserMode,
   docBrowserDockControls,
   docBrowserRenderers = {},
   docBrowserTabMenuGroups,
@@ -133,10 +132,11 @@ export function DesktopAppShell({
       {shouldUseWindowsChrome ? (
         <DesktopWindowChrome sidebarCollapsed={isSidebarCollapsed} />
       ) : null}
-      <div className="relative z-[1] flex min-h-0 flex-1 overflow-hidden">
+      <div className="relative flex min-h-0 flex-1 overflow-hidden">
         {!isMainRoute && <Sidebar />}
         <div className="flex-1 flex min-w-0 overflow-hidden relative">
           <div className="flex-1 flex flex-col min-w-0 overflow-hidden">
+            {!isMainRoute ? <CurrentPageActions /> : null}
             {isMainRoute ? (
               <div className="flex-1 h-full overflow-hidden">{children}</div>
             ) : (
@@ -152,7 +152,7 @@ export function DesktopAppShell({
               </main>
             )}
           </div>
-          {isDocBrowserOpen && docBrowserMode === "docked" ? (
+          {(
             <Suspense fallback={null}>
               <DocBrowser
                 customTabRenderers={docBrowserRenderers}
@@ -160,20 +160,11 @@ export function DesktopAppShell({
                 getTabMenuGroups={docBrowserTabMenuGroups}
               />
             </Suspense>
-          ) : null}
+          )}
           {sideDock}
         </div>
       </div>
       {showMobileBottomNav ? <MobileBottomNav /> : null}
-      {isDocBrowserOpen && docBrowserMode === "floating" ? (
-        <Suspense fallback={null}>
-          <DocBrowser
-            customTabRenderers={docBrowserRenderers}
-            dockControls={docBrowserDockControls}
-            getTabMenuGroups={docBrowserTabMenuGroups}
-          />
-        </Suspense>
-      ) : null}
     </div>
   );
 }

package/src/platforms/mobile/components/__tests__/mobile-app-shell.test.tsx

@@ -38,6 +38,7 @@ describe("MobileAppShell", () => {
     expect(shell.className).toContain("supports-[height:100dvh]:h-[100dvh]");
     expect(shell.className).not.toContain("h-screen");
     expect(screen.getByTestId("mobile-bottom-nav")).toBeTruthy();
+    expect(screen.queryByTestId('mobile-topbar')).toBeNull();
   });
 
   it("centers primary route titles without reserving back-button spacers", () => {

package/src/platforms/mobile/components/__tests__/mobile-bottom-nav.test.tsx

@@ -7,7 +7,8 @@ import { MobileBottomNav } from "@/platforms/mobile/components/mobile-bottom-nav
 
 const { openAppsMock } = vi.hoisted(() => ({ openAppsMock: vi.fn() }));
 
-vi.mock("@/features/panel-apps", () => ({ openApps: openAppsMock }));
+vi.mock("@/features/panel-apps", async (importOriginal) => ({
+  ...await importOriginal<object>(), openApps: openAppsMock }));
 vi.mock("@/shared/components/doc-browser", () => ({
   useDocBrowser: () => ({ open: vi.fn() }),
 }));
@@ -39,7 +40,7 @@ describe("MobileBottomNav", () => {
     ).toBeNull();
     expect(screen.getByTestId("mobile-nav-active-indicator")).toBeTruthy();
     expect(screen.getByRole("link", { name: /settings/i }).className).toContain(
-      "bg-gray-100",
+      "bg-muted",
     );
     expect(screen.getByTestId("mobile-nav-active-indicator").textContent).toMatch(
       /settings/i,