@nextclaw/ui 0.26.5 → 0.27.0

package/src/features/chat/features/workspace/components/chat-session-workspace-panel-content.tsx

@@ -66,17 +66,17 @@ function WorkspaceOverviewEntry({
   return (
     <button
       type="button"
-      className="group flex w-full items-center gap-3 rounded-lg border border-gray-200/80 bg-white px-3 py-3 text-left transition-colors hover:border-gray-300 hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/25"
+      className="group flex w-full items-center gap-3 px-3 py-2.5 text-left transition-colors first:rounded-t-lg last:rounded-b-lg hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary/25"
       onClick={onClick}
     >
-      <span className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-gray-100 text-gray-600">
+      <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center text-muted-foreground">
         {icon}
       </span>
       <span className="min-w-0 flex-1">
         <span className="flex items-center gap-2 text-sm font-medium text-gray-900">
           <span className="truncate">{title}</span>
           {typeof count === 'number' ? (
-            <span className="rounded-full bg-gray-100 px-1.5 py-0.5 text-[10px] font-semibold tabular-nums text-gray-500">
+            <span className="min-w-5 rounded bg-background px-1.5 py-0.5 text-center text-[11px] font-medium tabular-nums text-muted-foreground">
               {count}
             </span>
           ) : null}
@@ -84,7 +84,7 @@ function WorkspaceOverviewEntry({
         </span>
         <span className="mt-0.5 block text-xs leading-5 text-gray-500">{description}</span>
       </span>
-      <ChevronRight className="h-4 w-4 shrink-0 text-gray-300 transition-transform group-hover:translate-x-0.5 group-hover:text-gray-500" />
+      <ChevronRight className="h-3.5 w-3.5 shrink-0 text-muted-foreground/60 group-hover:text-muted-foreground" />
     </button>
   );
 }
@@ -102,52 +102,52 @@ function WorkspaceOverview({
   const observationsQuery = useNcpSessionObservations(sessionKey);
 
   return (
-    <div className="h-full overflow-auto bg-gray-50/45 px-4 py-5 custom-scrollbar">
+    <div className="h-full overflow-auto bg-background px-4 py-5 custom-scrollbar">
       <div className="mx-auto max-w-xl">
         <h2 className="text-base font-semibold text-gray-900">{t('chatWorkspaceOverview')}</h2>
         <p className="mt-1 text-xs leading-5 text-gray-500">{t('chatWorkspaceOverviewDescription')}</p>
-        <div className="mt-4 space-y-2">
+        <div className="mt-3 divide-y divide-border rounded-lg border border-border bg-muted/40">
           <WorkspaceOverviewEntry
-            count={observationsQuery.data?.counts.total ?? 0}
-            description={t('chatWorkspaceContinuousAttentionDescription')}
-            icon={<Eye className="h-4 w-4" />}
-            title={t('chatWorkspaceContinuousAttention')}
+            description={t('chatWorkspaceProjectFilesDescription')}
+            icon={<FolderTree className="h-4 w-4" />}
+            title={t('chatWorkspaceProjectFiles')}
             onClick={() => {
               if (sessionKey) {
-                presenter.chatThreadManager.openContinuousAttention(sessionKey);
+                presenter.chatThreadManager.openProjectFiles(sessionKey);
               }
             }}
           />
           <WorkspaceOverviewEntry
-            count={childSessionTabs.length}
-            description={t('chatWorkspaceChildSessionsDescription')}
-            icon={<GitBranch className="h-4 w-4" />}
-            runStatus={childSessionTabs.some((tab) => tab.runStatus === 'running') ? 'running' : undefined}
-            title={t('chatWorkspaceChildSessions')}
+            count={sessionCronJobs.length}
+            description={t('chatWorkspaceSessionCronJobsDescription')}
+            icon={<AlarmClock className="h-4 w-4" />}
+            title={t('chatWorkspaceSessionCronJobs')}
             onClick={() => {
               if (sessionKey) {
-                presenter.chatThreadManager.openChildSessions(sessionKey);
+                presenter.chatThreadManager.openSessionCronPanel(sessionKey);
               }
             }}
           />
           <WorkspaceOverviewEntry
-            count={sessionCronJobs.length}
-            description={t('chatWorkspaceSessionCronJobsDescription')}
-            icon={<AlarmClock className="h-4 w-4" />}
-            title={t('chatWorkspaceSessionCronJobs')}
+            count={childSessionTabs.length}
+            description={t('chatWorkspaceChildSessionsDescription')}
+            icon={<GitBranch className="h-4 w-4" />}
+            runStatus={childSessionTabs.some((tab) => tab.runStatus === 'running') ? 'running' : undefined}
+            title={t('chatWorkspaceChildSessions')}
             onClick={() => {
               if (sessionKey) {
-                presenter.chatThreadManager.openSessionCronPanel(sessionKey);
+                presenter.chatThreadManager.openChildSessions(sessionKey);
               }
             }}
           />
           <WorkspaceOverviewEntry
-            description={t('chatWorkspaceProjectFilesDescription')}
-            icon={<FolderTree className="h-4 w-4" />}
-            title={t('chatWorkspaceProjectFiles')}
+            count={observationsQuery.data?.counts.total ?? 0}
+            description={t('chatWorkspaceContinuousAttentionDescription')}
+            icon={<Eye className="h-4 w-4" />}
+            title={t('chatWorkspaceContinuousAttention')}
             onClick={() => {
               if (sessionKey) {
-                presenter.chatThreadManager.openProjectFiles(sessionKey);
+                presenter.chatThreadManager.openContinuousAttention(sessionKey);
               }
             }}
           />
@@ -372,7 +372,7 @@ export function ChatSessionWorkspacePanelContent({
         data-theme-surface="workspace-explorer"
         data-mode={projectFilesActive ? 'full' : explorerOverlay ? 'overlay' : 'side'}
         className={cn(
-          'relative min-h-0 shrink-0 flex-col border-r border-gray-200/80 bg-white',
+          'relative min-h-0 shrink-0 flex-col border-r border-border bg-background',
           showExplorer ? 'flex' : 'hidden',
           projectFilesActive ? 'flex-1 border-r-0' : null,
           explorerOverlay ? 'absolute inset-y-0 left-0 z-20 w-[min(320px,86%)] shadow-xl' : null,

package/src/features/chat/features/workspace/components/overview/chat-session-continuous-attention.tsx

@@ -51,7 +51,7 @@ function ObservationRow({
     : t('chatWorkspaceContinuousAttentionResume');
 
   return (
-    <article className="rounded-xl border border-gray-200/80 bg-white p-3 shadow-sm">
+    <article className="rounded-lg border border-border bg-muted/30 p-3">
       <div className="flex min-w-0 items-start gap-3">
         <span className="mt-0.5 inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-gray-100 text-gray-500">
           {item.kind === 'context' ? <Eye className="h-4 w-4" /> : <Inbox className="h-4 w-4" />}
@@ -148,11 +148,11 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
   };
 
   return (
-    <div className="h-full overflow-auto bg-gray-50/45 px-4 py-5 custom-scrollbar">
+    <div className="h-full overflow-auto bg-background px-4 py-5 custom-scrollbar">
       <div className="mx-auto max-w-xl">
         <ConfirmDialog />
         <div className="flex items-start gap-3">
-          <span className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-primary/10 text-primary">
+          <span className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground">
             <Eye className="h-4 w-4" />
           </span>
           <div className="min-w-0">
@@ -162,7 +162,7 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
         </div>
 
         {view ? (
-          <div className="mt-4 grid grid-cols-2 gap-2 sm:grid-cols-4">
+          <div className="mt-4 grid grid-cols-2 gap-1.5 rounded-lg border border-border p-2">
             <SummaryCard label={t('chatWorkspaceContinuousAttentionTotal')} value={view.counts.total} />
             <SummaryCard label={t('chatWorkspaceContinuousAttentionState')} value={view.counts.context} />
             <SummaryCard label={t('chatWorkspaceContinuousAttentionEvents')} value={view.counts.events} />
@@ -170,7 +170,7 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
           </div>
         ) : null}
 
-        <div className="mt-4 flex rounded-lg border border-gray-200 bg-white p-1" role="tablist">
+        <div className="mt-3 flex rounded-lg border border-border bg-muted/40 p-1" role="tablist">
           {(['context', 'events'] as const).map((group) => {
             const count = group === 'context' ? (view?.counts.context ?? 0) : (view?.counts.events ?? 0);
             return (
@@ -191,7 +191,7 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
 
         {query.isPending ? (
           <div className="mt-3 space-y-2" aria-label={t('chatWorkspaceContinuousAttentionLoading')}>
-            {[0, 1].map((item) => <div key={item} className="h-28 animate-pulse rounded-xl border border-gray-200 bg-white" />)}
+            {[0, 1].map((item) => <div key={item} className="h-28 animate-pulse rounded-lg border border-border bg-muted/40" />)}
           </div>
         ) : query.isError ? (
           <div className="mt-4 rounded-xl border border-rose-200 bg-rose-50 px-4 py-5 text-center">
@@ -202,8 +202,8 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
             </button>
           </div>
         ) : items.length === 0 ? (
-          <div className="mt-4 rounded-xl border border-dashed border-gray-300 bg-white px-4 py-8 text-center">
-            <Clock3 className="mx-auto h-5 w-5 text-gray-300" />
+          <div className="mt-3 rounded-lg border border-border bg-muted/30 px-4 py-6 text-center">
+            <Clock3 className="mx-auto h-5 w-5 text-muted-foreground" />
             <p className="mt-2 text-sm font-medium text-gray-700">{t('chatWorkspaceContinuousAttentionEmpty')}</p>
             <p className="mt-1 text-xs leading-5 text-gray-500">{t('chatWorkspaceContinuousAttentionEmptyDescription')}</p>
           </div>
@@ -226,9 +226,9 @@ export function ChatSessionContinuousAttention({ sessionKey }: { sessionKey: str
 
 function SummaryCard({ label, value }: { label: string; value: number }) {
   return (
-    <div className="rounded-lg border border-gray-200/80 bg-white px-3 py-2">
-      <div className="text-[10px] uppercase tracking-wide text-gray-400">{label}</div>
-      <div className="mt-1 text-lg font-semibold tabular-nums text-gray-900">{value}</div>
+    <div className="rounded-md bg-muted/60 px-2.5 py-2">
+      <div className="text-[11px] text-muted-foreground">{label}</div>
+      <div className="mt-0.5 text-base font-medium tabular-nums text-foreground">{value}</div>
     </div>
   );
 }

package/src/features/chat/features/workspace/components/overview/chat-session-token-usage.tsx

@@ -25,9 +25,9 @@ function TokenUsageStatusBadge({ status }: { status: 'reported' | 'partial' | 'u
   return (
     <span
       className={cn(
-        'inline-flex shrink-0 items-center rounded-full px-2 py-0.5 text-[10px] font-semibold',
+        'inline-flex shrink-0 items-center rounded px-1.5 py-0.5 text-[10px] font-medium',
         status === 'reported'
-          ? 'bg-emerald-50 text-emerald-700'
+          ? 'text-muted-foreground'
           : status === 'partial'
             ? 'bg-amber-50 text-amber-700'
             : 'bg-gray-100 text-gray-500',
@@ -46,9 +46,9 @@ function TokenUsageStatusBadge({ status }: { status: 'reported' | 'partial' | 'u
 
 function TokenUsageMetric({ label, value }: { label: string; value: string }) {
   return (
-    <div className="min-w-0 rounded-md bg-gray-50 px-2.5 py-2">
-      <div className="truncate text-[10px] font-medium text-gray-500">{label}</div>
-      <div className="mt-0.5 truncate text-sm font-semibold tabular-nums text-gray-900">
+    <div className="min-w-0 rounded-md bg-muted/60 px-2.5 py-2 first:bg-muted first:[&>div:last-child]:font-semibold">
+      <div className="text-[11px] text-muted-foreground">{label}</div>
+      <div className="mt-0.5 break-words text-sm font-medium tabular-nums text-foreground">
         {value}
       </div>
     </div>
@@ -62,14 +62,14 @@ export function ChatSessionTokenUsage({ sessionKey }: { sessionKey: string | nul
   return (
     <section
       aria-labelledby="chat-workspace-token-usage-title"
-      className="mt-4 rounded-lg border border-gray-200/80 bg-white p-3"
+      className="mt-4 rounded-lg border border-border p-3"
     >
-      <div className="flex items-start gap-3">
-        <span className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-gray-100 text-gray-600">
+      <div className="flex items-start gap-2">
+        <span className="inline-flex h-5 w-5 shrink-0 items-center justify-center text-muted-foreground">
           <ChartNoAxesColumn className="h-4 w-4" />
         </span>
         <div className="min-w-0 flex-1">
-          <div className="flex items-center justify-between gap-2">
+          <div className="flex flex-wrap items-center justify-between gap-2">
             <h3 id="chat-workspace-token-usage-title" className="text-sm font-semibold text-gray-900">
               {t('chatWorkspaceTokenUsage')}
             </h3>
@@ -136,10 +136,10 @@ export function ChatSessionTokenUsage({ sessionKey }: { sessionKey: string | nul
             <div className="mb-1.5 text-[11px] font-medium text-gray-700">
               {t('chatWorkspaceTokenUsageByModel')}
             </div>
-            <div className="space-y-1.5">
+            <div className="space-y-2">
               {usage.models.map((modelUsage) => (
-                <div key={modelUsage.model} className="rounded-md border border-gray-200/70 px-2.5 py-2">
-                  <div className="flex min-w-0 items-center justify-between gap-2">
+                <div key={modelUsage.model} className="rounded-md border border-border bg-muted/30 px-2.5 py-2">
+                  <div className="flex min-w-0 flex-wrap items-center justify-between gap-2">
                     <span className="min-w-0 truncate text-xs font-semibold text-gray-900" title={modelUsage.model}>
                       {modelUsage.model}
                     </span>
@@ -158,16 +158,16 @@ export function ChatSessionTokenUsage({ sessionKey }: { sessionKey: string | nul
                       formatCacheHitRate(modelUsage.cacheHitRate),
                     )}
                   </div>
-                  <dl className="mt-2 grid grid-cols-2 gap-x-3 gap-y-1 text-[10px] sm:grid-cols-4">
+                  <dl className="mt-2 grid grid-cols-2 gap-x-3 gap-y-2 text-[11px]">
                     {[
                       [t('chatWorkspaceTokenUsageInput'), modelUsage.inputTokens],
                       [t('chatWorkspaceTokenUsageOutput'), modelUsage.outputTokens],
                       [t('chatWorkspaceTokenUsageCachedInput'), modelUsage.cachedInputTokens],
                       [t('chatWorkspaceTokenUsageTotal'), modelUsage.totalTokens],
                     ].map(([label, value]) => (
-                      <div key={String(label)} className="flex min-w-0 items-center justify-between gap-1 sm:block">
+                      <div key={String(label)} className="min-w-0">
                         <dt className="truncate text-gray-500">{label}</dt>
-                        <dd className="shrink-0 font-semibold tabular-nums text-gray-800 sm:mt-0.5">
+                        <dd className="mt-0.5 break-words font-medium tabular-nums text-gray-800">
                           {formatTokenCount(value as number | null)}
                         </dd>
                       </div>

package/src/features/chat/features/workspace/components/project-files/workspace-directory-tree.tsx

@@ -77,9 +77,9 @@ function EntryIcon({
     return <FileTypeIcon fileName={fileName} />;
   }
   return isExpanded ? (
-    <FolderOpen className="h-4 w-4 shrink-0 text-amber-500" />
+    <FolderOpen className="h-4 w-4 shrink-0 text-muted-foreground" />
   ) : (
-    <Folder className="h-4 w-4 shrink-0 text-amber-500" />
+    <Folder className="h-4 w-4 shrink-0 text-muted-foreground" />
   );
 }
 

package/src/features/chat/features/workspace/components/project-files/workspace-new-folder-tree-item.tsx

@@ -64,7 +64,7 @@ export function WorkspaceNewFolderTreeItem({
         {kind === 'file' ? (
           <File className="h-4 w-4 shrink-0 text-gray-500" />
         ) : (
-          <Folder className="h-4 w-4 shrink-0 text-amber-500" />
+          <Folder className="h-4 w-4 shrink-0 text-muted-foreground" />
         )}
         <Input
           density="compact"

package/src/features/chat/features/workspace/components/project-files/workspace-project-files-toolbar.tsx

@@ -19,9 +19,9 @@ export function WorkspaceProjectFilesToolbar({
   onRefresh: () => void;
 }) {
   return (
-    <div className="flex h-9 shrink-0 items-center gap-0.5 border-b border-gray-200/80 bg-gray-50/55 px-1.5">
+    <div className="flex h-9 shrink-0 items-center gap-0.5 border-b border-border bg-background px-1.5">
       <span
-        className="min-w-0 flex-1 truncate px-0.5 text-[11px] font-semibold uppercase tracking-[0.03em] text-gray-800"
+        className="min-w-0 flex-1 truncate px-1 text-xs font-medium text-muted-foreground"
         title={rootLabel}
       >
         {rootLabel}

package/src/features/chat/features/workspace/components/session-cron-job-content.tsx

@@ -1,3 +1,5 @@
+import { ACTION_FEEDBACK, ACTION_MENU_ITEM_CLASS } from '@/shared/components/ui/actions/action-feedback';
+import { Trash2 } from 'lucide-react';
 import { useState } from "react";
 import {
   CalendarClock,
@@ -181,7 +183,7 @@ function SessionCronJobCard({
               </TooltipTrigger>
               <TooltipContent>{t("cronMoreActions")}</TooltipContent>
             </Tooltip>
-            <PopoverContent align="end" sideOffset={4} className="w-40 p-1">
+            <PopoverContent align="end" sideOffset={4} variant="menu">
               <button
                 type="button"
                 disabled={isPending}
@@ -189,9 +191,9 @@ function SessionCronJobCard({
                   setMenuOpen(false);
                   void cronActions.runJob(job);
                 }}
-                className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-foreground transition-colors hover:bg-[var(--interaction-hover)] disabled:cursor-not-allowed disabled:opacity-50"
+                className={`${ACTION_MENU_ITEM_CLASS} text-foreground ${ACTION_FEEDBACK.item}`}
               >
-                <Play className="h-3.5 w-3.5 text-muted-foreground" />
+                <Play className="h-4 w-4 shrink-0 text-muted-foreground" />
                 {t("cronRunNow")}
               </button>
               <button
@@ -201,8 +203,9 @@ function SessionCronJobCard({
                   setMenuOpen(false);
                   void cronActions.deleteJob(job);
                 }}
-                className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-red-600 transition-colors hover:bg-destructive/10 disabled:cursor-not-allowed disabled:opacity-50"
+                className={`${ACTION_MENU_ITEM_CLASS} ${ACTION_FEEDBACK.destructive}`}
               >
+                <Trash2 className="h-4 w-4 shrink-0" />
                 {t("delete")}
               </button>
             </PopoverContent>

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

@@ -1,3 +1,4 @@
+import { ACTION_FEEDBACK, ACTION_MENU_ITEM_CLASS } from '@/shared/components/ui/actions/action-feedback';
 import { PageResourceActionItems } from '@/features/right-panel-resources';
 import { pageResourceFromSystemObject } from '@/features/right-panel-resources';
 import { useState } from "react";
@@ -206,9 +207,9 @@ export function CronJobRow({
                       setMenuOpen(false);
                       onRun(job);
                     }}
-                    className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-foreground transition-colors hover:bg-[var(--interaction-hover)]"
+                    className={`${ACTION_MENU_ITEM_CLASS} text-foreground ${ACTION_FEEDBACK.item}`}
                   >
-                    <Play className="h-3.5 w-3.5 text-muted-foreground" />
+                    <Play className="h-4 w-4 shrink-0 text-muted-foreground" />
                     {t("cronRunNow")}
                   </button>
                   <button
@@ -217,9 +218,9 @@ export function CronJobRow({
                       setMenuOpen(false);
                       onDelete(job);
                     }}
-                    className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-red-600 transition-colors hover:bg-destructive/10"
+                    className={`${ACTION_MENU_ITEM_CLASS} ${ACTION_FEEDBACK.destructive}`}
                   >
-                    <Trash2 className="h-3.5 w-3.5" />
+                    <Trash2 className="h-4 w-4 shrink-0" />
                     {t("delete")}
                   </button>
                 <div className="my-1 h-px bg-border" />

package/src/features/desktop-capabilities/components/desktop-authorization-dialog.tsx

@@ -11,13 +11,13 @@ import {
 } from "@/shared/components/ui/dialog";
 import { Button } from "@/shared/components/ui/button";
 import { appQueryClient } from "@/app-query-client";
-import { nextclawClient } from "@/shared/lib/api/managers/client.manager";
+import { nextclawClient } from "@/shared/lib/api";
 import { t } from "@/shared/lib/i18n";
-import { desktopCapabilityManager } from "../managers/desktop-capability.manager";
+import { desktopCapabilityManager } from "@/features/desktop-capabilities/managers/desktop-capability.manager";
 import {
   type DesktopAuthorizationRequest,
   useDesktopAuthorizationStore,
-} from "../stores/desktop-authorization.store";
+} from "@/features/desktop-capabilities/stores/desktop-authorization.store";
 
 const AUTHORIZATION_EVENT_TYPE = "desktop.authorization.required";
 
@@ -61,8 +61,8 @@ export function DesktopAuthorizationDialog() {
         if (!open && !isGranting) clear();
       }}
     >
-      <DialogContent className="[&>:last-child]:hidden">
-        <DialogHeader>
+      <DialogContent>
+        <DialogHeader showClose={false}>
           <DialogTitle className="flex items-center gap-2">
             <ShieldAlert className="h-4 w-4 text-amber-600" />
             {t("desktopAuthorizationTitle")}

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

@@ -1,7 +1,7 @@
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { MemoryRouter, useLocation } from "react-router-dom";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { CHAT_DRAFT_SESSION_PATH } from "@/features/chat";
+import { buildSessionPath, CHAT_DRAFT_SESSION_PATH } from "@/features/chat";
 import { InboxReaderDialog } from "@/features/inbox/components/inbox-reader-dialog";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 import { t } from "@/shared/lib/i18n";
@@ -9,6 +9,7 @@ import { t } from "@/shared/lib/i18n";
 const mocks = vi.hoisted(() => ({
   closeReader: vi.fn(),
   contentType: "markdown",
+  deliveryCount: 1,
   prepareChatReference: vi.fn(),
   requestSystemObjectReference: vi.fn(),
   markRead: vi.fn(),
@@ -17,16 +18,17 @@ const mocks = vi.hoisted(() => ({
 
 vi.mock("@/app/components/app-presenter-provider", () => ({
   useAppPresenter: () => ({
+    docBrowserManager: { close: vi.fn() },
     inboxManager: mocks,
-    chatDraftIntentManager: { requestSystemObjectReference: mocks.requestSystemObjectReference },
+    chatComposerIntentManager: { requestSystemObjectReference: mocks.requestSystemObjectReference },
   }),
 }));
 
 vi.mock("@/features/inbox/hooks/use-inbox-deliveries", () => ({
   useInboxDeliveries: () => ({
     data: {
-      deliveries: [{
-        id: "delivery-1",
+      deliveries: Array.from({ length: mocks.deliveryCount }, (_, index) => ({
+        id: `delivery-${index + 1}`,
         title: "A considered report",
         summary: "A concise summary",
         content: mocks.contentType === "html"
@@ -39,7 +41,7 @@ vi.mock("@/features/inbox/hooks/use-inbox-deliveries", () => ({
         presentedAt: "2026-08-06T00:01:00.000Z",
         readAt: null,
         archivedAt: null,
-      }],
+      })),
     },
   }),
 }));
@@ -58,7 +60,9 @@ describe("InboxReaderDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mocks.contentType = "markdown";
+    mocks.deliveryCount = 1;
     mocks.prepareChatReference.mockResolvedValue({
+      targetSessionKey: null,
       reference: {
         uri: "nextclaw://objects/inbox-delivery/delivery-1",
         label: "A considered report",
@@ -110,9 +114,45 @@ describe("InboxReaderDialog", () => {
     });
     expect(mocks.prepareChatReference).toHaveBeenCalledWith("delivery-1");
     expect(mocks.requestSystemObjectReference).toHaveBeenCalledWith(
-      expect.objectContaining({ uri: "nextclaw://objects/inbox-delivery/delivery-1" }),
+      { targetSessionKey: null, reference: expect.objectContaining({ uri: "nextclaw://objects/inbox-delivery/delivery-1" }) },
     );
   });
+
+  it("keeps every reader action accessible and opens the current report in Inbox", async () => {
+    render(<MemoryRouter><InboxReaderDialog /><CurrentPath /></MemoryRouter>);
+    for (const key of ["inboxReadLater", "inboxMarkRead", "inboxOpenInbox", "inboxContinueChat"] as const) {
+      expect(screen.getByRole("button", { name: t(key) })).toBeTruthy();
+    }
+    fireEvent.click(screen.getByRole("button", { name: t("inboxOpenInbox") }));
+    await waitFor(() => expect(screen.getByTestId("current-path").textContent).toBe("/inbox/delivery-1"));
+    expect(mocks.markRead).toHaveBeenCalledWith("delivery-1");
+    expect(mocks.closeReader).toHaveBeenCalled();
+  });
+
+  it("returns to the report source instead of consuming the reference in the current session", async () => {
+    const reference = { uri: "nextclaw://objects/inbox-delivery/delivery-1", label: "A considered report" };
+    mocks.prepareChatReference.mockResolvedValue({ reference, targetSessionKey: "source-session" });
+    render(<MemoryRouter initialEntries={[buildSessionPath("other-session")]}><InboxReaderDialog /><CurrentPath /></MemoryRouter>);
+    fireEvent.click(screen.getByRole("button", { name: t("inboxContinueChat") }));
+    await waitFor(() => expect(screen.getByTestId("current-path").textContent).toBe(buildSessionPath("source-session")));
+    expect(mocks.requestSystemObjectReference).toHaveBeenCalledWith({ targetSessionKey: "source-session", reference });
+  });
+
+  it("closes through the shared icon action", () => {
+    render(<MemoryRouter><InboxReaderDialog /></MemoryRouter>);
+    fireEvent.click(screen.getByRole("button", { name: t("close") }));
+    expect(mocks.closeReader).toHaveBeenCalledOnce();
+  });
+
+  it("navigates multiple reports without triggering the adjacent close action", async () => {
+    mocks.deliveryCount = 2;
+    render(<MemoryRouter><InboxReaderDialog /></MemoryRouter>);
+    expect((screen.getByRole("button", { name: t("inboxPrevious") }) as HTMLButtonElement).disabled).toBe(true);
+    fireEvent.click(screen.getByRole("button", { name: t("inboxNext") }));
+    await waitFor(() => expect(mocks.selectInReader).toHaveBeenCalledWith("delivery-2"));
+    expect(mocks.closeReader).not.toHaveBeenCalled();
+    expect(screen.getAllByRole("button", { name: t("close") })).toHaveLength(1);
+  });
 });
 
 // Resource policy has separate integration coverage; keep this fixture scoped to its business UI.