ccman 3.0.18 → 3.0.20

package/dist/index.js

@@ -39,7 +39,7 @@ var init_package = __esm({
   "../core/package.json"() {
     package_default = {
       name: "@ccman/core",
-      version: "3.0.18",
+      version: "3.0.20",
       type: "module",
       description: "Core business logic for ccman",
       main: "./dist/index.js",
@@ -2163,37 +2163,55 @@ var require_toml = __commonJS({
   }
 });
 
+// ../core/dist/utils/template.js
+function replaceVariables(template, variables) {
+  const jsonStr = JSON.stringify(template);
+  let result = jsonStr;
+  for (const [key, value] of Object.entries(variables)) {
+    const escapedValue = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    result = result.replace(new RegExp(`{{${key}}}`, "g"), escapedValue);
+  }
+  return JSON.parse(result);
+}
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const key in source) {
+    const sourceValue = source[key];
+    const targetValue = result[key];
+    if (sourceValue && typeof sourceValue === "object" && !Array.isArray(sourceValue) && targetValue && typeof targetValue === "object" && !Array.isArray(targetValue)) {
+      result[key] = deepMerge(targetValue, sourceValue);
+    } else {
+      result[key] = sourceValue;
+    }
+  }
+  return result;
+}
+var init_template = __esm({
+  "../core/dist/utils/template.js"() {
+    "use strict";
+  }
+});
+
 // ../core/dist/writers/codex.js
 function writeCodexConfig(provider) {
   ensureDir(getCodexDir());
   const configPath = getCodexConfigPath();
-  let config;
+  let userConfig = {};
   if (fileExists(configPath)) {
     const content = fs2.readFileSync(configPath, "utf-8");
-    config = (0, import_toml.parse)(content);
-  } else {
-    config = {};
+    userConfig = (0, import_toml.parse)(content);
   }
-  config.model_provider = provider.name;
-  config.model_providers = config.model_providers || {};
-  config.model_providers[provider.name] = {
+  const mergedConfig = deepMerge(CODEX_DEFAULT_CONFIG, userConfig);
+  mergedConfig.model_provider = provider.name;
+  mergedConfig.model = provider.model || mergedConfig.model || "gpt-5-codex";
+  mergedConfig.model_providers = mergedConfig.model_providers || {};
+  mergedConfig.model_providers[provider.name] = {
     name: provider.name,
     base_url: provider.baseUrl,
     wire_api: "responses",
-    // 固定值
     requires_openai_auth: true
-    // 固定值
   };
-  if (!config.model) {
-    config.model = "gpt-5";
-  }
-  if (!config.model_reasoning_effort) {
-    config.model_reasoning_effort = "high";
-  }
-  if (!("disable_response_storage" in config)) {
-    config.disable_response_storage = true;
-  }
-  fs2.writeFileSync(configPath, (0, import_toml.stringify)(config), { mode: 384 });
+  fs2.writeFileSync(configPath, (0, import_toml.stringify)(mergedConfig), { mode: 384 });
   const authPath = getCodexAuthPath();
   let auth;
   if (fileExists(authPath)) {
@@ -2205,7 +2223,7 @@ function writeCodexConfig(provider) {
   auth.OPENAI_API_KEY = provider.apiKey;
   fs2.writeFileSync(authPath, JSON.stringify(auth, null, 2), { mode: 384 });
 }
-var fs2, import_toml;
+var fs2, import_toml, CODEX_DEFAULT_CONFIG;
 var init_codex = __esm({
   "../core/dist/writers/codex.js"() {
     "use strict";
@@ -2213,6 +2231,29 @@ var init_codex = __esm({
     import_toml = __toESM(require_toml(), 1);
     init_paths();
     init_file();
+    init_template();
+    CODEX_DEFAULT_CONFIG = {
+      model_reasoning_effort: "high",
+      disable_response_storage: true,
+      sandbox_mode: "workspace-write",
+      windows_wsl_setup_acknowledged: true,
+      features: {
+        plan_tool: true,
+        apply_patch_freeform: true,
+        view_image_tool: true,
+        web_search_request: true,
+        unified_exec: false,
+        streamable_shell: false,
+        rmcp_client: true
+      },
+      tools: {
+        web_search: true,
+        view_image: true
+      },
+      sandbox_workspace_write: {
+        network_access: true
+      }
+    };
   }
 });
 
@@ -2220,42 +2261,38 @@ var init_codex = __esm({
 function writeClaudeConfig(provider) {
   ensureDir(getClaudeDir());
   const configPath = getClaudeConfigPath();
-  let settings;
+  let userConfig = {};
   if (fileExists(configPath)) {
     const content = fs3.readFileSync(configPath, "utf-8");
-    settings = JSON.parse(content);
-  } else {
-    settings = {};
-  }
-  if (!settings.env) {
-    settings.env = {};
-  }
-  settings.env.ANTHROPIC_AUTH_TOKEN = provider.apiKey;
-  settings.env.ANTHROPIC_BASE_URL = provider.baseUrl;
-  if (!("CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC" in settings.env)) {
-    settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = 1;
-  }
-  if (!("CLAUDE_CODE_MAX_OUTPUT_TOKENS" in settings.env)) {
-    settings.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS = 32e3;
-  }
-  if (!settings.permissions) {
-    settings.permissions = { allow: [], deny: [] };
-  }
-  if (!settings.permissions.allow) {
-    settings.permissions.allow = [];
-  }
-  if (!settings.permissions.deny) {
-    settings.permissions.deny = [];
+    userConfig = JSON.parse(content);
   }
-  fs3.writeFileSync(configPath, JSON.stringify(settings, null, 2), { mode: 384 });
+  const defaultConfig = replaceVariables(CLAUDE_CONFIG_TEMPLATE, {
+    apiKey: provider.apiKey,
+    baseUrl: provider.baseUrl
+  });
+  const mergedConfig = deepMerge(defaultConfig, userConfig);
+  fs3.writeFileSync(configPath, JSON.stringify(mergedConfig, null, 2), { mode: 384 });
 }
-var fs3;
+var fs3, CLAUDE_CONFIG_TEMPLATE;
 var init_claude = __esm({
   "../core/dist/writers/claude.js"() {
     "use strict";
     fs3 = __toESM(require("fs"), 1);
     init_paths();
     init_file();
+    init_template();
+    CLAUDE_CONFIG_TEMPLATE = {
+      env: {
+        ANTHROPIC_AUTH_TOKEN: "{{apiKey}}",
+        ANTHROPIC_BASE_URL: "{{baseUrl}}",
+        CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: 1,
+        CLAUDE_CODE_MAX_OUTPUT_TOKENS: 32e3
+      },
+      permissions: {
+        allow: [],
+        deny: []
+      }
+    };
   }
 });
 
@@ -2265,14 +2302,9 @@ var init_codex2 = __esm({
   "../core/dist/presets/codex.js"() {
     "use strict";
     CODEX_PRESETS = [
-      {
-        name: "PackyCode",
-        baseUrl: "https://api.packycode.com",
-        description: "PackyCode API \u670D\u52A1"
-      },
       {
         name: "88Code",
-        baseUrl: "https://www.88code.org/api",
+        baseUrl: "https://www.88code.org/openai/v1",
         description: "88Code API \u670D\u52A1"
       }
     ];
@@ -2300,11 +2332,6 @@ var init_claude2 = __esm({
         baseUrl: "https://api.packycode.com",
         description: "PackyCode API \u670D\u52A1"
       },
-      {
-        name: "CoordCode",
-        baseUrl: "https://api.coordcode.com/api",
-        description: "CoordCode API \u670D\u52A1"
-      },
       {
         name: "88Code",
         baseUrl: "https://www.88code.org/api",
@@ -2342,8 +2369,8 @@ function createCodexManager() {
       ensureDir(getCcmanDir());
       const initialConfig = {
         providers: [],
-        presets: [...CODEX_PRESETS]
-        // 初始化内置预置到配置文件
+        presets: []
+        // 只存储用户自定义预置
       };
       writeJSON(configPath, initialConfig);
       return initialConfig;
@@ -2366,6 +2393,8 @@ function createCodexManager() {
         name: input.name,
         baseUrl: input.baseUrl,
         apiKey: input.apiKey,
+        model: input.model,
+        // 保存 model 字段
         createdAt: timestamp,
         lastModified: timestamp
       };
@@ -2387,7 +2416,8 @@ function createCodexManager() {
     },
     findByName(name) {
       const config = loadConfig2();
-      return config.providers.find((p) => p.name === name);
+      const lowerName = name.toLowerCase();
+      return config.providers.find((p) => p.name.toLowerCase() === lowerName);
     },
     switch(id) {
       const config = loadConfig2();
@@ -2426,6 +2456,8 @@ function createCodexManager() {
         provider.baseUrl = updates.baseUrl;
       if (updates.apiKey !== void 0)
         provider.apiKey = updates.apiKey;
+      if (updates.model !== void 0)
+        provider.model = updates.model;
       provider.lastModified = Date.now();
       saveConfig2(config);
       if (config.currentProviderId === id) {
@@ -2535,8 +2567,8 @@ function createClaudeManager() {
       ensureDir(getCcmanDir());
       const initialConfig = {
         providers: [],
-        presets: [...CC_PRESETS]
-        // 初始化内置预置到配置文件
+        presets: []
+        // 只存储用户自定义预置
       };
       writeJSON(configPath, initialConfig);
       return initialConfig;
@@ -2580,7 +2612,8 @@ function createClaudeManager() {
     },
     findByName(name) {
       const config = loadConfig2();
-      return config.providers.find((p) => p.name === name);
+      const lowerName = name.toLowerCase();
+      return config.providers.find((p) => p.name.toLowerCase() === lowerName);
     },
     switch(id) {
       const config = loadConfig2();
@@ -16471,6 +16504,7 @@ async function downloadFromCloud(config, password) {
         // 保留本地 presets
       };
       writeJSON(codexConfigPath, newCodexConfig);
+      applyCurrentProvider("codex", newCodexConfig);
     }
     if (remoteClaudeConfig && decryptedClaudeProviders) {
       const newClaudeConfig = {
@@ -16480,8 +16514,9 @@ async function downloadFromCloud(config, password) {
         // 保留本地 presets
       };
       writeJSON(claudeConfigPath, newClaudeConfig);
+      applyCurrentProvider("claude", newClaudeConfig);
     }
-    console.log("\u2705 \u914D\u7F6E\u5DF2\u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u5E76\u8986\u76D6\u672C\u5730");
+    console.log("\u2705 \u914D\u7F6E\u5DF2\u4ECE\u4E91\u7AEF\u4E0B\u8F7D\u5E76\u5E94\u7528");
     return backupPaths;
   } catch (error) {
     for (const backupPath of backupPaths) {
@@ -16559,6 +16594,8 @@ async function mergeSync(config, password) {
     };
     writeJSON(codexConfigPath, mergedCodexConfig);
     writeJSON(claudeConfigPath, mergedClaudeConfig);
+    applyCurrentProvider("codex", mergedCodexConfig);
+    applyCurrentProvider("claude", mergedClaudeConfig);
     const encryptedCodexProviders = encryptProviders(codexMergeResult.merged, password);
     const encryptedClaudeProviders = encryptProviders(claudeMergeResult.merged, password);
     const encryptedCodexConfig = {
@@ -16588,6 +16625,20 @@ async function mergeSync(config, password) {
     throw new Error(`\u5408\u5E76\u914D\u7F6E\u5931\u8D25\uFF0C\u5DF2\u6062\u590D\u5907\u4EFD: ${error.message}`);
   }
 }
+function applyCurrentProvider(tool, config) {
+  if (!config.currentProviderId) {
+    return;
+  }
+  const provider = config.providers.find((p) => p.id === config.currentProviderId);
+  if (!provider) {
+    return;
+  }
+  if (tool === "codex") {
+    writeCodexConfig(provider);
+  } else {
+    writeClaudeConfig(provider);
+  }
+}
 var import_fs2, import_path18, CODEX_REMOTE_PATH, CLAUDE_REMOTE_PATH;
 var init_sync_v2 = __esm({
   "../core/dist/sync/sync-v2.js"() {
@@ -16600,6 +16651,8 @@ var init_sync_v2 = __esm({
     init_merge2();
     init_paths();
     init_file();
+    init_codex();
+    init_claude();
     CODEX_REMOTE_PATH = ".ccman/codex.json";
     CLAUDE_REMOTE_PATH = ".ccman/claude.json";
   }
@@ -17486,6 +17539,7 @@ var import_chalk27 = __toESM(require("chalk"));
 
 // src/utils/logo.ts
 var import_chalk = __toESM(require("chalk"));
+init_dist4();
 function printLogo() {
   console.log(
     import_chalk.default.bold(
@@ -17499,7 +17553,9 @@ function printLogo() {
 `
     )
   );
-  console.log(import_chalk.default.gray("  Codex/Claude Code API \u670D\u52A1\u5546\u914D\u7F6E\u7BA1\u7406\u5DE5\u5177\n"));
+  console.log(import_chalk.default.gray("  Codex/Claude Code API \u670D\u52A1\u5546\u914D\u7F6E\u7BA1\u7406\u5DE5\u5177"));
+  console.log(import_chalk.default.gray(`  \u7248\u672C ${VERSION}
+`));
 }
 
 // src/commands/codex/add.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccman",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "description": "Manage Codex and Claude Code API service provider configurations",
   "main": "./dist/index.js",
   "bin": {