bingocode 1.0.20 → 1.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/components/Onboarding.tsx

@@ -5,7 +5,7 @@ import { setupTerminal, shouldOfferTerminalSetup } from '../commands/terminalSet
 import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
 import { Box, Link, Newline, Text, useTheme } from '../ink.js';
 import { useKeybindings } from '../keybindings/useKeybinding.js';
-import { isAnthropicAuthEnabled } from '../utils/auth.js';
+import { isAnthropicAuthEnabled, isManagedOAuthContext } from '../utils/auth.js';
 import { normalizeApiKeyForConfig } from '../utils/authPortable.js';
 import { getCustomApiKeyStatus } from '../utils/config.js';
 import { env } from '../utils/env.js';
@@ -114,7 +114,11 @@ export function Onboarding({
     goToNextStep();
   }
   const steps: OnboardingStep[] = [];
-  if (oauthEnabled) {
+  // Skip preflight in managed OAuth context (claude-desktop / CCR):
+  // The desktop app already verifies local server connectivity,
+  // and the Anthropic /api/hello endpoint may return 400 before OAuth login,
+  // which would incorrectly kill the onboarding flow.
+  if (oauthEnabled && !isManagedOAuthContext()) {
     steps.push({
       id: 'preflight',
       component: preflightStep

package/src/entrypoints/init.ts

@@ -1,4 +1,3 @@
-import { mkdirSync } from 'node:fs'
 import { profileCheckpoint } from '../utils/startupProfiler.js'
 import '../bootstrap/state.js'
 import '../utils/config.js'
@@ -26,7 +25,7 @@ import { logForDebugging } from '../utils/debug.js'
 import { detectCurrentRepository } from '../utils/detectRepository.js'
 import { logForDiagnosticsNoPII } from '../utils/diagLogs.js'
 import { initJetBrainsDetection } from '../utils/envDynamic.js'
-import { getClaudeConfigHomeDir, isEnvTruthy } from '../utils/envUtils.js'
+import { isEnvTruthy } from '../utils/envUtils.js'
 import { ConfigParseError, errorMessage } from '../utils/errors.js'
 // showInvalidConfigDialog is dynamically imported in the error path to avoid loading React at init
 import {
@@ -56,13 +55,6 @@ import { setShellIfWindows } from '../utils/windowsPaths.js'
 let telemetryInitialized = false
 
 export const init = memoize(async (): Promise<void> => {
-  // Ensure config directory exists for first-time use
-  try {
-    mkdirSync(getClaudeConfigHomeDir(), { recursive: true });
-  } catch (e) {
-    // Ignore error if it already exists
-  }
-
   const initStartTime = Date.now()
   logForDiagnosticsNoPII('info', 'init_started')
   profileCheckpoint('init_function_start')

package/src/manager/CliMenuManager.tsx

@@ -17,6 +17,9 @@ import { TopToolbar } from '../manager/TopToolbar.tsx';
 
 // 主题切换（Hook）
 import { useTheme } from '../components/design-system/ThemeProvider.js';
+// Markdown 渲染（纯函数，不依赖 AppStateProvider context）
+import { applyMarkdown } from '../utils/markdown.js';
+import { Ansi } from '../ink/Ansi.js';
 
 // 配置相关（仅使用可用接口）
 import { getGlobalConfig, saveGlobalConfig } from '../utils/config.ts';
@@ -132,21 +135,57 @@ function loadMarkedSessionIds(): Set<string> {
   }
 }
 
-//@C:F ID=F.CM.saveMarkedSessionIds;K=F;V=1.0;P=save marked ids;D=CLI;M=cli;S=persist;In=Set<string>;Out=void
+//@C:F ID=F.CM.saveMarkedSessionIds;K=F;V=1.1;P=save marked ids;D=CLI;M=cli;S=persist;In=Set<string>;Out=void
 function saveMarkedSessionIds(set: Set<string>) {
   try {
+    const dir = path.dirname(MARKED_FILE);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
     fs.writeFileSync(MARKED_FILE, JSON.stringify([...set]), 'utf-8');
-  } catch {}
+  } catch (err) {
+    console.error('[saveMarkedSessionIds] 写入失败:', err);
+  }
 }
 
-// 通用消息结构，供 <Messages />
-type ChatMessage = {
+// 消息条目（与后端 MessageEntry 对齐）
+type MessageEntry = {
   id: string;
-  userId: string;
-  content: string;
-  createdAt?: string;
+  type: 'user' | 'assistant' | 'system' | 'tool_use' | 'tool_result';
+  content: unknown; // string 或 ContentBlock[]
+  timestamp: string;
+  model?: string;
+  parentUuid?: string;
+  parentToolUseId?: string;
+  isSidechain?: boolean;
 };
 
+/** 从 MessageEntry.content 提取纯文本 */
+function extractTextFromContent(content: unknown): string {
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) {
+    return content
+      .map((block: any) => {
+        if (block.type === 'text' && typeof block.text === 'string') return block.text;
+        if (block.type === 'tool_use') return `[Tool: ${block.name || 'unknown'}]`;
+        if (block.type === 'tool_result') {
+          if (typeof block.content === 'string') return block.content;
+          if (Array.isArray(block.content)) {
+            return block.content
+              .filter((b: any) => b.type === 'text')
+              .map((b: any) => b.text)
+              .join('\n');
+          }
+          return '[Tool Result]';
+        }
+        return '';
+      })
+      .filter(Boolean)
+      .join('\n');
+  }
+  return String(content ?? '');
+}
+
 //@C:F ID=F.CM.CliMenuManager;K=F;V=1.5;P=CLI 主菜单;D=CLI;M=cli;S=main;In=;Out=JSX.Element
 export const CliMenuManager: React.FC = () => {
   const { stdout } = useStdout();
@@ -208,8 +247,8 @@ export const CliMenuManager: React.FC = () => {
   const [historyMenuStage, setHistoryMenuStage] = useState<'list'|'window'|'deleteConfirm'>('list');
   const [selectedHistory, setSelectedHistory] = useState<any|null>(null);
 
-  // 历史-消息内容（分页视口）
-  const [sessionMessages, setSessionMessages] = useState<ChatMessage[]>([]);
+  // 历史-消息内容
+  const [sessionMessages, setSessionMessages] = useState<MessageEntry[]>([]);
   const [loadingMsgs, setLoadingMsgs] = useState(false);
   const [msgsErr, setMsgsErr] = useState<string | null>(null);
   const [msgsPage, setMsgsPage] = useState(0); // 0=最新页（底部），1=向上翻一页
@@ -380,9 +419,26 @@ export const CliMenuManager: React.FC = () => {
 
   // 会话消息获取
   useEffect(() => {
-    // 进入 window 不再加载消息（只看属性）
-    if (false) {
-      /* 保留原实现以备将来恢复消息视图时启用 */
+    if (page === 'history' && historyMenuStage === 'window' && selectedHistory && apiUrl) {
+      let cancelled = false;
+      setLoadingMsgs(true);
+      setMsgsErr(null);
+      setSessionMessages([]);
+      setMsgsPage(0);
+      (async () => {
+        try {
+          const resp = await axios.get(`${apiUrl}/api/sessions/${selectedHistory.id}/messages`);
+          if (!cancelled) {
+            const msgs: MessageEntry[] = resp.data?.messages ?? [];
+            setSessionMessages(msgs);
+          }
+        } catch (e: any) {
+          if (!cancelled) setMsgsErr(e.message || '消息加载失败');
+        } finally {
+          if (!cancelled) setLoadingMsgs(false);
+        }
+      })();
+      return () => { cancelled = true; };
     } else {
       setSessionMessages([]);
       setLoadingMsgs(false);
@@ -531,6 +587,15 @@ export const CliMenuManager: React.FC = () => {
           handleHistoryMenuAction('__back');
           return;
         }
+        // 消息滚动：↑/k 向上翻页，↓/j 向下翻页
+        if (key.upArrow || input === 'k') {
+          setMsgsPage(p => Math.max(0, p - 1));
+          return;
+        }
+        if (key.downArrow || input === 'j') {
+          setMsgsPage(p => p + 1);
+          return;
+        }
 
       } else if (historyMenuStage === 'deleteConfirm') {
         if (input === 'q') {
@@ -860,54 +925,62 @@ export const CliMenuManager: React.FC = () => {
       }
 
       if (historyMenuStage === 'window' && selectedHistory) {
-        const halfH = Math.floor(MID_H / 2);
         const isMarked = markedSessionIds.has(selectedHistory.id);
-        const menu = secondaryMenu ?? {
-          title: lang === 'zh' ? '会话操作' : 'Session Actions',
-          items: [
-            { label: (isMarked ? i18nMap[lang].unmark : i18nMap[lang].mark), value: '__toggle_mark' },
-            { label: '→ 继续会话聊天', value: '__continue' },
-            { label: '→ 删除会话聊天', value: '__delete' },
-            { label: '← 返回历史列表', value: '__back' },
-          ],
-          onSelect: (item: any) => {
-            if (item.value === '__back') {
-              setHistoryMenuStage('list');
-              setSelectedHistory(null);
-              setMsgsPage(0);
-            } else if (item.value === '__continue' && selectedHistory) {
-              resumeSession(selectedHistory.id);
-            } else if (item.value === '__delete') {
-              setHistoryMenuStage('deleteConfirm');
-            } else if (item.value === '__toggle_mark' && selectedHistory) {
-              toggleMarkSession(selectedHistory.id);
-            }
-          }
-        };
+
+        // ── 信息栏高度固定 3 行（标题 + 元信息 + 提示） ──
+        const INFO_H = 3;
+        const MSGS_H = Math.max(3, MID_H - INFO_H);
+
+        // ── 过滤出可展示的消息（user / assistant / system，跳过 tool_use / tool_result） ──
+        const displayMsgs = sessionMessages.filter(
+          m => m.type === 'user' || m.type === 'assistant' || m.type === 'system'
+        );
+
+        // ── 分页：每页 MSGS_PAGE_SIZE 条消息 ──
+        const totalPages = Math.max(1, Math.ceil(displayMsgs.length / MSGS_PAGE_SIZE));
+        const safePage = Math.min(msgsPage, totalPages - 1);
+        const pageStart = safePage * MSGS_PAGE_SIZE;
+        const pageMsgs = displayMsgs.slice(pageStart, pageStart + MSGS_PAGE_SIZE);
 
         return (
           <Box width={VIEW_W} height={MID_H} flexDirection="column">
-            {/* 上半区：只显示会话属性 */}
-            <Box height={halfH} flexDirection="column">
+            {/* ── 顶部信息栏 ── */}
+            <Box height={INFO_H} flexDirection="column">
               <Text color={isMarked ? 'yellow' : 'cyan'}>
-                {isMarked ? '★ ' : ''}会话属性
+                {isMarked ? '★ ' : ''}{selectedHistory.title || 'Untitled'}
+                <Text dimColor>  {selectedHistory.createdAt?.slice(0, 16).replace('T', ' ') || ''} · {displayMsgs.length} msgs</Text>
               </Text>
-              <Text>id: {selectedHistory.id}</Text>
-              <Text>标题: {selectedHistory.title}</Text>
-              <Text>创建时间: {selectedHistory.createdAt}</Text>
-              <Text>消息数: {selectedHistory.messageCount ?? 0}</Text>
-              <Text>已标记: {isMarked ? '是' : '否'}</Text>
-              <Hint>m 标记/取消 · c 继续 · d 删除 · q 返回</Hint>
+              <Hint>
+                j/↓ 下翻 · k/↑ 上翻 · m 标记 · c 继续 · d 删除 · q 返回
+                {displayMsgs.length > MSGS_PAGE_SIZE ? `  [${safePage + 1}/${totalPages}]` : ''}
+              </Hint>
             </Box>
 
-            {/* 下半区：三级菜单 */}
-            <Box height={MID_H - halfH} flexDirection="column" borderStyle="round" borderColor="cyan" paddingLeft={1} paddingRight={1}>
-              <Text>{menu.title}</Text>
-              <SelectInput
-                items={menu.items.map(it => ({ label: it.label, value: it.value }))}
-                onSelect={(item) => handleHistoryMenuAction(String(item.value))}
-              />
-              <Hint>↩ 执行 · q 返回</Hint>
+            {/* ── 消息区 ── */}
+            <Box height={MSGS_H} flexDirection="column" overflow="hidden">
+              {loadingMsgs && <Text color="yellow">加载消息中...</Text>}
+              {msgsErr && <Text color="red">错误: {msgsErr}</Text>}
+              {!loadingMsgs && !msgsErr && displayMsgs.length === 0 && (
+                <Text dimColor>无消息记录</Text>
+              )}
+              {pageMsgs.map((msg) => {
+                const text = extractTextFromContent(msg.content);
+                if (!text.trim()) return null;
+                const isUser = msg.type === 'user';
+                const isSystem = msg.type === 'system';
+                const roleLabel = isUser ? '👤 You' : isSystem ? '⚙ System' : '🤖 Assistant';
+                const roleColor = isUser ? 'green' : isSystem ? 'gray' : 'cyan';
+                return (
+                  <Box key={msg.id} flexDirection="column" marginBottom={1}>
+                    <Text color={roleColor} bold>{roleLabel}</Text>
+                    {isUser ? (
+                      <Text>{text}</Text>
+                    ) : (
+                      <Ansi>{applyMarkdown(text, theme)}</Ansi>
+                    )}
+                  </Box>
+                );
+              })}
             </Box>
           </Box>
         );

package/src/server/cli/providerManager.ts

@@ -121,13 +121,14 @@ export class ProviderManager {
     }
   }
 
-  // 预设列表
+  // 预设列表（可选，providerPresets 不存在则返回空）
   static async listPresets(): Promise<any[]> {
     try {
-      const { loadProviderPresets } = await import('../config/providerPresets.ts');
-      return await loadProviderPresets();
-    } catch (e) {
-      console.error('Failed to load presets:', e);
+      // 相对 src/server/cli 到 config 的路径
+      const mod = await import('../config/providerPresets.ts');
+      const presets = (mod as any).presets || (mod as any).providerPresets || [];
+      return presets;
+    } catch {
       return [];
     }
   }
@@ -144,83 +145,33 @@ export class ProviderManager {
       baseUrl: overrides?.baseUrl ?? p.baseUrl ?? '',
       apiFormat: overrides?.apiFormat ?? p.apiFormat ?? 'openai_chat',
       models: overrides?.models ?? { main: p.defaultModel || '', haiku: '', sonnet: '', opus: '' },
-      notes: overrides?.notes ?? p.notes ?? '',
-      extra: { ...p, ...overrides?.extra }
+      notes: overrides?.notes ?? p.notes ?? ''
     };
   }
 
-  // 获取模型列表
-  static async fetchModels(target: SavedProvider | any, apiKeyOverride?: string): Promise<string[]> {
-    const p = target;
-    const apiKey = apiKeyOverride || p.apiKey;
-    const baseUrl = (p.baseUrl || '').replace(/\/+$/, '');
-    const modelsUrl = p.modelsUrl || p.extra?.modelsUrl;
-    const modelsDataPath = p.modelsDataPath || p.extra?.modelsDataPath || 'data';
-    const authStyle = p.modelsAuthStyle || p.extra?.modelsAuthStyle || 'bearer';
-
-    if (!modelsUrl) return [];
-
-    const url = modelsUrl.startsWith('http') ? modelsUrl : (baseUrl + modelsUrl);
-
-    try {
-      const headers: any = {};
-      if (apiKey) {
-        if (authStyle === 'bearer') {
-          headers['Authorization'] = `Bearer ${apiKey}`;
-        } else if (authStyle === 'x-api-key') {
-          headers['x-api-key'] = apiKey;
-          headers['anthropic-version'] = '2023-06-01';
-        }
-      }
-
-      const res = await axios.get(url, { headers, timeout: 5000 });
-      const data = res.data;
-      const list = modelsDataPath.split('.').reduce((acc: any, part: string) => acc && acc[part], data);
-
-      if (Array.isArray(list)) {
-        return list.map((m: any) => typeof m === 'string' ? m : (m.id || m.name)).filter(Boolean);
-      }
-      return [];
-    } catch (e) {
-      console.error('Failed to fetch models:', e);
-      return [];
-    }
-  }
-
-  // 连通性测试：优先使用配置的 modelsUrl
+  // 连通性测试：按 apiFormat 选择探测路径
   static async testProvider(target: SavedProvider | string): Promise<{ ok: boolean; latencyMs?: number; message?: string }> {
     const p = typeof target === 'string' ? await this.getProvider(target) : target;
     if (!p) return { ok: false, message: 'Provider not found' };
-
-    const baseUrl = (p.baseUrl || '').replace(/\/+$/, '');
-    const modelsUrl = p.modelsUrl || p.extra?.modelsUrl || (p.apiFormat?.includes('openai') ? '/v1/models' : '/v1/models');
-    const authStyle = p.modelsAuthStyle || p.extra?.modelsAuthStyle || 'bearer';
-    const apiKey = p.apiKey;
-
-    const url = modelsUrl.startsWith('http') ? modelsUrl : (baseUrl + modelsUrl);
+    const base = (p.baseUrl || '').replace(/\/+$/,'');
     const start = Date.now();
-
+    // 简单路径推断
+    let url = base;
+    if ((p.apiFormat || '').includes('openai')) url = base + '/v1/models';
+    else if ((p.apiFormat || '').includes('anthropic')) url = base + '/v1/models';
     try {
-      const headers: any = {};
-      if (apiKey) {
-        if (authStyle === 'bearer') {
-          headers['Authorization'] = `Bearer ${apiKey}`;
-        } else if (authStyle === 'x-api-key') {
-          headers['x-api-key'] = apiKey;
-          headers['anthropic-version'] = '2023-06-01';
-        }
-      }
-
       const res = await axios.get(url, {
         timeout: 8000,
-        headers,
+        headers: {
+          ...(p.apiKey ? { Authorization: `Bearer ${p.apiKey}` } : {}),
+        },
         validateStatus: () => true
       });
-
+      // 2xx/3xx 都视为连通
       if (res.status >= 200 && res.status < 400) {
         return { ok: true, latencyMs: Date.now() - start };
       }
-      return { ok: false, message: `HTTP ${res.status}: ${JSON.stringify(res.data)}` };
+      return { ok: false, message: `HTTP ${res.status}` };
     } catch (e: any) {
       return { ok: false, message: e?.message || 'network error' };
     }

package/src/server/cli/providersMenu.tsx

@@ -30,9 +30,8 @@ const FIXED_APIFMT = 'openai_chat';
 
 const ProvidersMenu: React.FC = () => {
   const { exit } = useApp();
-  const [modelOptions, setModelOptions] = useState<string[]>([]);
   const [modelSelectIdx, setModelSelectIdx] = useState(0);
-  const [addStep, setAddStep] = useState(0); // 0:输入key并加载模型, 1:选模型
+  const [addStep, setAddStep] = useState(0); // 0:选模型, 1:填key
   const [inputKey, setInputKey] = useState('');
   const [addError, setAddError] = useState('');
   const [mode, setMode] = useState<UiMode>('list');
@@ -45,9 +44,6 @@ const ProvidersMenu: React.FC = () => {
   const [msg, setMsg] = useState<string>('');
   const [detail, setDetail] = useState<SavedProvider | null>(null);
   const [presets, setPresets] = useState<any[]>([]);
-  // 临时存储当前正在配置的 Provider 草案
-  const [pendingProvider, setPendingProvider] = useState<CreateProviderInput | null>(null);
-
   useEffect(() => { ProviderManager.listPresets().then(setPresets).catch(()=>setPresets([])); }, []);
 
   const refresh = async () => {
@@ -58,14 +54,7 @@ const ProvidersMenu: React.FC = () => {
   };
   useEffect(() => { refresh(); }, []);
   useEffect(() => {
-    if (mode !== 'add') {
-      setAddStep(0);
-      setInputKey('');
-      setAddError('');
-      setModelSelectIdx(0);
-      setModelOptions([]);
-      setPendingProvider(null);
-    }
+    if (mode !== 'add') { setAddStep(0); setInputKey(''); setAddError(''); setModelSelectIdx(0); }
   }, [mode]);
 
   // 主界面 LIST 模式
@@ -107,55 +96,33 @@ const ProvidersMenu: React.FC = () => {
       setMode('list'); setAddError(''); setInputKey(''); setAddStep(0);
       return;
     }
-    // 步骤1: 选模型
-    if (addStep === 1 && modelOptions.length > 0) {
-      if (key.downArrow) setModelSelectIdx(idx => Math.min(modelOptions.length - 1, idx + 1));
+    // 步骤0: 主模型选择
+    if (addStep === 0) {
+      if (key.downArrow) setModelSelectIdx(idx => Math.min(MODEL_OPTIONS.length - 1, idx + 1));
       else if (key.upArrow) setModelSelectIdx(idx => Math.max(0, idx - 1));
-      else if (key.return) {
-        completeAdd(modelOptions[modelSelectIdx]);
-      }
+      else if (key.return) { setAddStep(1); }
     }
   });
 
-  // 获取模型并进入下一步
-  const fetchModelsStep = async (keyInput: string) => {
+  // 新增表单
+  const addSubmit = async (keyInput: string) => {
+    const selectedModel = MODEL_OPTIONS[modelSelectIdx];
+    const presetId = selectedModel.replace(/[^a-zA-Z0-9]/g, '') + '-preset';
+    const name = `${selectedModel} Provider`;
     if (!keyInput.trim()) { setAddError('API Key 不能为空'); return; }
-    setAddError('正在获取模型列表...');
-    try {
-      // 如果没有 pendingProvider，手动创建一个（比如 Custom 模式）
-      const draft = pendingProvider || {
-        presetId: 'custom-' + Date.now(),
-        name: 'Custom Provider',
-        baseUrl: FIXED_BASEURL,
-        apiFormat: FIXED_APIFMT,
-        apiKey: keyInput.trim(),
-        models: { main: '', haiku: '', sonnet: '', opus: '' }
-      };
-
-      const models = await ProviderManager.fetchModels(draft, keyInput.trim());
-      if (models.length === 0) {
-        setAddError('未获取到可用模型，请检查 API Key 或网络连通性。');
-        return;
-      }
-      setModelOptions(models);
-      setPendingProvider({ ...draft, apiKey: keyInput.trim() });
-      setAddStep(1);
-      setAddError('');
-    } catch (e: any) {
-      setAddError('获取模型失败: ' + (e.message || '未知错误'));
-    }
-  };
-
-  const completeAdd = async (selectedModel: string) => {
-    if (!pendingProvider) return;
-    const name = pendingProvider.name || `${selectedModel} Provider`;
-
+    const exists = (await ProviderManager.listProviders()).some(p => p.id === presetId);
+    if (exists) { setAddError('该模型已添加过，如要更换Key请在列表编辑。'); return; }
+    setAddError('');
+    // 支持预设覆盖
+    const overrideBase = (global as any).__PM_BASEURL_OVERRIDE__ || FIXED_BASEURL;
+    const overrideFmt = (global as any).__PM_APIFMT_OVERRIDE__ || FIXED_APIFMT;
     await ProviderManager.addProvider({
-      ...pendingProvider,
-      name,
+      presetId, name, apiKey: keyInput.trim(),
+      baseUrl: overrideBase, apiFormat: overrideFmt,
       models: { main: selectedModel, haiku: '', sonnet: '', opus: '' }
     });
-
+    delete (global as any).__PM_BASEURL_OVERRIDE__;
+    delete (global as any).__PM_APIFMT_OVERRIDE__;
     setMode('list');
     setAddStep(0);
     setInputKey('');
@@ -186,25 +153,25 @@ const ProvidersMenu: React.FC = () => {
       {/* 新增 */}
       {mode === 'add' && (
         <Box flexDirection="column">
+          <Text>选择模型与输入API Key：</Text>
           {addStep === 0
             ? <>
-                <Text>请输入 API Key (将自动拉取可用模型)：</Text>
+                {MODEL_OPTIONS.map((m, idx) => (
+                  <Text key={m} color={idx === modelSelectIdx ? 'yellow' : undefined}>
+                    {idx === modelSelectIdx ? '> ' : '  '}{m}
+                  </Text>
+                ))}
+                <Text color="gray">↑↓选择，回车下一步，q返回</Text>
+              </>
+            : <>
+                <Text>已选模型：{MODEL_OPTIONS[modelSelectIdx]}</Text>
                 <TextInput
                   value={inputKey}
                   onChange={setInputKey}
-                  onSubmit={fetchModelsStep}
+                  onSubmit={addSubmit}
                   placeholder="请输入API Key"
                 />
-                <Text color="gray">输入后回车继续，q返回</Text>
-              </>
-            : <>
-                <Text>获取成功！请选择主模型：</Text>
-                {modelOptions.map((m, idx) => (
-                  <Text key={m} color={idx === modelSelectIdx ? 'yellow' : undefined}>
-                    {idx === modelSelectIdx ? '> ' : '  '}{m}
-                  </Text>
-                ))}
-                <Text color="gray">↑↓选择，回车保存，q返回</Text>
+                <Text color="gray">输入后回车提交，q返回</Text>
               </>
           }
           {addError && <Text color="red">{addError}</Text>}
@@ -292,14 +259,17 @@ const ProvidersMenu: React.FC = () => {
               <SelectInput
                 items={presets.map((p: any) => ({ label: `${p.name || p.id} ${p.baseUrl || ''}`, value: p.id }))}
                 onSelect={async it => {
-                  try {
-                    const draft = await ProviderManager.applyPreset(it.value);
-                    setPendingProvider(draft);
-                    setMode('add');
-                    setAddStep(0); // 去输入 Key
-                  } catch (e: any) {
-                    setMsg('预设加载失败: ' + e.message);
-                  }
+                  const p = presets.find((x: any) => x.id === it.value);
+                  if (!p) return;
+                  const model = (p.defaultModel || MODEL_OPTIONS[0]);
+                  const presetBase = p.baseUrl || FIXED_BASEURL;
+                  const presetFmt = p.apiFormat || FIXED_APIFMT;
+                  const idx = Math.max(0, MODEL_OPTIONS.findIndex(m => m === model));
+                  setModelSelectIdx(idx);
+                  (global as any).__PM_BASEURL_OVERRIDE__ = presetBase;
+                  (global as any).__PM_APIFMT_OVERRIDE__ = presetFmt;
+                  setMode('add');
+                  setAddStep(1); // 直接跳到 Key 输入
                 }}
               />
               <Text color="gray">回车选择预设，q 返回</Text>