@nextclaw/ui 0.12.11 → 0.12.13

package/src/{components → features}/chat/hooks/use-chat-session-project.test.tsx

@@ -1,21 +1,21 @@
 import { act, renderHook } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { toast } from 'sonner';
-import { useChatSessionProject } from '@/components/chat/hooks/use-chat-session-project';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionProject } from '@/features/chat/hooks/use-chat-session-project';
 
 const mocks = vi.hoisted(() => ({
-  updateSession: vi.fn(),
+  updateSession: vi.fn()
 }));
 
 vi.mock('sonner', () => ({
   toast: {
-    success: vi.fn(),
-  },
+    success: vi.fn()
+  }
 }));
 
-vi.mock('@/components/chat/hooks/use-chat-session-update', () => ({
-  useChatSessionUpdate: () => mocks.updateSession,
+vi.mock('@/features/chat/hooks/use-chat-session-update', () => ({
+  useChatSessionUpdate: () => mocks.updateSession
 }));
 
 describe('useChatSessionProject', () => {
@@ -24,8 +24,8 @@ describe('useChatSessionProject', () => {
       snapshot: {
         ...state.snapshot,
         pendingProjectRoot: null,
-        pendingProjectRootSessionKey: null,
-      },
+        pendingProjectRootSessionKey: null
+      }
     }));
   });
 
@@ -40,14 +40,14 @@ describe('useChatSessionProject', () => {
       await result.current({
         sessionKey: 'draft-session-1',
         projectRoot: '/tmp/project-alpha',
-        persistToServer: false,
+        persistToServer: false
       });
     });
 
     expect(mocks.updateSession).not.toHaveBeenCalled();
     expect(useChatInputStore.getState().snapshot).toMatchObject({
       pendingProjectRoot: '/tmp/project-alpha',
-      pendingProjectRootSessionKey: 'draft-session-1',
+      pendingProjectRootSessionKey: 'draft-session-1'
     });
     expect(toast.success).toHaveBeenCalledTimes(1);
   });
@@ -59,14 +59,14 @@ describe('useChatSessionProject', () => {
       await result.current({
         sessionKey: 'draft-session-1',
         projectRoot: null,
-        persistToServer: false,
+        persistToServer: false
       });
     });
 
     expect(mocks.updateSession).not.toHaveBeenCalled();
     expect(useChatInputStore.getState().snapshot).toMatchObject({
       pendingProjectRoot: null,
-      pendingProjectRootSessionKey: 'draft-session-1',
+      pendingProjectRootSessionKey: 'draft-session-1'
     });
     expect(toast.success).toHaveBeenCalledTimes(1);
   });
@@ -78,18 +78,18 @@ describe('useChatSessionProject', () => {
       await result.current({
         sessionKey: 'session-1',
         projectRoot: '/tmp/project-beta',
-        persistToServer: true,
+        persistToServer: true
       });
     });
 
     expect(mocks.updateSession).toHaveBeenCalledWith({
       sessionKey: 'session-1',
       patch: { projectRoot: '/tmp/project-beta' },
-      successMessage: 'Project directory updated',
+      successMessage: 'Project directory updated'
     });
     expect(useChatInputStore.getState().snapshot).toMatchObject({
       pendingProjectRoot: null,
-      pendingProjectRootSessionKey: null,
+      pendingProjectRootSessionKey: null
     });
   });
 
@@ -100,18 +100,18 @@ describe('useChatSessionProject', () => {
       await result.current({
         sessionKey: 'session-1',
         projectRoot: null,
-        persistToServer: true,
+        persistToServer: true
       });
     });
 
     expect(mocks.updateSession).toHaveBeenCalledWith({
       sessionKey: 'session-1',
       patch: { projectRoot: null },
-      successMessage: 'Project directory cleared',
+      successMessage: 'Project directory cleared'
     });
     expect(useChatInputStore.getState().snapshot).toMatchObject({
       pendingProjectRoot: null,
-      pendingProjectRootSessionKey: null,
+      pendingProjectRootSessionKey: null
     });
   });
 });

package/src/features/chat/hooks/use-chat-session-project.ts

@@ -0,0 +1,34 @@
+import { toast } from 'sonner';
+import { t } from '@/shared/lib/i18n';
+import { useChatInputStore } from '@/features/chat/stores/chat-input.store';
+import { useChatSessionUpdate } from '@/features/chat/hooks/use-chat-session-update';
+
+type UpdateChatSessionProjectParams = {
+  sessionKey: string;
+  projectRoot: string | null;
+  persistToServer: boolean;
+};
+
+export function useChatSessionProject() {
+  const updateSession = useChatSessionUpdate();
+
+  return async (params: UpdateChatSessionProjectParams): Promise<void> => {
+    const { persistToServer, projectRoot, sessionKey } = params;
+    const successMessage = projectRoot ? t('chatSessionProjectUpdated') : t('chatSessionProjectCleared');
+
+    if (!persistToServer) {
+      useChatInputStore.getState().setSnapshot({
+        pendingProjectRoot: projectRoot,
+        pendingProjectRootSessionKey: sessionKey
+      });
+      toast.success(successMessage);
+      return;
+    }
+
+    await updateSession({
+      sessionKey,
+      patch: { projectRoot },
+      successMessage
+    });
+  };
+}

package/src/{components/chat/useChatSessionTypeState.test.tsx → features/chat/hooks/use-chat-session-type-state.test.tsx}

@@ -1,8 +1,8 @@
 import { renderHook } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
-import { resolveSessionTypeLabel, useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
+import { resolveSessionTypeLabel, useChatSessionTypeState } from './use-chat-session-type-state';
 
-vi.mock('@/lib/i18n', () => ({
+vi.mock('@/shared/lib/i18n', () => ({
   t: (key: string) => key
 }));
 

package/src/{components/chat/useChatSessionTypeState.ts → features/chat/hooks/use-chat-session-type-state.ts}

@@ -1,12 +1,7 @@
 import { useEffect, useMemo, useRef } from 'react';
 import type { Dispatch, SetStateAction } from 'react';
-import type {
-  AgentProfileView,
-  ChatSessionTypeOptionView,
-  SessionEntryView,
-  SessionTypeIconView
-} from '@/api/types';
-import { t } from '@/lib/i18n';
+import type { AgentProfileView, ChatSessionTypeOptionView, SessionEntryView, SessionTypeIconView } from '@/shared/lib/api';
+import { t } from '@/shared/lib/i18n';
 
 export const DEFAULT_SESSION_TYPE = 'native';
 
@@ -26,15 +21,7 @@ export type ChatSessionTypeOption = {
   } | null;
 };
 
-type UseChatSessionTypeStateParams = {
-  selectedSession: SessionEntryView | null;
-  pendingSessionType: string;
-  setPendingSessionType: Dispatch<SetStateAction<string>>;
-  sessionTypesData?: {
-    defaultType?: string;
-    options?: ChatSessionTypeOptionView[];
-  } | null;
-};
+type UseChatSessionTypeStateParams = { selectedSession: SessionEntryView | null; pendingSessionType: string; setPendingSessionType: Dispatch<SetStateAction<string>>; sessionTypesData?: { defaultType?: string; options?: ChatSessionTypeOptionView[] } | null };
 
 export function normalizeSessionType(value: unknown): string {
   if (typeof value !== 'string') {

package/src/{components → features}/chat/hooks/use-chat-session-update.test.tsx

@@ -3,28 +3,29 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { toast } from 'sonner';
-import { useChatSessionUpdate } from '@/components/chat/hooks/use-chat-session-update';
+import { useChatSessionUpdate } from '@/features/chat/hooks/use-chat-session-update';
 
 const mocks = vi.hoisted(() => ({
   updateNcpSession: vi.fn(),
-  upsertNcpSessionSummaryInQueryClient: vi.fn(),
+  upsertNcpSessionSummaryInQueryClient: vi.fn()
 }));
 
 vi.mock('sonner', () => ({
   toast: {
     success: vi.fn(),
-    error: vi.fn(),
-  },
+    error: vi.fn()
+  }
 }));
 
-vi.mock('@/api/ncp-session', () => ({
-  updateNcpSession: (...args: unknown[]) => mocks.updateNcpSession(...args),
-}));
-
-vi.mock('@/api/ncp-session-query-cache', () => ({
-  upsertNcpSessionSummaryInQueryClient: (...args: unknown[]) =>
-    mocks.upsertNcpSessionSummaryInQueryClient(...args),
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    updateNcpSession: (...args: unknown[]) => mocks.updateNcpSession(...args),
+    upsertNcpSessionSummaryInQueryClient: (...args: unknown[]) =>
+      mocks.upsertNcpSessionSummaryInQueryClient(...args)
+  };
+});
 
 function createWrapper(queryClient: QueryClient) {
   return function Wrapper({ children }: { children: ReactNode }) {
@@ -44,31 +45,28 @@ describe('useChatSessionUpdate', () => {
       sessionId: 'session-1',
       updatedAt: '2026-04-09T00:00:00.000Z',
       status: 'idle',
-      metadata: { project_root: '/tmp/project-alpha' },
+      metadata: { project_root: '/tmp/project-alpha' }
     };
     mocks.updateNcpSession.mockResolvedValue(updatedSession);
 
     const { result } = renderHook(() => useChatSessionUpdate(), {
-      wrapper: createWrapper(queryClient),
+      wrapper: createWrapper(queryClient)
     });
 
     await act(async () => {
       await result.current({
         sessionKey: 'session-1',
         patch: { projectRoot: '/tmp/project-alpha' },
-        successMessage: 'Project directory updated',
+        successMessage: 'Project directory updated'
       });
     });
 
     expect(mocks.updateNcpSession).toHaveBeenCalledWith('session-1', {
-      projectRoot: '/tmp/project-alpha',
+      projectRoot: '/tmp/project-alpha'
     });
-    expect(mocks.upsertNcpSessionSummaryInQueryClient).toHaveBeenCalledWith(
-      queryClient,
-      updatedSession,
-    );
+    expect(mocks.upsertNcpSessionSummaryInQueryClient).toHaveBeenCalledWith(queryClient, updatedSession);
     expect(invalidateQueriesSpy).toHaveBeenCalledWith({
-      queryKey: ['ncp-session-skills', 'session-1'],
+      queryKey: ['ncp-session-skills', 'session-1']
     });
     expect(toast.success).toHaveBeenCalledWith('Project directory updated');
   });

package/src/{components → features}/chat/hooks/use-chat-session-update.ts

@@ -1,9 +1,9 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { toast } from 'sonner';
-import type { SessionPatchUpdate } from '@/api/types';
-import { upsertNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
-import { updateNcpSession } from '@/api/ncp-session';
-import { t } from '@/lib/i18n';
+import type { SessionPatchUpdate } from '@/shared/lib/api';
+import { updateNcpSession } from '@/shared/lib/api';
+import { upsertNcpSessionSummaryInQueryClient } from '@/shared/lib/api';
+import { t } from '@/shared/lib/i18n';
 
 type UpdateChatSessionParams = {
   sessionKey: string;
@@ -22,9 +22,7 @@ export function useChatSessionUpdate() {
       await queryClient.invalidateQueries({ queryKey: ['ncp-session-skills', sessionKey] });
       toast.success(successMessage ?? t('configSavedApplied'));
     } catch (error) {
-      toast.error(
-        t('configSaveFailed') + ': ' + (error instanceof Error ? error.message : String(error)),
-      );
+      toast.error(t('configSaveFailed') + ': ' + (error instanceof Error ? error.message : String(error)));
       throw error;
     }
   };

package/src/{components → features}/chat/hooks/use-chat-sidebar-session-label-editor.ts

@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import type { SessionEntryView } from '@/api/types';
-import { useChatSessionLabel } from '@/components/chat/hooks/use-chat-session-label';
+import type { SessionEntryView } from '@/shared/lib/api';
+import { useChatSessionLabel } from '@/features/chat/hooks/use-chat-session-label';
 
 export function useChatSidebarSessionLabelEditor() {
   const updateSessionLabel = useChatSessionLabel();
@@ -29,7 +29,7 @@ export function useChatSidebarSessionLabelEditor() {
     try {
       await updateSessionLabel({
         sessionKey: session.key,
-        label: normalizedLabel || null,
+        label: normalizedLabel || null
       });
       cancelEditingSessionLabel();
     } catch {
@@ -44,6 +44,6 @@ export function useChatSidebarSessionLabelEditor() {
     setDraftLabel,
     startEditingSessionLabel,
     cancelEditingSessionLabel,
-    saveSessionLabel,
+    saveSessionLabel
   };
 }

package/src/{components/chat/useHydratedNcpAgent.test.tsx → features/chat/hooks/use-hydrated-ncp-agent.test.tsx}

@@ -1,7 +1,7 @@
 import { renderHook, waitFor } from "@testing-library/react";
 import type { NcpAgentClientEndpoint } from "@nextclaw/ncp";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { useHydratedNcpAgent } from "../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-hydrated-ncp-agent.ts";
+import { useHydratedNcpAgent } from "../../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-hydrated-ncp-agent.ts";
 
 const mocks = vi.hoisted(() => ({
   manager: {
@@ -26,7 +26,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 vi.mock(
-  "../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-ncp-agent-runtime.js",
+  "../../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-ncp-agent-runtime.js",
   () => ({
     useScopedAgentManager: () => mocks.manager,
     useNcpAgentRuntime: () => mocks.runtime,

package/src/{components/chat/useNcpAgentRuntime.test.tsx → features/chat/hooks/use-ncp-agent-runtime.test.tsx}

@@ -1,7 +1,7 @@
 import { act, renderHook } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { NcpEventType, type NcpEndpointEvent } from "@nextclaw/ncp";
-import { useNcpAgentRuntime } from "../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-ncp-agent-runtime.ts";
+import { useNcpAgentRuntime } from "../../../../../ncp-packages/nextclaw-ncp-react/src/hooks/use-ncp-agent-runtime.ts";
 
 function createEvent(type: NcpEventType, delta: string): NcpEndpointEvent {
   return {

package/src/{components/chat/ncp/page/ncp-chat-derived-state.ts → features/chat/hooks/use-ncp-chat-derived-state.ts}

@@ -4,15 +4,15 @@ import type {
   NcpSessionSummaryView,
   SessionEntryView,
   SessionSkillEntryView
-} from '@/api/types';
-import { sessionDisplayName } from '@/components/chat/chat-session-display';
-import { adaptNcpSessionSummary } from '@/components/chat/ncp/ncp-session-adapter';
-import type { NcpChatPresenter } from '@/components/chat/ncp/ncp-chat.presenter';
+} from '@/shared/lib/api';
+import { sessionDisplayName } from '@/features/chat/utils/chat-session-display.utils';
+import { adaptNcpSessionSummary } from '@/features/chat/utils/ncp-session-adapter.utils';
+import type { NcpChatPresenter } from '@/features/chat/managers/ncp-chat-presenter.manager';
 import type { UseHydratedNcpAgentResult } from '@nextclaw/ncp-react';
-import type { ChatModelOption } from '@/components/chat/chat-input.types';
-import type { ChatChildSessionTab } from '@/components/chat/stores/chat-thread.store';
-import type { ChatSessionTypeOption } from '@/components/chat/useChatSessionTypeState';
-import { resolveSessionTypeLabel } from '@/components/chat/useChatSessionTypeState';
+import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
+import type { ChatChildSessionTab } from '@/features/chat/stores/chat-thread.store';
+import type { ChatSessionTypeOption } from '@/features/chat/hooks/use-chat-session-type-state';
+import { resolveSessionTypeLabel } from '@/features/chat/hooks/use-chat-session-type-state';
 
 function buildChildSessionTabs(params: {
   parentSessionKey: string | null;

package/src/{components/chat/ncp/ncp-chat-page-data.ts → features/chat/hooks/use-ncp-chat-page-data.ts}

@@ -1,24 +1,26 @@
 import { useMemo } from 'react';
 import type { Dispatch, SetStateAction } from 'react';
-import type { SessionEntryView, ThinkingLevel } from '@/api/types';
-import type { ChatModelOption } from '@/components/chat/chat-input.types';
-import { sessionMatchesQuery } from '@/components/chat/chat-session-display';
-import { adaptNcpSessionSummaries } from '@/components/chat/ncp/ncp-session-adapter';
-import { useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
+import type { SessionEntryView, ThinkingLevel } from '@/shared/lib/api';
+import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
+import { sessionMatchesQuery } from '@/features/chat/utils/chat-session-display.utils';
+import { adaptNcpSessionSummaries } from '@/features/chat/utils/ncp-session-adapter.utils';
+import { useChatSessionTypeState } from '@/features/chat/hooks/use-chat-session-type-state';
 import {
   resolveRecentSessionPreferredThinking,
   resolveRecentSessionPreferredModel,
   useSyncSelectedModel,
   useSyncSelectedThinking
-} from '@/components/chat/chat-session-preference-governance';
+} from '@/features/chat/utils/chat-session-preference-governance.utils';
 import {
   useConfig,
   useConfigMeta,
   useNcpSessionSkills,
   useNcpSessions
-} from '@/hooks/useConfig';
-import { useNcpChatSessionTypes } from '@/hooks/use-ncp-chat-session-types';
-import { buildProviderModelCatalog, composeProviderModel, resolveModelThinkingCapability } from '@/lib/provider-models';
+} from '@/shared/hooks/use-config';
+import { useNcpChatSessionTypes } from './use-ncp-chat-session-types';
+import { buildProviderModelCatalog, composeProviderModel, resolveModelThinkingCapability } from '@/shared/lib/provider-models';
+
+export type { ChatModelOption } from '@/features/chat/types/chat-input.types';
 
 type UseNcpChatPageDataParams = {
   query: string;
@@ -35,37 +37,15 @@ function filterSessionsByQuery(sessions: SessionEntryView[], query: string): Ses
   return sessions.filter((session) => sessionMatchesQuery(session, query));
 }
 
-export function filterModelOptionsBySessionType(params: {
-  modelOptions: ChatModelOption[];
-  supportedModels?: string[];
-}): ChatModelOption[] {
-  if (!params.supportedModels || params.supportedModels.length === 0) {
-    return params.modelOptions;
-  }
-  const supportedModelSet = new Set(params.supportedModels);
-  const filtered = params.modelOptions.filter((option) => supportedModelSet.has(option.value));
-  return filtered.length > 0 ? filtered : params.modelOptions;
-}
-
-export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
-  const configQuery = useConfig();
-  const configMetaQuery = useConfigMeta();
-  const sessionsQuery = useNcpSessions({ limit: 200 });
-  const sessionTypesQuery = useNcpChatSessionTypes();
-  const sessionSkillsQuery = useNcpSessionSkills({
-    sessionId: params.sessionKey,
-    ...(Object.prototype.hasOwnProperty.call(params, 'projectRootOverride')
-      ? { projectRoot: params.projectRootOverride ?? null }
-      : {})
-  });
-  const isProviderStateResolved =
-    (configQuery.isFetched || configQuery.isSuccess) &&
-    (configMetaQuery.isFetched || configMetaQuery.isSuccess);
-
-  const modelOptions = useMemo<ChatModelOption[]>(() => {
+function useNcpChatModelOptions(params: {
+  config: ReturnType<typeof useConfig>['data'];
+  meta: ReturnType<typeof useConfigMeta>['data'];
+}) {
+  const { config, meta } = params;
+  return useMemo<ChatModelOption[]>(() => {
     const providers = buildProviderModelCatalog({
-      meta: configMetaQuery.data,
-      config: configQuery.data,
+      meta,
+      config,
       onlyConfigured: true
     });
     const seen = new Set<string>();
@@ -92,7 +72,103 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
       }
       return left.modelLabel.localeCompare(right.modelLabel);
     });
-  }, [configMetaQuery.data, configQuery.data]);
+  }, [config, meta]);
+}
+
+function useRecentSessionPreferences(params: {
+  sessions: SessionEntryView[];
+  sessionKey: string;
+  sessionType: string;
+}) {
+  const { sessions, sessionKey, sessionType } = params;
+  const recentSessionPreferredModel = useMemo(
+    () =>
+      resolveRecentSessionPreferredModel({
+        sessions,
+        selectedSessionKey: sessionKey,
+        sessionType
+      }),
+    [sessionKey, sessionType, sessions]
+  );
+  const recentSessionPreferredThinking = useMemo(
+    () =>
+      resolveRecentSessionPreferredThinking({
+        sessions,
+        selectedSessionKey: sessionKey,
+        sessionType
+      }),
+    [sessionKey, sessionType, sessions]
+  );
+  return {
+    recentSessionPreferredModel,
+    recentSessionPreferredThinking
+  };
+}
+
+function useCurrentModelThinkingState(params: {
+  currentSelectedModel: string;
+  modelOptions: ChatModelOption[];
+}) {
+  const { currentSelectedModel, modelOptions } = params;
+  const currentModelOption = useMemo(
+    () => modelOptions.find((option) => option.value === currentSelectedModel),
+    [currentSelectedModel, modelOptions]
+  );
+  const supportedThinkingLevels = useMemo(
+    () => (currentModelOption?.thinkingCapability?.supported as ThinkingLevel[] | undefined) ?? [],
+    [currentModelOption?.thinkingCapability?.supported]
+  );
+  const defaultThinkingLevel = useMemo(
+    () => (currentModelOption?.thinkingCapability?.default as ThinkingLevel | null | undefined) ?? null,
+    [currentModelOption?.thinkingCapability?.default]
+  );
+  return {
+    supportedThinkingLevels,
+    defaultThinkingLevel
+  };
+}
+
+export function filterModelOptionsBySessionType(params: {
+  modelOptions: ChatModelOption[];
+  supportedModels?: string[];
+}): ChatModelOption[] {
+  const { modelOptions, supportedModels } = params;
+  if (!supportedModels || supportedModels.length === 0) {
+    return modelOptions;
+  }
+  const supportedModelSet = new Set(supportedModels);
+  const filtered = modelOptions.filter((option) => supportedModelSet.has(option.value));
+  return filtered.length > 0 ? filtered : modelOptions;
+}
+
+export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
+  const {
+    currentSelectedModel,
+    pendingSessionType,
+    projectRootOverride,
+    query,
+    sessionKey,
+    setPendingSessionType,
+    setSelectedModel,
+    setSelectedThinkingLevel,
+  } = params;
+  const configQuery = useConfig();
+  const configMetaQuery = useConfigMeta();
+  const sessionsQuery = useNcpSessions({ limit: 200 });
+  const sessionTypesQuery = useNcpChatSessionTypes();
+  const sessionSkillsQuery = useNcpSessionSkills({
+    sessionId: sessionKey,
+    ...(Object.prototype.hasOwnProperty.call(params, 'projectRootOverride')
+      ? { projectRoot: projectRootOverride ?? null }
+      : {})
+  });
+  const isProviderStateResolved =
+    (configQuery.isFetched || configQuery.isSuccess) &&
+    (configMetaQuery.isFetched || configMetaQuery.isSuccess);
+  const modelOptions = useNcpChatModelOptions({
+    config: configQuery.data,
+    meta: configMetaQuery.data
+  });
 
   const sessionSummaries = useMemo(
     () => sessionsQuery.data?.sessions ?? [],
@@ -103,12 +179,12 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
     [sessionSummaries]
   );
   const sessions = useMemo(
-    () => filterSessionsByQuery(allSessions, params.query),
-    [allSessions, params.query]
+    () => filterSessionsByQuery(allSessions, query),
+    [allSessions, query]
   );
   const selectedSession = useMemo(
-    () => allSessions.find((session) => session.key === params.sessionKey) ?? null,
-    [allSessions, params.sessionKey]
+    () => allSessions.find((session) => session.key === sessionKey) ?? null,
+    [allSessions, sessionKey]
   );
   const skillRecords = useMemo(
     () => sessionSkillsQuery.data?.records ?? [],
@@ -116,8 +192,8 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
   );
   const sessionTypeState = useChatSessionTypeState({
     selectedSession,
-    pendingSessionType: params.pendingSessionType,
-    setPendingSessionType: params.setPendingSessionType,
+    pendingSessionType,
+    setPendingSessionType,
     sessionTypesData: sessionTypesQuery.data
   });
   const filteredModelOptions = useMemo(
@@ -128,54 +204,35 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
       }),
     [modelOptions, sessionTypeState.selectedSessionTypeOption?.supportedModels]
   );
-  const recentSessionPreferredModel = useMemo(
-    () =>
-      resolveRecentSessionPreferredModel({
-        sessions: allSessions,
-        selectedSessionKey: params.sessionKey,
-        sessionType: sessionTypeState.selectedSessionType
-      }),
-    [allSessions, params.sessionKey, sessionTypeState.selectedSessionType]
-  );
-  const currentModelOption = useMemo(
-    () => filteredModelOptions.find((option) => option.value === params.currentSelectedModel),
-    [filteredModelOptions, params.currentSelectedModel]
-  );
-  const supportedThinkingLevels = useMemo(
-    () => (currentModelOption?.thinkingCapability?.supported as ThinkingLevel[] | undefined) ?? [],
-    [currentModelOption?.thinkingCapability?.supported]
-  );
-  const defaultThinkingLevel = useMemo(
-    () => (currentModelOption?.thinkingCapability?.default as ThinkingLevel | null | undefined) ?? null,
-    [currentModelOption?.thinkingCapability?.default]
-  );
-  const recentSessionPreferredThinking = useMemo(
-    () =>
-      resolveRecentSessionPreferredThinking({
-        sessions: allSessions,
-        selectedSessionKey: params.sessionKey,
-        sessionType: sessionTypeState.selectedSessionType
-      }),
-    [allSessions, params.sessionKey, sessionTypeState.selectedSessionType]
-  );
+  const { recentSessionPreferredModel, recentSessionPreferredThinking } =
+    useRecentSessionPreferences({
+      sessions: allSessions,
+      sessionKey,
+      sessionType: sessionTypeState.selectedSessionType
+    });
+  const { supportedThinkingLevels, defaultThinkingLevel } =
+    useCurrentModelThinkingState({
+      currentSelectedModel,
+      modelOptions: filteredModelOptions
+    });
 
   useSyncSelectedModel({
     modelOptions: filteredModelOptions,
-    selectedSessionKey: params.sessionKey,
+    selectedSessionKey: sessionKey,
     selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredModel: selectedSession?.preferredModel,
     fallbackPreferredModel: sessionTypeState.selectedSessionTypeOption?.recommendedModel ?? recentSessionPreferredModel,
     defaultModel: sessionTypeState.selectedSessionTypeOption?.recommendedModel ?? configQuery.data?.agents.defaults.model,
-    setSelectedModel: params.setSelectedModel
+    setSelectedModel
   });
   useSyncSelectedThinking({
     supportedThinkingLevels,
-    selectedSessionKey: params.sessionKey,
+    selectedSessionKey: sessionKey,
     selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredThinking: selectedSession?.preferredThinking ?? null,
     fallbackPreferredThinking: recentSessionPreferredThinking ?? null,
     defaultThinkingLevel,
-    setSelectedThinkingLevel: params.setSelectedThinkingLevel
+    setSelectedThinkingLevel
   });
 
   return {