@nextclaw/ui 0.12.23 → 0.12.24

package/src/features/chat/managers/chat-session-list.manager.test.ts

@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type * as SharedApi from '@/shared/lib/api';
 import { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
 import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
 import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
@@ -9,7 +10,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 vi.mock('@/shared/lib/api', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  const actual = await importOriginal<typeof SharedApi>();
   return {
     ...actual,
     updateNcpSession: mocks.updateNcpSession,
@@ -59,13 +60,13 @@ describe('ChatSessionListManager', () => {
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
 
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
-    const sessionKey = manager.createSession('codex');
+    manager.createSession('codex');
 
     expect(streamActionsManager.resetStreamState).toHaveBeenCalledTimes(1);
     expect(uiManager.goToChatRoot).toHaveBeenCalledTimes(1);
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBeNull();
-    expect(useChatSessionListStore.getState().snapshot.draftSessionKey).toBe(sessionKey);
-    expect(useChatSessionListStore.getState().snapshot.draftSessionKey).not.toBe('draft-root-1');
+    expect(useChatSessionListStore.getState().snapshot.draftSessionKey).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.sessionKey).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
     expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
@@ -82,14 +83,14 @@ describe('ChatSessionListManager', () => {
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
 
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
-    const sessionKey = manager.startAgentDraftChat('researcher', 'codex');
+    manager.startAgentDraftChat('researcher', 'codex');
 
     expect(streamActionsManager.resetStreamState).toHaveBeenCalledTimes(1);
     expect(uiManager.goToChatRoot).toHaveBeenCalledTimes(1);
     expect(useChatSessionListStore.getState().snapshot.selectedAgentId).toBe('researcher');
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBeNull();
-    expect(useChatSessionListStore.getState().snapshot.draftSessionKey).toBe(sessionKey);
-    expect(useChatThreadStore.getState().snapshot.sessionKey).toBe(sessionKey);
+    expect(useChatSessionListStore.getState().snapshot.draftSessionKey).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.sessionKey).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
     expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
@@ -106,13 +107,13 @@ describe('ChatSessionListManager', () => {
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
 
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
-    const sessionKey = manager.createSession('native', '/tmp/project-alpha');
+    manager.createSession('native', '/tmp/project-alpha');
 
     expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBe('/tmp/project-alpha');
-    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBe(sessionKey);
+    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
   });
 
-  it('reuses the current root draft when send flow needs a concrete session key', () => {
+  it('keeps the root draft key empty when send flow has no concrete session yet', () => {
     useChatSessionListStore.setState({
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
@@ -132,7 +133,7 @@ describe('ChatSessionListManager', () => {
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
     const sessionKey = manager.ensureDraftSession('native');
 
-    expect(sessionKey).toBe('draft-root-2');
+    expect(sessionKey).toBeNull();
     expect(uiManager.goToChatRoot).not.toHaveBeenCalled();
     expect(uiManager.goToSession).not.toHaveBeenCalled();
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBeNull();
@@ -149,10 +150,10 @@ describe('ChatSessionListManager', () => {
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
 
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
-    const sessionKey = manager.createSession('native', '/tmp/project-alpha');
+    manager.createSession('native', '/tmp/project-alpha');
 
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBeNull();
-    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBe(sessionKey);
+    expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
   });
 
   it('delegates existing-session selection to routing without eagerly mutating the selected session state', () => {
@@ -224,7 +225,7 @@ describe('ChatSessionListManager', () => {
     expect(mocks.updateNcpSession).not.toHaveBeenCalled();
   });
 
-  it('promotes the active root draft to a concrete session route after the draft has been sent successfully', () => {
+  it('routes to the backend-materialized root session after the first send starts', () => {
     useChatSessionListStore.setState({
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
@@ -243,8 +244,10 @@ describe('ChatSessionListManager', () => {
     const manager = new ChatSessionListManager(uiManager, streamActionsManager);
 
     manager.ensureDraftSession('native');
-    manager.promoteRootDraftSessionRoute('draft-root-2');
+    manager.materializeRootSessionRoute('ncp-materialized-session');
 
-    expect(uiManager.goToSession).toHaveBeenCalledWith('draft-root-2', { replace: true });
+    expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe('ncp-materialized-session');
+    expect(useChatThreadStore.getState().snapshot.sessionKey).toBe('ncp-materialized-session');
+    expect(uiManager.goToSession).toHaveBeenCalledWith('ncp-materialized-session', { replace: true });
   });
 });

package/src/features/chat/managers/chat-session-list.manager.ts

@@ -5,7 +5,6 @@ import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
 import type { SetStateAction } from 'react';
 import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
 import { normalizeSessionProjectRootValue } from '@/shared/lib/session-project';
-import { createNcpSessionId } from '@/features/chat/utils/ncp-session-adapter.utils';
 import { updateNcpSession } from '@/shared/lib/api';
 export class ChatSessionListManager {
   constructor(
@@ -13,9 +12,9 @@ export class ChatSessionListManager {
     private streamActionsManager: ChatStreamActionsManager
   ) {}
 
-  private syncDraftThreadState = (sessionKey: string) => {
+  private syncDraftThreadState = () => {
     useChatThreadStore.getState().setSnapshot({
-      sessionKey,
+      sessionKey: null,
       sessionDisplayName: undefined,
       canDeleteSession: false,
       isHistoryLoading: false,
@@ -97,7 +96,7 @@ export class ChatSessionListManager {
     void updateNcpSession(normalizedSessionKey, { uiReadAt: normalizedReadAt }).catch(() => undefined);
   };
 
-  createSession = (sessionType?: string, projectRoot?: string | null): string => {
+  createSession = (sessionType?: string, projectRoot?: string | null): void => {
     const { snapshot } = useChatInputStore.getState();
     const { defaultSessionType: configuredDefaultSessionType } = snapshot;
     const defaultSessionType = configuredDefaultSessionType || 'native';
@@ -106,30 +105,27 @@ export class ChatSessionListManager {
         ? sessionType.trim()
         : defaultSessionType;
     const normalizedProjectRoot = normalizeSessionProjectRootValue(projectRoot);
-    const nextSessionKey = createNcpSessionId();
     this.streamActionsManager.resetStreamState();
     useChatSessionListStore.getState().setSnapshot({
       selectedSessionKey: null,
-      draftSessionKey: nextSessionKey
+      draftSessionKey: null
     });
-    this.syncDraftThreadState(nextSessionKey);
+    this.syncDraftThreadState();
     useChatInputStore.getState().setSnapshot({
       pendingSessionType: nextSessionType,
       pendingProjectRoot: normalizedProjectRoot,
-      pendingProjectRootSessionKey: normalizedProjectRoot ? nextSessionKey : null
+      pendingProjectRootSessionKey: null
     });
     this.uiManager.goToChatRoot();
-    return nextSessionKey;
   };
 
-  startAgentDraftChat = (agentId: string, sessionType: string): string => {
+  startAgentDraftChat = (agentId: string, sessionType: string): void => {
     const normalizedAgentId = agentId.trim() || 'main';
-    const nextSessionKey = this.createSession(sessionType);
+    this.createSession(sessionType);
     this.setSelectedAgentId(normalizedAgentId);
-    return nextSessionKey;
   };
 
-  ensureDraftSession = (sessionType?: string): string => {
+  ensureDraftSession = (sessionType?: string): string | null => {
     const { snapshot } = useChatSessionListStore.getState();
     if (snapshot.selectedSessionKey) {
       return snapshot.selectedSessionKey;
@@ -138,28 +134,28 @@ export class ChatSessionListManager {
       typeof sessionType === 'string' && sessionType.trim().length > 0
         ? sessionType.trim()
         : null;
-    this.syncDraftThreadState(snapshot.draftSessionKey);
+    this.syncDraftThreadState();
     if (normalizedSessionType) {
       useChatInputStore.getState().setSnapshot({ pendingSessionType: normalizedSessionType });
     }
-    return snapshot.draftSessionKey;
+    return null;
   };
 
-  promoteRootDraftSessionRoute = (sessionKey: string) => {
+  materializeRootSessionRoute = (sessionKey: string) => {
     const normalizedSessionKey = sessionKey.trim();
     if (!normalizedSessionKey) {
       return;
     }
-    const { snapshot } = useChatSessionListStore.getState();
-    const { sessionKey: currentThreadSessionKey } = useChatThreadStore.getState().snapshot;
-    if (
-      snapshot.selectedSessionKey !== null ||
-      snapshot.draftSessionKey !== normalizedSessionKey ||
-      currentThreadSessionKey !== normalizedSessionKey ||
-      !this.uiManager.isAtChatRoot()
-    ) {
+    if (!this.uiManager.isAtChatRoot()) {
       return;
     }
+    useChatSessionListStore.getState().setSnapshot({
+      selectedSessionKey: normalizedSessionKey,
+      draftSessionKey: null,
+    });
+    useChatThreadStore.getState().setSnapshot({
+      sessionKey: normalizedSessionKey,
+    });
     this.uiManager.goToSession(normalizedSessionKey, { replace: true });
   };
 

package/src/features/chat/managers/ncp-chat-input.manager.test.ts

@@ -77,7 +77,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -95,14 +95,21 @@ describe('NcpChatInputManager', () => {
       }),
     );
     expect(sessionListManager.ensureDraftSession).not.toHaveBeenCalled();
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('current-route-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
-  it('keeps sending through the current root draft session while /chat is still in blank-draft mode', async () => {
+  it('sends without a session key while /chat is still in blank-draft mode', async () => {
     useChatThreadStore.setState({
       snapshot: {
         ...useChatThreadStore.getState().snapshot,
-        sessionKey: 'draft-root-session',
+        sessionKey: null,
+      },
+    });
+    useChatSessionListStore.setState({
+      snapshot: {
+        ...useChatSessionListStore.getState().snapshot,
+        selectedSessionKey: null,
+        draftSessionKey: null,
       },
     });
     const streamActionsManager = {
@@ -111,7 +118,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'materialized-draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -121,14 +128,18 @@ describe('NcpChatInputManager', () => {
 
     await manager.send();
 
-    expect(sessionListManager.ensureDraftSession).not.toHaveBeenCalled();
+    expect(sessionListManager.ensureDraftSession).toHaveBeenCalledWith('native');
+    expect(streamActionsManager.sendMessage).toHaveBeenCalledWith(
+      expect.not.objectContaining({
+        sessionKey: expect.any(String),
+      }),
+    );
     expect(streamActionsManager.sendMessage).toHaveBeenCalledWith(
       expect.objectContaining({
-        sessionKey: 'draft-root-session',
         message: 'hello from current thread',
       }),
     );
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('draft-root-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
   it('does not send while the runtime is still blocked during startup', async () => {
@@ -158,7 +169,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -169,7 +180,7 @@ describe('NcpChatInputManager', () => {
     await manager.send();
 
     expect(streamActionsManager.sendMessage).not.toHaveBeenCalled();
-    expect(sessionListManager.promoteRootDraftSessionRoute).not.toHaveBeenCalled();
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 
   it('still attempts to send when provider metadata is stale or the session type is marked unavailable', async () => {
@@ -187,7 +198,7 @@ describe('NcpChatInputManager', () => {
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
     const sessionListManager = {
       ensureDraftSession: vi.fn(() => 'draft-session'),
-      promoteRootDraftSessionRoute: vi.fn(),
+      materializeRootSessionRoute: vi.fn(),
     } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
     const manager = new NcpChatInputManager(
       {} as ConstructorParameters<typeof NcpChatInputManager>[0],
@@ -198,6 +209,6 @@ describe('NcpChatInputManager', () => {
     await manager.send();
 
     expect(streamActionsManager.sendMessage).toHaveBeenCalledTimes(1);
-    expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('current-route-session');
+    expect(sessionListManager.materializeRootSessionRoute).not.toHaveBeenCalled();
   });
 });

package/src/features/chat/managers/ncp-chat-input.manager.ts

@@ -197,11 +197,14 @@ export class NcpChatInputManager {
     const sessionKey =
       threadSnapshot.sessionKey ??
       sessionSnapshot.selectedSessionKey ??
+      null;
+    if (!sessionKey && inputSnapshot.selectedSessionType?.trim()) {
       this.sessionListManager.ensureDraftSession(inputSnapshot.selectedSessionType);
+    }
     this.setComposerNodes(createInitialChatComposerNodes());
     await this.streamActionsManager.sendMessage({
       message,
-      sessionKey,
+      ...(sessionKey ? { sessionKey } : {}),
       agentId: sessionSnapshot.selectedAgentId,
       sessionType: inputSnapshot.selectedSessionType,
       model: inputSnapshot.selectedModel || undefined,
@@ -213,7 +216,6 @@ export class NcpChatInputManager {
       restoreDraftOnError: true,
       composerNodes
     });
-    this.sessionListManager.promoteRootDraftSessionRoute(sessionKey);
   };
 
   stop = async () => {

package/src/features/chat/pages/ncp-chat-page.tsx

@@ -106,9 +106,6 @@ function useNcpChatPageBaseState(presenter: NcpChatPresenter) {
   const selectedSessionKey = useChatSessionListStore(
     (state) => state.snapshot.selectedSessionKey,
   );
-  const draftSessionKey = useChatSessionListStore(
-    (state) => state.snapshot.draftSessionKey,
-  );
   const selectedAgentId = useChatSessionListStore(
     (state) => state.snapshot.selectedAgentId,
   );
@@ -137,16 +134,16 @@ function useNcpChatPageBaseState(presenter: NcpChatPresenter) {
     () => parseSessionKeyFromRoute(routeSessionIdParam),
     [routeSessionIdParam],
   );
-  const sessionKey = routeSessionKey ?? selectedSessionKey ?? draftSessionKey;
+  const sessionKey = routeSessionKey ?? undefined;
   const hasSessionProjectRootOverride =
     pendingProjectRoot !== null &&
-    pendingProjectRootSessionKey === sessionKey;
+    (!sessionKey || pendingProjectRootSessionKey === sessionKey);
   const sessionProjectRootOverride = hasSessionProjectRootOverride
     ? pendingProjectRoot
     : undefined;
   const pageData = useNcpChatPageData({
     query,
-    sessionKey,
+    sessionKey: sessionKey ?? null,
     projectRootOverride: sessionProjectRootOverride,
     currentSelectedModel,
     pendingSessionType,
@@ -213,7 +210,7 @@ function useNcpChatPageState(presenter: NcpChatPresenter) {
     ? (agentsQuery.data?.agents ?? [])
     : [{ id: selectedSession?.agentId ?? selectedAgentId }];
   const derivedState = useNcpChatDerivedState({
-    sessionKey,
+    sessionKey: sessionKey ?? null,
     selectedSession,
     selectedAgentId,
     availableAgents,
@@ -251,14 +248,13 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
     pendingProjectRootSessionKey,
     presenter,
     selectedSession,
-    selectedSessionKey,
     selectedSessionKeyRef,
     sessionKey,
   } = params;
   useEffect(() => {
     presenter.chatStreamActionsManager.bind({
       sendMessage: async (payload) => {
-        if (payload.sessionKey !== sessionKey) {
+        if ((payload.sessionKey ?? null) !== (sessionKey ?? null)) {
           return;
         }
         const metadata = buildNcpSendMetadata({
@@ -267,7 +263,7 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
           thinkingLevel: payload.thinkingLevel,
           sessionType: payload.sessionType,
           projectRoot:
-            payload.sessionKey === pendingProjectRootSessionKey
+            !payload.sessionKey || payload.sessionKey === pendingProjectRootSessionKey
               ? pendingProjectRoot
               : (selectedSession?.projectRoot ?? null),
           requestedSkills: payload.requestedSkills,
@@ -322,7 +318,6 @@ function useNcpChatStreamBindings(params: ReturnType<typeof useNcpChatPageState>
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     presenter,
-    selectedSessionKey,
     selectedSession?.projectRoot,
     selectedSessionKeyRef,
     sessionKey,
@@ -336,7 +331,6 @@ function usePendingProjectRootOverrideCleanup(
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     selectedSession,
-    selectedSessionKey,
   } = params;
   useEffect(() => {
     if (
@@ -358,7 +352,6 @@ function usePendingProjectRootOverrideCleanup(
     pendingProjectRoot,
     pendingProjectRootSessionKey,
     selectedSession,
-    selectedSessionKey,
   ]);
 }
 
@@ -385,6 +378,22 @@ function useSelectedSessionAgentSync(params: ReturnType<typeof useNcpChatPageSta
   }, [presenter, selectedAgentId, selectedSession?.agentId]);
 }
 
+function useMaterializedRootSessionRouteSync(
+  params: ReturnType<typeof useNcpChatPageState>,
+) {
+  const { agent, presenter, routeSessionKey } = params;
+  const materializedSessionKey =
+    agent.snapshot.activeRun?.sessionId ??
+    agent.visibleMessages.find((message) => message.sessionId.trim())?.sessionId ??
+    null;
+  useEffect(() => {
+    if (routeSessionKey || !materializedSessionKey) {
+      return;
+    }
+    presenter.chatSessionListManager.materializeRootSessionRoute(materializedSessionKey);
+  }, [materializedSessionKey, presenter, routeSessionKey]);
+}
+
 export function NcpChatPage({ view }: ChatPageProps) {
   const [presenter] = useState(() => new NcpChatPresenter());
   const state = useNcpChatPageState(presenter);
@@ -392,6 +401,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
   usePendingProjectRootOverrideCleanup(state);
   useNcpChatUiBindings(state);
   useSelectedSessionAgentSync(state);
+  useMaterializedRootSessionRouteSync(state);
   useChatSessionSync({
     view,
     routeSessionKey: state.routeSessionKey,

package/src/features/chat/stores/chat-session-list.store.ts

@@ -1,10 +1,9 @@
 import { create, type StateCreator } from 'zustand';
-import { createNcpSessionId } from '@/features/chat/utils/ncp-session-adapter.utils';
 import type { SessionRunStatus } from '@/features/chat/types/session-run-status.types';
 export type ChatSessionListMode = 'time-first' | 'project-first';
 export type ChatSessionListSnapshot = {
   selectedSessionKey: string | null;
-  draftSessionKey: string;
+  draftSessionKey: string | null;
   selectedAgentId: string;
   query: string;
   listMode: ChatSessionListMode;
@@ -50,7 +49,7 @@ type ChatSessionListStoreSet = Parameters<StateCreator<ChatSessionListStore>>[0]
 
 const initialSnapshot: ChatSessionListSnapshot = {
   selectedSessionKey: null,
-  draftSessionKey: createNcpSessionId(),
+  draftSessionKey: null,
   selectedAgentId: 'main',
   query: '',
   listMode: 'time-first'

package/src/features/chat/types/chat-stream.types.ts

@@ -5,7 +5,7 @@ import type { ThinkingLevel } from '@/shared/lib/api';
 
 export type SendMessageParams = {
   message: string;
-  sessionKey: string;
+  sessionKey?: string;
   agentId: string;
   sessionType?: string;
   model?: string;

package/src/features/chat/utils/ncp-session-adapter.utils.ts

@@ -288,7 +288,7 @@ export function adaptNcpSessionSummary(summary: NcpSessionSummaryView): SessionE
   const isPromotedChildSession = readPromotedChildSession(summary);
   return {
     key: summary.sessionId,
-    createdAt: summary.updatedAt,
+    createdAt: summary.createdAt ?? summary.updatedAt,
     updatedAt: summary.updatedAt,
     ...(lastMessageAt ? { lastMessageAt } : {}),
     ...(readAt ? { readAt } : {}),

package/src/shared/lib/api/ncp-session-query-cache.test.ts

@@ -14,14 +14,18 @@ function createSessionsList(): NcpSessionsListView {
       {
         sessionId: 'session-1',
         messageCount: 1,
+        createdAt: '2026-03-29T08:00:00.000Z',
         updatedAt: '2026-03-29T10:00:00.000Z',
+        lastMessageAt: '2026-03-29T10:00:00.000Z',
         status: 'idle',
         metadata: {}
       },
       {
         sessionId: 'session-2',
         messageCount: 2,
+        createdAt: '2026-03-29T07:00:00.000Z',
         updatedAt: '2026-03-29T09:00:00.000Z',
+        lastMessageAt: '2026-03-29T09:00:00.000Z',
         status: 'idle',
         metadata: {}
       }
@@ -31,11 +35,13 @@ function createSessionsList(): NcpSessionsListView {
 }
 
 describe('ncp-session-query-cache', () => {
-  it('upserts summaries and keeps the list sorted by updatedAt descending', () => {
+  it('upserts summaries and keeps the list sorted by last message time descending', () => {
     const updated = upsertNcpSessionSummaryList(createSessionsList(), {
       sessionId: 'session-2',
       messageCount: 3,
+      createdAt: '2026-03-29T07:00:00.000Z',
       updatedAt: '2026-03-29T11:00:00.000Z',
+      lastMessageAt: '2026-03-29T11:00:00.000Z',
       status: 'running',
       metadata: { label: 'Latest' }
     });
@@ -48,6 +54,23 @@ describe('ncp-session-query-cache', () => {
     });
   });
 
+  it('does not reorder when only session metadata updatedAt changes', () => {
+    const updated = upsertNcpSessionSummaryList(createSessionsList(), {
+      sessionId: 'session-2',
+      messageCount: 2,
+      createdAt: '2026-03-29T07:00:00.000Z',
+      updatedAt: '2026-03-29T12:00:00.000Z',
+      lastMessageAt: '2026-03-29T09:00:00.000Z',
+      status: 'idle',
+      metadata: { ui_last_read_at: '2026-03-29T09:00:00.000Z' }
+    });
+
+    expect(updated?.sessions.map((session) => session.sessionId)).toEqual(['session-1', 'session-2']);
+    expect(updated?.sessions[1]?.metadata).toEqual({
+      ui_last_read_at: '2026-03-29T09:00:00.000Z'
+    });
+  });
+
   it('ignores stale summaries that would move a session back to an older running state', () => {
     const updated = upsertNcpSessionSummaryList(createSessionsList(), {
       sessionId: 'session-1',
@@ -128,7 +151,9 @@ describe('ncp-session-query-cache', () => {
         summary: {
           sessionId: 'session-3',
           messageCount: 1,
+          createdAt: '2026-03-29T12:00:00.000Z',
           updatedAt: '2026-03-29T12:00:00.000Z',
+          lastMessageAt: '2026-03-29T12:00:00.000Z',
           status: 'running',
           metadata: {}
         }

package/src/shared/lib/api/ncp-session-query-cache.ts

@@ -1,8 +1,12 @@
 import type { QueryClient } from '@tanstack/react-query';
 import type { NcpSessionSummaryView, NcpSessionsListView, WsEvent } from '@/shared/lib/api';
 
+function readSessionActivityAt(summary: NcpSessionSummaryView): string {
+  return summary.lastMessageAt ?? summary.createdAt ?? summary.updatedAt;
+}
+
 function sortSessionSummaries(summaries: readonly NcpSessionSummaryView[]): NcpSessionSummaryView[] {
-  return [...summaries].sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));
+  return [...summaries].sort((left, right) => readSessionActivityAt(right).localeCompare(readSessionActivityAt(left)));
 }
 
 function shouldReplaceSessionSummary(

package/dist/assets/marketplace-page-B2Pm2RDJ.js

@@ -1 +0,0 @@
-import{t as e}from"./marketplace-page-CPHxlYL8.js";export{e as MarketplacePage};

package/dist/assets/mcp-marketplace-page-BcjVmw36.js

@@ -1 +0,0 @@
-import{t as e}from"./mcp-marketplace-page-CswPXSjf.js";export{e as McpMarketplacePage};

package/dist/assets/remote-Db2M39Cv.js

@@ -1 +0,0 @@
-import{m as e}from"./app-manager-provider-BuJ_U9eC.js";export{e as RemoteAccessPage};