@nextclaw/ui 0.26.5 → 0.27.1

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

@@ -11,7 +11,9 @@ import {
 
 import { PageHeader, PageLayout } from "@/app/components/layout/page-layout";
 import { usePresenter } from "@/features/chat";
-import { CronJobDetailDialog } from "@/features/cron/components/cron-job-detail-dialog";
+import { useAppPresenter } from "@/app/components/app-presenter-provider";
+import { useNavigate } from "react-router-dom";
+import { pageResourceFromSystemObject } from "@/features/right-panel-resources";
 import { CronJobRow } from "@/features/cron/components/cron-job-row";
 import {
   CronTaskComposer,
@@ -146,12 +148,13 @@ function CronPagination({
 }
 
 export function CronConfig() {
+  const app = useAppPresenter();
+  const navigate = useNavigate();
   const [composerPrompt, setComposerPrompt] = useState("");
   const [query, setQuery] = useState("");
   const [status, setStatus] = useState<CronListStatus>("all");
   const [page, setPage] = useState(0);
   const [expandedJobId, setExpandedJobId] = useState<string | null>(null);
-  const [selectedJobId, setSelectedJobId] = useState<string | null>(null);
   const deferredQuery = useDeferredValue(query.trim());
   const composerRef = useRef<HTMLInputElement>(null);
   const presenter = usePresenter();
@@ -166,7 +169,6 @@ export function CronConfig() {
   const jobs = cronQuery.data?.jobs ?? [];
   const total = cronQuery.data?.total ?? 0;
   const summary = cronQuery.data?.summary;
-  const selectedJob = jobs.find((job) => job.id === selectedJobId) ?? null;
 
   const startDraftConversation = () => {
     const prompt = composerPrompt.trim();
@@ -185,7 +187,6 @@ export function CronConfig() {
   const handleDelete = (job: CronJobView) => {
     void cronActions.deleteJob(job, () => {
       setExpandedJobId(null);
-      setSelectedJobId(null);
       if (jobs.length === 1 && page > 0) {
         setPage(page - 1);
       }
@@ -333,7 +334,7 @@ export function CronConfig() {
                       expanded={expandedJobId === job.id}
                       job={job}
                       onDelete={handleDelete}
-                      onEdit={(item) => setSelectedJobId(item.id)}
+                      onEdit={(item) => app.pageResourceManager.open(pageResourceFromSystemObject("cron-job", item.id, item.name || item.id), "default", navigate)}
                       onRun={handleRun}
                       onToggleExpanded={handleToggleExpanded}
                       onToggle={handleToggle}
@@ -409,18 +410,6 @@ export function CronConfig() {
         </>
       )}
 
-      <CronJobDetailDialog
-        job={selectedJob}
-        open={Boolean(selectedJob)}
-        onOpenChange={(open) => {
-          if (!open) {
-            setSelectedJobId(null);
-          }
-        }}
-        onDelete={handleDelete}
-        onRun={handleRun}
-        onToggle={handleToggle}
-      />
       <cronActions.ConfirmDialog />
     </PageLayout>
   );

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

@@ -43,6 +43,7 @@ function DetailRow({
 }
 
 type CronJobDetailDialogProps = {
+  readonly embedded?: boolean;
   readonly job: CronJobView | null;
   readonly open: boolean;
   readonly onDelete: (job: CronJobView) => void;
@@ -52,6 +53,7 @@ type CronJobDetailDialogProps = {
 };
 
 export function CronJobDetailDialog({
+  embedded = false,
   job,
   open,
   onDelete,
@@ -74,13 +76,8 @@ export function CronJobDetailDialog({
       )
     : t("cronNeverRun");
 
-  return (
-    <Sheet open={open} onOpenChange={onOpenChange}>
-      <SheetContent
-        side="right"
-        closeLabel={t("cronCloseDetails")}
-        className="flex w-full flex-col overflow-hidden p-0 sm:max-w-[510px]"
-      >
+  const content = (
+    <>
         <SheetHeader className="shrink-0 border-b border-border/60 px-5 pb-5 pt-6 pr-14 sm:px-7 sm:pt-7">
           <div className="mb-1 flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
             <span>{describeCronSchedule(job)}</span>
@@ -232,7 +229,11 @@ export function CronJobDetailDialog({
             {t("cronRunNow")}
           </Button>
         </SheetFooter>
-      </SheetContent>
-    </Sheet>
+    </>
   );
+  return <Sheet open={!embedded && open} onOpenChange={onOpenChange}>
+    {embedded ? <div className="flex h-full min-h-0 flex-col" data-testid="cron-job-detail">{content}</div> : (
+      <SheetContent side="right" closeLabel={t("cronCloseDetails")} className="flex w-full flex-col overflow-hidden p-0 sm:max-w-[510px]">{content}</SheetContent>
+    )}
+  </Sheet>;
 }

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

@@ -0,0 +1,51 @@
+import { CronJobDetailDialog } from "./cron-job-detail-dialog";
+import { useCronJobs } from "@/features/cron/hooks/use-cron-jobs";
+import { useCronJobActions } from "@/features/cron/hooks/use-cron-job-actions";
+import { t } from "@/shared/lib/i18n";
+
+export function CronJobResource({ jobId }: { jobId: string }) {
+  const query = useCronJobs({ all: true });
+  const actions = useCronJobActions();
+  const job = query.data?.jobs.find((item) => item.id === jobId);
+  if (query.isPending)
+    return (
+      <p role="status" className="p-4">
+        {t("loading")}
+      </p>
+    );
+  if (query.isError)
+    return (
+      <div className="p-4">
+        <p role="alert">{t("resourceLoadFailed")}</p>
+        <button onClick={() => void query.refetch()}>
+          {t("resourceRetry")}
+        </button>
+      </div>
+    );
+  if (!job)
+    return (
+      <p role="alert" className="p-4">
+        {t("resourceNotFound")}
+      </p>
+    );
+  return (
+    <>
+      <CronJobDetailDialog
+        embedded
+        job={job}
+        open
+        onOpenChange={() => {}}
+        onDelete={(value) => {
+          void actions.deleteJob(value);
+        }}
+        onRun={(value) => {
+          void actions.runJob(value);
+        }}
+        onToggle={(value, enabled) => {
+          void actions.toggleJob(value, enabled);
+        }}
+      />
+      <actions.ConfirmDialog />
+    </>
+  );
+}

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/cron/index.ts

@@ -1,4 +1,5 @@
 export { CronConfig } from "./components/cron-config";
+export { CronJobResource } from "./components/cron-job-resource";
 export { CronJobDetailDialog } from "./components/cron-job-detail-dialog";
 export { useCronJobActions } from "./hooks/use-cron-job-actions";
 export {

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.

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

@@ -4,7 +4,8 @@ import { useRef, useState } from "react";
 import { ChevronLeft, ChevronRight, Inbox } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { useAppPresenter } from "@/app/components/app-presenter-provider";
-import { CHAT_DRAFT_SESSION_PATH } from "@/features/chat";
+import { useViewportLayout } from "@/app/hooks/use-viewport-layout";
+import { buildSessionPath, CHAT_DRAFT_SESSION_PATH } from "@/features/chat";
 import { InboxDeliveryContent } from "@/features/inbox/components/inbox-delivery-content";
 import { useInboxDeliveries } from "@/features/inbox/hooks/use-inbox-deliveries";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
@@ -13,6 +14,7 @@ import {
   Dialog,
   DialogContent,
   DialogDescription,
+  DialogHeader,
   DialogTitle,
 } from "@/shared/components/ui/dialog";
 import { IconActionButton } from "@/shared/components/ui/actions/icon-action-button";
@@ -28,7 +30,8 @@ function formatPosition(current: number, total: number): string {
 export function InboxReaderDialog() {
   const titleRef = useRef<HTMLHeadingElement>(null);
   const navigate = useNavigate();
-  const { chatDraftIntentManager, inboxManager } = useAppPresenter();
+  const { chatComposerIntentManager, docBrowserManager, inboxManager } = useAppPresenter();
+  const { isMobile } = useViewportLayout();
   const { data } = useInboxDeliveries();
   const { activeDeliveryId, readerOpen } = useInboxStore((state) => state.snapshot);
   const [pendingAction, setPendingAction] = useState<string | null>(null);
@@ -77,9 +80,10 @@ export function InboxReaderDialog() {
       return;
     }
     void runAction("continue", async () => {
-      const { reference } = await inboxManager.prepareChatReference(activeDelivery.id);
-      chatDraftIntentManager.requestSystemObjectReference(reference);
-      navigate(CHAT_DRAFT_SESSION_PATH);
+      const { reference, targetSessionKey } = await inboxManager.prepareChatReference(activeDelivery.id);
+      chatComposerIntentManager.requestSystemObjectReference({ targetSessionKey, reference });
+      if (isMobile) docBrowserManager.close();
+      navigate(targetSessionKey ? buildSessionPath(targetSessionKey) : CHAT_DRAFT_SESSION_PATH);
     });
   };
 
@@ -96,15 +100,18 @@ export function InboxReaderDialog() {
   const positionControls = unreadDeliveries.length > 1 ? (
     <div className="flex shrink-0 items-center gap-1 pr-1">
       <span className="mr-1 text-[11px] tabular-nums text-muted-foreground">
-        {formatPosition(activeIndex + 1, unreadDeliveries.length)}
+        <span className="hidden md:inline">{formatPosition(activeIndex + 1, unreadDeliveries.length)}</span>
+        <span className="md:hidden" aria-label={formatPosition(activeIndex + 1, unreadDeliveries.length)}>{activeIndex + 1}/{unreadDeliveries.length}</span>
       </span>
       <IconActionButton
+        size="sm"
         icon={<ChevronLeft className="h-4 w-4" />}
         label={t("inboxPrevious")}
         disabled={activeIndex <= 0 || pendingAction === "select"}
         onClick={() => selectAt(activeIndex - 1)}
       />
       <IconActionButton
+        size="sm"
         icon={<ChevronRight className="h-4 w-4" />}
         label={t("inboxNext")}
         disabled={activeIndex >= unreadDeliveries.length - 1 || pendingAction === "select"}
@@ -123,7 +130,7 @@ export function InboxReaderDialog() {
       }}
     >
       <DialogContent
-        className="flex h-[min(82vh,760px)] w-[calc(100vw-2rem)] max-w-[820px] flex-col gap-0 overflow-hidden rounded-[24px] border-border/70 bg-background p-0 shadow-[0_20px_55px_-22px_rgba(15,23,42,0.32)] max-sm:h-[100dvh] max-sm:max-h-none max-sm:w-screen max-sm:rounded-none max-sm:border-0"
+        className="flex h-[min(82vh,760px)] w-[calc(100vw-2rem)] max-w-[820px] flex-col gap-0 overflow-hidden rounded-[24px] border-border/70 bg-background p-0 shadow-[0_20px_55px_-22px_rgba(15,23,42,0.32)] max-md:h-[100dvh] max-md:max-h-[100dvh] max-md:w-screen max-md:max-w-none max-md:rounded-none max-md:border-0 max-md:pt-[env(safe-area-inset-top,0px)] max-md:pb-[env(safe-area-inset-bottom,0px)]"
         onOpenAutoFocus={(event) => {
           event.preventDefault();
           titleRef.current?.focus();
@@ -131,10 +138,15 @@ export function InboxReaderDialog() {
       >
         {activeDelivery ? (
           <>
-            <header className="shrink-0 border-b border-border/50 px-5 py-3 pr-14 sm:px-6">
-              <div className="flex min-h-7 items-center justify-between gap-3">
+            <DialogHeader
+              className="items-center gap-1 border-b border-border/50 px-3 py-2 md:gap-3 md:px-6 md:py-3"
+              actions={<>
+                {positionControls}
+                <PageResourceActionsMenu page={pageResourceFromSystemObject("inbox-delivery", activeDelivery.id, activeDelivery.title)} />
+              </>}
+            >
                 <div className="flex min-w-0 items-center gap-2">
-                  <span className="flex h-7 w-7 shrink-0 items-center justify-center rounded-lg bg-muted/70 text-muted-foreground">
+                  <span className="hidden h-7 w-7 shrink-0 items-center justify-center rounded-lg bg-muted/70 text-muted-foreground md:flex">
                     <Inbox className="h-3.5 w-3.5" />
                   </span>
                   <DialogTitle
@@ -145,29 +157,24 @@ export function InboxReaderDialog() {
                   >
                     {activeDelivery.title}
                   </DialogTitle>
-                  <span className="hidden shrink-0 text-muted-foreground sm:inline" aria-hidden="true">·</span>
+                  <span className="hidden shrink-0 text-muted-foreground md:inline" aria-hidden="true">·</span>
                   <time
-                    className="hidden shrink-0 text-[11px] tabular-nums text-muted-foreground sm:block"
+                    className="hidden shrink-0 text-[11px] tabular-nums text-muted-foreground md:block"
                     dateTime={activeDelivery.createdAt}
                   >
                     {formatDateTime(activeDelivery.createdAt)}
                   </time>
                 </div>
-                <div className="flex shrink-0 items-center gap-1">
-                  {positionControls}
-                  <PageResourceActionsMenu page={pageResourceFromSystemObject("inbox-delivery", activeDelivery.id, activeDelivery.title)} />
-                </div>
-              </div>
               <DialogDescription className="sr-only">
                 {activeDelivery.summary ?? t("inboxNoSummary")}
               </DialogDescription>
-            </header>
+            </DialogHeader>
 
             <div className={cn(
               "min-h-0 flex-1",
               isHtml
-                ? "p-3 sm:p-4"
-                : "custom-scrollbar overflow-y-auto px-6 py-5 sm:px-8 sm:py-6",
+                ? "p-0 md:p-4"
+                : "custom-scrollbar overflow-y-auto overscroll-contain px-4 py-3 md:px-8 md:py-6",
             )}>
               <InboxDeliveryContent
                 className={isHtml ? "h-full" : undefined}
@@ -178,24 +185,26 @@ export function InboxReaderDialog() {
               />
             </div>
 
-            <footer className="shrink-0 border-t border-border/50 bg-background px-5 py-3 sm:px-6">
+            <footer className="shrink-0 border-t border-border/50 bg-background px-3 py-2 md:px-6 md:py-3">
               {error ? (
                 <p role="alert" className="mb-3 text-sm text-destructive">{error}</p>
               ) : null}
-              <div className="flex flex-col-reverse gap-2 sm:flex-row sm:items-center sm:justify-between">
-                <div className="flex flex-col-reverse gap-1 sm:flex-row sm:flex-wrap">
-                  <Button size="sm" variant="ghost" onClick={inboxManager.closeReader}>
+              <div className="flex items-center justify-between gap-2 [--control-touch-size:2rem]">
+                <div className="flex items-center gap-1">
+                  <Button size="sm" className="px-2 md:px-3" variant="ghost" onClick={inboxManager.closeReader}>
                     {t("inboxReadLater")}
                   </Button>
-                  <Button size="sm" variant="outline" disabled={pendingAction !== null} onClick={markRead}>
+                  <Button size="sm" className="px-2 md:px-3" variant="outline" disabled={pendingAction !== null} onClick={markRead}>
                     {t("inboxMarkRead")}
                   </Button>
-                  <Button size="sm" variant="ghost" disabled={pendingAction !== null} onClick={openInbox}>
-                    {t("inboxOpenInbox")}
+                  <Button size="sm" className="px-2 md:px-3" variant="ghost" aria-label={t("inboxOpenInbox")} disabled={pendingAction !== null} onClick={openInbox}>
+                    <span className="md:hidden">{t("inboxTitle")}</span>
+                    <span className="hidden md:inline">{t("inboxOpenInbox")}</span>
                   </Button>
                 </div>
-                <Button size="sm" disabled={pendingAction !== null} onClick={continueInChat}>
-                  {t("inboxContinueChat")}
+                <Button size="sm" className="px-2 md:px-3" aria-label={t("inboxContinueChat")} disabled={pendingAction !== null} onClick={continueInChat}>
+                  <span className="md:hidden">{t("inboxContinueChatCompact")}</span>
+                  <span className="hidden md:inline">{t("inboxContinueChat")}</span>
                 </Button>
               </div>
             </footer>

package/src/features/inbox/managers/inbox.manager.test.ts

@@ -1,10 +1,13 @@
 import { QueryClient } from "@tanstack/react-query";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { InboxDelivery } from "@nextclaw/shared";
+import { NextClawClientError } from "@nextclaw/client-sdk";
 import { InboxManager } from "@/features/inbox/managers/inbox.manager";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 
 const mocks = vi.hoisted(() => ({
+  getDelivery: vi.fn(),
+  getSession: vi.fn(),
   delete: vi.fn(),
   resolveReference: vi.fn(),
   list: vi.fn(),
@@ -16,6 +19,7 @@ vi.mock("@/shared/lib/api", () => ({
   nextclawClient: {
     eventBus: { on: mocks.on },
     inboxDeliveries: {
+      get: mocks.getDelivery,
       delete: mocks.delete,
       list: mocks.list,
       updateState: mocks.updateState,
@@ -23,6 +27,7 @@ vi.mock("@/shared/lib/api", () => ({
     systemObjectReferences: {
       resolve: mocks.resolveReference,
     },
+    sessions: { get: mocks.getSession },
   },
 }));
 
@@ -43,6 +48,8 @@ const delivery: InboxDelivery = {
 describe("InboxManager", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    mocks.getDelivery.mockResolvedValue(delivery);
+    mocks.getSession.mockResolvedValue({ sessionId: "source-session" });
     Object.defineProperty(document, "visibilityState", { configurable: true, value: "visible" });
     useInboxStore.setState({
       snapshot: { readerOpen: false, activeDeliveryId: null },
@@ -107,5 +114,26 @@ describe("InboxManager", () => {
     );
     expect(mocks.updateState).toHaveBeenCalledWith(delivery.id, "read");
     expect(result.reference.assetUri).toBe("asset://store/report");
+    expect(result.targetSessionKey).toBeNull();
+  });
+
+  it("targets the original report session", async () => {
+    mocks.getDelivery.mockResolvedValue({ ...delivery, source: { ...delivery.source, sessionId: "source-session" } });
+    const result = await new InboxManager(new QueryClient()).prepareChatReference(delivery.id);
+    expect(mocks.getSession).toHaveBeenCalledWith("source-session");
+    expect(result.targetSessionKey).toBe("source-session");
+  });
+
+  it("falls back to a draft only when the source session was deleted", async () => {
+    mocks.getDelivery.mockResolvedValue({ ...delivery, source: { ...delivery.source, sessionId: "deleted" } });
+    mocks.getSession.mockRejectedValueOnce(new NextClawClientError({ message: "Missing", status: 404 }));
+    expect((await new InboxManager(new QueryClient()).prepareChatReference(delivery.id)).targetSessionKey).toBeNull();
+  });
+
+  it("keeps the report unread when the source session lookup fails", async () => {
+    mocks.getDelivery.mockResolvedValue({ ...delivery, source: { ...delivery.source, sessionId: "source-session" } });
+    mocks.getSession.mockRejectedValueOnce(new NextClawClientError({ message: "Offline", status: 503 }));
+    await expect(new InboxManager(new QueryClient()).prepareChatReference(delivery.id)).rejects.toThrow("Offline");
+    expect(mocks.updateState).not.toHaveBeenCalled();
   });
 });

package/src/features/inbox/managers/inbox.manager.ts

@@ -13,6 +13,7 @@ import {
 import { appQueryClient } from "@/app-query-client";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 import { nextclawClient } from "@/shared/lib/api";
+import { NextClawClientError } from "@nextclaw/client-sdk";
 
 export const INBOX_DELIVERIES_QUERY_KEY = ["inbox-deliveries"] as const;
 
@@ -112,13 +113,26 @@ export class InboxManager {
   prepareChatReference = async (deliveryId: string): Promise<{
     delivery: InboxDelivery;
     reference: SystemObjectResolvedReference;
+    targetSessionKey: string | null;
   }> => {
-    const reference = await nextclawClient.systemObjectReferences.resolve(
-      createSystemObjectReferenceUri(SYSTEM_OBJECT_TYPE_INBOX_DELIVERY, deliveryId),
-    );
+    const [reference, sourceDelivery] = await Promise.all([
+      nextclawClient.systemObjectReferences.resolve(
+        createSystemObjectReferenceUri(SYSTEM_OBJECT_TYPE_INBOX_DELIVERY, deliveryId),
+      ),
+      nextclawClient.inboxDeliveries.get(deliveryId),
+    ]);
+    let targetSessionKey = sourceDelivery.source.sessionId?.trim() || null;
+    if (targetSessionKey) {
+      try {
+        await nextclawClient.sessions.get(targetSessionKey);
+      } catch (error) {
+        if (!(error instanceof NextClawClientError) || error.status !== 404) throw error;
+        targetSessionKey = null;
+      }
+    }
     const delivery = await this.updateState(deliveryId, "read");
     this.closeReader();
-    return { delivery, reference };
+    return { delivery, reference, targetSessionKey };
   };
 
   private updateState = async (

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

@@ -14,7 +14,8 @@ const mocks = vi.hoisted(() => ({
 
 vi.mock("@/app/components/app-presenter-provider", () => ({
   useAppPresenter: () => ({
-    chatDraftIntentManager: {
+    docBrowserManager: { close: vi.fn() },
+    chatComposerIntentManager: {
       requestSystemObjectReference: mocks.requestSystemObjectReference,
     },
     inboxManager: {
@@ -104,6 +105,7 @@ describe("InboxPage", () => {
     vi.clearAllMocks();
     mocks.isMobile = false;
     mocks.prepareChatReference.mockResolvedValue({
+      targetSessionKey: null,
       reference: {
         uri: "nextclaw://objects/inbox-delivery/delivery-1",
         label: "A considered report",
@@ -150,7 +152,7 @@ describe("InboxPage", () => {
     });
     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" }) },
     );
   });
 });