bingocode 1.0.13 → 1.0.15

package/src/manager/CliMenuManager.tsx

@@ -8,6 +8,7 @@ import { LogoV2 } from '../components/LogoV2/LogoV2.tsx';
 import { CondensedLogo } from '../components/LogoV2/CondensedLogo.tsx';
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { ensureSingletonLocalServer } from '../server/ensureSingletonLocalServer.ts';
 // 新增：通用 UI 元素与顶部工具栏
 import { TopBar, BottomBar, Panel, Hint, Kbd, SecondaryMenu } from '../manager/CliMenuUi.tsx';
@@ -20,7 +21,8 @@ import { useTheme } from '../components/design-system/ThemeProvider.js';
 // 配置相关（仅使用可用接口）
 import { getGlobalConfig, saveGlobalConfig } from '../utils/config.ts';
 
-const MARKED_FILE = path.join(process.cwd(), 'markedSessions.json');
+// markedSessions 存到 ~/.claude-cli/ 固定目录，不受 cwd 影响
+const MARKED_FILE = path.join(os.homedir(), '.claude-cli', 'markedSessions.json');
 
 // 固定尺寸视口（可用环境变量覆盖）
 const VIEW_W = Number(process.env.CLI_VIEW_W || 96);
@@ -182,7 +184,7 @@ export const CliMenuManager: React.FC = () => {
     (async () => {
       try {
         if (apiUrl) return;
-        const entry = path.resolve(process.cwd(), 'src/server/index.ts');
+        const entry = path.resolve(import.meta.dir, '../server/index.ts');
         const handle = await ensureSingletonLocalServer({ serverEntry: entry });
         if (!mounted) { await handle.stopIfLast(); return; }
         setApiUrl(handle.baseUrl);
@@ -678,24 +680,7 @@ export const CliMenuManager: React.FC = () => {
             setSelectedHistory(null);
             setMsgsPage(0);
           } else if (item.value === '__continue') {
-            try {
-              const fsReq = require('fs');
-              const pathReq = require('path');
-              const { spawn } = require('child_process');
-              const pkgPath = pathReq.resolve(process.cwd(), 'package.json');
-              const pkgJson = JSON.parse(fsReq.readFileSync(pkgPath, 'utf-8'));
-              const bins = pkgJson.bin || {};
-              const isWin = process.platform === 'win32';
-              let binName = isWin
-                ? bins['claude-haha'] ? 'claude-haha' : bins['claude'] ? 'claude' : Object.keys(bins)[0]
-                : bins['claude-linux'] ? 'claude-linux' : bins['claude'] ? 'claude' : Object.keys(bins)[0];
-              const spawnCmd = isWin ? 'cmd' : 'sh';
-              const spawnArgs = isWin
-                ? ['/c', binName, '--resume', selectedHistory.id]
-                : ['-c', `./${binName} --resume ${selectedHistory.id}`];
-              // 静默启动继续会话
-              resumeSession(selectedHistory.id);
-            } catch { }
+            resumeSession(selectedHistory.id);
           } else if (item.value === '__delete') {
             setHistoryMenuStage('deleteConfirm');
           } else if (item.value === '__toggle_mark') {

package/src/server/config/providerPresets.ts

@@ -1,93 +1,93 @@
-// 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
+// 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
+}

package/src/server/config/providers.yaml

@@ -1,145 +1,145 @@
-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 时前端使用密码掩码显示
+
+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: openai_chat
+    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/v1'
+      - key: apiKey
+        label: API Key
+        required: false
+        secret: true
+        placeholder: '（可选）API Key'