bingocode 1.0.18 → 1.0.20

package/src/server/cli/providersMenu.tsx

@@ -30,8 +30,9 @@ 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:选模型, 1:填key
+  const [addStep, setAddStep] = useState(0); // 0:输入key并加载模型, 1:选模型
   const [inputKey, setInputKey] = useState('');
   const [addError, setAddError] = useState('');
   const [mode, setMode] = useState<UiMode>('list');
@@ -44,6 +45,9 @@ 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 () => {
@@ -54,7 +58,14 @@ const ProvidersMenu: React.FC = () => {
   };
   useEffect(() => { refresh(); }, []);
   useEffect(() => {
-    if (mode !== 'add') { setAddStep(0); setInputKey(''); setAddError(''); setModelSelectIdx(0); }
+    if (mode !== 'add') {
+      setAddStep(0);
+      setInputKey('');
+      setAddError('');
+      setModelSelectIdx(0);
+      setModelOptions([]);
+      setPendingProvider(null);
+    }
   }, [mode]);
 
   // 主界面 LIST 模式
@@ -96,33 +107,55 @@ const ProvidersMenu: React.FC = () => {
       setMode('list'); setAddError(''); setInputKey(''); setAddStep(0);
       return;
     }
-    // 步骤0: 主模型选择
-    if (addStep === 0) {
-      if (key.downArrow) setModelSelectIdx(idx => Math.min(MODEL_OPTIONS.length - 1, idx + 1));
+    // 步骤1: 选模型
+    if (addStep === 1 && modelOptions.length > 0) {
+      if (key.downArrow) setModelSelectIdx(idx => Math.min(modelOptions.length - 1, idx + 1));
       else if (key.upArrow) setModelSelectIdx(idx => Math.max(0, idx - 1));
-      else if (key.return) { setAddStep(1); }
+      else if (key.return) {
+        completeAdd(modelOptions[modelSelectIdx]);
+      }
     }
   });
 
-  // 新增表单
-  const addSubmit = async (keyInput: string) => {
-    const selectedModel = MODEL_OPTIONS[modelSelectIdx];
-    const presetId = selectedModel.replace(/[^a-zA-Z0-9]/g, '') + '-preset';
-    const name = `${selectedModel} Provider`;
+  // 获取模型并进入下一步
+  const fetchModelsStep = async (keyInput: string) => {
     if (!keyInput.trim()) { setAddError('API Key 不能为空'); return; }
-    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;
+    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`;
+
     await ProviderManager.addProvider({
-      presetId, name, apiKey: keyInput.trim(),
-      baseUrl: overrideBase, apiFormat: overrideFmt,
+      ...pendingProvider,
+      name,
       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('');
@@ -153,25 +186,25 @@ const ProvidersMenu: React.FC = () => {
       {/* 新增 */}
       {mode === 'add' && (
         <Box flexDirection="column">
-          <Text>选择模型与输入API Key：</Text>
           {addStep === 0
             ? <>
-                {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>
+                <Text>请输入 API Key (将自动拉取可用模型)：</Text>
                 <TextInput
                   value={inputKey}
                   onChange={setInputKey}
-                  onSubmit={addSubmit}
+                  onSubmit={fetchModelsStep}
                   placeholder="请输入API Key"
                 />
-                <Text color="gray">输入后回车提交，q返回</Text>
+                <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>
               </>
           }
           {addError && <Text color="red">{addError}</Text>}
@@ -259,17 +292,14 @@ const ProvidersMenu: React.FC = () => {
               <SelectInput
                 items={presets.map((p: any) => ({ label: `${p.name || p.id} ${p.baseUrl || ''}`, value: p.id }))}
                 onSelect={async it => {
-                  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 输入
+                  try {
+                    const draft = await ProviderManager.applyPreset(it.value);
+                    setPendingProvider(draft);
+                    setMode('add');
+                    setAddStep(0); // 去输入 Key
+                  } catch (e: any) {
+                    setMsg('预设加载失败: ' + e.message);
+                  }
                 }}
               />
               <Text color="gray">回车选择预设，q 返回</Text>

package/src/server/config/providers.yaml

@@ -1,207 +1,207 @@
-version: 2
-
-# Provider 预设配置
-# fields 数组声明新增时需填写的字段
-# key: 'name' | 'apiKey' | 'baseUrl' 直接映射到顶层字段，其余存入 extra.<key>
-# secret: true 时前端使用密码掩码显示
-#
-# modelsUrl: 相对于 baseUrl 的模型列表路径，空字符串表示不支持动态拉取
-# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
-#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
-# modelsDataPath: 响应 JSON 中模型数组的字段名（几乎总是 'data'）
-
-presets:
-  - id: official
-    name: Claude Official
-    baseUrl: ''
-    apiFormat: anthropic
-    needsApiKey: false
-    websiteUrl: https://www.anthropic.com/claude-code
-    modelsUrl: /v1/models
-    modelsAuthStyle: x-api-key
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. Claude Official'
-
-  - id: openai
-    name: OpenAI
-    baseUrl: https://api.openai.com/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.openai.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My OpenAI'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-      - key: baseUrl
-        label: Base URL (Optional)
-        required: false
-        secret: false
-        default: https://api.openai.com/v1
-        placeholder: 'https://api.openai.com/v1'
-
-  - id: gemini
-    name: Google Gemini
-    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://aistudio.google.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Gemini'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Gemini API Key'
-
-  - id: mistral
-    name: Mistral AI
-    baseUrl: https://api.mistral.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://console.mistral.ai
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Mistral'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Mistral API Key'
-
-  - id: deepseek
-    name: DeepSeek
-    baseUrl: https://api.deepseek.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.deepseek.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My DeepSeek'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-
-  - id: zhipuglm
-    name: Zhipu GLM
-    baseUrl: https://open.bigmodel.cn/api/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://open.bigmodel.cn
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My GLM'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: '智谱 API Key'
-
-  - id: kimi
-    name: Kimi
-    baseUrl: https://api.moonshot.cn/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.moonshot.cn
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Kimi'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Moonshot API Key'
-
-  - id: minimax
-    name: MiniMax
-    baseUrl: https://api.minimaxi.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.minimaxi.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My MiniMax'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'MiniMax API Key'
-
-  - id: custom
-    name: Custom
-    baseUrl: ''
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: ''
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Custom Provider'
-      - key: baseUrl
-        label: Base URL
-        required: true
-        secret: false
-        placeholder: 'https://your-api-endpoint.com/v1'
-      - key: apiKey
-        label: API Key
-        required: false
-        secret: true
-        placeholder: '（可选）API Key'
+version: 2
+
+# Provider 预设配置
+# fields 数组声明新增时需填写的字段
+# key: 'name' | 'apiKey' | 'baseUrl' 直接映射到顶层字段，其余存入 extra.<key>
+# secret: true 时前端使用密码掩码显示
+#
+# modelsUrl: 相对于 baseUrl 的模型列表路径，空字符串表示不支持动态拉取
+# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
+#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
+# modelsDataPath: 响应 JSON 中模型数组的字段名（几乎总是 'data'）
+
+presets:
+  - id: official
+    name: Claude Official
+    baseUrl: ''
+    apiFormat: anthropic
+    needsApiKey: false
+    websiteUrl: https://www.anthropic.com/claude-code
+    modelsUrl: /v1/models
+    modelsAuthStyle: x-api-key
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. Claude Official'
+
+  - id: openai
+    name: OpenAI
+    baseUrl: https://api.openai.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.openai.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My OpenAI'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+      - key: baseUrl
+        label: Base URL (Optional)
+        required: false
+        secret: false
+        default: https://api.openai.com/v1
+        placeholder: 'https://api.openai.com/v1'
+
+  - id: gemini
+    name: Google Gemini
+    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://aistudio.google.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Gemini'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Gemini API Key'
+
+  - id: mistral
+    name: Mistral AI
+    baseUrl: https://api.mistral.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://console.mistral.ai
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Mistral'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Mistral API Key'
+
+  - id: deepseek
+    name: DeepSeek
+    baseUrl: https://api.deepseek.com
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.deepseek.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My DeepSeek'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+
+  - id: zhipuglm
+    name: Zhipu GLM
+    baseUrl: https://open.bigmodel.cn/api/paas/v4
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://open.bigmodel.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My GLM'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: '智谱 API Key'
+
+  - id: kimi
+    name: Kimi
+    baseUrl: https://api.moonshot.cn/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.moonshot.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Kimi'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Moonshot API Key'
+
+  - id: minimax
+    name: MiniMax
+    baseUrl: https://api.minimaxi.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.minimaxi.com
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My MiniMax'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'MiniMax API Key'
+
+  - id: custom
+    name: Custom
+    baseUrl: ''
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Custom Provider'
+      - key: baseUrl
+        label: Base URL
+        required: true
+        secret: false
+        placeholder: 'https://your-api-endpoint.com/v1'
+      - key: apiKey
+        label: API Key
+        required: false
+        secret: true
+        placeholder: '（可选）API Key'