ccman 3.3.6 → 3.3.8

package/README.md

@@ -9,7 +9,7 @@
 - 🔄 **一键切换**：一条命令切换服务商，自动修改配置文件
 - 📦 **内置预设**：提供常用预设（Claude: 1 个，Gemini: 2 个，Codex: 2 个，OpenCode: 1 个，MCP: 多个），只需填写 API Key
 - 🛠️ **自定义配置**：支持添加任意第三方服务商
-- 🔐 **零破坏性**：只修改管理的字段，写入前备份，失败回滚
+- 🔐 **安全写入**：写入前备份；Codex 的 `config.toml/auth.json` 备份后覆盖写入，其他工具尽量保留用户字段
 - 🎯 **多工具支持**：同时管理 Codex、Claude Code、Gemini CLI、OpenCode 和 MCP 服务器
 - 📱 **双界面**：提供 CLI（命令行）和 Desktop（图形界面）
 - 🔁 **克隆功能**：快速复制配置，管理多个 API Key
@@ -350,9 +350,9 @@ $ ccman cc use "Claude Test"
 - **Gemini CLI**: `~/.gemini/settings.json` 和 `~/.gemini/.env`
 - **OpenCode**: `~/.config/opencode/opencode.json`
 
-**零破坏性承诺**：
-- 只修改管理的字段，保留其他所有配置
-- 写入前备份，失败时自动回滚
+**安全写入承诺**：
+- 写入前备份（`.bak`），失败时自动回滚
+- Codex 的 `config.toml/auth.json` 采用备份后覆盖写入（避免遗留字段导致报错/告警）
 - API Key 存储在本地，权限 `0600`
 
 ---

package/dist/index.js

@@ -15,7 +15,7 @@ var init_package = __esm({
   "../core/package.json"() {
     package_default = {
       name: "@ccman/core",
-      version: "3.3.6",
+      version: "3.3.8",
       type: "module",
       description: "Core business logic for ccman - Manage Codex, Claude Code, Gemini CLI, and MCP configurations",
       main: "./dist/index.js",
@@ -229,37 +229,17 @@ function fileExists(filePath) {
     return false;
   }
 }
-var init_file = __esm({
-  "../core/dist/utils/file.js"() {
-    "use strict";
-  }
-});
-
-// ../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;
-    }
+function backupFile(filePath) {
+  if (!fileExists(filePath)) {
+    throw new Error(`File not found: ${filePath}`);
   }
-  return result;
+  const backupPath = `${filePath}.bak`;
+  fs.copyFileSync(filePath, backupPath);
+  fs.chmodSync(backupPath, 384);
+  return backupPath;
 }
-var init_template = __esm({
-  "../core/dist/utils/template.js"() {
+var init_file = __esm({
+  "../core/dist/utils/file.js"() {
     "use strict";
   }
 });
@@ -304,53 +284,41 @@ function loadCodexTemplateConfig() {
 function writeCodexConfig(provider) {
   ensureDir(getCodexDir());
   const configPath = getCodexConfigPath();
-  let userConfig = {};
   if (fileExists(configPath)) {
-    const content = fs2.readFileSync(configPath, "utf-8");
-    userConfig = parseToml(content);
+    try {
+      backupFile(configPath);
+    } catch {
+    }
   }
   const templateConfig = loadCodexTemplateConfig();
-  const mergedConfig = deepMerge(templateConfig, userConfig);
-  if (mergedConfig.features && typeof mergedConfig.features === "object" && !Array.isArray(mergedConfig.features) && "web_search_request" in mergedConfig.features) {
-    delete mergedConfig.features.web_search_request;
-  }
-  if (mergedConfig.features && typeof mergedConfig.features === "object" && !Array.isArray(mergedConfig.features)) {
-    for (const key of ["plan_tool", "view_image_tool", "rmcp_client", "streamable_shell"]) {
-      if (key in mergedConfig.features) {
-        delete mergedConfig.features[key];
-      }
-    }
-    if (Object.keys(mergedConfig.features).length === 0) {
-      delete mergedConfig.features;
-    }
+  const nextConfig = { ...templateConfig };
+  if (nextConfig.features && typeof nextConfig.features === "object" && !Array.isArray(nextConfig.features) && "web_search_request" in nextConfig.features) {
+    delete nextConfig.features.web_search_request;
   }
-  if (!mergedConfig.web_search) {
-    mergedConfig.web_search = "live";
+  if ("web_search_request" in nextConfig) {
+    delete nextConfig.web_search_request;
   }
   const providerKey = resolveCodexProviderKey(provider);
-  mergedConfig.model_provider = providerKey;
-  mergedConfig.model = provider.model || mergedConfig.model || "gpt-5.2-codex";
-  mergedConfig.model_providers = mergedConfig.model_providers || {};
-  if (providerKey !== provider.name) {
-    delete mergedConfig.model_providers[provider.name];
-  }
-  mergedConfig.model_providers[providerKey] = {
-    name: providerKey,
-    base_url: provider.baseUrl,
-    wire_api: "responses",
-    requires_openai_auth: true
+  nextConfig.model_provider = providerKey;
+  nextConfig.model = provider.model || nextConfig.model || "gpt-5.2-codex";
+  nextConfig.model_providers = {
+    [providerKey]: {
+      name: providerKey,
+      base_url: provider.baseUrl,
+      wire_api: "responses",
+      requires_openai_auth: true
+    }
   };
-  fs2.writeFileSync(configPath, stringifyToml(mergedConfig), { mode: 384 });
+  fs2.writeFileSync(configPath, stringifyToml(nextConfig), { mode: 384 });
   const authPath = getCodexAuthPath();
-  let auth;
   if (fileExists(authPath)) {
-    const content = fs2.readFileSync(authPath, "utf-8");
-    auth = JSON.parse(content);
-  } else {
-    auth = { OPENAI_API_KEY: "" };
+    try {
+      backupFile(authPath);
+    } catch {
+    }
   }
-  auth.OPENAI_API_KEY = provider.apiKey;
-  fs2.writeFileSync(authPath, JSON.stringify(auth, null, 2), { mode: 384 });
+  const auth = { OPENAI_API_KEY: provider.apiKey };
+  writeJSON(authPath, auth);
 }
 var __filename, __dirname, CODEX_DEFAULT_CONFIG;
 var init_codex = __esm({
@@ -358,24 +326,48 @@ var init_codex = __esm({
     "use strict";
     init_paths();
     init_file();
-    init_template();
     __filename = fileURLToPath(import.meta.url);
     __dirname = path3.dirname(__filename);
     CODEX_DEFAULT_CONFIG = {
       model: "gpt-5.2-codex",
       model_reasoning_effort: "high",
       model_verbosity: "high",
-      web_search: "live",
+      network_access: "enabled",
       disable_response_storage: true,
-      windows_wsl_setup_acknowledged: true,
-      sandbox_mode: "workspace-write",
-      sandbox_workspace_write: {
-        network_access: true
-      }
+      windows_wsl_setup_acknowledged: true
     };
   }
 });
 
+// ../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/claude.js
 import * as fs3 from "fs";
 import * as path4 from "path";
@@ -2202,7 +2194,7 @@ function getFileSize(filePath) {
     return 0;
   }
 }
-function backupFile(filePath) {
+function backupFile2(filePath) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-").split(".")[0];
   const backupPath = `${filePath}.backup-${timestamp}`;
   fs11.copyFileSync(filePath, backupPath);
@@ -2269,7 +2261,7 @@ function cleanClaudeJson(options = {}) {
   if (!fs11.existsSync(filePath)) {
     throw new Error(`${filePath} \u6587\u4EF6\u4E0D\u5B58\u5728`);
   }
-  const backupPath = backupFile(filePath);
+  const backupPath = backupFile2(filePath);
   const sizeBefore = getFileSize(filePath);
   const content = fs11.readFileSync(filePath, "utf-8");
   const config = JSON.parse(content);

package/dist/templates/codex/config.toml

@@ -1,21 +1,50 @@
-########################################
-# Codex 最小模板（ccman 默认）
-#
-# - model_provider 与 [model_providers.*] 由 ccman 根据当前服务商自动写入
-# - 配置越少越稳定；需要扩展再手动加
-########################################
-
 model = "gpt-5.2-codex"
-model_reasoning_effort = "high"
-model_verbosity = "high"
+model_reasoning_effort = "xhigh"
 disable_response_storage = true
+sandbox_mode = "danger-full-access"
 windows_wsl_setup_acknowledged = true
+approval_policy = "never"
+profile = "auto-max"
+file_opener = "vscode"
+model_provider = "gmn"
+web_search = "cached"
+suppress_unstable_features_warning = true
 
-# Web 搜索策略（替代旧的 [features].web_search_request）
-web_search = "live" # "live" | "cached" | "disabled"
+[history]
+persistence = "save-all"
 
-# 沙箱与网络访问：workspace-write + 允许联网
-sandbox_mode = "workspace-write"
+[tui]
+notifications = true
+
+[shell_environment_policy]
+inherit = "all"
+ignore_default_excludes = false
 
 [sandbox_workspace_write]
 network_access = true
+
+[features]
+plan_tool = true
+apply_patch_freeform = true
+view_image_tool = true
+unified_exec = false
+streamable_shell = false
+rmcp_client = true
+elevated_windows_sandbox = true
+
+[profiles.auto-max]
+approval_policy = "never"
+sandbox_mode = "workspace-write"
+
+[profiles.review]
+approval_policy = "on-request"
+sandbox_mode = "workspace-write"
+
+[notice]
+hide_gpt5_1_migration_prompt = true
+
+[model_providers.gmn]
+name = "gmn"
+base_url = "https://gmn.chuangzuoli.com"
+wire_api = "responses"
+requires_openai_auth = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccman",
-  "version": "3.3.6",
+  "version": "3.3.8",
   "type": "module",
   "description": "Manage Codex, Claude Code, Gemini CLI, OpenCode, and MCP API service provider configurations",
   "main": "./dist/index.js",