@nextclaw/ui 0.8.0 → 0.9.0

package/src/components/chat/legacy/LegacyChatPage.tsx

@@ -8,6 +8,7 @@ import { parseSessionKeyFromRoute, resolveAgentIdFromSessionKey } from '@/compon
 import { ChatPresenterProvider } from '@/components/chat/presenter/chat-presenter-context';
 import { ChatPresenter } from '@/components/chat/presenter/chat.presenter';
 import { useChatRuntimeController } from '@/components/chat/useChatRuntimeController';
+import { resolveSessionTypeLabel } from '@/components/chat/useChatSessionTypeState';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
 
@@ -23,6 +24,7 @@ export function LegacyChatPage({ view }: ChatPageProps) {
   const { sessionId: routeSessionIdParam } = useParams<{ sessionId?: string }>();
   const threadRef = useRef<HTMLDivElement | null>(null);
   const selectedSessionKeyRef = useRef<string | null>(selectedSessionKey);
+  const modelHydratedSessionKeyRef = useRef<string | null>(null);
   const thinkingHydratedSessionKeyRef = useRef<string | null>(null);
   const routeSessionKey = useMemo(
     () => parseSessionKeyFromRoute(routeSessionIdParam),
@@ -38,6 +40,7 @@ export function LegacyChatPage({ view }: ChatPageProps) {
     sessions,
     skillRecords,
     selectedSession,
+    hydratedSessionModel,
     historyMessages,
     selectedSessionThinkingLevel,
     sessionTypeOptions,
@@ -125,6 +128,9 @@ export function LegacyChatPage({ view }: ChatPageProps) {
   }, [confirm, location.pathname, navigate, presenter]);
 
   const currentSessionDisplayName = selectedSession ? sessionDisplayName(selectedSession) : undefined;
+  const currentSessionTypeLabel =
+    sessionTypeOptions.find((option) => option.value === selectedSessionType)?.label ??
+    resolveSessionTypeLabel(selectedSessionType);
 
   useEffect(() => {
     presenter.chatThreadManager.bindActions({
@@ -133,10 +139,19 @@ export function LegacyChatPage({ view }: ChatPageProps) {
   }, [presenter, sessionsQuery.refetch]);
 
   useEffect(() => {
+    const shouldHydrateModelFromSession =
+      !isSending &&
+      !isAwaitingAssistantOutput &&
+      !sessionsQuery.isLoading &&
+      isProviderStateResolved &&
+      modelOptions.length > 0 &&
+      selectedSessionKey !== modelHydratedSessionKeyRef.current;
     const shouldHydrateThinkingFromHistory =
       !isSending &&
       !isAwaitingAssistantOutput &&
       !historyQuery.isLoading &&
+      isProviderStateResolved &&
+      modelOptions.length > 0 &&
       selectedSessionKey !== thinkingHydratedSessionKeyRef.current;
 
     presenter.chatInputManager.syncSnapshot({
@@ -149,6 +164,7 @@ export function LegacyChatPage({ view }: ChatPageProps) {
       sendError: lastSendError,
       isSending,
       modelOptions,
+      ...(shouldHydrateModelFromSession ? { selectedModel: hydratedSessionModel } : {}),
       sessionTypeOptions,
       selectedSessionType,
       ...(shouldHydrateThinkingFromHistory ? { selectedThinkingLevel: selectedSessionThinkingLevel } : {}),
@@ -157,10 +173,14 @@ export function LegacyChatPage({ view }: ChatPageProps) {
       skillRecords,
       isSkillsLoading: installedSkillsQuery.isLoading
     });
+    if (shouldHydrateModelFromSession) {
+      modelHydratedSessionKeyRef.current = selectedSessionKey;
+    }
     if (shouldHydrateThinkingFromHistory) {
       thinkingHydratedSessionKeyRef.current = selectedSessionKey;
     }
     if (!selectedSessionKey) {
+      modelHydratedSessionKeyRef.current = null;
       thinkingHydratedSessionKeyRef.current = null;
     }
     presenter.chatSessionListManager.syncSnapshot({
@@ -178,6 +198,7 @@ export function LegacyChatPage({ view }: ChatPageProps) {
       modelOptions,
       sessionTypeUnavailable,
       sessionTypeUnavailableMessage,
+      sessionTypeLabel: currentSessionTypeLabel,
       selectedSessionKey,
       sessionDisplayName: currentSessionDisplayName,
       canDeleteSession: Boolean(selectedSession),
@@ -192,15 +213,18 @@ export function LegacyChatPage({ view }: ChatPageProps) {
     canEditSessionType,
     canStopCurrentRun,
     currentSessionDisplayName,
+    currentSessionTypeLabel,
     chatCapabilitiesQuery.data?.stopReason,
     chatCapabilitiesQuery.data?.stopSupported,
     defaultSessionType,
     historyQuery.isLoading,
     installedSkillsQuery.isLoading,
     isAwaitingAssistantOutput,
+    hydratedSessionModel,
     isProviderStateResolved,
     isSending,
     lastSendError,
+    modelOptions.length,
     modelOptions,
     presenter,
     query,

package/src/components/chat/managers/chat-input.manager.ts

@@ -5,12 +5,15 @@ import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
 import { normalizeSessionType } from '@/components/chat/useChatSessionTypeState';
 import type { ChatInputSnapshot } from '@/components/chat/stores/chat-input.store';
+import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
 import type { SetStateAction } from 'react';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 import type { ThinkingLevel } from '@/api/types';
 import type { ChatModelOption } from '@/components/chat/chat-input.types';
 
 export class ChatInputManager {
+  private readonly sessionPreferenceSync = new ChatSessionPreferenceSync(updateSession);
+
   constructor(
     private uiManager: ChatUiManager,
     private streamActionsManager: ChatStreamActionsManager
@@ -139,10 +142,12 @@ export class ChatInputManager {
 
   selectModel = (value: string) => {
     this.setSelectedModel(value);
+    this.sessionPreferenceSync.syncSelectedSessionPreferences();
   };
 
   selectThinkingLevel = (value: ThinkingLevel) => {
     this.setSelectedThinkingLevel(value);
+    this.sessionPreferenceSync.syncSelectedSessionPreferences();
   };
 
   selectSkills = (next: string[]) => {

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

@@ -0,0 +1,39 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
+import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
+import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
+
+describe('ChatSessionListManager', () => {
+  beforeEach(() => {
+    useChatInputStore.setState({
+      snapshot: {
+        ...useChatInputStore.getState().snapshot,
+        defaultSessionType: 'native',
+        pendingSessionType: 'native'
+      }
+    });
+    useChatSessionListStore.setState({
+      snapshot: {
+        ...useChatSessionListStore.getState().snapshot,
+        selectedSessionKey: 'session-1'
+      }
+    });
+  });
+
+  it('applies the requested session type when creating a session', () => {
+    const uiManager = {
+      goToChatRoot: vi.fn()
+    } as unknown as ConstructorParameters<typeof ChatSessionListManager>[0];
+    const streamActionsManager = {
+      resetStreamState: vi.fn()
+    } as unknown as ConstructorParameters<typeof ChatSessionListManager>[1];
+
+    const manager = new ChatSessionListManager(uiManager, streamActionsManager);
+    manager.createSession('codex');
+
+    expect(streamActionsManager.resetStreamState).toHaveBeenCalledTimes(1);
+    expect(uiManager.goToChatRoot).toHaveBeenCalledTimes(1);
+    expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBeNull();
+    expect(useChatInputStore.getState().snapshot.pendingSessionType).toBe('codex');
+  });
+});

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

@@ -53,11 +53,17 @@ export class ChatSessionListManager {
     useChatSessionListStore.getState().setSnapshot({ selectedSessionKey: value });
   };
 
-  createSession = () => {
-    const defaultSessionType = useChatInputStore.getState().snapshot.defaultSessionType || 'native';
+  createSession = (sessionType?: string) => {
+    const { snapshot } = useChatInputStore.getState();
+    const { defaultSessionType: configuredDefaultSessionType } = snapshot;
+    const defaultSessionType = configuredDefaultSessionType || 'native';
+    const nextSessionType =
+      typeof sessionType === 'string' && sessionType.trim().length > 0
+        ? sessionType.trim()
+        : defaultSessionType;
     this.streamActionsManager.resetStreamState();
     this.setSelectedSessionKey(null);
-    useChatInputStore.getState().setSnapshot({ pendingSessionType: defaultSessionType });
+    useChatInputStore.getState().setSnapshot({ pendingSessionType: nextSessionType });
     this.uiManager.goToChatRoot();
   };
 

package/src/components/chat/ncp/NcpChatPage.tsx

@@ -3,17 +3,18 @@ import { NcpHttpAgentClientEndpoint } from '@nextclaw/ncp-http-agent-client';
 import { useHydratedNcpAgent, type NcpConversationSeed } from '@nextclaw/ncp-react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { API_BASE } from '@/api/client';
-import { fetchNcpSessionMessages } from '@/api/config';
+import { fetchNcpSessionMessages } from '@/api/ncp-session';
 import type { ChatRunView } from '@/api/types';
 import { sessionDisplayName } from '@/components/chat/chat-page-data';
 import { ChatPageLayout, type ChatPageProps, useChatSessionSync } from '@/components/chat/chat-page-shell';
 import { parseSessionKeyFromRoute, resolveAgentIdFromSessionKey } from '@/components/chat/chat-session-route';
 import { useNcpChatPageData } from '@/components/chat/ncp/ncp-chat-page-data';
 import { NcpChatPresenter } from '@/components/chat/ncp/ncp-chat.presenter';
-import { adaptNcpMessagesToUiMessages, createNcpSessionId } from '@/components/chat/ncp/ncp-session-adapter';
+import { adaptNcpMessagesToUiMessages, buildNcpSessionRunStatusByKey, createNcpSessionId } from '@/components/chat/ncp/ncp-session-adapter';
 import { ChatPresenterProvider } from '@/components/chat/presenter/chat-presenter-context';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
+import { resolveSessionTypeLabel } from '@/components/chat/useChatSessionTypeState';
 import { useConfirmDialog } from '@/hooks/useConfirmDialog';
 import { normalizeRequestedSkills } from '@/lib/chat-runtime-utils';
 
@@ -70,6 +71,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
   const { sessionId: routeSessionIdParam } = useParams<{ sessionId?: string }>();
   const threadRef = useRef<HTMLDivElement | null>(null);
   const selectedSessionKeyRef = useRef<string | null>(selectedSessionKey);
+  const modelHydratedSessionKeyRef = useRef<string | null>(null);
   const thinkingHydratedSessionKeyRef = useRef<string | null>(null);
   const routeSessionKey = useMemo(
     () => parseSessionKeyFromRoute(routeSessionIdParam),
@@ -84,6 +86,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
     sessions,
     skillRecords,
     selectedSession,
+    hydratedSessionModel,
     selectedSessionThinkingLevel,
     sessionTypeOptions,
     defaultSessionType,
@@ -98,6 +101,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
     setPendingSessionType: presenter.chatInputManager.setPendingSessionType,
     setSelectedModel: presenter.chatInputManager.setSelectedModel
   });
+  const refetchSessions = sessionsQuery.refetch;
 
   const activeSessionId = selectedSessionKey ?? draftSessionId;
   const sessionSummariesRef = useRef(sessionSummaries);
@@ -161,15 +165,22 @@ export function NcpChatPage({ view }: ChatPageProps) {
   const stopDisabledReason = agent.isRunning ? null : '__preparing__';
   const lastSendError = agent.hydrateError?.message ?? agent.snapshot.error?.message ?? null;
   const activeBackendRunId = agent.activeRunId;
-  const sessionRunStatusByKey = useMemo(() => {
-    const map = new Map<string, 'running'>();
-    for (const sessionSummary of sessionSummaries) {
-      if (sessionSummary.status === 'running') {
-        map.set(sessionSummary.sessionId, 'running');
-      }
+  const sessionRunStatusByKey = useMemo(
+    () =>
+      buildNcpSessionRunStatusByKey({
+        summaries: sessionSummaries,
+        activeSessionId,
+        isLocallyRunning: isSending || Boolean(activeBackendRunId)
+      }),
+    [activeBackendRunId, activeSessionId, isSending, sessionSummaries]
+  );
+
+  useEffect(() => {
+    if (!isSending && !activeBackendRunId) {
+      return;
     }
-    return map;
-  }, [sessionSummaries]);
+    void refetchSessions();
+  }, [activeBackendRunId, isSending, refetchSessions]);
 
   useEffect(() => {
     presenter.chatStreamActionsManager.bind({
@@ -248,6 +259,9 @@ export function NcpChatPage({ view }: ChatPageProps) {
   }, [confirm, location.pathname, navigate, presenter]);
 
   const currentSessionDisplayName = selectedSession ? sessionDisplayName(selectedSession) : undefined;
+  const currentSessionTypeLabel =
+    sessionTypeOptions.find((option) => option.value === selectedSessionType)?.label ??
+    resolveSessionTypeLabel(selectedSessionType);
 
   useEffect(() => {
     presenter.chatThreadManager.bindActions({
@@ -256,10 +270,19 @@ export function NcpChatPage({ view }: ChatPageProps) {
   }, [presenter, sessionsQuery.refetch]);
 
   useEffect(() => {
+    const shouldHydrateModelFromSession =
+      !isSending &&
+      !isAwaitingAssistantOutput &&
+      !sessionsQuery.isLoading &&
+      isProviderStateResolved &&
+      modelOptions.length > 0 &&
+      selectedSessionKey !== modelHydratedSessionKeyRef.current;
     const shouldHydrateThinkingFromSession =
       !isSending &&
       !isAwaitingAssistantOutput &&
       !agent.isHydrating &&
+      isProviderStateResolved &&
+      modelOptions.length > 0 &&
       selectedSessionKey !== thinkingHydratedSessionKeyRef.current;
 
     presenter.chatInputManager.syncSnapshot({
@@ -272,6 +295,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
       sendError: lastSendError,
       isSending,
       modelOptions,
+      ...(shouldHydrateModelFromSession ? { selectedModel: hydratedSessionModel } : {}),
       sessionTypeOptions,
       selectedSessionType,
       ...(shouldHydrateThinkingFromSession ? { selectedThinkingLevel: selectedSessionThinkingLevel } : {}),
@@ -280,10 +304,14 @@ export function NcpChatPage({ view }: ChatPageProps) {
       skillRecords,
       isSkillsLoading: installedSkillsQuery.isLoading
     });
+    if (shouldHydrateModelFromSession) {
+      modelHydratedSessionKeyRef.current = selectedSessionKey;
+    }
     if (shouldHydrateThinkingFromSession) {
       thinkingHydratedSessionKeyRef.current = selectedSessionKey;
     }
     if (!selectedSessionKey) {
+      modelHydratedSessionKeyRef.current = null;
       thinkingHydratedSessionKeyRef.current = null;
     }
     presenter.chatSessionListManager.syncSnapshot({
@@ -301,6 +329,7 @@ export function NcpChatPage({ view }: ChatPageProps) {
       modelOptions,
       sessionTypeUnavailable,
       sessionTypeUnavailableMessage,
+      sessionTypeLabel: currentSessionTypeLabel,
       selectedSessionKey,
       sessionDisplayName: currentSessionDisplayName,
       canDeleteSession: Boolean(selectedSession),
@@ -316,12 +345,15 @@ export function NcpChatPage({ view }: ChatPageProps) {
     canEditSessionType,
     canStopCurrentRun,
     currentSessionDisplayName,
+    currentSessionTypeLabel,
     defaultSessionType,
     installedSkillsQuery.isLoading,
     isAwaitingAssistantOutput,
+    hydratedSessionModel,
     isProviderStateResolved,
     isSending,
     lastSendError,
+    modelOptions.length,
     modelOptions,
     presenter,
     query,

package/src/components/chat/ncp/ncp-chat-input.manager.ts

@@ -1,14 +1,18 @@
 import type { SetStateAction } from 'react';
 import type { ThinkingLevel } from '@/api/types';
+import { updateNcpSession } from '@/api/ncp-session';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
 import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
 import type { ChatInputSnapshot } from '@/components/chat/stores/chat-input.store';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
+import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
 import type { ChatModelOption } from '@/components/chat/chat-input.types';
 import { normalizeSessionType } from '@/components/chat/useChatSessionTypeState';
 
 export class NcpChatInputManager {
+  private readonly sessionPreferenceSync = new ChatSessionPreferenceSync(updateNcpSession);
+
   constructor(
     private uiManager: ChatUiManager,
     private streamActionsManager: ChatStreamActionsManager,
@@ -135,10 +139,12 @@ export class NcpChatInputManager {
 
   selectModel = (value: string) => {
     this.setSelectedModel(value);
+    this.sessionPreferenceSync.syncSelectedSessionPreferences();
   };
 
   selectThinkingLevel = (value: ThinkingLevel) => {
     this.setSelectedThinkingLevel(value);
+    this.sessionPreferenceSync.syncSelectedSessionPreferences();
   };
 
   selectSkills = (next: string[]) => {

package/src/components/chat/ncp/ncp-chat-page-data.ts

@@ -7,12 +7,17 @@ import {
   readNcpSessionPreferredThinking
 } from '@/components/chat/ncp/ncp-session-adapter';
 import { useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
-import { useSyncSelectedModel } from '@/components/chat/chat-page-runtime';
+import {
+  resolveSelectedModelValue,
+  resolveRecentSessionPreferredModel,
+  useSyncSelectedModel
+} from '@/components/chat/chat-page-runtime';
 import {
   useConfig,
   useConfigMeta,
   useNcpSessions
 } from '@/hooks/useConfig';
+import { useNcpChatSessionTypes } from '@/hooks/use-ncp-chat-session-types';
 import { useMarketplaceInstalled } from '@/hooks/useMarketplace';
 import { buildProviderModelCatalog, composeProviderModel, resolveModelThinkingCapability } from '@/lib/provider-models';
 
@@ -36,6 +41,7 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
   const configQuery = useConfig();
   const configMetaQuery = useConfigMeta();
   const sessionsQuery = useNcpSessions({ limit: 200 });
+  const sessionTypesQuery = useNcpChatSessionTypes();
   const installedSkillsQuery = useMarketplaceInstalled('skill');
   const isProviderStateResolved =
     (configQuery.isFetched || configQuery.isSuccess) &&
@@ -107,20 +113,45 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
     selectedSessionKey: params.selectedSessionKey,
     pendingSessionType: params.pendingSessionType,
     setPendingSessionType: params.setPendingSessionType,
-    sessionTypesData: null
+    sessionTypesData: sessionTypesQuery.data
   });
+  const recentSessionPreferredModel = useMemo(
+    () =>
+      resolveRecentSessionPreferredModel({
+        sessions: allSessions,
+        selectedSessionKey: params.selectedSessionKey,
+        sessionType: sessionTypeState.selectedSessionType
+      }),
+    [allSessions, params.selectedSessionKey, sessionTypeState.selectedSessionType]
+  );
 
   useSyncSelectedModel({
     modelOptions,
+    selectedSessionKey: params.selectedSessionKey,
     selectedSessionPreferredModel: selectedSession?.preferredModel,
+    fallbackPreferredModel: recentSessionPreferredModel,
     defaultModel: configQuery.data?.agents.defaults.model,
     setSelectedModel: params.setSelectedModel
   });
 
+  const hydratedSessionModel = useMemo(
+    () =>
+      resolveSelectedModelValue({
+        currentSelectedModel: '',
+        modelOptions,
+        selectedSessionPreferredModel: selectedSession?.preferredModel,
+        fallbackPreferredModel: recentSessionPreferredModel,
+        defaultModel: configQuery.data?.agents.defaults.model,
+        preferSessionPreferredModel: true
+      }),
+    [configQuery.data?.agents.defaults.model, modelOptions, recentSessionPreferredModel, selectedSession?.preferredModel]
+  );
+
   return {
     configQuery,
     configMetaQuery,
     sessionsQuery,
+    sessionTypesQuery,
     installedSkillsQuery,
     isProviderStateResolved,
     modelOptions,
@@ -128,6 +159,7 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
     sessions,
     skillRecords,
     selectedSession,
+    hydratedSessionModel,
     selectedSessionThinkingLevel,
     ...sessionTypeState
   };

package/src/components/chat/ncp/ncp-chat-thread.manager.ts

@@ -1,4 +1,4 @@
-import { deleteNcpSession as deleteNcpSessionApi } from '@/api/config';
+import { deleteNcpSession as deleteNcpSessionApi } from '@/api/ncp-session';
 import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';

package/src/components/chat/ncp/ncp-session-adapter.test.ts

@@ -1,4 +1,8 @@
-import { adaptNcpSessionSummary, readNcpSessionPreferredThinking } from '@/components/chat/ncp/ncp-session-adapter';
+import {
+  adaptNcpSessionSummary,
+  buildNcpSessionRunStatusByKey,
+  readNcpSessionPreferredThinking
+} from '@/components/chat/ncp/ncp-session-adapter';
 import type { NcpSessionSummaryView } from '@/api/types';
 
 function createSummary(partial: Partial<NcpSessionSummaryView> = {}): NcpSessionSummaryView {
@@ -47,3 +51,25 @@ describe('readNcpSessionPreferredThinking', () => {
     expect(thinking).toBe('high');
   });
 });
+
+describe('buildNcpSessionRunStatusByKey', () => {
+  it('marks the active local session as running before the server summary catches up', () => {
+    const statuses = buildNcpSessionRunStatusByKey({
+      summaries: [createSummary({ sessionId: 'ncp-session-1', status: 'idle' })],
+      activeSessionId: 'ncp-session-1',
+      isLocallyRunning: true
+    });
+
+    expect(statuses.get('ncp-session-1')).toBe('running');
+  });
+
+  it('keeps persisted running sessions marked as running', () => {
+    const statuses = buildNcpSessionRunStatusByKey({
+      summaries: [createSummary({ sessionId: 'ncp-session-2', status: 'running' })],
+      activeSessionId: null,
+      isLocallyRunning: false
+    });
+
+    expect(statuses.get('ncp-session-2')).toBe('running');
+  });
+});

package/src/components/chat/ncp/ncp-session-adapter.ts

@@ -1,6 +1,7 @@
 import { ToolInvocationStatus, type UIMessage } from '@nextclaw/agent-chat';
 import type { NcpMessagePart } from '@nextclaw/ncp';
 import type { NcpMessageView, NcpSessionSummaryView, SessionEntryView, ThinkingLevel } from '@/api/types';
+import type { SessionRunStatus } from '@/lib/session-run-status';
 
 const THINKING_LEVEL_SET = new Set<string>(['off', 'minimal', 'low', 'medium', 'high', 'adaptive', 'xhigh']);
 
@@ -167,6 +168,7 @@ export function adaptNcpMessageToUiMessage(message: NcpMessageView): UIMessage {
 }
 
 export function adaptNcpMessagesToUiMessages(messages: readonly NcpMessageView[]): UIMessage[] {
+  console.log('[adaptNcpMessagesToUiMessages]', { messages });
   return messages.map(adaptNcpMessageToUiMessage);
 }
 
@@ -189,6 +191,24 @@ export function adaptNcpSessionSummaries(summaries: NcpSessionSummaryView[]): Se
   return summaries.map(adaptNcpSessionSummary);
 }
 
+export function buildNcpSessionRunStatusByKey(params: {
+  summaries: readonly NcpSessionSummaryView[];
+  activeSessionId?: string | null;
+  isLocallyRunning?: boolean;
+}): Map<string, SessionRunStatus> {
+  const map = new Map<string, SessionRunStatus>();
+  for (const summary of params.summaries) {
+    if (summary.status === 'running') {
+      map.set(summary.sessionId, 'running');
+    }
+  }
+  const activeSessionId = readOptionalString(params.activeSessionId);
+  if (params.isLocallyRunning && activeSessionId) {
+    map.set(activeSessionId, 'running');
+  }
+  return map;
+}
+
 export function createNcpSessionId(): string {
   return `ncp-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
 }

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

@@ -8,6 +8,7 @@ export type ChatThreadSnapshot = {
   modelOptions: ChatModelOption[];
   sessionTypeUnavailable: boolean;
   sessionTypeUnavailableMessage?: string | null;
+  sessionTypeLabel?: string | null;
   selectedSessionKey: string | null;
   sessionDisplayName?: string;
   canDeleteSession: boolean;
@@ -29,6 +30,7 @@ const initialSnapshot: ChatThreadSnapshot = {
   modelOptions: [],
   sessionTypeUnavailable: false,
   sessionTypeUnavailableMessage: null,
+  sessionTypeLabel: null,
   selectedSessionKey: null,
   sessionDisplayName: undefined,
   canDeleteSession: false,

package/src/components/chat/useChatSessionTypeState.test.tsx

@@ -0,0 +1,58 @@
+import { renderHook } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { resolveSessionTypeLabel, useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
+
+vi.mock('@/lib/i18n', () => ({
+  t: (key: string) => key
+}));
+
+describe('useChatSessionTypeState', () => {
+  it('formats non-native runtime labels generically when no explicit label is provided', () => {
+    expect(resolveSessionTypeLabel('workspace-agent')).toBe('Workspace Agent');
+  });
+
+  it('preserves an explicitly selected draft session type instead of resetting to the default', () => {
+    const setPendingSessionType = vi.fn();
+
+    const { result } = renderHook(() =>
+      useChatSessionTypeState({
+        selectedSession: null,
+        selectedSessionKey: null,
+        pendingSessionType: 'codex-sdk',
+        setPendingSessionType,
+        sessionTypesData: {
+          defaultType: 'native',
+          options: [
+            { value: 'native', label: 'Native' },
+            { value: 'codex-sdk', label: 'Codex' }
+          ]
+        }
+      })
+    );
+
+    expect(result.current.selectedSessionType).toBe('codex-sdk');
+    expect(setPendingSessionType).not.toHaveBeenCalled();
+  });
+
+  it('hydrates the draft session type from the runtime default when no explicit type exists', () => {
+    const setPendingSessionType = vi.fn();
+
+    renderHook(() =>
+      useChatSessionTypeState({
+        selectedSession: null,
+        selectedSessionKey: null,
+        pendingSessionType: '',
+        setPendingSessionType,
+        sessionTypesData: {
+          defaultType: 'codex-sdk',
+          options: [
+            { value: 'native', label: 'Native' },
+            { value: 'codex-sdk', label: 'Codex' }
+          ]
+        }
+      })
+    );
+
+    expect(setPendingSessionType).toHaveBeenCalledWith('codex-sdk');
+  });
+});