@nextclaw/ui 0.25.4 → 0.26.0

package/src/features/chat/managers/chat-thread.manager.ts

@@ -1,3 +1,5 @@
+import type { DocBrowserManager } from '@/shared/components/doc-browser/managers/doc-browser.manager';
+import { createWorkspaceFilePanelTarget, type WorkspaceFileViewContext } from '@/features/chat/features/workspace/utils/workspace-file-panel-route.utils';
 import { appQueryClient } from '@/app-query-client';
 import { deleteNcpSession as deleteNcpSessionApi, deleteNcpSessionSummaryInQueryClient } from '@/shared/lib/api';
 import { toast } from 'sonner';
@@ -40,6 +42,7 @@ import {
 } from '@/features/chat/features/workspace/utils/chat-workspace-file-viewer.utils';
 import {
   createWorkspaceFileTab,
+  createWorkspaceFileViewerTab,
   upsertWorkspaceFileTab,
 } from '@/features/chat/features/workspace/utils/chat-workspace-file-tab.utils';
 import {
@@ -148,13 +151,14 @@ export class ChatThreadManager {
           );
     useChatThreadStore.getState().setSnapshot({
       ...patch,
+      workspacePanelHidden: false,
       closedWorkspaceTabEntries,
       workspaceNavigationHistory: [...history.entries],
       workspaceNavigationHistoryIndex: history.index,
     });
   };
 
-  private openWorkspacePage = (
+  openWorkspacePage = (
     rawParentSessionKey: string | null,
     kind: 'overview' | 'child-sessions' | 'project-files' | 'cron' | 'continuous-attention',
   ) => {
@@ -184,7 +188,10 @@ export class ChatThreadManager {
     const normalizedSessionKey = sessionKey?.trim() || null;
     const { snapshot } = useChatThreadStore.getState();
     if (snapshot.workspacePanelParentKey === normalizedSessionKey && snapshot.activeWorkspacePanelKind) {
-      this.closeWorkspacePanel();
+      if (snapshot.workspacePanelHidden) {
+        useChatThreadStore.getState().setSnapshot({ workspacePanelHidden: false });
+        this.onWorkspacePanelOpened?.();
+      } else this.closeWorkspacePanel();
       return;
     }
     if (normalizedSessionKey) {
@@ -327,6 +334,13 @@ export class ChatThreadManager {
     this.activateWorkspaceFileTab(nextTab);
   };
 
+  moveFileToGlobal = (fileKey: string, context: WorkspaceFileViewContext, docBrowser: DocBrowserManager): void => {
+    const file = useChatThreadStore.getState().snapshot.workspaceFileTabs.find((item) => item.key === fileKey);
+    if (!file) return;
+    docBrowser.openTarget(createWorkspaceFilePanelTarget(file, context), { newTab: true, placement: 'docked' });
+    this.closeWorkspaceTab({ kind: 'file', key: file.key });
+  };
+
   openWorkspaceFileViewer = (fileKey: string, viewer?: ChatWorkspaceFileViewer) => {
     const sourceTab = useChatThreadStore
       .getState()
@@ -338,21 +352,7 @@ export class ChatThreadManager {
     if (!nextViewer) {
       return;
     }
-    const nextTab = createWorkspaceFileTab(
-      {
-        path: sourceTab.path,
-        label: sourceTab.label ?? undefined,
-        viewMode: 'preview',
-        previewViewer: nextViewer,
-        line: sourceTab.line ?? undefined,
-        column: sourceTab.column ?? undefined,
-        params: sourceTab.params ?? undefined,
-        rawText: sourceTab.rawText ?? undefined,
-        contentUrl: sourceTab.contentUrl ?? undefined,
-        mimeType: sourceTab.mimeType ?? undefined,
-      },
-      sourceTab.parentSessionKey,
-    );
+    const nextTab = createWorkspaceFileViewerTab(sourceTab, nextViewer);
     if (nextTab) {
       this.activateWorkspaceFileTab(nextTab, sourceTab.key);
     }
@@ -486,16 +486,7 @@ export class ChatThreadManager {
   };
 
   closeWorkspacePanel = () => {
-    useChatThreadStore.getState().setSnapshot({
-      workspacePanelParentKey: null,
-      activeWorkspacePanelKind: null,
-      activeChildSessionKey: null,
-      activeSideChatDraft: null,
-      activeWorkspaceFileKey: null,
-      closedWorkspaceTabEntries: [],
-      workspaceNavigationHistory: [],
-      workspaceNavigationHistoryIndex: 0,
-    });
+    useChatThreadStore.getState().setSnapshot({ workspacePanelHidden: true });
   };
 
   openSessionCronPanel = (sessionKey: string) => {

package/src/features/chat/managers/session-surface.manager.ts

@@ -0,0 +1,46 @@
+import { workbenchSurfaceManager } from '@/shared/components/workbench/managers/workbench-surface.manager';
+import { GLOBAL_WORKBENCH_SURFACE, SESSION_WORKBENCH_SURFACE } from '@/shared/components/workbench/types/workbench-surface.types';
+import { useFloatingSessionStore, type FloatingSession } from '@/features/chat/stores/floating-session.store';
+import type { DocBrowserManager } from '@/shared/components/doc-browser/managers/doc-browser.manager';
+import type { DocBrowserTab } from '@/shared/components/doc-browser/types/doc-browser.types';
+import { buildSessionPanelUrl, CHAT_SESSION_PANEL_KIND, parseSessionKeyFromPanelUrl } from '@/features/chat/features/session/utils/chat-session-route.utils';
+
+class SessionSurfaceManager {
+  open = (session: FloatingSession): void => {
+    useFloatingSessionStore.setState({ session });
+    workbenchSurfaceManager.place(SESSION_WORKBENCH_SURFACE, 'floating');
+  };
+
+  minimize = (): void => {
+    workbenchSurfaceManager.minimize(SESSION_WORKBENCH_SURFACE);
+  };
+
+  restore = (): void => {
+    workbenchSurfaceManager.restore(SESSION_WORKBENCH_SURFACE);
+  };
+
+  close = (): void => {
+    useFloatingSessionStore.setState({ session: null });
+    workbenchSurfaceManager.place(SESSION_WORKBENCH_SURFACE, 'floating');
+  };
+
+  dock = (session: FloatingSession, docBrowser: DocBrowserManager): void => {
+    workbenchSurfaceManager.place(GLOBAL_WORKBENCH_SURFACE, 'docked');
+    docBrowser.open(buildSessionPanelUrl(session.sessionKey), {
+      kind: CHAT_SESSION_PANEL_KIND,
+      title: session.title,
+      newTab: true,
+      dedupeKey: buildSessionPanelUrl(session.sessionKey),
+    });
+    if (useFloatingSessionStore.getState().session?.sessionKey === session.sessionKey) this.close();
+  };
+
+  popOut = (tab: DocBrowserTab, docBrowser: DocBrowserManager): void => {
+    const sessionKey = parseSessionKeyFromPanelUrl(tab.currentUrl);
+    if (!sessionKey) return;
+    this.open({ sessionKey, title: tab.title });
+    docBrowser.closeTab(tab.id);
+  };
+}
+
+export const sessionSurfaceManager = new SessionSurfaceManager();

package/src/features/chat/pages/__tests__/ncp-chat-page.test.tsx

@@ -1,8 +1,10 @@
+import { sessionSurfaceManager } from '@/features/chat/managers/session-surface.manager';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { AppPresenterProvider } from '@/app/components/app-presenter-provider';
+import { ChatRuntimeProvider } from '@/features/chat/components/providers/chat-runtime.provider';
 import { NcpChatPage } from '@/features/chat/pages/ncp-chat-page';
 import { buildSessionPath } from '@/features/chat/features/session/utils/chat-session-route.utils';
 import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
@@ -19,6 +21,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/app/presenters/app.presenter', () => ({
   getAppPresenter: () => ({
     docBrowserManager: {},
+    pageResourceManager: { bindWorkspace: vi.fn() },
     chatDraftIntentManager: {
       consumePending: mocks.consumePending,
       markConsumed: mocks.markConsumed,
@@ -56,8 +59,13 @@ vi.mock('@/features/chat/features/ncp/hooks/use-ui-show-content-event', () => ({
   useUiShowContentEvent: () => undefined,
 }));
 
-describe('NcpChatPage render boundary', () => {
+vi.mock('@/features/chat/features/conversation/components/floating-session-conversation', () => ({
+  FloatingSessionConversation: () => null,
+}));
+
+describe('Shared chat runtime and page boundary', () => {
   beforeEach(() => {
+    sessionSurfaceManager.close();
     mocks.syncVisibleSessions.mockReset();
     mocks.useChatSessionSync.mockReset();
     useChatThreadStore.getState().setSnapshot({
@@ -70,9 +78,9 @@ describe('NcpChatPage render boundary', () => {
   it('creates its chat presenter from the global app presenter provider', () => {
     render(
       <MemoryRouter initialEntries={['/chat']}>
-        <AppPresenterProvider>
+        <AppPresenterProvider><ChatRuntimeProvider>
           <NcpChatPage view="chat" />
-        </AppPresenterProvider>
+        </ChatRuntimeProvider></AppPresenterProvider>
       </MemoryRouter>,
     );
 
@@ -89,17 +97,19 @@ describe('NcpChatPage render boundary', () => {
     });
     const view = render(
       <MemoryRouter initialEntries={[sessionPath]}>
-        <AppPresenterProvider>
+        <AppPresenterProvider><ChatRuntimeProvider>
           <Routes>
             <Route path="/chat/:sessionId?" element={<NcpChatPage view="chat" />} />
           </Routes>
-        </AppPresenterProvider>
+        </ChatRuntimeProvider></AppPresenterProvider>
       </MemoryRouter>,
     );
 
     expect(mocks.syncVisibleSessions).toHaveBeenCalledWith([
       'session-background',
       'session-child',
+      undefined,
+      null,
     ]);
 
     act(() => {
@@ -111,9 +121,17 @@ describe('NcpChatPage render boundary', () => {
       expect(mocks.syncVisibleSessions).toHaveBeenLastCalledWith([
         'session-background',
         null,
+        undefined,
+        null,
       ]);
     });
 
+    act(() => {
+      sessionSurfaceManager.open({ sessionKey: 'session-float', title: 'Float' });
+    });
+    expect(mocks.syncVisibleSessions).toHaveBeenLastCalledWith(['session-background', null, 'session-float', null]);
+    act(() => sessionSurfaceManager.minimize());
+    expect(mocks.syncVisibleSessions).toHaveBeenLastCalledWith(['session-background', null, null, null]);
     view.unmount();
     expect(mocks.syncVisibleSessions).toHaveBeenLastCalledWith([]);
   });

package/src/features/chat/pages/ncp-chat-page.tsx

@@ -1,100 +1,20 @@
-import {
-  useEffect,
-  useMemo,
-} from "react";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import {
   ChatPageLayout,
   type ChatPageProps,
   useChatSessionSync,
 } from "@/features/chat/components/layout/chat-page-shell";
 import { parseSessionKeyFromRoute } from "@/features/chat/features/session/utils/chat-session-route.utils";
-import { ChatPresenter } from "@/features/chat/presenters/chat.presenter";
-import { useChatQueryStoreSync } from "@/features/chat/features/ncp/hooks/use-ncp-chat-query-store-sync";
-import {
-  ChatPresenterProvider,
-  usePresenter,
-} from "@/features/chat/components/providers/chat-presenter.provider";
-import { useConfirmDialog } from "@/shared/hooks/use-confirm-dialog";
-import { useAppPresenter } from "@/app/components/app-presenter-provider";
+import { usePresenter } from "@/features/chat/components/providers/chat-presenter.provider";
 import { useUiShowContentEvent } from "@/features/chat/features/ncp/hooks/use-ui-show-content-event";
-import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
-
-function useNcpChatRouteSelection() {
-  const { sessionId: routeSessionIdParam } = useParams<{ sessionId?: string }>();
-  const routeSessionKey = useMemo(
-    () => parseSessionKeyFromRoute(routeSessionIdParam),
-    [routeSessionIdParam],
-  );
-  return {
-    routeSessionKey,
-    sessionKey: routeSessionKey ?? undefined,
-  };
-}
-
-function useNcpChatUiBindings() {
-  const presenter = usePresenter();
-  const { confirm, ConfirmDialog } = useConfirmDialog();
-  const location = useLocation();
-  const navigate = useNavigate();
-  useEffect(() => {
-    presenter.chatUiManager.syncState({
-      pathname: location.pathname,
-    });
-    presenter.chatUiManager.bindActions({
-      navigate,
-      confirm,
-    });
-  }, [confirm, location.pathname, navigate, presenter]);
-  return <ConfirmDialog />;
-}
 
 export function NcpChatPage({ view }: ChatPageProps) {
-  const appPresenter = useAppPresenter();
-  const presenter = useMemo(() => new ChatPresenter(appPresenter), [appPresenter]);
-  return (
-    <ChatPresenterProvider presenter={presenter}>
-      <NcpChatPageContent view={view} />
-    </ChatPresenterProvider>
-  );
-}
-
-function NcpChatPageContent({ view }: ChatPageProps) {
-  const appPresenter = useAppPresenter();
   const presenter = usePresenter();
-  const confirmDialog = useNcpChatUiBindings();
-  const routeSelection = useNcpChatRouteSelection();
-  const { routeSessionKey, sessionKey } = routeSelection;
-  const visibleWorkspaceSessionKey = useChatThreadStore((state) => {
-    const { snapshot } = state;
-    if (
-      snapshot.workspacePanelParentKey !== (sessionKey ?? null) ||
-      snapshot.activeWorkspacePanelKind !== "child-session"
-    ) {
-      return null;
-    }
-    return snapshot.activeChildSessionKey?.trim() || null;
-  });
-  useEffect(() => {
-    appPresenter.chatCompletionNotificationManager.syncVisibleSessions(
-      [sessionKey, visibleWorkspaceSessionKey],
-    );
-    return () => {
-      appPresenter.chatCompletionNotificationManager.syncVisibleSessions([]);
-    };
-  }, [
-    appPresenter.chatCompletionNotificationManager,
-    sessionKey,
-    visibleWorkspaceSessionKey,
-  ]);
-  useChatQueryStoreSync({
-    sessionKey: sessionKey ?? null,
-  });
+  const { sessionId } = useParams<{ sessionId?: string }>();
   useChatSessionSync({
-    routeSessionKey,
-    syncRouteSessionSelection:
-      presenter.chatSessionListManager.syncRouteSessionSelection,
+    routeSessionKey: parseSessionKeyFromRoute(sessionId),
+    syncRouteSessionSelection: presenter.chatSessionListManager.syncRouteSessionSelection,
   });
   useUiShowContentEvent();
-  return <ChatPageLayout view={view} confirmDialog={confirmDialog} />;
+  return <ChatPageLayout view={view} />;
 }

package/src/features/chat/presenters/chat.presenter.ts

@@ -22,7 +22,8 @@ export class ChatPresenter {
     this.chatThreadManager = new ChatThreadManager(
       this.chatUiManager,
       this.chatSessionListManager,
-      appPresenter.notifyRightPanelOpened,
+      appPresenter.notifyWorkspacePanelOpened,
     );
+    appPresenter.pageResourceManager.bindWorkspace(this.chatThreadManager);
   }
 }

package/src/features/chat/stores/__tests__/chat-thread.store.test.ts

@@ -99,7 +99,7 @@ describe('chat thread workspace panel persistence', () => {
     expect(persisted.state.snapshot.workspaceFileTabs[0].params).toEqual({
       chart: { series: [3, 5, 8] },
     });
-    expect(persisted.state.snapshot.workspaceFileTabs[0].fullLines).toBeUndefined();
+    expect(persisted.state.snapshot.workspaceFileTabs[0].fullLines).toEqual([]);
   });
 
   it('does not persist an unmaterialized side chat draft', () => {
@@ -228,7 +228,7 @@ describe('chat thread workspace panel persistence', () => {
             ],
           },
         },
-        version: 2,
+        version: 3,
       }),
     );
 

package/src/features/chat/stores/chat-thread.store.ts

@@ -1,3 +1,4 @@
+import { ViewMemoryStorage } from '@/shared/lib/navigation-history';
 import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
 import type { NcpMessage } from '@nextclaw/ncp';
@@ -71,6 +72,7 @@ export type ChatWorkspaceNavigationEntry =
   | { kind: 'continuous-attention' };
 
 export type ChatThreadSnapshot = {
+  workspacePanelHidden?: boolean;
   sessionTypeLabel?: string | null;
   sessionTypeIcon?: SessionTypeIconView | null;
   sessionKey: string | null;
@@ -115,6 +117,7 @@ type ChatThreadStore = {
 type PersistedChatThreadStore = {
   snapshot?: {
     workspacePanelParentKey?: unknown;
+    workspacePanelHidden?: unknown;
     activeWorkspacePanelKind?: unknown;
     activeChildSessionKey?: unknown;
     workspaceFileTabs?: unknown;
@@ -130,6 +133,7 @@ type PersistedChatThreadStore = {
 
 type PersistedChatWorkspaceSnapshot = Pick<
   ChatThreadSnapshot,
+  | 'workspacePanelHidden'
   | 'workspacePanelParentKey'
   | 'activeWorkspacePanelKind'
   | 'activeChildSessionKey'
@@ -280,6 +284,7 @@ function normalizePersistedWorkspaceSnapshot(value: unknown): PersistedChatWorks
       : 0;
 
   return {
+    workspacePanelHidden: value.workspacePanelHidden === true,
     workspacePanelParentKey,
     activeWorkspacePanelKind: resolvedActiveWorkspacePanelKind,
     activeChildSessionKey,
@@ -309,7 +314,7 @@ export const useChatThreadStore = create<ChatThreadStore>()(
     {
       name: CHAT_THREAD_WORKSPACE_STORAGE_KEY,
       version: CHAT_THREAD_WORKSPACE_STORAGE_VERSION,
-      storage: createJSONStorage(() => window.localStorage),
+      storage: createJSONStorage(() => new ViewMemoryStorage()),
       partialize: (state): PersistedChatThreadStore => {
         const workspaceNavigationHistory = state.snapshot.workspaceNavigationHistory.filter(
           (entry) => entry.kind !== 'side-chat-draft',
@@ -320,6 +325,7 @@ export const useChatThreadStore = create<ChatThreadStore>()(
             : 0;
         return {
           snapshot: {
+            workspacePanelHidden: state.snapshot.workspacePanelHidden,
             workspacePanelParentKey: state.snapshot.workspacePanelParentKey,
             activeWorkspacePanelKind:
               state.snapshot.activeWorkspacePanelKind === 'side-chat-draft'

package/src/features/chat/stores/floating-session.store.ts

@@ -0,0 +1,11 @@
+import { create } from 'zustand';
+
+export type FloatingSession = { sessionKey: string; title: string };
+
+type FloatingSessionStore = {
+  session: FloatingSession | null;
+};
+
+export const useFloatingSessionStore = create<FloatingSessionStore>(() => ({
+  session: null,
+}));

package/src/features/cron/components/__tests__/cron-config.test.tsx

@@ -350,3 +350,7 @@ describe("CronConfig", () => {
     });
   });
 });
+
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));
+
+vi.mock("@/features/right-panel-resources", () => ({ PageResourceActionsMenu: () => null, PageResourceActionItems: () => null, pageResourceFromSystemObject: vi.fn() }));

package/src/features/cron/components/cron-job-detail-dialog.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionsMenu } from '@/features/right-panel-resources';
+import { pageResourceFromSystemObject } from '@/features/right-panel-resources';
 import type { ReactNode } from "react";
 import { Play, Trash2 } from "lucide-react";
 
@@ -87,7 +89,7 @@ export function CronJobDetailDialog({
               {isBound ? t("cronBoundSession") : t("cronDedicatedSession")}
             </span>
           </div>
-          <SheetTitle>{job.name || job.id}</SheetTitle>
+          <div className="flex items-center justify-between gap-2"><SheetTitle>{job.name || job.id}</SheetTitle><PageResourceActionsMenu page={pageResourceFromSystemObject('cron-job', job.id, job.name || job.id)} /></div>
           <SheetDescription>{t("cronDetailDescription")}</SheetDescription>
         </SheetHeader>
 

package/src/features/cron/components/cron-job-row.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionItems } from '@/features/right-panel-resources';
+import { pageResourceFromSystemObject } from '@/features/right-panel-resources';
 import { useState } from "react";
 import {
   CalendarClock,
@@ -190,7 +192,9 @@ export function CronJobRow({
                   </TooltipTrigger>
                   <TooltipContent>{t("cronMoreActions")}</TooltipContent>
                 </Tooltip>
-                <PopoverContent align="end" sideOffset={4} className="w-40 p-1">
+                <PopoverContent align="end" sideOffset={4} className="w-56 p-1">
+                  <PageResourceActionItems page={pageResourceFromSystemObject("cron-job", job.id, jobLabel)} onSelect={() => setMenuOpen(false)} />
+                  <div className="my-1 h-px bg-border" />
                   <button
                     type="button"
                     onClick={() => {

package/src/features/inbox/components/inbox-reader-dialog.test.tsx

@@ -114,3 +114,6 @@ describe("InboxReaderDialog", () => {
     );
   });
 });
+
+// Resource policy has separate integration coverage; keep this fixture scoped to its business UI.
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/inbox/components/inbox-reader-dialog.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionsMenu } from '@/features/right-panel-resources';
+import { pageResourceFromSystemObject } from '@/features/right-panel-resources';
 import { useRef, useState } from "react";
 import { ChevronLeft, ChevronRight, Inbox } from "lucide-react";
 import { useNavigate } from "react-router-dom";
@@ -151,6 +153,7 @@ export function InboxReaderDialog() {
                     {formatDateTime(activeDelivery.createdAt)}
                   </time>
                 </div>
+                {activeDelivery && <PageResourceActionsMenu page={pageResourceFromSystemObject("inbox-delivery", activeDelivery.id, activeDelivery.title)} />}
                 {positionControls}
               </div>
               <DialogDescription className="sr-only">

package/src/features/inbox/pages/inbox-page.test.ts

@@ -145,3 +145,6 @@ describe("InboxPage", () => {
     );
   });
 });
+
+// Resource policy has separate integration coverage; keep this fixture scoped to its business UI.
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/inbox/pages/inbox-page.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionsMenu } from '@/features/right-panel-resources';
+import { pageResourceFromSystemObject } from '@/features/right-panel-resources';
 import { useEffect, useMemo, useState } from "react";
 import type { InboxDelivery } from "@nextclaw/shared";
 import { Archive, ArrowLeft, Inbox, MessageCircle, RotateCcw, Trash2 } from "lucide-react";
@@ -129,6 +131,7 @@ function InboxListPane({
                   )}>
                     {delivery.title}
                   </h2>
+          <PageResourceActionsMenu page={pageResourceFromSystemObject("inbox-delivery", delivery.id, delivery.title)} />
                   <div className="mt-0.5 flex items-center gap-2 text-[11px] leading-4 text-muted-foreground/65">
                     <p className="min-w-0 flex-1 truncate">
                       {delivery.summary ?? t("inboxNoSummary")}

package/src/features/marketplace/components/__tests__/marketplace-page-detail.test.tsx

@@ -43,7 +43,8 @@ vi.mock("@/shared/components/doc-browser", () => ({
   }),
 }));
 
-vi.mock("@/shared/lib/api", () => ({
+vi.mock("@/shared/lib/api", async (importOriginal) => ({
+  ...await importOriginal<object>(),
   fetchMarketplaceSkillContent: mocks.fetchMarketplaceSkillContent,
 }));
 
@@ -348,3 +349,6 @@ describe("MarketplacePage detail loading", () => {
     expect(useMarketplaceDetailDocStore.getState().entries["skill:web-search"]?.contentRaw).not.toContain("Stale");
   });
 });
+
+// Resource policy has separate integration coverage; keep this fixture scoped to its business UI.
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/marketplace/components/__tests__/marketplace-page.test.tsx

@@ -449,3 +449,6 @@ describe("MarketplacePage", () => {
     );
   });
 });
+
+// Resource policy has separate integration coverage; keep this fixture scoped to its business UI.
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/marketplace/components/curated-shelves/__tests__/marketplace-curated-scene-route.test.tsx

@@ -273,3 +273,5 @@ describe("Marketplace curated scene routes", () => {
     expect(screen.queryByRole("button", { name: /Development/ })).toBeNull();
   });
 });
+
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/marketplace/components/marketplace-list-card.tsx

@@ -1,3 +1,6 @@
+import { PageResourceActionsMenu } from '@/features/right-panel-resources';
+import { pageResourceFromTarget } from '@/features/right-panel-resources';
+import { createMarketplaceDetailDocTarget } from '@/features/marketplace/components/marketplace-detail-doc';
 import type {
   MarketplaceInstalledRecord,
   MarketplaceItemSummary,
@@ -273,6 +276,7 @@ export function MarketplaceListCard(props: {
         </div>
 
         <MarketplaceListCardStatus record={record} disabled={isDisabled} />
+        {record?.resourceUri ? <PageResourceActionsMenu page={{ uri: record.resourceUri, title, target: { kind: "system-object", title, url: record.resourceUri, resourceUri: record.resourceUri, historyPolicy: "none" } }} /> : item && <PageResourceActionsMenu page={pageResourceFromTarget(createMarketplaceDetailDocTarget({ id: `skill:${item.slug}`, title, typeLabel: t("marketplaceTypeSkill"), spec, status: "loading" }))} />}
       </div>
 
       <div className="mt-2 flex min-w-0 flex-1 flex-col">

package/src/features/marketplace/components/mcp/__tests__/mcp-marketplace-page.test.tsx

@@ -226,3 +226,5 @@ describe("McpMarketplacePage", () => {
     expect(screen.getByText("Disable")).toBeTruthy();
   });
 });
+
+vi.mock("@/features/right-panel-resources/hooks/use-page-resource-actions", () => ({ usePageResourceActions: () => () => [] }));

package/src/features/marketplace/components/mcp/mcp-marketplace-card.tsx

@@ -1,3 +1,5 @@
+import { PageResourceActionsMenu } from "@/features/right-panel-resources";
+import { pageResourceFromSystemObject } from "@/features/right-panel-resources";
 import type {
   MarketplaceInstalledRecord,
   MarketplaceItemSummary,
@@ -58,6 +60,7 @@ export function McpMarketplaceCard(props: {
         </div>
 
         <div className="flex shrink-0 flex-col gap-2">
+          {record?.id && <PageResourceActionsMenu page={pageResourceFromSystemObject("mcp-server", record.id, name)} />}
           {!installed && item && onInstall ? (
             <Button
               type="button"

package/src/features/notifications/components/__tests__/app-notification-toast.test.tsx

@@ -9,6 +9,25 @@ function CurrentPathname() {
 }
 
 describe("AppNotificationToast", () => {
+  it("expands through a separate keyboard action without navigating", async () => {
+    const onDismiss = vi.fn();
+    const onExpand = vi.fn();
+    const user = userEvent.setup();
+    render(
+      <MemoryRouter initialEntries={['/chat/current']}>
+        <AppNotificationToast title="Reply" href="/chat/other" dismissLabel="Dismiss"
+          onDismiss={onDismiss} action={{ label: 'Expand', onClick: onExpand }} />
+        <CurrentPathname />
+      </MemoryRouter>,
+    );
+    await user.tab();
+    await user.tab();
+    expect(document.activeElement).toBe(screen.getByRole('button', { name: 'Expand' }));
+    await user.keyboard('{Enter}');
+    expect(onExpand).toHaveBeenCalledOnce();
+    expect(onDismiss).toHaveBeenCalledOnce();
+    expect(screen.getByTestId('current-pathname').textContent).toBe('/chat/current');
+  });
   it("keeps opening and dismissing a route notification as separate actions", async () => {
     const onDismiss = vi.fn();
     const user = userEvent.setup();