bingocode 1.0.19 → 1.0.20

package/package.json

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

package/src/entrypoints/init.ts

@@ -1,3 +1,4 @@
+import { mkdirSync } from 'node:fs'
 import { profileCheckpoint } from '../utils/startupProfiler.js'
 import '../bootstrap/state.js'
 import '../utils/config.js'
@@ -25,7 +26,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 { isEnvTruthy } from '../utils/envUtils.js'
+import { getClaudeConfigHomeDir, 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 {
@@ -55,6 +56,13 @@ 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

@@ -818,7 +818,7 @@ export const CliMenuManager: React.FC = () => {
         <Box flexDirection="column" width={VIEW_W} height={MID_H}>
           {creating && <Text color="yellow">新建中...</Text>}
           {createErr && <Text color="red">新建失败: {createErr}</Text>}
-          {newSessionId && <Text color="green">新建会话（本地Id，仅演示）: {newSessionId}</Text>}
+          {newSessionId && <Text color="green">新建会话: {newSessionId}</Text>}
           {!creating && !createErr && !newSessionId && <Text dimColor>已进入新建会话页，等待创建结果...</Text>}
         </Box>
       );

package/src/server/cli/providerManager.ts

@@ -121,14 +121,13 @@ export class ProviderManager {
     }
   }
 
-  // 预设列表（可选，providerPresets 不存在则返回空）
+  // 预设列表
   static async listPresets(): Promise<any[]> {
     try {
-      // 相对 src/server/cli 到 config 的路径
-      const mod = await import('../config/providerPresets.ts');
-      const presets = (mod as any).presets || (mod as any).providerPresets || [];
-      return presets;
-    } catch {
+      const { loadProviderPresets } = await import('../config/providerPresets.ts');
+      return await loadProviderPresets();
+    } catch (e) {
+      console.error('Failed to load presets:', e);
       return [];
     }
   }
@@ -145,33 +144,83 @@ 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 ?? ''
+      notes: overrides?.notes ?? p.notes ?? '',
+      extra: { ...p, ...overrides?.extra }
     };
   }
 
-  // 连通性测试：按 apiFormat 选择探测路径
+  // 获取模型列表
+  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
   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 base = (p.baseUrl || '').replace(/\/+$/,'');
+
+    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 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: {
-          ...(p.apiKey ? { Authorization: `Bearer ${p.apiKey}` } : {}),
-        },
+        headers,
         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}` };
+      return { ok: false, message: `HTTP ${res.status}: ${JSON.stringify(res.data)}` };
     } catch (e: any) {
       return { ok: false, message: e?.message || 'network error' };
     }

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/utils/config.ts

@@ -1344,11 +1344,17 @@ export function enableConfigs(): void {
   // to prevent us from adding config reading during module initialization
   configReadingAllowed = true
   // We only check the global config because currently all the configs share a file
-  getConfig(
-    getGlobalClaudeFile(),
-    createDefaultGlobalConfig,
-    true /* throw on invalid */,
-  )
+  try {
+    getConfig(
+      getGlobalClaudeFile(),
+      createDefaultGlobalConfig,
+      true /* throw on invalid */,
+    )
+  } catch (e) {
+    logForDebugging(`Failed to load config during enableConfigs: ${e}`, { level: 'error' })
+    // If it's a corrupted file, we allow the boostrap to continue with defaults
+    // instead of hard-crashing the process.
+  }
 
   logForDiagnosticsNoPII('info', 'enable_configs_completed', {
     duration_ms: Date.now() - startTime,

package/src/utils/preflightChecks.tsx

@@ -202,7 +202,7 @@ export function PreflightStep(t0) {
 
 //@C:ID=F.PC._temp;K=F;V=1.0;P=Helper function for process exit;D=UI;M=Connectivity;S=Utility;In=void;Out=void
 function _temp() {
-  console.log("F.PC._temp");
-  
-  return process.exit(1);
+  console.log("F.PC._temp: Skipping force exit on connectivity failure.");
+
+  // return process.exit(1);
 }