@nextclaw/ui 0.15.24 → 0.15.26

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

@@ -1,22 +1,17 @@
 import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
 import type { NcpMessage } from '@nextclaw/ncp';
-import type {
-  ChatContentParams,
-  ChatFileOperationLineViewModel,
-  ChatFilePreviewViewer,
-} from '@nextclaw/agent-chat-ui';
-import type {
-  SessionContextWindowView,
-  SessionTypeIconView
-} from '@/shared/lib/api';
+import type { ChatContentParams, ChatFileOperationLineViewModel, ChatFilePreviewViewer } from '@nextclaw/agent-chat-ui';
+import type { SessionContextWindowView, SessionTypeIconView } from '@/shared/lib/api';
 import {
   normalizePersistedWorkspaceFileTab,
   retainWorkspaceFileTabs,
   toPersistedWorkspaceFileTab,
 } from '@/features/chat/features/workspace/utils/chat-workspace-file-tab-persistence.utils';
 import {
+  CHAT_WORKSPACE_EXPLORER_DEFAULT_WIDTH,
   CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
+  normalizeChatWorkspaceExplorerWidth,
   normalizeChatWorkspacePanelWidth,
 } from '@/features/chat/features/workspace/utils/chat-workspace-panel-layout.utils';
 import { createWorkspaceNavigationEntryFromSnapshot } from '@/features/chat/features/workspace/utils/chat-thread-workspace-session.utils';
@@ -100,6 +95,8 @@ export type ChatThreadSnapshot = {
   closedWorkspaceTabEntries: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistory: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistoryIndex: number;
+  workspaceExplorerOpen: boolean;
+  workspaceExplorerWidth: number;
   workspacePanelWidth: number;
   contextWindow?: SessionContextWindowView | null;
 };
@@ -123,6 +120,8 @@ type PersistedChatThreadStore = {
     closedWorkspaceTabEntries?: unknown;
     workspaceNavigationHistory?: unknown;
     workspaceNavigationHistoryIndex?: unknown;
+    workspaceExplorerOpen?: unknown;
+    workspaceExplorerWidth?: unknown;
     workspacePanelWidth?: unknown;
   };
 };
@@ -137,6 +136,8 @@ type PersistedChatWorkspaceSnapshot = Pick<
   | 'closedWorkspaceTabEntries'
   | 'workspaceNavigationHistory'
   | 'workspaceNavigationHistoryIndex'
+  | 'workspaceExplorerOpen'
+  | 'workspaceExplorerWidth'
   | 'workspacePanelWidth'
 >;
 
@@ -169,8 +170,10 @@ const initialSnapshot: ChatThreadSnapshot = {
   closedWorkspaceTabEntries: [],
   workspaceNavigationHistory: [],
   workspaceNavigationHistoryIndex: 0,
+  workspaceExplorerOpen: false,
+  workspaceExplorerWidth: CHAT_WORKSPACE_EXPLORER_DEFAULT_WIDTH,
   workspacePanelWidth: CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
-  contextWindow: null
+  contextWindow: null,
 };
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -178,20 +181,14 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 function normalizeOptionalString(value: unknown): string | null {
-  return typeof value === 'string' && value.trim().length > 0
-    ? value.trim()
-    : null;
+  return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null;
 }
 
 function normalizeHistoryIndex(value: unknown, maxIndex: number): number {
-  return typeof value === 'number' && Number.isInteger(value)
-    ? Math.min(Math.max(0, value), maxIndex)
-    : maxIndex;
+  return typeof value === 'number' && Number.isInteger(value) ? Math.min(Math.max(0, value), maxIndex) : maxIndex;
 }
 
-function isWorkspacePanelKind(
-  value: unknown,
-): value is PersistedWorkspacePanelKind {
+function isWorkspacePanelKind(value: unknown): value is PersistedWorkspacePanelKind {
   return (
     value === 'overview' ||
     value === 'child-sessions' ||
@@ -202,9 +199,7 @@ function isWorkspacePanelKind(
   );
 }
 
-function normalizePersistedWorkspaceNavigationEntry(
-  value: unknown,
-): ChatWorkspaceNavigationEntry | null {
+function normalizePersistedWorkspaceNavigationEntry(value: unknown): ChatWorkspaceNavigationEntry | null {
   if (!isRecord(value)) {
     return null;
   }
@@ -226,9 +221,7 @@ function normalizePersistedWorkspaceNavigationEntry(
   };
 }
 
-function normalizePersistedWorkspaceSnapshot(
-  value: unknown,
-): PersistedChatWorkspaceSnapshot | null {
+function normalizePersistedWorkspaceSnapshot(value: unknown): PersistedChatWorkspaceSnapshot | null {
   if (!isRecord(value)) {
     return null;
   }
@@ -236,35 +229,29 @@ function normalizePersistedWorkspaceSnapshot(
   const activeWorkspaceFileKey = normalizeOptionalString(value.activeWorkspaceFileKey);
   const normalizedWorkspaceFileTabs = Array.isArray(value.workspaceFileTabs)
     ? value.workspaceFileTabs
-      .map(normalizePersistedWorkspaceFileTab)
-      .filter((tab): tab is ChatWorkspaceFileTab => tab !== null)
+        .map(normalizePersistedWorkspaceFileTab)
+        .filter((tab): tab is ChatWorkspaceFileTab => tab !== null)
     : [];
   const workspaceFileTabs = retainWorkspaceFileTabs(
     normalizedWorkspaceFileTabs,
     activeWorkspaceFileKey,
     CHAT_THREAD_MAX_PERSISTED_WORKSPACE_FILE_TABS,
   );
-  const sessionWorkspaceFileTabs = workspaceFileTabs.filter(
-    (tab) => tab.parentSessionKey === workspacePanelParentKey,
-  );
+  const sessionWorkspaceFileTabs = workspaceFileTabs.filter((tab) => tab.parentSessionKey === workspacePanelParentKey);
   const resolvedActiveWorkspaceFileKey =
     activeWorkspaceFileKey && sessionWorkspaceFileTabs.some((tab) => tab.key === activeWorkspaceFileKey)
       ? activeWorkspaceFileKey
-      : sessionWorkspaceFileTabs[0]?.key ?? null;
+      : (sessionWorkspaceFileTabs[0]?.key ?? null);
   const activeWorkspacePanelKind = isWorkspacePanelKind(value.activeWorkspacePanelKind)
     ? value.activeWorkspacePanelKind
     : null;
   const resolvedActiveWorkspacePanelKind =
-    activeWorkspacePanelKind === 'file' && !resolvedActiveWorkspaceFileKey
-      ? null
-      : activeWorkspacePanelKind;
+    activeWorkspacePanelKind === 'file' && !resolvedActiveWorkspaceFileKey ? null : activeWorkspacePanelKind;
   const activeChildSessionKey = normalizeOptionalString(value.activeChildSessionKey);
   const closedWorkspaceTabEntries = Array.isArray(value.closedWorkspaceTabEntries)
     ? value.closedWorkspaceTabEntries
-      .map(normalizePersistedWorkspaceNavigationEntry)
-      .filter((entry): entry is ChatWorkspaceNavigationEntry =>
-        entry !== null && entry.kind !== 'overview',
-      )
+        .map(normalizePersistedWorkspaceNavigationEntry)
+        .filter((entry): entry is ChatWorkspaceNavigationEntry => entry !== null && entry.kind !== 'overview')
     : [];
   const fallbackHistoryEntry = createWorkspaceNavigationEntryFromSnapshot({
     activeWorkspacePanelKind: resolvedActiveWorkspacePanelKind,
@@ -274,11 +261,9 @@ function normalizePersistedWorkspaceSnapshot(
   });
   const normalizedNavigationHistory = Array.isArray(value.workspaceNavigationHistory)
     ? value.workspaceNavigationHistory
-      .map(normalizePersistedWorkspaceNavigationEntry)
-      .filter((entry): entry is ChatWorkspaceNavigationEntry => entry !== null)
-      .filter((entry) =>
-        entry.kind !== 'file' || workspaceFileTabs.some((tab) => tab.key === entry.key),
-      )
+        .map(normalizePersistedWorkspaceNavigationEntry)
+        .filter((entry): entry is ChatWorkspaceNavigationEntry => entry !== null)
+        .filter((entry) => entry.kind !== 'file' || workspaceFileTabs.some((tab) => tab.key === entry.key))
     : [];
   const workspaceNavigationHistory =
     normalizedNavigationHistory.length > 0
@@ -288,10 +273,7 @@ function normalizePersistedWorkspaceSnapshot(
         : [];
   const workspaceNavigationHistoryIndex =
     workspaceNavigationHistory.length > 0
-      ? normalizeHistoryIndex(
-        value.workspaceNavigationHistoryIndex,
-        workspaceNavigationHistory.length - 1,
-      )
+      ? normalizeHistoryIndex(value.workspaceNavigationHistoryIndex, workspaceNavigationHistory.length - 1)
       : 0;
 
   return {
@@ -303,9 +285,9 @@ function normalizePersistedWorkspaceSnapshot(
     closedWorkspaceTabEntries,
     workspaceNavigationHistory,
     workspaceNavigationHistoryIndex,
-    workspacePanelWidth: normalizeChatWorkspacePanelWidth(
-      value.workspacePanelWidth,
-    ),
+    workspaceExplorerOpen: value.workspaceExplorerOpen === true,
+    workspaceExplorerWidth: normalizeChatWorkspaceExplorerWidth(value.workspaceExplorerWidth),
+    workspacePanelWidth: normalizeChatWorkspacePanelWidth(value.workspacePanelWidth),
   };
 }
 
@@ -317,23 +299,21 @@ export const useChatThreadStore = create<ChatThreadStore>()(
         set((state) => ({
           snapshot: {
             ...state.snapshot,
-            ...patch
-          }
-        }))
+            ...patch,
+          },
+        })),
     }),
     {
       name: CHAT_THREAD_WORKSPACE_STORAGE_KEY,
       version: CHAT_THREAD_WORKSPACE_STORAGE_VERSION,
       storage: createJSONStorage(() => window.localStorage),
       partialize: (state): PersistedChatThreadStore => {
-        const workspaceNavigationHistory = state.snapshot.workspaceNavigationHistory
-          .filter((entry) => entry.kind !== 'side-chat-draft');
+        const workspaceNavigationHistory = state.snapshot.workspaceNavigationHistory.filter(
+          (entry) => entry.kind !== 'side-chat-draft',
+        );
         const workspaceNavigationHistoryIndex =
           workspaceNavigationHistory.length > 0
-            ? Math.min(
-              state.snapshot.workspaceNavigationHistoryIndex,
-              workspaceNavigationHistory.length - 1,
-            )
+            ? Math.min(state.snapshot.workspaceNavigationHistoryIndex, workspaceNavigationHistory.length - 1)
             : 0;
         return {
           snapshot: {
@@ -347,23 +327,22 @@ export const useChatThreadStore = create<ChatThreadStore>()(
               state.snapshot.workspaceFileTabs,
               state.snapshot.activeWorkspaceFileKey,
               CHAT_THREAD_MAX_PERSISTED_WORKSPACE_FILE_TABS,
-            )
-              .map(toPersistedWorkspaceFileTab),
+            ).map(toPersistedWorkspaceFileTab),
             activeWorkspaceFileKey: state.snapshot.activeWorkspaceFileKey,
-            closedWorkspaceTabEntries: state.snapshot.closedWorkspaceTabEntries
-              .filter((entry) => entry.kind !== 'overview' && entry.kind !== 'side-chat-draft'),
+            closedWorkspaceTabEntries: state.snapshot.closedWorkspaceTabEntries.filter(
+              (entry) => entry.kind !== 'overview' && entry.kind !== 'side-chat-draft',
+            ),
             workspaceNavigationHistory,
             workspaceNavigationHistoryIndex,
+            workspaceExplorerOpen: state.snapshot.workspaceExplorerOpen,
+            workspaceExplorerWidth: state.snapshot.workspaceExplorerWidth,
             workspacePanelWidth: state.snapshot.workspacePanelWidth,
-          }
+          },
         };
       },
       merge: (persistedState, currentState) => {
-        const persistedSnapshot = isRecord(persistedState)
-          ? persistedState.snapshot
-          : null;
-        const workspaceSnapshot =
-          normalizePersistedWorkspaceSnapshot(persistedSnapshot);
+        const persistedSnapshot = isRecord(persistedState) ? persistedState.snapshot : null;
+        const workspaceSnapshot = normalizePersistedWorkspaceSnapshot(persistedSnapshot);
         if (!workspaceSnapshot) {
           return currentState;
         }
@@ -371,10 +350,10 @@ export const useChatThreadStore = create<ChatThreadStore>()(
           ...currentState,
           snapshot: {
             ...currentState.snapshot,
-            ...workspaceSnapshot
-          }
+            ...workspaceSnapshot,
+          },
         };
-      }
-    }
-  )
+      },
+    },
+  ),
 );

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

@@ -1,6 +1,7 @@
-import { render, screen } from "@testing-library/react";
-import { MemoryRouter } from "react-router-dom";
+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 { InboxReaderDialog } from "@/features/inbox/components/inbox-reader-dialog";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 import { t } from "@/shared/lib/i18n";
@@ -8,13 +9,17 @@ import { t } from "@/shared/lib/i18n";
 const mocks = vi.hoisted(() => ({
   closeReader: vi.fn(),
   contentType: "markdown",
-  continueInChat: vi.fn(),
+  prepareChatReference: vi.fn(),
+  requestSystemObjectReference: vi.fn(),
   markRead: vi.fn(),
   selectInReader: vi.fn(),
 }));
 
 vi.mock("@/app/components/app-presenter-provider", () => ({
-  useAppPresenter: () => ({ inboxManager: mocks }),
+  useAppPresenter: () => ({
+    inboxManager: mocks,
+    chatDraftIntentManager: { requestSystemObjectReference: mocks.requestSystemObjectReference },
+  }),
 }));
 
 vi.mock("@/features/inbox/hooks/use-inbox-deliveries", () => ({
@@ -34,7 +39,6 @@ vi.mock("@/features/inbox/hooks/use-inbox-deliveries", () => ({
         presentedAt: "2026-08-06T00:01:00.000Z",
         readAt: null,
         archivedAt: null,
-        conversationSessionId: null,
       }],
     },
   }),
@@ -46,10 +50,20 @@ vi.mock("@nextclaw/agent-chat-ui", () => ({
   ),
 }));
 
+function CurrentPath() {
+  return <span data-testid="current-path">{useLocation().pathname}</span>;
+}
+
 describe("InboxReaderDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mocks.contentType = "markdown";
+    mocks.prepareChatReference.mockResolvedValue({
+      reference: {
+        uri: "nextclaw://objects/inbox-delivery/delivery-1",
+        label: "A considered report",
+      },
+    });
     useInboxStore.setState({
       snapshot: { readerOpen: true, activeDeliveryId: "delivery-1" },
     });
@@ -80,4 +94,23 @@ describe("InboxReaderDialog", () => {
       .find((element) => element.tagName === "IFRAME");
     expect(htmlPreview?.className).toContain("h-full");
   });
+
+  it("opens a draft with a visible system object reference intent", async () => {
+    render(
+      <MemoryRouter initialEntries={["/inbox"]}>
+        <InboxReaderDialog />
+        <CurrentPath />
+      </MemoryRouter>,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: t("inboxContinueChat") }));
+
+    await waitFor(() => {
+      expect(screen.getByTestId("current-path").textContent).toBe(CHAT_DRAFT_SESSION_PATH);
+    });
+    expect(mocks.prepareChatReference).toHaveBeenCalledWith("delivery-1");
+    expect(mocks.requestSystemObjectReference).toHaveBeenCalledWith(
+      expect.objectContaining({ uri: "nextclaw://objects/inbox-delivery/delivery-1" }),
+    );
+  });
 });

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

@@ -2,6 +2,7 @@ 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 { 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";
@@ -25,7 +26,7 @@ function formatPosition(current: number, total: number): string {
 export function InboxReaderDialog() {
   const titleRef = useRef<HTMLHeadingElement>(null);
   const navigate = useNavigate();
-  const { inboxManager } = useAppPresenter();
+  const { chatDraftIntentManager, inboxManager } = useAppPresenter();
   const { data } = useInboxDeliveries();
   const { activeDeliveryId, readerOpen } = useInboxStore((state) => state.snapshot);
   const [pendingAction, setPendingAction] = useState<string | null>(null);
@@ -74,8 +75,9 @@ export function InboxReaderDialog() {
       return;
     }
     void runAction("continue", async () => {
-      const result = await inboxManager.continueInChat(activeDelivery.id);
-      navigate(`/chat/${encodeURIComponent(result.sessionId)}`);
+      const { reference } = await inboxManager.prepareChatReference(activeDelivery.id);
+      chatDraftIntentManager.requestSystemObjectReference(reference);
+      navigate(CHAT_DRAFT_SESSION_PATH);
     });
   };
 

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

@@ -6,7 +6,7 @@ import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 
 const mocks = vi.hoisted(() => ({
   delete: vi.fn(),
-  continueInChat: vi.fn(),
+  resolveReference: vi.fn(),
   list: vi.fn(),
   on: vi.fn(() => vi.fn()),
   updateState: vi.fn(),
@@ -17,10 +17,12 @@ vi.mock("@/shared/lib/api", () => ({
     eventBus: { on: mocks.on },
     inboxDeliveries: {
       delete: mocks.delete,
-      continueInChat: mocks.continueInChat,
       list: mocks.list,
       updateState: mocks.updateState,
     },
+    systemObjectReferences: {
+      resolve: mocks.resolveReference,
+    },
   },
 }));
 
@@ -36,7 +38,6 @@ const delivery: InboxDelivery = {
   presentedAt: null,
   readAt: null,
   archivedAt: null,
-  conversationSessionId: null,
 };
 
 describe("InboxManager", () => {
@@ -57,6 +58,19 @@ describe("InboxManager", () => {
       presentedAt: action === "present" || action === "read" ? "2026-08-06T01:00:00.000Z" : null,
       readAt: action === "read" ? "2026-08-06T01:00:00.000Z" : null,
     }));
+    mocks.resolveReference.mockResolvedValue({
+      uri: "nextclaw://objects/inbox-delivery/delivery-1",
+      objectType: "inbox-delivery",
+      objectId: "delivery-1",
+      label: "Brief",
+      description: null,
+      updatedAt: delivery.updatedAt,
+      version: "version-1",
+      assetUri: "asset://store/report",
+      fileName: "brief.md",
+      mimeType: "text/markdown",
+      sizeBytes: 7,
+    });
   });
 
   it("auto-opens the oldest unpresented item and only marks it presented", async () => {
@@ -83,4 +97,15 @@ describe("InboxManager", () => {
     expect(mocks.updateState).toHaveBeenCalledTimes(1);
     expect(mocks.updateState).toHaveBeenCalledWith(delivery.id, "present");
   });
+
+  it("prepares a generic immutable report reference before marking it read", async () => {
+    const manager = new InboxManager(new QueryClient());
+    const result = await manager.prepareChatReference(delivery.id);
+
+    expect(mocks.resolveReference).toHaveBeenCalledWith(
+      "nextclaw://objects/inbox-delivery/delivery-1",
+    );
+    expect(mocks.updateState).toHaveBeenCalledWith(delivery.id, "read");
+    expect(result.reference.assetUri).toBe("asset://store/report");
+  });
 });

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

@@ -5,6 +5,11 @@ import type {
   InboxDeliveryStateAction,
 } from "@nextclaw/shared";
 import { eventKeys } from "@nextclaw/shared";
+import {
+  createSystemObjectReferenceUri,
+  SYSTEM_OBJECT_TYPE_INBOX_DELIVERY,
+  type SystemObjectResolvedReference,
+} from "@nextclaw/shared";
 import { appQueryClient } from "@/app-query-client";
 import { useInboxStore } from "@/features/inbox/stores/inbox.store";
 import { nextclawClient } from "@/shared/lib/api";
@@ -104,11 +109,16 @@ export class InboxManager {
     return deleted;
   };
 
-  continueInChat = async (deliveryId: string) => {
-    const result = await nextclawClient.inboxDeliveries.continueInChat(deliveryId);
-    this.replaceCachedDelivery(result.delivery);
+  prepareChatReference = async (deliveryId: string): Promise<{
+    delivery: InboxDelivery;
+    reference: SystemObjectResolvedReference;
+  }> => {
+    const reference = await nextclawClient.systemObjectReferences.resolve(
+      createSystemObjectReferenceUri(SYSTEM_OBJECT_TYPE_INBOX_DELIVERY, deliveryId),
+    );
+    const delivery = await this.updateState(deliveryId, "read");
     this.closeReader();
-    return result;
+    return { delivery, reference };
   };
 
   private updateState = async (

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

@@ -1,5 +1,76 @@
-import { describe, expect, it } from "vitest";
-import { resolveInboxFilter } from "@/features/inbox/pages/inbox-page";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { createElement } from "react";
+import { MemoryRouter, Route, Routes, useLocation } from "react-router-dom";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CHAT_DRAFT_SESSION_PATH } from "@/features/chat";
+import { InboxPage, resolveInboxFilter } from "@/features/inbox/pages/inbox-page";
+import { t } from "@/shared/lib/i18n";
+
+const mocks = vi.hoisted(() => ({
+  prepareChatReference: vi.fn(),
+  requestSystemObjectReference: vi.fn(),
+}));
+
+vi.mock("@/app/components/app-presenter-provider", () => ({
+  useAppPresenter: () => ({
+    chatDraftIntentManager: {
+      requestSystemObjectReference: mocks.requestSystemObjectReference,
+    },
+    inboxManager: {
+      archive: vi.fn(),
+      delete: vi.fn(),
+      markRead: vi.fn(),
+      markUnread: vi.fn(),
+      prepareChatReference: mocks.prepareChatReference,
+      restore: vi.fn(),
+    },
+  }),
+}));
+
+vi.mock("@/app/hooks/use-viewport-layout", () => ({
+  useViewportLayout: () => ({ isMobile: false }),
+}));
+
+vi.mock("@/features/inbox/hooks/use-inbox-deliveries", () => ({
+  useInboxDeliveries: () => ({
+    data: {
+      deliveries: [{
+        id: "delivery-1",
+        title: "A considered report",
+        summary: "A concise summary",
+        content: "# Finding",
+        contentType: "markdown",
+        source: { kind: "agent", agentId: null, sessionId: null, toolCallId: null, filePath: null },
+        createdAt: "2026-08-06T00:00:00.000Z",
+        updatedAt: "2026-08-06T00:00:00.000Z",
+        presentedAt: "2026-08-06T00:01:00.000Z",
+        readAt: "2026-08-06T00:02:00.000Z",
+        archivedAt: null,
+      }],
+    },
+    isError: false,
+  }),
+}));
+
+vi.mock("@/features/inbox/components/inbox-delivery-content", () => ({
+  InboxDeliveryContent: ({ content }: { content: string }) =>
+    createElement("article", null, content),
+}));
+
+vi.mock("@/shared/hooks/use-confirm-dialog", () => ({
+  useConfirmDialog: () => ({
+    confirm: vi.fn(async () => true),
+    ConfirmDialog: () => null,
+  }),
+}));
+
+function CurrentPath() {
+  return createElement(
+    "span",
+    { "data-testid": "current-path" },
+    useLocation().pathname,
+  );
+}
 
 const readDelivery = {
   archivedAt: null,
@@ -26,3 +97,51 @@ describe("resolveInboxFilter", () => {
     expect(resolveInboxFilter([unreadDelivery], "archived")).toBe("archived");
   });
 });
+
+describe("InboxPage", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.prepareChatReference.mockResolvedValue({
+      reference: {
+        uri: "nextclaw://objects/inbox-delivery/delivery-1",
+        label: "A considered report",
+      },
+    });
+  });
+
+  it("opens a draft with the same visible system object intent as the reader dialog", async () => {
+    render(
+      createElement(
+        MemoryRouter,
+        { initialEntries: ["/inbox/delivery-1"] },
+        createElement(
+          Routes,
+          null,
+          createElement(Route, {
+            path: "/inbox/:deliveryId",
+            element: createElement(
+              "div",
+              null,
+              createElement(InboxPage),
+              createElement(CurrentPath),
+            ),
+          }),
+          createElement(Route, {
+            path: "*",
+            element: createElement(CurrentPath),
+          }),
+        ),
+      ),
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: t("inboxContinueChat") }));
+
+    await waitFor(() => {
+      expect(screen.getByTestId("current-path").textContent).toBe(CHAT_DRAFT_SESSION_PATH);
+    });
+    expect(mocks.prepareChatReference).toHaveBeenCalledWith("delivery-1");
+    expect(mocks.requestSystemObjectReference).toHaveBeenCalledWith(
+      expect.objectContaining({ uri: "nextclaw://objects/inbox-delivery/delivery-1" }),
+    );
+  });
+});

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

@@ -5,6 +5,7 @@ import { Link, useNavigate, useParams } from "react-router-dom";
 import { useAppPresenter } from "@/app/components/app-presenter-provider";
 import { PageHeader } from "@/app/components/layout/page-layout";
 import { useViewportLayout } from "@/app/hooks/use-viewport-layout";
+import { 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 { Button } from "@/shared/components/ui/button";
@@ -246,7 +247,7 @@ export function InboxPage() {
   const navigate = useNavigate();
   const { deliveryId } = useParams<{ deliveryId?: string }>();
   const { isMobile } = useViewportLayout();
-  const { inboxManager } = useAppPresenter();
+  const { chatDraftIntentManager, inboxManager } = useAppPresenter();
   const deliveriesQuery = useInboxDeliveries();
   const { confirm, ConfirmDialog } = useConfirmDialog();
   const [selectedFilter, setSelectedFilter] = useState<InboxFilter | null>(null);
@@ -287,8 +288,9 @@ export function InboxPage() {
       return;
     }
     void runAction("continue", async () => {
-      const result = await inboxManager.continueInChat(activeDelivery.id);
-      navigate(`/chat/${encodeURIComponent(result.sessionId)}`);
+      const { reference } = await inboxManager.prepareChatReference(activeDelivery.id);
+      chatDraftIntentManager.requestSystemObjectReference(reference);
+      navigate(CHAT_DRAFT_SESSION_PATH);
     });
   };