@nextclaw/ui 0.15.25 → 0.15.26

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

@@ -24,6 +24,7 @@ import {
 } from '@/features/chat/features/workspace/utils/chat-workspace-panel-layout.utils';
 import { useWorkspaceExplorerLayout } from '@/features/chat/features/workspace/hooks/use-workspace-explorer-layout';
 import { t } from '@/shared/lib/i18n';
+import { resolveWorkspaceRelativePath } from '@/shared/lib/session-project';
 import { cn } from '@/shared/lib/utils';
 import { IconActionButton } from '@/shared/components/ui/actions/icon-action-button';
 
@@ -175,11 +176,13 @@ function WorkspaceChildSessions({ childSessionTabs }: { childSessionTabs: readon
 }
 
 function WorkspaceProjectFiles({
+  activePath,
   onFileOpen,
   projectRoot,
   sessionKey,
   workingDir,
 }: {
+  activePath: string | null;
   onFileOpen?: (action: ChatFileOpenActionViewModel) => void;
   projectRoot: string | null;
   sessionKey: string | null;
@@ -203,6 +206,9 @@ function WorkspaceProjectFiles({
 
   return (
     <ChatSessionWorkspaceDirectoryBrowser
+      activeRelativePath={
+        activePath ? resolveWorkspaceRelativePath({ path: activePath, sessionProjectRoot: rootPath }) : null
+      }
       key={rootPath}
       browseQuery={browseQuery}
       onFileOpen={onFileOpen ?? presenter.chatThreadManager.openFilePreview}
@@ -384,7 +390,7 @@ export function ChatSessionWorkspacePanelContent({
     onResizeStart,
     setExplorerOpen,
     showExplorer,
-  } = useWorkspaceExplorerLayout({ fileActive, projectFilesActive, sessionProjectRoot, sessionWorkingDir });
+  } = useWorkspaceExplorerLayout({ fileActive, projectFilesActive });
 
   return (
     <div
@@ -414,6 +420,7 @@ export function ChatSessionWorkspacePanelContent({
         aria-hidden={!showExplorer}
       >
         <WorkspaceProjectFiles
+          activePath={fileActive ? activeSelection.file.path : null}
           onFileOpen={(action) => {
             if (compact) setExplorerOpen(false);
             presenter.chatThreadManager.openFilePreview(action);
@@ -445,7 +452,7 @@ export function ChatSessionWorkspacePanelContent({
               fileActive
                 ? {
                     open: explorerOpen,
-                    onToggle: () => setExplorerOpen((value) => !value),
+                    onToggle: () => setExplorerOpen(!explorerOpen),
                   }
                 : undefined
             }

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

@@ -30,6 +30,7 @@ import { buildWorkspaceEntryContextMenuGroups } from '@/features/chat/features/w
 export { copyWorkspacePath } from '@/features/chat/features/workspace/components/project-files/workspace-directory-entry-menu';
 
 type WorkspaceDirectoryTreeActionProps = {
+  activeRelativePath: string | null;
   busy: boolean;
   collapseVersion: number;
   createTarget: WorkspaceDirectoryActionTarget | null;
@@ -182,7 +183,31 @@ function useWorkspaceEntryRename({
   return { active, cancel, error, name, start, submit, updateName };
 }
 
+function readWorkspaceTreeEntrySelection(
+  activeRelativePath: string | null,
+  relativePath: string | null,
+  selectedPath: string | null,
+  entryPath: string,
+): readonly [active: boolean, selected: boolean] {
+  const active = !selectedPath && activeRelativePath !== null && activeRelativePath === relativePath;
+  return [active, selectedPath === null ? active : selectedPath === entryPath];
+}
+
+function isWorkspaceTreeEntryExpanded(
+  manuallyExpanded: boolean,
+  isDirectory: boolean,
+  activeRelativePath: string | null,
+  relativePath: string | null,
+  selectedPath: string | null,
+): boolean {
+  return (
+    manuallyExpanded ||
+    Boolean(!selectedPath && isDirectory && relativePath && activeRelativePath?.startsWith(`${relativePath}/`))
+  );
+}
+
 export function WorkspaceDirectoryTreeEntry({
+  activeRelativePath,
   browseParentRefresh,
   busy,
   collapseVersion,
@@ -216,7 +241,14 @@ export function WorkspaceDirectoryTreeEntry({
   const rowRef = useRef<HTMLDivElement | null>(null);
   const entryButtonRef = useRef<HTMLButtonElement | null>(null);
   const isDirectory = entry.kind === 'directory';
-  const [isExpanded, setIsExpanded] = useState(false);
+  const [manuallyExpanded, setIsExpanded] = useState(false);
+  const isExpanded = isWorkspaceTreeEntryExpanded(
+    manuallyExpanded,
+    isDirectory,
+    activeRelativePath,
+    relativePath,
+    selectedPath,
+  );
   const rename = useWorkspaceEntryRename({
     entry,
     onRename,
@@ -248,6 +280,16 @@ export function WorkspaceDirectoryTreeEntry({
     () => ({ path: entry.path, createTarget: ownCreateTarget }),
     [entry.path, ownCreateTarget],
   );
+  const [activeSelected, selected] = readWorkspaceTreeEntrySelection(
+    activeRelativePath,
+    relativePath,
+    selectedPath,
+    entry.path,
+  );
+
+  useLayoutEffect(() => {
+    if (activeSelected) rowRef.current?.scrollIntoView?.({ block: 'nearest' });
+  }, [activeSelected]);
 
   useLayoutEffect(() => {
     if (revealPath !== entry.path) return;
@@ -259,7 +301,7 @@ export function WorkspaceDirectoryTreeEntry({
 
   const activateEntry = () => {
     onSelect(selection);
-    if (isDirectory) setIsExpanded((value) => !value);
+    if (isDirectory) setIsExpanded(!isExpanded);
     else onFileOpen({ path: entry.path, label: entry.name, viewMode: 'preview' });
   };
 
@@ -280,14 +322,19 @@ export function WorkspaceDirectoryTreeEntry({
     relativePath,
   });
   return (
-    <div role="treeitem" aria-expanded={isDirectory ? isExpanded : undefined} aria-label={buildEntryLabel(entry)}>
+    <div
+      role="treeitem"
+      aria-expanded={isDirectory ? isExpanded : undefined}
+      aria-label={buildEntryLabel(entry)}
+      aria-selected={selected}
+    >
       <ContextMenu groups={contextMenuGroups} label={t('chatWorkspaceFileContextMenu')}>
         <div
           ref={rowRef}
           data-workspace-tree-entry=""
           className={cn(
             'group flex h-[26px] w-full min-w-0 items-center text-gray-700 transition-colors hover:bg-gray-100 focus-within:bg-gray-100',
-            selectedPath === entry.path ? 'bg-primary/10' : null,
+            selected ? 'bg-primary/10' : null,
             entry.hidden ? 'opacity-65' : null,
           )}
           style={{ paddingLeft: `${6 + level * 12}px` }}
@@ -383,6 +430,7 @@ export function WorkspaceDirectoryTreeEntry({
         <div role="group">
           {createTarget?.path === entry.path ? renderCreateFolder(level + 1) : null}
           <WorkspaceDirectoryTreeChildren
+            activeRelativePath={activeRelativePath}
             browseQuery={browseQuery}
             busy={busy}
             collapseVersion={collapseVersion}

package/src/features/chat/features/workspace/hooks/use-workspace-explorer-layout.ts

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, type PointerEvent as ReactPointerEvent } from 'react';
+import { useCallback, useEffect, useRef, useState, type PointerEvent as ReactPointerEvent } from 'react';
 import { usePresenter } from '@/features/chat/components/providers/chat-presenter.provider';
 import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 import {
@@ -9,22 +9,23 @@ import {
 export function useWorkspaceExplorerLayout({
   fileActive,
   projectFilesActive,
-  sessionProjectRoot,
-  sessionWorkingDir,
 }: {
   fileActive: boolean;
   projectFilesActive: boolean;
-  sessionProjectRoot: string | null;
-  sessionWorkingDir: string | null;
 }) {
   const presenter = usePresenter();
   const containerRef = useRef<HTMLDivElement | null>(null);
   const resizeRef = useRef<{ startX: number; startWidth: number; width: number } | null>(null);
+  const explorerOpen = useChatThreadStore((state) => state.snapshot.workspaceExplorerOpen);
   const persistedExplorerWidth = useChatThreadStore((state) => state.snapshot.workspaceExplorerWidth);
+  const setSnapshot = useChatThreadStore((state) => state.setSnapshot);
   const [compact, setCompact] = useState(false);
   const [explorerDragWidth, setExplorerDragWidth] = useState<number | null>(null);
-  const [explorerOpen, setExplorerOpen] = useState(true);
   const explorerWidth = explorerDragWidth ?? persistedExplorerWidth;
+  const setExplorerOpen = useCallback(
+    (open: boolean) => setSnapshot({ workspaceExplorerOpen: open }),
+    [setSnapshot],
+  );
 
   useEffect(() => {
     const node = containerRef.current;
@@ -36,10 +37,6 @@ export function useWorkspaceExplorerLayout({
     return () => observer.disconnect();
   }, []);
 
-  useEffect(() => {
-    setExplorerOpen(true);
-  }, [sessionProjectRoot, sessionWorkingDir]);
-
   useEffect(() => {
     if (!fileActive || !compact || !explorerOpen) return;
     const closeOnEscape = (event: KeyboardEvent) => {
@@ -47,7 +44,7 @@ export function useWorkspaceExplorerLayout({
     };
     window.addEventListener('keydown', closeOnEscape);
     return () => window.removeEventListener('keydown', closeOnEscape);
-  }, [compact, explorerOpen, fileActive]);
+  }, [compact, explorerOpen, fileActive, setExplorerOpen]);
 
   const onResizeStart = (event: ReactPointerEvent<HTMLDivElement>) => {
     if (compact || !fileActive) return;

package/src/features/chat/features/workspace/hooks/use-workspace-file-actions.ts

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { NextClawClientError } from '@nextclaw/client-sdk';
 import { toast } from 'sonner';
 import type { useConfirmDialog } from '@/shared/hooks/use-confirm-dialog';
@@ -29,6 +29,11 @@ export type WorkspaceTreeSelection = {
   createTarget: WorkspaceDirectoryActionTarget;
 };
 
+type WorkspaceTreeSelectionState = {
+  activeRelativePath: string | null;
+  selection: WorkspaceTreeSelection;
+};
+
 function readErrorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
@@ -193,6 +198,7 @@ async function createWorkspaceEntry({
 }
 
 type WorkspaceProjectFilesControllerOptions = {
+  activeRelativePath: string | null;
   confirm: Confirm;
   onEntryDeleted?: (path: string) => void;
   onEntryRenamed?: (params: { previousPath: string; path: string; label: string }) => void;
@@ -200,6 +206,7 @@ type WorkspaceProjectFilesControllerOptions = {
 };
 
 export function useWorkspaceProjectFilesController({
+  activeRelativePath,
   confirm,
   onEntryDeleted,
   onEntryRenamed,
@@ -211,18 +218,11 @@ export function useWorkspaceProjectFilesController({
   const [createName, setCreateName] = useState('');
   const [createKind, setCreateKind] = useState<'directory' | 'file'>('directory');
   const [createError, setCreateError] = useState<string | null>(null);
-  const [selectedPath, setSelectedPath] = useState<string | null>(null);
-  const [selectedCreateTarget, setSelectedCreateTarget] = useState<WorkspaceDirectoryActionTarget | null>(null);
+  const [selectionState, setSelectionState] = useState<WorkspaceTreeSelectionState | null>(null);
   const [revealPath, setRevealPath] = useState<string | null>(null);
   const [uploadTarget, setUploadTarget] = useState<WorkspaceDirectoryActionTarget | null>(null);
-
-  useEffect(() => {
-    setCreateTarget(null);
-    setSelectedPath(null);
-    setSelectedCreateTarget(null);
-    setRevealPath(null);
-    setUploadTarget(null);
-  }, [rootPath]);
+  const selectedEntry =
+    selectionState?.activeRelativePath === activeRelativePath ? selectionState.selection : null;
 
   const requestUpload = (target: WorkspaceDirectoryActionTarget) => {
     setUploadTarget(target);
@@ -231,8 +231,7 @@ export function useWorkspaceProjectFilesController({
     fileInputRef.current.click();
   };
   const selectEntry = (selection: WorkspaceTreeSelection) => {
-    setSelectedPath(selection.path);
-    setSelectedCreateTarget(selection.createTarget);
+    setSelectionState({ activeRelativePath, selection });
   };
   const openCreate = (kind: 'directory' | 'file', target: WorkspaceDirectoryActionTarget) => {
     target.expand?.();
@@ -275,7 +274,20 @@ export function useWorkspaceProjectFilesController({
       label: renamed.name,
     });
     await refresh();
-    setSelectedPath(renamed.path);
+    setSelectionState((state) =>
+      state?.activeRelativePath === activeRelativePath
+        ? {
+            activeRelativePath,
+            selection: {
+              path: renamed.path,
+              createTarget:
+                state.selection.createTarget.path === entry.path
+                  ? { ...state.selection.createTarget, label: renamed.name, path: renamed.path }
+                  : state.selection.createTarget,
+            },
+          }
+        : null,
+    );
     setRevealPath(renamed.path);
     toast.success(t('chatWorkspaceRenameSucceeded').replace('{name}', renamed.name));
     return renamed;
@@ -292,44 +304,54 @@ export function useWorkspaceProjectFilesController({
     });
     if (!created) return;
     setCreateTarget(null);
-    setSelectedPath(created.path);
-    setSelectedCreateTarget({
-      label: createName.trim(),
-      path: created.path,
-      refresh: createTarget.refresh,
+    setSelectionState({
+      activeRelativePath,
+      selection: {
+        path: created.path,
+        createTarget: {
+          label: createName.trim(),
+          path: created.path,
+          refresh: createTarget.refresh,
+        },
+      },
     });
     setRevealPath(created.path);
   };
 
   return {
-    actions,
-    cancelCreateFolder: () => {
-      setCreateTarget(null);
-      setCreateName('');
-      setCreateError(null);
+    actions: {
+      cancelCreateFolder: () => {
+        setCreateTarget(null);
+        setCreateName('');
+        setCreateError(null);
+      },
+      clearSelection: () => {
+        setSelectionState(null);
+      },
+      completeReveal: () => setRevealPath(null),
+      deleteEntry,
+      openCreateFile: (target: WorkspaceDirectoryActionTarget) => openCreate('file', target),
+      openCreateFolder: (target: WorkspaceDirectoryActionTarget) => openCreate('directory', target),
+      renameEntry,
+      requestUpload,
+      selectEntry,
+      setCreateError,
+      setCreateName,
+      submitCreate,
+      uploadFiles,
+    },
+    refs: {
+      fileInputRef,
     },
-    clearSelection: () => {
-      setSelectedPath(null);
-      setSelectedCreateTarget(null);
+    state: {
+      createError,
+      createKind,
+      createName,
+      createTarget,
+      pendingAction: actions.pendingAction,
+      revealPath,
+      selectedCreateTarget: selectedEntry?.createTarget ?? null,
+      selectedPath: selectedEntry?.path ?? null,
     },
-    completeReveal: () => setRevealPath(null),
-    submitCreate,
-    createError,
-    createName,
-    createKind,
-    createTarget,
-    deleteEntry,
-    fileInputRef,
-    openCreateFile: (target: WorkspaceDirectoryActionTarget) => openCreate('file', target),
-    openCreateFolder: (target: WorkspaceDirectoryActionTarget) => openCreate('directory', target),
-    requestUpload,
-    renameEntry,
-    revealPath,
-    selectEntry,
-    selectedCreateTarget,
-    selectedPath,
-    setCreateError,
-    setCreateName,
-    uploadFiles,
   };
 }

package/src/features/chat/index.ts

@@ -5,7 +5,7 @@ export { usePresenter } from "./components/providers/chat-presenter.provider";
 export { ChatPresenter } from "./presenters/chat.presenter";
 export { ChatDraftIntentManager } from "./managers/chat-draft-intent.manager";
 export { ChatCompletionNotificationManager } from "./managers/chat-completion-notification.manager";
-export { buildSessionPath } from "./features/session/utils/chat-session-route.utils";
+export { buildSessionPath, CHAT_DRAFT_SESSION_PATH } from "./features/session/utils/chat-session-route.utils";
 export { useChatSessionListStore } from "./stores/chat-session-list.store";
 export { useChatThreadStore } from "./stores/chat-thread.store";
 export { useChatMessageLayoutStore } from "./stores/chat-message-layout.store";

package/src/features/chat/managers/chat-draft-intent.manager.ts

@@ -1,7 +1,11 @@
+import type { SystemObjectResolvedReference } from '@nextclaw/shared';
+
 export type ChatDraftIntent = {
   id: number;
-  prompt: string;
-};
+} & (
+  | { kind: 'prompt'; prompt: string }
+  | { kind: 'system-object-reference'; reference: SystemObjectResolvedReference }
+);
 
 type ChatDraftIntentListener = (intent: ChatDraftIntent) => void;
 
@@ -17,6 +21,7 @@ export class ChatDraftIntentManager {
     }
     const intent: ChatDraftIntent = {
       id: this.nextId + 1,
+      kind: 'prompt',
       prompt: normalizedPrompt,
     };
     this.nextId = intent.id;
@@ -24,6 +29,17 @@ export class ChatDraftIntentManager {
     this.listeners.forEach((listener) => listener(intent));
   };
 
+  requestSystemObjectReference = (reference: SystemObjectResolvedReference) => {
+    const intent: ChatDraftIntent = {
+      id: this.nextId + 1,
+      kind: 'system-object-reference',
+      reference: structuredClone(reference),
+    };
+    this.nextId = intent.id;
+    this.pendingIntent = intent;
+    this.listeners.forEach((listener) => listener(intent));
+  };
+
   consumePending = (): ChatDraftIntent | null => {
     const intent = this.pendingIntent;
     this.pendingIntent = null;

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

@@ -32,6 +32,7 @@ function resetChatThreadStore() {
       closedWorkspaceTabEntries: [],
       workspaceNavigationHistory: [],
       workspaceNavigationHistoryIndex: 0,
+      workspaceExplorerOpen: false,
       workspaceExplorerWidth: CHAT_WORKSPACE_EXPLORER_DEFAULT_WIDTH,
       workspacePanelWidth: CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
     },
@@ -74,6 +75,7 @@ describe('chat thread workspace panel persistence', () => {
         { kind: 'file', key: 'session-1::preview::README.md' },
       ],
       workspaceNavigationHistoryIndex: 1,
+      workspaceExplorerOpen: true,
     });
 
     const persisted = JSON.parse(window.localStorage.getItem(chatThreadWorkspaceStorageKey) ?? '{}');
@@ -88,6 +90,7 @@ describe('chat thread workspace panel persistence', () => {
         { kind: 'file', key: 'session-1::preview::README.md' },
       ],
       workspaceNavigationHistoryIndex: 1,
+      workspaceExplorerOpen: true,
     });
     expect(persisted.state.snapshot.sessionKey).toBeUndefined();
     expect(persisted.state.snapshot.isSending).toBeUndefined();
@@ -131,6 +134,7 @@ describe('chat thread workspace panel persistence', () => {
       activeWorkspacePanelKind: 'project-files',
       workspaceNavigationHistory: [{ kind: 'overview' }, { kind: 'child-sessions' }, { kind: 'project-files' }],
       workspaceNavigationHistoryIndex: 2,
+      workspaceExplorerOpen: true,
       workspaceExplorerWidth: 318,
       workspacePanelWidth: 620,
     });
@@ -147,6 +151,7 @@ describe('chat thread workspace panel persistence', () => {
       activeWorkspacePanelKind: 'project-files',
       workspaceNavigationHistory: [{ kind: 'overview' }, { kind: 'child-sessions' }, { kind: 'project-files' }],
       workspaceNavigationHistoryIndex: 2,
+      workspaceExplorerOpen: true,
       workspaceExplorerWidth: 318,
       workspacePanelWidth: 620,
     });
@@ -234,6 +239,7 @@ describe('chat thread workspace panel persistence', () => {
       activeWorkspacePanelKind: 'file',
       activeWorkspaceFileKey: 'session-1::preview::README.md',
       workspaceExplorerWidth: 400,
+      workspaceExplorerOpen: false,
       activeChildSessionKey: 'child-session-1',
       workspaceNavigationHistory: [{ kind: 'file', key: 'session-1::preview::README.md' }],
       workspaceNavigationHistoryIndex: 0,

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

@@ -95,6 +95,7 @@ export type ChatThreadSnapshot = {
   closedWorkspaceTabEntries: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistory: ChatWorkspaceNavigationEntry[];
   workspaceNavigationHistoryIndex: number;
+  workspaceExplorerOpen: boolean;
   workspaceExplorerWidth: number;
   workspacePanelWidth: number;
   contextWindow?: SessionContextWindowView | null;
@@ -119,6 +120,7 @@ type PersistedChatThreadStore = {
     closedWorkspaceTabEntries?: unknown;
     workspaceNavigationHistory?: unknown;
     workspaceNavigationHistoryIndex?: unknown;
+    workspaceExplorerOpen?: unknown;
     workspaceExplorerWidth?: unknown;
     workspacePanelWidth?: unknown;
   };
@@ -134,6 +136,7 @@ type PersistedChatWorkspaceSnapshot = Pick<
   | 'closedWorkspaceTabEntries'
   | 'workspaceNavigationHistory'
   | 'workspaceNavigationHistoryIndex'
+  | 'workspaceExplorerOpen'
   | 'workspaceExplorerWidth'
   | 'workspacePanelWidth'
 >;
@@ -167,6 +170,7 @@ const initialSnapshot: ChatThreadSnapshot = {
   closedWorkspaceTabEntries: [],
   workspaceNavigationHistory: [],
   workspaceNavigationHistoryIndex: 0,
+  workspaceExplorerOpen: false,
   workspaceExplorerWidth: CHAT_WORKSPACE_EXPLORER_DEFAULT_WIDTH,
   workspacePanelWidth: CHAT_WORKSPACE_PANEL_DEFAULT_WIDTH,
   contextWindow: null,
@@ -281,6 +285,7 @@ function normalizePersistedWorkspaceSnapshot(value: unknown): PersistedChatWorks
     closedWorkspaceTabEntries,
     workspaceNavigationHistory,
     workspaceNavigationHistoryIndex,
+    workspaceExplorerOpen: value.workspaceExplorerOpen === true,
     workspaceExplorerWidth: normalizeChatWorkspaceExplorerWidth(value.workspaceExplorerWidth),
     workspacePanelWidth: normalizeChatWorkspacePanelWidth(value.workspacePanelWidth),
   };
@@ -329,6 +334,7 @@ export const useChatThreadStore = create<ChatThreadStore>()(
             ),
             workspaceNavigationHistory,
             workspaceNavigationHistoryIndex,
+            workspaceExplorerOpen: state.snapshot.workspaceExplorerOpen,
             workspaceExplorerWidth: state.snapshot.workspaceExplorerWidth,
             workspacePanelWidth: state.snapshot.workspacePanelWidth,
           },

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);
     });
   };