@nextclaw/ui 0.15.25 → 0.15.27

package/src/features/chat/components/layout/__tests__/chat-sidebar-session-area.test.tsx

@@ -25,13 +25,34 @@ function renderSessionArea(isProjectFirstView: boolean) {
 }
 
 describe("ChatSidebarSessionArea", () => {
-  it("reserves the action-row height while switching list modes", () => {
+  it("renders an accessible animated segmented control for list modes", () => {
     const { onSelectMode } = renderSessionArea(false);
+    const modeGroup = screen.getByRole("group", { name: "Session list view" });
+    const timeButton = screen.getByRole("button", { name: "Time" });
+    const projectButton = screen.getByRole("button", { name: "Project" });
 
-    expect(
-      screen.getByRole("button", { name: "Time" }).parentElement?.parentElement?.className,
-    ).toContain("h-7");
-    fireEvent.click(screen.getByRole("button", { name: "Project" }));
+    expect(modeGroup.className).toContain("h-7");
+    expect(modeGroup.className).toContain("rounded-full");
+    expect(modeGroup.className).toContain("bg-foreground/[0.04]");
+    expect(modeGroup.className).not.toContain("border");
+    expect(modeGroup.className).not.toContain("shadow-inner");
+    const modeIndicator = modeGroup.querySelector("span[aria-hidden='true']");
+    expect(modeIndicator?.className).toContain("rounded-full");
+    expect(modeIndicator?.className).toContain("bg-gray-200/70");
+    expect(modeIndicator?.className).not.toContain("shadow-");
+    expect(modeIndicator?.className).not.toContain("ring-");
+    expect(modeIndicator?.className).toContain("transition-transform");
+    expect(timeButton.getAttribute("aria-pressed")).toBe("true");
+    expect(projectButton.getAttribute("aria-pressed")).toBe("false");
+    expect(timeButton.className).toContain("rounded-full");
+    expect(projectButton.className).toContain("rounded-full");
+    expect(timeButton.querySelector("svg")).not.toBeNull();
+    expect(projectButton.querySelector("svg")).not.toBeNull();
+    expect(modeGroup.parentElement?.className).toContain("justify-end");
+    expect(modeGroup.parentElement?.className).toContain("h-8");
+    expect(modeGroup.parentElement?.lastElementChild).toBe(modeGroup);
+
+    fireEvent.click(projectButton);
 
     expect(onSelectMode).toHaveBeenCalledWith("project-first");
   });
@@ -39,12 +60,22 @@ describe("ChatSidebarSessionArea", () => {
   it("uses a folder-plus icon for the add-project action", () => {
     const { onAddProject } = renderSessionArea(true);
     const addProjectButton = screen.getByRole("button", { name: "Add Project" });
+    const modeIndicator = screen
+      .getByRole("group", { name: "Session list view" })
+      .querySelector("span[aria-hidden='true']");
 
     expect(
       addProjectButton
         .querySelector("svg")
         ?.classList.contains("lucide-folder-plus"),
     ).toBe(true);
+    expect(addProjectButton.className).toContain("hover:bg-gray-200/60");
+    expect(modeIndicator?.className).toContain("translate-x-full");
+    expect(modeIndicator?.className).toContain("motion-reduce:transition-none");
+    expect(screen.getByRole("button", { name: "Project" }).getAttribute("aria-pressed")).toBe(
+      "true",
+    );
+    expect(modeIndicator?.parentElement?.previousElementSibling).toBe(addProjectButton);
     fireEvent.click(addProjectButton);
 
     expect(onAddProject).toHaveBeenCalledOnce();

package/src/features/chat/components/layout/chat-sidebar-desktop-layout.tsx

@@ -165,20 +165,19 @@ export function ChatSidebarSessionArea({
 
   return (
     <>
-      <div className="flex items-center justify-end px-4 pb-1 pt-2">
-        <div className="flex h-7 items-center gap-1.5">
-          {isProjectFirstView ? (
-            <IconActionButton
-              icon={<FolderPlus className="h-3.5 w-3.5" />}
-              label={t("chatProjectAdd")}
-              onClick={onAddProject}
-            />
-          ) : null}
-          <ChatSidebarListModeSwitch
-            isProjectFirstView={isProjectFirstView}
-            onSelectMode={onSelectMode}
+      <div className="flex h-8 items-center justify-end gap-1 px-3">
+        {isProjectFirstView ? (
+          <IconActionButton
+            icon={<FolderPlus className="h-3.5 w-3.5" />}
+            label={t("chatProjectAdd")}
+            tone="surface"
+            onClick={onAddProject}
           />
-        </div>
+        ) : null}
+        <ChatSidebarListModeSwitch
+          isProjectFirstView={isProjectFirstView}
+          onSelectMode={onSelectMode}
+        />
       </div>
 
       <div

package/src/features/chat/features/conversation/components/__tests__/session-conversation-area.test.tsx

@@ -4,6 +4,7 @@ import { MemoryRouter } from "react-router-dom";
 import { describe, expect, it, vi, beforeEach } from "vitest";
 
 import { SessionConversationArea } from "@/features/chat/features/conversation/components/session-conversation-area";
+import type { ChatDraftIntent } from "@/features/chat/managers/chat-draft-intent.manager";
 
 const mocks = vi.hoisted(() => {
   const inputRenderSpy = vi.fn();
@@ -118,7 +119,7 @@ const mocks = vi.hoisted(() => {
     },
     appPresenter: {
       chatDraftIntentManager: {
-        consumePending: vi.fn(() => null),
+        consumePending: vi.fn<() => ChatDraftIntent | null>(() => null),
         markConsumed: vi.fn(),
         subscribe: vi.fn(() => vi.fn()),
       },
@@ -409,6 +410,53 @@ describe("SessionConversationArea input boundary", () => {
     );
   });
 
+  it("consumes a system object draft intent as a visible composer token", () => {
+    const reference = {
+      uri: "nextclaw://objects/inbox-delivery/delivery-1",
+      objectType: "inbox-delivery",
+      objectId: "delivery-1",
+      label: "OOM investigation report",
+      description: "Root cause and mitigation",
+      updatedAt: "2026-08-11T00:00:00.000Z",
+      version: "sha256-report",
+      assetUri: "asset://store/report",
+      fileName: "oom-investigation-report.md",
+      mimeType: "text/markdown",
+      sizeBytes: 128,
+    };
+    mocks.appPresenter.chatDraftIntentManager.consumePending.mockReturnValueOnce({
+      id: 1,
+      kind: "system-object-reference",
+      reference,
+    });
+
+    render(
+      <MemoryRouter>
+        <SessionConversationArea
+          consumeDraftIntent
+          sessionKey={null}
+        />
+      </MemoryRouter>,
+    );
+
+    expect(mocks.presenter.chatSessionListManager.createSession).toHaveBeenCalledOnce();
+    expect(mocks.appPresenter.chatDraftIntentManager.markConsumed).toHaveBeenCalledWith(1);
+    const update = mocks.inputActions.update.mock.calls.at(-1)?.[0] as (
+      current: { nodes: []; text: string },
+    ) => { nodes: Array<Record<string, unknown>>; text: string };
+    const next = update({ nodes: [], text: "" });
+    expect(next.nodes).toEqual([
+      expect.objectContaining({
+        type: "token",
+        tokenKind: "system_object",
+        tokenKey: reference.uri,
+        label: reference.label,
+        data: { reference },
+      }),
+    ]);
+    expect(next.text).toBe("");
+  });
+
   it("syncs draft preferences with the selected runtime context", () => {
     mocks.inputQuery.defaultModel = "openai/gpt-5";
     mocks.inputQuery.fallbackPreferredModel = "minimax/MiniMax-M3";

package/src/features/chat/features/conversation/components/__tests__/session-conversation-input.streaming.test.tsx

@@ -349,7 +349,7 @@ describe('SessionConversationInput streaming stability', () => {
 
   it('inserts a project file reference at the saved composer caret', async () => {
     const controlRef: MutableRefObject<StreamingInputControl | null> = { current: null };
-    render(
+    renderInput(
       <StreamingSessionConversationInputHarness
         controlRef={controlRef}
         initialText="Hello"
@@ -427,11 +427,31 @@ describe('SessionConversationInput streaming stability', () => {
     expect(deleteQueuedInput).toHaveBeenCalledWith('queued-2');
   });
 
+  it('renders a submitting queue row immediately without premature edit actions', () => {
+    const controlRef: MutableRefObject<StreamingInputControl | null> = { current: null };
+    renderInput(
+      <StreamingSessionConversationInputHarness
+        controlRef={controlRef}
+        controllerOverride={{
+          ...controller,
+          queuedInputs: [
+            { id: 'submitting-1', isSubmitting: true, preview: '正在提交的任务' },
+          ],
+        }}
+      />,
+    );
+
+    expect(screen.getByText('正在提交的任务')).toBeTruthy();
+    expect(screen.getByLabelText('Adding to queue…')).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Edit queued input' })).toBeNull();
+    expect(screen.queryByRole('button', { name: 'Delete queued input' })).toBeNull();
+  });
+
   it('leaves send-error rendering to the conversation surface', () => {
     const controlRef: MutableRefObject<StreamingInputControl | null> = { current: null };
     const providerError = 'Chat Completions API failed (402): raw provider error';
 
-    render(
+    renderInput(
       <StreamingSessionConversationInputHarness
         controlRef={controlRef}
         sendError={providerError}
@@ -456,9 +476,13 @@ function createAttachmentRunHandle(): NcpRunHandle {
 
 function AttachmentSubmitHarness({
   initialPrompt,
+  isRunning = false,
+  refreshQueuedInputs = async () => [],
   send,
 }: {
   readonly initialPrompt?: string;
+  readonly isRunning?: boolean;
+  readonly refreshQueuedInputs?: () => Promise<readonly never[]>;
   readonly send: AttachmentSubmitAgentSend;
 }) {
   const { inputActions, inputSnapshot } = useSessionConversationInputState(
@@ -503,14 +527,14 @@ function AttachmentSubmitHarness({
     continueRun: vi.fn(),
     editMessage: vi.fn(),
     isHydrating: false,
-    isRunning: false,
+    isRunning,
     isSending: false,
     send,
     snapshot: {
-      activeRun: null,
+      activeRun: isRunning ? { sessionId: 'session-attachment' } : null,
     },
     visibleMessages: [],
-  }), [send]);
+  }), [isRunning, send]);
   const controller = useSessionConversationController({
     agent,
     inputSnapshot,
@@ -518,6 +542,7 @@ function AttachmentSubmitHarness({
     isRuntimeBlocked: false,
     runQueue: {
       inputs: [],
+      refreshQueuedInputs,
       removeQueuedInput: async () => null,
     },
     selectedAgentId: 'main',
@@ -543,10 +568,46 @@ function AttachmentSubmitHarness({
 }
 
 describe('SessionConversationInput attachment submit', () => {
+  it('shows immediate queue feedback from the real send button before backend acknowledgement', async () => {
+    let resolveSend!: (handle: NcpRunHandle) => void;
+    const send = vi.fn<AttachmentSubmitAgentSend>(() => new Promise((resolve) => {
+      resolveSend = resolve;
+    }));
+    const refreshQueuedInputs = vi.fn(async () => [] as const);
+
+    renderInput(
+      <AttachmentSubmitHarness
+        initialPrompt="稍后继续这个任务"
+        isRunning
+        refreshQueuedInputs={refreshQueuedInputs}
+        send={send}
+      />,
+    );
+
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: /Queue|排队发送/ }));
+      await Promise.resolve();
+    });
+
+    expect(send).toHaveBeenCalledTimes(1);
+    const submittingStatus = screen.getByLabelText('Adding to queue…');
+    expect(submittingStatus.parentElement?.textContent).toContain('稍后继续这个任务');
+    await waitFor(() => expect(screen.getByRole('textbox').textContent).toBe(''));
+    expect(refreshQueuedInputs).not.toHaveBeenCalled();
+
+    await act(async () => {
+      resolveSend({ ...createAttachmentRunHandle(), runId: null });
+      await Promise.resolve();
+    });
+
+    await waitFor(() => expect(refreshQueuedInputs).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(screen.queryByLabelText('Adding to queue…')).toBeNull());
+  });
+
   it('preserves a project file reference in the outgoing user message and AI context', async () => {
     const send = vi.fn<AttachmentSubmitAgentSend>(async () => createAttachmentRunHandle());
 
-    render(<AttachmentSubmitHarness initialPrompt="这里面有啥" send={send} />);
+    renderInput(<AttachmentSubmitHarness initialPrompt="这里面有啥" send={send} />);
 
     const textbox = screen.getByRole('textbox');
     fireEvent.focus(textbox);
@@ -605,7 +666,7 @@ describe('SessionConversationInput attachment submit', () => {
 
   it('preserves an exact workspace excerpt in the outgoing message metadata', async () => {
     const send = vi.fn<AttachmentSubmitAgentSend>(async () => createAttachmentRunHandle());
-    render(<AttachmentSubmitHarness initialPrompt="解释一下" send={send} />);
+    renderInput(<AttachmentSubmitHarness initialPrompt="解释一下" send={send} />);
 
     const textbox = screen.getByRole('textbox');
     await waitFor(() => expect(textbox.textContent).toBe('解释一下'));

package/src/features/chat/features/conversation/components/session-conversation-area.tsx

@@ -18,6 +18,10 @@ import { ChatConversationWelcome } from "@/features/chat/features/welcome/compon
 import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
 import { useSystemStatus } from "@/features/system-status";
 import { t } from "@/shared/lib/i18n";
+import type { SystemObjectResolvedReference } from "@nextclaw/shared";
+import { deriveChatComposerDraft } from "@/features/chat/features/input/utils/chat-composer-state.utils";
+import { appendSystemObjectReferenceToken } from "@/features/chat/features/input/utils/chat-system-object-reference.utils";
+import type { ChatDraftIntent } from "@/features/chat/managers/chat-draft-intent.manager";
 
 import {
   useSessionConversationController,
@@ -42,18 +46,23 @@ type SessionConversationAreaProps = {
 function useSessionConversationDraftIntent(params: {
   readonly consumeDraftIntent: boolean;
   readonly applyPromptSuggestion: (prompt: string) => void;
+  readonly applySystemObjectReference: (reference: SystemObjectResolvedReference) => void;
 }) {
-  const { applyPromptSuggestion, consumeDraftIntent } = params;
+  const { applyPromptSuggestion, applySystemObjectReference, consumeDraftIntent } = params;
   const appPresenter = useAppPresenter();
   const presenter = usePresenter();
   useEffect(() => {
     if (!consumeDraftIntent) {
       return undefined;
     }
-    const applyIntent = (intent: { id: number; prompt: string }) => {
+    const applyIntent = (intent: ChatDraftIntent) => {
       presenter.chatSessionListManager.createSession();
       presenter.chatSessionListManager.setSelectedAgentId("main");
-      applyPromptSuggestion(intent.prompt);
+      if (intent.kind === 'prompt') {
+        applyPromptSuggestion(intent.prompt);
+      } else {
+        applySystemObjectReference(intent.reference);
+      }
       appPresenter.chatDraftIntentManager.markConsumed(intent.id);
     };
     const unsubscribe =
@@ -63,7 +72,7 @@ function useSessionConversationDraftIntent(params: {
       applyIntent(pendingIntent);
     }
     return unsubscribe;
-  }, [appPresenter, applyPromptSuggestion, consumeDraftIntent, presenter]);
+  }, [appPresenter, applyPromptSuggestion, applySystemObjectReference, consumeDraftIntent, presenter]);
 }
 
 type ChatDraftRouteState = {
@@ -204,6 +213,17 @@ export function SessionConversationArea(props: SessionConversationAreaProps) {
     initialPrompt,
     sessionKey,
   );
+  const applySystemObjectReference = useCallback((reference: SystemObjectResolvedReference) => {
+    inputActions.update((current) => {
+      const nodes = appendSystemObjectReferenceToken(current.nodes, reference);
+      return {
+        nodes,
+        text: deriveChatComposerDraft(nodes),
+        composerFocusRequestId: Date.now(),
+        sendError: null,
+      };
+    });
+  }, [inputActions]);
   const inputQuery = useSessionConversationInputQuery({
     sessionKey,
     inputSnapshot,
@@ -355,6 +375,7 @@ export function SessionConversationArea(props: SessionConversationAreaProps) {
   useSessionConversationDraftIntent({
     consumeDraftIntent,
     applyPromptSuggestion: inputActions.applyPromptSuggestion,
+    applySystemObjectReference,
   });
   const renderInput = useCallback(
     (surface: "default" | "embedded", placeholder?: string) => (

package/src/features/chat/features/conversation/components/session-conversation-input.tsx

@@ -47,6 +47,7 @@ import { useSessionConversationInputAttachments } from '@/features/chat/features
 import { useChatComposerReferenceIntent } from '@/features/chat/features/conversation/hooks/use-chat-composer-reference-intent';
 import { useSessionConversationComposerNodes } from '@/features/chat/features/conversation/hooks/use-session-conversation-composer-nodes';
 import { useSessionConversationSlashCommands } from '@/features/chat/features/conversation/hooks/use-session-conversation-slash-commands';
+import { useSystemObjectReferenceSelect } from '@/features/chat/features/conversation/hooks/use-system-object-reference-select';
 import { ChatConversationTrack } from '@/features/chat/components/conversation/chat-conversation-track';
 import { useChatMessageLayoutStore } from '@/features/chat/stores/chat-message-layout.store';
 import type { useSessionConversationInputQuery } from '@/features/chat/features/conversation/hooks/use-session-conversation-input-query';
@@ -231,6 +232,7 @@ export const SessionConversationInput = memo(function SessionConversationInput(p
   const contextReferenceProjectRoot = inputQuery.selectedSessionKey
     ? inputQuery.selectedSession?.projectRoot ?? inputQuery.defaultProjectRoot ?? ''
     : inputSnapshot.pendingProjectRoot ?? inputQuery.defaultProjectRoot ?? '';
+  const handleSystemObjectSelect = useSystemObjectReferenceSelect(inputBarRef);
   const { inputSurfaceState, setInputSurfaceTrigger } = useChatInputSurfaceState({
     commands: slashCommands,
     isSkillsLoading: inputQuery.isSkillsLoading,
@@ -240,6 +242,7 @@ export const SessionConversationInput = memo(function SessionConversationInput(p
     language,
     onSelectPanelApp: handleSlashPanelAppSelect,
     onSelectSkill: chatRecentSkillsManager.remember,
+    onSelectSystemObject: handleSystemObjectSelect,
     projectRoot: contextReferenceProjectRoot,
     recentSkillValues,
     skillRecords,

package/src/features/chat/features/conversation/components/session-queued-input-rows.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react';
-import { CornerDownRight, Pencil, Trash2 } from 'lucide-react';
+import { CornerDownRight, LoaderCircle, Pencil, Trash2 } from 'lucide-react';
 
 import {
   Tooltip,
@@ -74,20 +74,30 @@ export function SessionQueuedInputRows({
             <span className="min-w-0 flex-1 truncate font-medium text-foreground/80">
               {item.preview || t('chatQueuedBannerAttachmentFallback')}
             </span>
-            <div className="flex shrink-0 items-center gap-1.5">
-              <QueuedInputIconButton
-                label={t('chatQueuedEdit')}
-                onClick={() => controller.editQueuedInput(item.id)}
+            {item.isSubmitting ? (
+              <span
+                aria-label={t('chatQueuedSubmitting')}
+                className="inline-flex shrink-0 items-center gap-1.5 text-xs text-muted-foreground"
               >
-                <Pencil className="h-4 w-4" />
-              </QueuedInputIconButton>
-              <QueuedInputIconButton
-                label={t('chatQueuedDelete')}
-                onClick={() => controller.deleteQueuedInput(item.id)}
-              >
-                <Trash2 className="h-4 w-4" />
-              </QueuedInputIconButton>
-            </div>
+                <LoaderCircle className="h-3.5 w-3.5 animate-spin" />
+                {t('chatQueuedSubmitting')}
+              </span>
+            ) : (
+              <div className="flex shrink-0 items-center gap-1.5">
+                <QueuedInputIconButton
+                  label={t('chatQueuedEdit')}
+                  onClick={() => controller.editQueuedInput(item.id)}
+                >
+                  <Pencil className="h-4 w-4" />
+                </QueuedInputIconButton>
+                <QueuedInputIconButton
+                  label={t('chatQueuedDelete')}
+                  onClick={() => controller.deleteQueuedInput(item.id)}
+                >
+                  <Trash2 className="h-4 w-4" />
+                </QueuedInputIconButton>
+              </div>
+            )}
           </div>
         ))}
       </div>

package/src/features/chat/features/conversation/hooks/__tests__/use-session-conversation-controller.test.tsx

@@ -59,6 +59,7 @@ function createControllerParams(params: {
   const removeQueuedInput = vi.fn(async (id: string) =>
     queuedInputs.find((item) => item.id === id) ?? null,
   );
+  const refreshQueuedInputs = vi.fn(async () => queuedInputs);
   return {
     agent: {
       abort: vi.fn(),
@@ -116,6 +117,7 @@ function createControllerParams(params: {
     isRuntimeBlocked: false,
     runQueue: {
       inputs: queuedInputs,
+      refreshQueuedInputs,
       removeQueuedInput,
     },
     selectedAgentId: 'main',
@@ -178,6 +180,57 @@ describe('useSessionConversationController backend run queue', () => {
     expect(params.resetComposer).toHaveBeenCalledTimes(1);
   });
 
+  it('projects a submitting queue row before the backend acknowledges the message', async () => {
+    let resolveSend!: (handle: NcpRunHandle) => void;
+    const send = vi.fn<TestAgentSend>(() => new Promise((resolve) => {
+      resolveSend = resolve;
+    }));
+    const params = createControllerParams({ isRunning: true, send });
+    const { result } = renderHook(() => useSessionConversationController(params));
+    let submission!: Promise<void>;
+
+    act(() => {
+      submission = result.current.send();
+    });
+
+    expect(params.resetComposer).toHaveBeenCalledTimes(1);
+    expect(result.current.queuedInputs).toEqual([
+      expect.objectContaining({
+        isSubmitting: true,
+        preview: 'next task',
+      }),
+    ]);
+    expect(params.runQueue.refreshQueuedInputs).not.toHaveBeenCalled();
+
+    await act(async () => {
+      resolveSend(createRunHandle({ runId: null }));
+      await submission;
+    });
+
+    expect(params.runQueue.refreshQueuedInputs).toHaveBeenCalledTimes(1);
+    expect(result.current.queuedInputs).toEqual([]);
+  });
+
+  it('removes the submitting queue row and restores the draft when submission fails', async () => {
+    const sendError = new Error('queue submission failed');
+    const send = vi.fn<TestAgentSend>(async () => {
+      throw sendError;
+    });
+    const params = createControllerParams({ isRunning: true, send });
+    const { result } = renderHook(() => useSessionConversationController(params));
+
+    await act(async () => {
+      await expect(result.current.send()).rejects.toThrow(sendError);
+    });
+
+    expect(result.current.queuedInputs).toEqual([]);
+    expect(params.restoreComposer).toHaveBeenCalledWith(expect.objectContaining({
+      text: 'next task',
+    }));
+    expect(params.setSendError).toHaveBeenLastCalledWith(sendError.message);
+    expect(params.runQueue.refreshQueuedInputs).not.toHaveBeenCalled();
+  });
+
   it('keeps an existing session bound to its agent instead of the global draft selection', async () => {
     const send = createSendMock();
     const params = createControllerParams({ isRunning: false, send });

package/src/features/chat/features/conversation/hooks/__tests__/use-session-run-queue.test.tsx

@@ -83,6 +83,24 @@ describe('useSessionRunQueue', () => {
     unmount();
   });
 
+  it('refreshes the authoritative queue on demand after a submission is accepted', async () => {
+    const listQueuedInputs = vi.spyOn(nextclawClient.sessions, 'listQueuedInputs')
+      .mockResolvedValue(createQueue('session-1', 'queued'));
+    const { result } = renderHook(
+      () => useSessionRunQueue('session-1'),
+      { wrapper: createWrapper() },
+    );
+    await waitFor(() => expect(listQueuedInputs).toHaveBeenCalledTimes(1));
+
+    let refreshed: UiNcpSessionQueuedInputsView['inputs'] = [];
+    await act(async () => {
+      refreshed = [...await result.current.refreshQueuedInputs()];
+    });
+
+    expect(listQueuedInputs).toHaveBeenCalledTimes(2);
+    expect(refreshed[0]?.message.parts[0]).toMatchObject({ text: 'queued' });
+  });
+
   it('replaces an in-flight stale queue read after the queue changes', async () => {
     let resolveInitialRead!: (queue: UiNcpSessionQueuedInputsView) => void;
     const initialRead = new Promise<UiNcpSessionQueuedInputsView>((resolve) => {

package/src/features/chat/features/conversation/hooks/use-chat-composer-reference-intent.ts

@@ -2,6 +2,7 @@ import { useEffect, type RefObject } from 'react';
 import { type ChatInputBarHandle } from '@nextclaw/agent-chat-ui';
 import {
   CHAT_CONVERSATION_EXCERPT_TOKEN_KIND,
+  CHAT_UI_RESOURCE_TOKEN_KIND,
   CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
 } from '@nextclaw/shared';
 
@@ -41,7 +42,9 @@ export function useChatComposerReferenceIntent(params: {
                 role: intent.role,
                 excerpt: intent.excerpt,
               }
-          : undefined,
+            : intent.kind === CHAT_UI_RESOURCE_TOKEN_KIND
+              ? { reference: intent.reference }
+              : undefined,
       });
       intentManager.markConsumed(intent.id);
     };