@nextclaw/ui 0.9.1 → 0.9.3

package/src/components/chat/ChatSidebar.tsx

@@ -85,6 +85,16 @@ function resolveSessionTypeLabel(
     .join(' ');
 }
 
+function resolveSessionTypeStatusText(option: {
+  ready?: boolean;
+  reasonMessage?: string | null;
+}): string {
+  if (option.ready === false) {
+    return option.reasonMessage?.trim() || t('statusSetup');
+  }
+  return t('statusReady');
+}
+
 const navItems = [
   { target: '/cron', label: () => t('chatSidebarScheduledTasks'), icon: AlarmClock },
   { target: '/skills', label: () => t('chatSidebarSkills'), icon: BrainCircuit },
@@ -168,8 +178,22 @@ export function ChatSidebar() {
                       }}
                       className="w-full rounded-xl px-3 py-2 text-left transition-colors hover:bg-gray-100"
                     >
-                      <div className="text-[13px] font-medium text-gray-900">{option.label}</div>
-                      <div className="mt-0.5 text-[11px] text-gray-500">{t('chatSidebarNewTask')}</div>
+                      <div className="flex items-center justify-between gap-3">
+                        <div className="text-[13px] font-medium text-gray-900">{option.label}</div>
+                        <span
+                          className={cn(
+                            'shrink-0 rounded-full px-2 py-0.5 text-[10px] font-semibold',
+                            option.ready === false
+                              ? 'bg-amber-100 text-amber-800'
+                              : 'bg-emerald-100 text-emerald-700'
+                          )}
+                        >
+                          {option.ready === false ? t('statusSetup') : t('statusReady')}
+                        </span>
+                      </div>
+                      <div className="mt-0.5 text-[11px] text-gray-500">
+                        {resolveSessionTypeStatusText(option)}
+                      </div>
                     </button>
                   ))}
                 </div>

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

@@ -4,10 +4,11 @@ import type { SessionEntryView, ThinkingLevel } from '@/api/types';
 import type { ChatModelOption } from '@/components/chat/chat-input.types';
 import { useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
 import {
-  resolveSelectedModelValue,
+  resolveRecentSessionPreferredThinking,
   resolveRecentSessionPreferredModel,
-  useSyncSelectedModel
-} from '@/components/chat/chat-page-runtime';
+  useSyncSelectedModel,
+  useSyncSelectedThinking
+} from '@/components/chat/chat-session-preference-governance';
 import {
   useChatCapabilities,
   useChatSessionTypes,
@@ -23,24 +24,13 @@ type UseChatPageDataParams = {
   query: string;
   selectedSessionKey: string | null;
   selectedAgentId: string;
+  currentSelectedModel: string;
   pendingSessionType: string;
   setPendingSessionType: Dispatch<SetStateAction<string>>;
   setSelectedModel: Dispatch<SetStateAction<string>>;
+  setSelectedThinkingLevel: Dispatch<SetStateAction<ThinkingLevel | null>>;
 };
 
-const THINKING_LEVEL_SET = new Set<string>(['off', 'minimal', 'low', 'medium', 'high', 'adaptive', 'xhigh']);
-
-function parseThinkingLevel(value: unknown): ThinkingLevel | null {
-  if (typeof value !== 'string') {
-    return null;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (!normalized) {
-    return null;
-  }
-  return THINKING_LEVEL_SET.has(normalized) ? (normalized as ThinkingLevel) : null;
-}
-
 export function useChatPageData(params: UseChatPageDataParams) {
   const configQuery = useConfig();
   const configMetaQuery = useConfigMeta();
@@ -111,52 +101,48 @@ export function useChatPageData(params: UseChatPageDataParams) {
       }),
     [params.selectedSessionKey, sessionTypeState.selectedSessionType, sessions]
   );
+  const currentModelOption = useMemo(
+    () => modelOptions.find((option) => option.value === params.currentSelectedModel),
+    [modelOptions, 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,
+        selectedSessionKey: params.selectedSessionKey,
+        sessionType: sessionTypeState.selectedSessionType
+      }),
+    [params.selectedSessionKey, sessionTypeState.selectedSessionType, sessions]
+  );
 
   useSyncSelectedModel({
     modelOptions,
     selectedSessionKey: params.selectedSessionKey,
+    selectedSessionExists: Boolean(selectedSession),
     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]
-  );
+  useSyncSelectedThinking({
+    supportedThinkingLevels,
+    selectedSessionKey: params.selectedSessionKey,
+    selectedSessionExists: Boolean(selectedSession),
+    selectedSessionPreferredThinking: selectedSession?.preferredThinking ?? null,
+    fallbackPreferredThinking: recentSessionPreferredThinking ?? null,
+    defaultThinkingLevel,
+    setSelectedThinkingLevel: params.setSelectedThinkingLevel
+  });
 
   const historyMessages = useMemo(() => historyQuery.data?.messages ?? [], [historyQuery.data?.messages]);
-  const selectedSessionThinkingLevel = useMemo(() => {
-    if (!params.selectedSessionKey) {
-      return null;
-    }
-    const metadata = historyQuery.data?.metadata;
-    if (!metadata || typeof metadata !== 'object') {
-      return null;
-    }
-    const candidates = [
-      metadata.preferred_thinking,
-      metadata.thinking,
-      metadata.thinking_level,
-      metadata.thinkingLevel
-    ];
-    for (const value of candidates) {
-      const level = parseThinkingLevel(value);
-      if (level) {
-        return level;
-      }
-    }
-    return null;
-  }, [historyQuery.data?.metadata, params.selectedSessionKey]);
 
   return {
     configQuery,
@@ -171,9 +157,7 @@ export function useChatPageData(params: UseChatPageDataParams) {
     sessions,
     skillRecords,
     selectedSession,
-    hydratedSessionModel,
     historyMessages,
-    selectedSessionThinkingLevel,
     ...sessionTypeState
   };
 }

package/src/components/chat/chat-page-runtime.test.ts

@@ -1,6 +1,11 @@
 import { describe, expect, it } from 'vitest';
-import type { SessionEntryView } from '@/api/types';
-import { resolveRecentSessionPreferredModel, resolveSelectedModelValue } from '@/components/chat/chat-page-runtime';
+import type { SessionEntryView, ThinkingLevel } from '@/api/types';
+import {
+  resolveRecentSessionPreferredModel,
+  resolveRecentSessionPreferredThinking,
+  resolveSelectedModelValue,
+  resolveSelectedThinkingLevelValue
+} from '@/components/chat/chat-session-preference-governance';
 
 const modelOptions = [
   {
@@ -27,11 +32,16 @@ function createSession(overrides: Partial<SessionEntryView> & Pick<SessionEntryV
     messageCount: overrides.messageCount ?? 0,
     ...(overrides.label ? { label: overrides.label } : {}),
     ...(overrides.preferredModel ? { preferredModel: overrides.preferredModel } : {}),
+    ...(Object.prototype.hasOwnProperty.call(overrides, 'preferredThinking')
+      ? { preferredThinking: overrides.preferredThinking ?? null }
+      : {}),
     ...(overrides.lastRole ? { lastRole: overrides.lastRole } : {}),
     ...(overrides.lastTimestamp ? { lastTimestamp: overrides.lastTimestamp } : {})
   };
 }
 
+const thinkingLevels: ThinkingLevel[] = ['off', 'minimal', 'medium', 'high'];
+
 describe('resolveSelectedModelValue', () => {
   it('keeps the current selected model when it is still available', () => {
     expect(
@@ -82,6 +92,32 @@ describe('resolveSelectedModelValue', () => {
     ).toBe('openai/gpt-5');
   });
 
+  it('preserves the current valid model when a draft session materializes before the new session metadata exists', () => {
+    expect(
+      resolveSelectedModelValue({
+        currentSelectedModel: 'openai/gpt-5',
+        modelOptions,
+        fallbackPreferredModel: 'anthropic/claude-sonnet-4',
+        defaultModel: 'anthropic/claude-sonnet-4',
+        preferSessionPreferredModel: true,
+        preserveCurrentSelectedModelOnSessionChange: true
+      })
+    ).toBe('openai/gpt-5');
+  });
+
+  it('still falls back when the current model is no longer valid during draft session materialization', () => {
+    expect(
+      resolveSelectedModelValue({
+        currentSelectedModel: 'missing/model',
+        modelOptions,
+        fallbackPreferredModel: 'openai/gpt-5',
+        defaultModel: 'anthropic/claude-sonnet-4',
+        preferSessionPreferredModel: true,
+        preserveCurrentSelectedModelOnSessionChange: true
+      })
+    ).toBe('openai/gpt-5');
+  });
+
   it('uses the recent same-runtime model when the current session has no valid preferred model', () => {
     expect(
       resolveSelectedModelValue({
@@ -179,3 +215,87 @@ describe('resolveRecentSessionPreferredModel', () => {
     ).toBe('anthropic/claude-sonnet-4');
   });
 });
+
+describe('resolveSelectedThinkingLevelValue', () => {
+  it('keeps the current selected thinking when it is still valid', () => {
+    expect(
+      resolveSelectedThinkingLevelValue({
+        currentSelectedThinkingLevel: 'high',
+        supportedThinkingLevels: thinkingLevels,
+        selectedSessionPreferredThinking: 'medium',
+        fallbackPreferredThinking: 'minimal',
+        defaultThinkingLevel: 'off'
+      })
+    ).toBe('high');
+  });
+
+  it('prefers the persisted session thinking after switching sessions', () => {
+    expect(
+      resolveSelectedThinkingLevelValue({
+        currentSelectedThinkingLevel: 'high',
+        supportedThinkingLevels: thinkingLevels,
+        selectedSessionPreferredThinking: 'medium',
+        fallbackPreferredThinking: 'minimal',
+        defaultThinkingLevel: 'off',
+        preferSessionPreferredThinking: true
+      })
+    ).toBe('medium');
+  });
+
+  it('preserves the current valid thinking when a draft session materializes before metadata exists', () => {
+    expect(
+      resolveSelectedThinkingLevelValue({
+        currentSelectedThinkingLevel: 'high',
+        supportedThinkingLevels: thinkingLevels,
+        fallbackPreferredThinking: 'minimal',
+        defaultThinkingLevel: 'off',
+        preferSessionPreferredThinking: true,
+        preserveCurrentSelectedThinkingOnSessionChange: true
+      })
+    ).toBe('high');
+  });
+
+  it('falls back to the model default when no current or persisted thinking is valid', () => {
+    expect(
+      resolveSelectedThinkingLevelValue({
+        currentSelectedThinkingLevel: null,
+        supportedThinkingLevels: thinkingLevels,
+        fallbackPreferredThinking: null,
+        defaultThinkingLevel: 'medium'
+      })
+    ).toBe('medium');
+  });
+});
+
+describe('resolveRecentSessionPreferredThinking', () => {
+  it('returns the most recent preferred thinking from the same runtime', () => {
+    const sessions = [
+      createSession({
+        key: 'native-1',
+        sessionType: 'native',
+        preferredThinking: 'low',
+        updatedAt: '2026-03-18T01:00:00.000Z'
+      }),
+      createSession({
+        key: 'codex-1',
+        sessionType: 'codex',
+        preferredThinking: 'high',
+        updatedAt: '2026-03-18T03:00:00.000Z'
+      }),
+      createSession({
+        key: 'codex-2',
+        sessionType: 'codex',
+        preferredThinking: 'medium',
+        updatedAt: '2026-03-18T02:00:00.000Z'
+      })
+    ];
+
+    expect(
+      resolveRecentSessionPreferredThinking({
+        sessions,
+        selectedSessionKey: 'draft',
+        sessionType: 'codex'
+      })
+    ).toBe('high');
+  });
+});

package/src/components/chat/chat-page-runtime.ts

@@ -1,127 +1,10 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
-import type { Dispatch, SetStateAction } from 'react';
-import type { ChatRunView, SessionEntryView } from '@/api/types';
-import type { ChatModelOption } from '@/components/chat/chat-input.types';
+import type { ChatRunView } from '@/api/types';
 import { useChatRuns } from '@/hooks/useConfig';
 import { buildActiveRunBySessionKey, buildSessionRunStatusByKey } from '@/lib/session-run-status';
 
 export type ChatMainPanelView = 'chat' | 'cron' | 'skills';
 
-function normalizeSessionType(value: string | null | undefined): string {
-  const normalized = value?.trim().toLowerCase();
-  return normalized || 'native';
-}
-
-function hasModelOption(modelOptions: ChatModelOption[], value: string | null | undefined): value is string {
-  const normalized = value?.trim();
-  if (!normalized) {
-    return false;
-  }
-  return modelOptions.some((option) => option.value === normalized);
-}
-
-export function resolveSelectedModelValue(params: {
-  currentSelectedModel?: string;
-  modelOptions: ChatModelOption[];
-  selectedSessionPreferredModel?: string;
-  fallbackPreferredModel?: string;
-  defaultModel?: string;
-  preferSessionPreferredModel?: boolean;
-}): string {
-  const {
-    currentSelectedModel,
-    modelOptions,
-    selectedSessionPreferredModel,
-    fallbackPreferredModel,
-    defaultModel,
-    preferSessionPreferredModel = false
-  } = params;
-  if (modelOptions.length === 0) {
-    return '';
-  }
-  if (!preferSessionPreferredModel && hasModelOption(modelOptions, currentSelectedModel)) {
-    return currentSelectedModel.trim();
-  }
-  if (hasModelOption(modelOptions, selectedSessionPreferredModel)) {
-    return selectedSessionPreferredModel.trim();
-  }
-  if (hasModelOption(modelOptions, fallbackPreferredModel)) {
-    return fallbackPreferredModel.trim();
-  }
-  if (hasModelOption(modelOptions, defaultModel)) {
-    return defaultModel.trim();
-  }
-  return modelOptions[0]?.value ?? '';
-}
-
-export function resolveRecentSessionPreferredModel(params: {
-  sessions: readonly SessionEntryView[];
-  selectedSessionKey?: string | null;
-  sessionType?: string | null;
-}): string | undefined {
-  const targetSessionType = normalizeSessionType(params.sessionType);
-  let bestSession: SessionEntryView | null = null;
-  let bestTimestamp = Number.NEGATIVE_INFINITY;
-  for (const session of params.sessions) {
-    if (session.key === params.selectedSessionKey) {
-      continue;
-    }
-    if (normalizeSessionType(session.sessionType) !== targetSessionType) {
-      continue;
-    }
-    const preferredModel = session.preferredModel?.trim();
-    if (!preferredModel) {
-      continue;
-    }
-    const updatedAtTimestamp = Date.parse(session.updatedAt);
-    const comparableTimestamp = Number.isFinite(updatedAtTimestamp) ? updatedAtTimestamp : Number.NEGATIVE_INFINITY;
-    if (!bestSession || comparableTimestamp > bestTimestamp) {
-      bestSession = session;
-      bestTimestamp = comparableTimestamp;
-    }
-  }
-  return bestSession?.preferredModel?.trim();
-}
-
-export function useSyncSelectedModel(params: {
-  modelOptions: ChatModelOption[];
-  selectedSessionKey?: string | null;
-  selectedSessionPreferredModel?: string;
-  fallbackPreferredModel?: string;
-  defaultModel?: string;
-  setSelectedModel: Dispatch<SetStateAction<string>>;
-}) {
-  const {
-    modelOptions,
-    selectedSessionKey,
-    selectedSessionPreferredModel,
-    fallbackPreferredModel,
-    defaultModel,
-    setSelectedModel
-  } = params;
-  const previousSessionKeyRef = useRef<string | null | undefined>(undefined);
-
-  useEffect(() => {
-    const sessionChanged = previousSessionKeyRef.current !== selectedSessionKey;
-    if (modelOptions.length === 0) {
-      setSelectedModel('');
-      previousSessionKeyRef.current = selectedSessionKey;
-      return;
-    }
-    setSelectedModel((prev) => {
-      return resolveSelectedModelValue({
-        currentSelectedModel: prev,
-        modelOptions,
-        selectedSessionPreferredModel,
-        fallbackPreferredModel,
-        defaultModel,
-        preferSessionPreferredModel: sessionChanged
-      });
-    });
-    previousSessionKeyRef.current = selectedSessionKey;
-  }, [defaultModel, fallbackPreferredModel, modelOptions, selectedSessionKey, selectedSessionPreferredModel, setSelectedModel]);
-}
-
 export function useSessionRunStatus(params: {
   view: ChatMainPanelView;
   selectedSessionKey: string | null;