bingocode 1.0.14 → 1.0.16

package/src/commands/resume/resume.tsx

@@ -229,6 +229,22 @@ export const call: LocalJSXCommandCall = async (onDone, context, args) => {
       return null;
     }
 
+    // Same-repo logs didn't find it — search across ALL projects.
+    // This handles the case where the user runs `bingo` from a different
+    // directory than where the session was originally created (the session
+    // file lives under ~/.claude/projects/{originalCwd}/). A direct UUID
+    // resume should always be location-independent.
+    const allLogs = await loadAllProjectsMessageLogs();
+    const allMatchingLogs = allLogs
+      .filter(l => getSessionIdFromLog(l) === maybeSessionId)
+      .sort((a, b) => b.modified.getTime() - a.modified.getTime());
+    if (allMatchingLogs.length > 0) {
+      const log = allMatchingLogs[0]!;
+      const fullLog = isLiteLog(log) ? await loadFullLog(log) : log;
+      void onResume(maybeSessionId, fullLog, 'slash_command_session_id');
+      return null;
+    }
+
     // Enriched logs didn't find it — try direct file lookup. This handles
     // sessions filtered out by enrichLogs (e.g., first message >16KB makes
     // firstPrompt extraction fail, causing the session to be dropped).

package/src/server/config/providerPresets.ts

@@ -1,93 +1,105 @@
-// Provider presets — loaded from providers.yaml at startup
-// Original work inspired by cc-switch (https://github.com/farion1231/cc-switch) by Jason Young, MIT License
-
-//@C:ID=M.PP.providerPresets;K=M;V=2.0;P=Import dependencies;D=API;M=Providers;S=ModelConfiguration
-import { readFileSync } from 'fs'
-import { fileURLToPath } from 'url'
-import { parse } from 'yaml'
-import path from 'path'
-import type { ApiFormat } from '../types/provider.js'
-
-//@C:ID=T.PP.ModelMapping;K=T;V=1.0;P=Define model type mappings;D=API;M=Providers;S=ModelConfiguration
-export type ModelMapping = {
-  main: string
-  haiku: string
-  sonnet: string
-  opus: string
-}
-
-//@C:ID=T.PP.ProviderField;K=T;V=1.0;P=Define per-provider field descriptor;D=API;M=Providers;S=ModelConfiguration
-export type ProviderField = {
-  /** Field key: 'name' | 'apiKey' | 'baseUrl' map to top-level fields; others go into extra.<key> */
-  key: string
-  /** Human-readable label shown in the CLI form */
-  label: string
-  required?: boolean
-  /** If true, input is masked in the terminal */
-  secret?: boolean
-  placeholder?: string
-  /** Default value pre-filled in the form */
-  default?: string
-}
-
-//@C:ID=T.PP.ProviderPreset;K=T;V=2.0;P=Define provider preset structure;D=API;M=Providers;S=ModelConfiguration
-export type ProviderPreset = {
-  id: string
-  name: string
-  baseUrl: string
-  apiFormat: ApiFormat
-  defaultModels: ModelMapping
-  needsApiKey: boolean
-  websiteUrl: string
-  /** Ordered list of fields to render when adding a new provider from this preset */
-  fields: ProviderField[]
-}
-
-//@C:ID=D.PP.PROVIDER_PRESETS;K=D;V=2.0;P=Load provider presets from yaml;D=API;M=Providers;S=ModelConfiguration
-function loadPresetsFromYaml(): ProviderPreset[] {
-  try {
-    const yamlPath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'providers.yaml')
-    const raw = parse(readFileSync(yamlPath, 'utf-8')) as { presets?: ProviderPreset[] }
-    const presets = raw?.presets
-    if (!Array.isArray(presets) || presets.length === 0) {
-      throw new Error('providers.yaml missing presets array')
-    }
-    // Ensure fields is always an array
-    return presets.map(p => ({ ...p, fields: Array.isArray(p.fields) ? p.fields : [] }))
-  } catch (err) {
-    console.error('[providerPresets] Failed to load providers.yaml, falling back to defaults:', err)
-    // Minimal fallback so the server can still start
-    return [
-      {
-        id: 'official',
-        name: 'Claude Official',
-        baseUrl: '',
-        apiFormat: 'anthropic',
-        defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-        needsApiKey: false,
-        websiteUrl: 'https://www.anthropic.com/claude-code',
-        fields: [{ key: 'name', label: 'Provider 昵称', required: true }],
-      },
-      {
-        id: 'custom',
-        name: 'Custom',
-        baseUrl: '',
-        apiFormat: 'anthropic',
-        defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
-        needsApiKey: true,
-        websiteUrl: '',
-        fields: [
-          { key: 'name', label: 'Provider 昵称', required: true },
-          { key: 'baseUrl', label: 'Base URL', required: true },
-          { key: 'apiKey', label: 'API Key', required: false, secret: true },
-        ],
-      },
-    ]
-  }
-}
-
-export const PROVIDER_PRESETS: ProviderPreset[] = loadPresetsFromYaml()
-
-export async function loadProviderPresets(): Promise<ProviderPreset[]> {
-  return PROVIDER_PRESETS
-}
+// Provider presets — loaded from providers.yaml at startup
+
+import { readFileSync } from 'fs'
+import { fileURLToPath } from 'url'
+import { parse } from 'yaml'
+import path from 'path'
+import type { ApiFormat } from '../types/provider.js'
+
+export type ProviderField = {
+  /** Field key: 'name' | 'apiKey' | 'baseUrl' map to top-level fields; others go into extra.<key> */
+  key: string
+  /** Human-readable label shown in the CLI form */
+  label: string
+  required?: boolean
+  /** If true, input is masked in the terminal */
+  secret?: boolean
+  placeholder?: string
+  /** Default value pre-filled in the form */
+  default?: string
+}
+
+export type ProviderPreset = {
+  id: string
+  name: string
+  /** Default base URL for this provider (can be overridden by user) */
+  baseUrl: string
+  apiFormat: ApiFormat
+  needsApiKey: boolean
+  websiteUrl: string
+  /**
+   * Relative path to the models list endpoint, e.g. '/v1/models'.
+   * Empty string means dynamic model fetching is not supported.
+   */
+  modelsUrl: string
+  /**
+   * Auth header style for the models list request:
+   *   'bearer'   → Authorization: Bearer <apiKey>
+   *   'x-api-key' → x-api-key: <apiKey>  (+ anthropic-version header)
+   */
+  modelsAuthStyle: 'bearer' | 'x-api-key'
+  /**
+   * Field name in the response JSON that contains the model array.
+   * Almost always 'data' (OpenAI-compatible standard).
+   */
+  modelsDataPath: string
+  /** Ordered list of fields to render when adding a new provider from this preset */
+  fields: ProviderField[]
+}
+
+function loadPresetsFromYaml(): ProviderPreset[] {
+  try {
+    const yamlPath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'providers.yaml')
+    const raw = parse(readFileSync(yamlPath, 'utf-8')) as { presets?: ProviderPreset[] }
+    const presets = raw?.presets
+    if (!Array.isArray(presets) || presets.length === 0) {
+      throw new Error('providers.yaml missing presets array')
+    }
+    // Ensure fields is always an array and apply defaults for optional fields
+    return presets.map(p => ({
+      modelsUrl: '',
+      modelsAuthStyle: 'bearer' as const,
+      modelsDataPath: 'data',
+      ...p,
+      fields: Array.isArray(p.fields) ? p.fields : [],
+    }))
+  } catch (err) {
+    console.error('[providerPresets] Failed to load providers.yaml, falling back to defaults:', err)
+    return [
+      {
+        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 }],
+      },
+      {
+        id: 'custom',
+        name: 'Custom',
+        baseUrl: '',
+        apiFormat: 'anthropic',
+        needsApiKey: true,
+        websiteUrl: '',
+        modelsUrl: '/v1/models',
+        modelsAuthStyle: 'bearer',
+        modelsDataPath: 'data',
+        fields: [
+          { key: 'name', label: 'Provider 昵称', required: true },
+          { key: 'baseUrl', label: 'Base URL', required: true },
+          { key: 'apiKey', label: 'API Key', required: false, secret: true },
+        ],
+      },
+    ]
+  }
+}
+
+export const PROVIDER_PRESETS: ProviderPreset[] = loadPresetsFromYaml()
+
+export async function loadProviderPresets(): Promise<ProviderPreset[]> {
+  return PROVIDER_PRESETS
+}

package/src/server/config/providers.yaml

@@ -1,145 +1,138 @@
-version: 2
-
-# Provider 预设配置
-# fields 数组声明新增时需填写的字段
-# key: 'name' | 'apiKey' | 'baseUrl' 直接映射到顶层字段，其余存入 extra.<key>
-# secret: true 时前端使用密码掩码显示
-
-presets:
-  - id: official
-    name: Claude Official
-    baseUrl: ''
-    apiFormat: anthropic
-    needsApiKey: false
-    websiteUrl: https://www.anthropic.com/claude-code
-    defaultModels:
-      main: ''
-      haiku: ''
-      sonnet: ''
-      opus: ''
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. Claude Official'
-
-  - id: deepseek
-    name: DeepSeek
-    baseUrl: https://api.deepseek.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.deepseek.com
-    defaultModels:
-      main: DeepSeek-V3.2
-      haiku: DeepSeek-V3.2
-      sonnet: DeepSeek-V3.2
-      opus: DeepSeek-V3.2
-    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
-    defaultModels:
-      main: glm-5
-      haiku: glm-5
-      sonnet: glm-5
-      opus: glm-5
-    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
-    defaultModels:
-      main: kimi-k2.5
-      haiku: kimi-k2.5
-      sonnet: kimi-k2.5
-      opus: kimi-k2.5
-    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
-    defaultModels:
-      main: MiniMax-M2.7
-      haiku: MiniMax-M2.7
-      sonnet: MiniMax-M2.7
-      opus: MiniMax-M2.7
-    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: anthropic
-    needsApiKey: true
-    websiteUrl: ''
-    defaultModels:
-      main: ''
-      haiku: ''
-      sonnet: ''
-      opus: ''
-    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/anthropic'
-      - 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: 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'

package/src/server/services/providerService.ts

@@ -9,12 +9,14 @@
 import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
+import { getDirectFetchOptions } from '../../utils/proxy.ts'
 import { ApiError } from '../middleware/errorHandler.js'
 import { anthropicToOpenaiChat } from '../proxy/transform/anthropicToOpenaiChat.js'
 import { anthropicToOpenaiResponses } from '../proxy/transform/anthropicToOpenaiResponses.js'
 import { openaiChatToAnthropic } from '../proxy/transform/openaiChatToAnthropic.js'
 import { openaiResponsesToAnthropic } from '../proxy/transform/openaiResponsesToAnthropic.js'
 import type { AnthropicRequest, AnthropicResponse } from '../proxy/transform/types.js'
+import { PROVIDER_PRESETS } from '../config/providerPresets.js'
 import type {
   SavedProvider,
   ProvidersIndex,
@@ -379,29 +381,37 @@ export class ProviderService {
 
   async fetchProviderModels(id: string): Promise<string[]> {
     const provider = await this.getProvider(id)
+    const preset = PROVIDER_PRESETS.find(p => p.id === provider.presetId)
+
     const base = provider.baseUrl.replace(/\/+$/, '')
     if (!base) return []
 
-    const url = `${base}/v1/models`
+    const modelsUrl = preset?.modelsUrl || '/v1/models'
+    const url = `${base}${modelsUrl}`
+
     const headers: Record<string, string> = {
       'Content-Type': 'application/json',
-      Authorization: `Bearer ${provider.apiKey}`,
     }
-    // anthropic format uses x-api-key header style
-    if (provider.apiFormat === 'anthropic') {
+
+    const authStyle = preset?.modelsAuthStyle || (provider.apiFormat === 'anthropic' ? 'x-api-key' : 'bearer')
+    if (authStyle === 'x-api-key') {
       headers['x-api-key'] = provider.apiKey
-      delete headers['Authorization']
       headers['anthropic-version'] = '2023-06-01'
+    } else {
+      headers['Authorization'] = `Bearer ${provider.apiKey}`
     }
 
     try {
-      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000) })
+      const directOpts = getDirectFetchOptions()
+      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...directOpts })
       if (!res.ok) {
         return []
       }
-      const data = await res.json() as { data?: { id: string }[]; models?: { id: string }[] }
-      const list = data.data ?? data.models ?? []
-      return list.map((m: { id: string }) => m.id).filter(Boolean)
+      const data = await res.json() as any
+      const dataPath = preset?.modelsDataPath || 'data'
+      const list = data[dataPath] ?? data.data ?? data.models ?? []
+      if (!Array.isArray(list)) return []
+      return list.map((m: any) => (typeof m === 'string' ? m : m.id)).filter(Boolean)
     } catch {
       return []
     }
@@ -464,11 +474,13 @@ export class ProviderService {
     const start = Date.now()
     try {
       const { url, headers, body } = buildDirectTestRequest(base, apiKey, modelId, format)
+      const directOpts = getDirectFetchOptions()
       const response = await fetch(url, {
         method: 'POST',
         headers,
         body: JSON.stringify(body),
         signal: AbortSignal.timeout(30000),
+        ...directOpts,
       })
 
       const latencyMs = Date.now() - start
@@ -526,11 +538,13 @@ export class ProviderService {
       }
 
       // Call upstream with transformed request
+      const directOpts = getDirectFetchOptions()
       const response = await fetch(upstreamUrl, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
         body: JSON.stringify(transformedBody),
         signal: AbortSignal.timeout(30000),
+        ...directOpts,
       })
 
       if (!response.ok) {

package/src/server/types/provider.ts

@@ -1,8 +1,8 @@
 /**
  * Provider types — preset-based provider configuration.
  *
- * Providers are stored in ~/.claude/cc-haha/providers.json as a lightweight index.
- * The active provider's env vars are written to ~/.claude/settings.json.
+ * Providers are stored in ~/.claude/bingo/providers.json as a lightweight index.
+ * The active provider's env vars are written to ~/.claude/bingo/settings.json.
  */
 
 import { z } from 'zod'
@@ -44,7 +44,7 @@ export const CreateProviderSchema = z.object({
   apiKey: z.string(),
   baseUrl: z.string(),
   apiFormat: ApiFormatSchema.default('anthropic'),
-  models: ModelMappingSchema,
+  models: ModelMappingSchema.default({ main: '', haiku: '', sonnet: '', opus: '' }).optional(),
   notes: z.string().optional(),
   extra: z.record(z.any()).optional(),
 }).catchall(z.any())

package/src/utils/managedEnv.ts

@@ -93,15 +93,15 @@ function filterSettingsEnv(
 }
 
 /**
- * Read env vars from ~/.claude/cc-haha/settings.json (Haha-specific provider
+ * Read env vars from ~/.claude/bingo/settings.json (Bingo-specific provider
  * config). This file is written by ProviderService.syncToSettings() and
  * contains ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, model defaults, etc.
  * Returns an empty object if the file doesn't exist or is invalid.
  */
 function getCcHahaSettingsEnv(): Record<string, string> {
   try {
-    const ccHahaSettings = join(getClaudeConfigHomeDir(), 'cc-haha', 'settings.json')
-    const raw = readFileSync(ccHahaSettings, 'utf-8')
+    const bingoSettings = join(getClaudeConfigHomeDir(), 'bingo', 'settings.json')
+    const raw = readFileSync(bingoSettings, 'utf-8')
     const parsed = JSON.parse(raw) as { env?: Record<string, string> }
     return parsed.env ?? {}
   } catch {