@nextclaw/ui 0.12.23 → 0.12.25

package/src/features/chat/hooks/use-ncp-chat-page-data.test.tsx

@@ -0,0 +1,70 @@
+import { renderHook } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { useNcpChatPageData } from './use-ncp-chat-page-data';
+
+const useNcpSessionSkillsMock = vi.fn();
+
+vi.mock('@/shared/hooks/use-config', () => ({
+  useConfig: () => ({
+    data: {
+      agents: { defaults: {} },
+      providers: {}
+    },
+    isFetched: true,
+    isSuccess: true
+  }),
+  useConfigMeta: () => ({
+    data: { providers: [] },
+    isFetched: true,
+    isSuccess: true
+  }),
+  useNcpSessions: () => ({
+    data: { sessions: [] }
+  }),
+  useNcpSessionSkills: (params: unknown) => useNcpSessionSkillsMock(params)
+}));
+
+vi.mock('./use-ncp-chat-session-types', () => ({
+  useNcpChatSessionTypes: () => ({
+    data: {
+      defaultType: 'native',
+      options: [{ value: 'native', label: 'Native' }]
+    }
+  })
+}));
+
+function renderPageData(params: { sessionKey: string | null }) {
+  return renderHook(() =>
+    useNcpChatPageData({
+      sessionKey: params.sessionKey,
+      query: '',
+      currentSelectedModel: '',
+      pendingSessionType: '',
+      setPendingSessionType: vi.fn(),
+      setSelectedModel: vi.fn(),
+      setSelectedThinkingLevel: vi.fn()
+    })
+  );
+}
+
+describe('useNcpChatPageData skills query', () => {
+  it('loads draft-session skills before a new chat materializes', () => {
+    useNcpSessionSkillsMock.mockReturnValue({ data: { records: [] }, isLoading: false });
+
+    renderPageData({ sessionKey: null });
+
+    expect(useNcpSessionSkillsMock).toHaveBeenCalledWith({
+      sessionId: 'draft-session'
+    });
+  });
+
+  it('loads real session skills after materialization', () => {
+    useNcpSessionSkillsMock.mockReturnValue({ data: { records: [] }, isLoading: false });
+
+    renderPageData({ sessionKey: 'session-1' });
+
+    expect(useNcpSessionSkillsMock).toHaveBeenCalledWith({
+      sessionId: 'session-1'
+    });
+  });
+});

package/src/features/chat/hooks/use-ncp-chat-page-data.ts

@@ -23,7 +23,7 @@ export type { ChatModelOption } from '@/features/chat/types/chat-input.types';
 
 type UseNcpChatPageDataParams = {
   query: string;
-  sessionKey: string;
+  sessionKey: string | null;
   projectRootOverride?: string | null;
   currentSelectedModel: string;
   pendingSessionType: string;
@@ -76,7 +76,7 @@ function useNcpChatModelOptions(params: {
 
 function useRecentSessionPreferences(params: {
   sessions: SessionEntryView[];
-  sessionKey: string;
+  sessionKey: string | null;
   sessionType: string;
 }) {
   const { sessions, sessionKey, sessionType } = params;
@@ -84,7 +84,7 @@ function useRecentSessionPreferences(params: {
     () =>
       resolveRecentSessionPreferredValue<string>({
         sessions,
-        selectedSessionKey: sessionKey,
+        selectedSessionKey: sessionKey ?? '',
         sessionType,
         readPreference: (session) => session.preferredModel?.trim() || undefined
       }),
@@ -94,7 +94,7 @@ function useRecentSessionPreferences(params: {
     () =>
       resolveRecentSessionPreferredValue<ThinkingLevel>({
         sessions,
-        selectedSessionKey: sessionKey,
+        selectedSessionKey: sessionKey ?? '',
         sessionType,
         readPreference: (session) => session.preferredThinking ?? undefined
       }),
@@ -158,7 +158,7 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
   const sessionsQuery = useNcpSessions({ limit: 200 });
   const sessionTypesQuery = useNcpChatSessionTypes();
   const sessionSkillsQuery = useNcpSessionSkills({
-    sessionId: sessionKey,
+    sessionId: sessionKey?.trim() || 'draft-session',
     ...(Object.prototype.hasOwnProperty.call(params, 'projectRootOverride')
       ? { projectRoot: projectRootOverride ?? null }
       : {})
@@ -219,7 +219,7 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
 
   useSyncSelectedModel({
     modelOptions: filteredModelOptions,
-    selectedSessionKey: sessionKey,
+    selectedSessionKey: sessionKey ?? '',
     selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredModel: selectedSession?.preferredModel,
     fallbackPreferredModel: sessionTypeState.selectedSessionTypeOption?.recommendedModel ?? recentSessionPreferredModel,
@@ -228,7 +228,7 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
   });
   useSyncSelectedThinking({
     supportedThinkingLevels,
-    selectedSessionKey: sessionKey,
+    selectedSessionKey: sessionKey ?? '',
     selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredThinking: selectedSession?.preferredThinking ?? null,
     fallbackPreferredThinking: recentSessionPreferredThinking ?? null,

package/src/features/chat/hooks/use-ncp-child-session-tabs-view.ts

@@ -49,16 +49,10 @@ export function useNcpChildSessionTabsView(
     return new Map(sessions.map((session) => [session.key, session]));
   }, [summaries]);
 
-  const summaryByKey = useMemo(
-    () => new Map(summaries.map((summary) => [summary.sessionId, summary])),
-    [summaries],
-  );
-
   return useMemo(
     () =>
       tabs.map((tab) => {
         const session = sessionByKey.get(tab.sessionKey) ?? null;
-        const summary = summaryByKey.get(tab.sessionKey) ?? null;
         const agentId = tab.agentId?.trim() || session?.agentId || null;
         return {
           sessionKey: tab.sessionKey,
@@ -68,7 +62,7 @@ export function useNcpChildSessionTabsView(
           updatedAt: session?.updatedAt ?? null,
           lastMessageAt: session?.lastMessageAt ?? null,
           readAt: session?.readAt ?? null,
-          runStatus: summary?.status === "running" ? "running" : undefined,
+          runStatus: session?.status === "running" ? "running" : undefined,
           sessionTypeLabel: session?.sessionType
             ? resolveSessionTypeLabel(session.sessionType)
             : null,
@@ -77,6 +71,6 @@ export function useNcpChildSessionTabsView(
           projectRoot: session?.projectRoot?.trim() || null,
         };
       }),
-    [sessionByKey, summaryByKey, tabs],
+    [sessionByKey, tabs],
   );
 }

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

@@ -146,6 +146,16 @@ describe("useNcpSessionConversation", () => {
     expect(mocks.hydratedCalls[1]?.client).toBe(mocks.clientInstances[1]);
   });
 
+  it("passes an empty session through without requesting a draft history seed", () => {
+    renderHook(() => useNcpSessionConversation(undefined));
+
+    expect(mocks.useHydratedNcpAgent).toHaveBeenCalledTimes(1);
+    expect(mocks.hydratedCalls[0]).toMatchObject({
+      sessionId: undefined,
+    });
+    expect(mocks.fetchNcpSessionMessages).not.toHaveBeenCalled();
+  });
+
   it("exposes the hydrated session context window without changing the generic ncp agent seed", async () => {
     const contextWindow = {
       usedContextTokens: 42,

package/src/features/chat/hooks/use-ncp-session-conversation.ts

@@ -93,7 +93,7 @@ function useSyncReadyRetryVersion(
 }
 
 export function useNcpSessionConversation(
-  sessionId: string,
+  sessionId: string | undefined,
   options: UseNcpSessionConversationOptions = {},
 ) {
   const [client] = useState(() => createNcpSessionConversationClient());
@@ -126,6 +126,7 @@ export function useNcpSessionConversation(
   const currentAgentError =
     agent.hydrateError?.message ?? agent.snapshot.error?.message ?? null;
   const readyRetrySignature =
+    sessionId &&
     systemStatus.phase === "ready" &&
     isNcpAgentStartupUnavailableErrorMessage(currentAgentError)
       ? `${sessionId}:${systemStatus.lastReadyAt ?? 0}`

package/src/features/chat/hooks/use-ncp-session-list-view.ts

@@ -32,11 +32,10 @@ export function useNcpSessionListView(params: { limit?: number } = {}) {
       shouldShowSessionInSidebar,
     );
     const filteredSessions = filterSessionsByQuery(sessions, query);
-    const summaryBySessionId = new Map(summaries.map((summary) => [summary.sessionId, summary]));
 
     return filteredSessions.map((session) => ({
       session,
-      runStatus: summaryBySessionId.get(session.key)?.status === 'running' ? 'running' : undefined
+      runStatus: session.status === 'running' ? 'running' : undefined
     }));
   }, [query, sessionsQuery.data?.sessions]);
 

package/src/features/chat/hooks/use-selected-session-context-window-indicator.ts

@@ -6,15 +6,13 @@ import { buildChatContextWindowIndicator } from '@/features/chat/utils/chat-cont
 
 export function useSelectedSessionContextWindowIndicator(): ChatContextWindowIndicator | null {
   const selectedSessionKey = useChatSessionListStore((state) => state.snapshot.selectedSessionKey);
-  const draftSessionKey = useChatSessionListStore((state) => state.snapshot.draftSessionKey);
   const liveSessionKey = useChatThreadStore((state) => state.snapshot.sessionKey);
   const liveContextWindow = useChatThreadStore((state) => state.snapshot.contextWindow);
-  const currentSessionKey = selectedSessionKey ?? draftSessionKey;
 
   return useMemo(() => {
-    if (liveSessionKey === currentSessionKey && liveContextWindow) {
+    if (selectedSessionKey && liveSessionKey === selectedSessionKey && liveContextWindow) {
       return buildChatContextWindowIndicator(liveContextWindow);
     }
     return null;
-  }, [currentSessionKey, liveContextWindow, liveSessionKey]);
+  }, [liveContextWindow, liveSessionKey, selectedSessionKey]);
 }

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,
@@ -34,7 +35,6 @@ describe('ChatSessionListManager', () => {
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
         selectedSessionKey: 'session-1',
-        draftSessionKey: 'draft-root-1',
         listMode: 'time-first'
       }
     });
@@ -59,13 +59,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(useChatThreadStore.getState().snapshot.sessionKey).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.hasSubmittedDraftMessage).toBe(false);
     expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
     expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
@@ -82,14 +82,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(useChatThreadStore.getState().snapshot.sessionKey).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.hasSubmittedDraftMessage).toBe(false);
     expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
     expect(useChatInputStore.getState().snapshot.pendingProjectRoot).toBeNull();
     expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
@@ -106,18 +106,17 @@ 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,
-        selectedSessionKey: null,
-        draftSessionKey: 'draft-root-2'
+        selectedSessionKey: null
       }
     });
     const uiManager = {
@@ -132,10 +131,11 @@ 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();
+    expect(useChatThreadStore.getState().snapshot.hasSubmittedDraftMessage).toBe(true);
   });
 
   it('does not eagerly replace the old selected session before the route finishes switching', () => {
@@ -149,10 +149,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,12 +224,11 @@ 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 without duplicating route-owned selection state', () => {
     useChatSessionListStore.setState({
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
         selectedSessionKey: null,
-        draftSessionKey: 'draft-root-2',
       }
     });
     const uiManager = {
@@ -243,8 +242,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).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.sessionKey).toBeNull();
+    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,18 +12,20 @@ export class ChatSessionListManager {
     private streamActionsManager: ChatStreamActionsManager
   ) {}
 
-  private syncDraftThreadState = (sessionKey: string) => {
+  private syncDraftThreadState = (hasSubmittedDraftMessage = false) => {
     useChatThreadStore.getState().setSnapshot({
-      sessionKey,
+      sessionKey: null,
       sessionDisplayName: undefined,
       canDeleteSession: false,
       isHistoryLoading: false,
       messages: [],
       isSending: false,
       isAwaitingAssistantOutput: false,
+      hasSubmittedDraftMessage,
       parentSessionKey: null,
       parentSessionLabel: null,
       workspacePanelParentKey: null,
+      activeWorkspacePanelKind: null,
       childSessionTabs: [],
       activeChildSessionKey: null,
       activeWorkspaceFileKey: null,
@@ -97,7 +98,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 +107,26 @@ export class ChatSessionListManager {
         ? sessionType.trim()
         : defaultSessionType;
     const normalizedProjectRoot = normalizeSessionProjectRootValue(projectRoot);
-    const nextSessionKey = createNcpSessionId();
     this.streamActionsManager.resetStreamState();
     useChatSessionListStore.getState().setSnapshot({
       selectedSessionKey: null,
-      draftSessionKey: nextSessionKey
     });
-    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,26 +135,19 @@ export class ChatSessionListManager {
       typeof sessionType === 'string' && sessionType.trim().length > 0
         ? sessionType.trim()
         : null;
-    this.syncDraftThreadState(snapshot.draftSessionKey);
+    this.syncDraftThreadState(true);
     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;
     }
     this.uiManager.goToSession(normalizedSessionKey, { replace: true });
@@ -166,6 +156,7 @@ export class ChatSessionListManager {
   selectSession = (sessionKey: string) => {
     useChatThreadStore.getState().setSnapshot({
       workspacePanelParentKey: null,
+      activeWorkspacePanelKind: null,
       activeChildSessionKey: null,
       activeWorkspaceFileKey: null,
     });

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

@@ -58,7 +58,6 @@ describe('NcpChatInputManager', () => {
       snapshot: {
         ...useChatSessionListStore.getState().snapshot,
         selectedSessionKey: 'stale-selected-session',
-        draftSessionKey: 'draft-root-session',
         selectedAgentId: 'main',
       },
     });
@@ -77,7 +76,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 +94,20 @@ 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,
       },
     });
     const streamActionsManager = {
@@ -111,7 +116,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 +126,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 +167,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 +178,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 +196,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 +207,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/managers/ncp-chat-presenter.manager.ts

@@ -18,4 +18,10 @@ export class NcpChatPresenter {
     this.chatSessionListManager,
     this.chatStreamActionsManager
   );
+
+  startAgentCreationDraft = (prompt: string) => {
+    this.chatSessionListManager.createSession();
+    this.chatSessionListManager.setSelectedAgentId('main');
+    this.chatInputManager.setDraft(prompt);
+  };
 }