@daylenjeez/ccm-switch 1.2.3 → 1.2.6

package/README.md

@@ -64,6 +64,8 @@ Active: OpenRouter
 
 You can also run `ccm sync` at any time to pull the latest cc-switch configurations into `~/.ccm/config.json`.
 
+> ⚠️ **Known Issue**: After ccm modifies `~/.claude/settings.json`, cc-switch will automatically sync the content back to its database, overwriting the current provider's `settings_config`. If the configurations differ between the two tools, the original configuration stored in cc-switch will be modified.
+
 ## ➕ Adding Configurations
 
 ### Interactive wizard (recommended)
@@ -202,7 +204,11 @@ Use `ccm clear` to delete them automatically, or clean them up manually:
 - `~/.ccm/config.json` — profiles
 - `~/.claude/settings.json` — may still contain an active `env` profile written by ccm
 
-> Do **not** delete `~/.cc-switch/cc-switch.db` unless you are also uninstalling cc-switch; that database is owned by cc-switch.
+Then remove the CLI:
+
+```bash
+npm uninstall -g @daylenjeez/ccm-switch
+```
 
 ## 📄 License
 

package/README.zh-CN.md

@@ -10,7 +10,7 @@
 [![license](https://img.shields.io/npm/l/@daylenjeez/ccm-switch.svg?style=flat-square)](https://github.com/daylenjeez/ccm-switch/blob/main/LICENSE)
 [![node](https://img.shields.io/badge/node-%3E%3D18-brightgreen?style=flat-square)](https://nodejs.org)
 
-English | [中文文档](https://github.com/daylenjeez/ccm-switch/blob/main/README.zh-CN.md)
+[English](https://github.com/daylenjeez/ccm-switch/blob/main/README.md) | 中文文档
 
 [安装](#-安装) · [快速开始](#-快速开始) · [命令一览](#-命令一览) · [工作原理](#%EF%B8%8F-工作原理)
 
@@ -20,12 +20,12 @@ English | [中文文档](https://github.com/daylenjeez/ccm-switch/blob/main/READ
 
 ## ✨ 亮点
 
-- 🔌 **cc-switch 无缝对接** — 直接读取 [cc-switch](https://github.com/farion1231/cc-switch) 数据库，无需迁移
-- 🧙 **交互式向导** — `ccm add` 逐步引导，输入 `<` 可返回上一步
-- ⚡ **一键切换** — `ccm use OpenRouter` 或 `ccm ls` 方向键选择
-- 🛡️ **安全切换** — 自动保留 `language`、`permissions` 等个人设置
-- 🚀 **零配置上手** — 直接 `ccm init`，跟着提示走，无需阅读文档
-- 🌍 **中英双语** — `ccm locale set zh/en` 切换界面语言
+- 🔌 **cc-switch Integration** — 直接读取 `cc-switch` 数据库，无需迁移
+- 🧙 **Interactive Wizard** — `ccm add` 逐步引导，输入 `<` 可返回上一步
+- ⚡ **One-command Switch** — `ccm use OpenRouter` 或 `ccm ls` 方向键选择
+- 🛡️ **Safe Switching** — 自动保留 `language`、`permissions` 等个人设置
+- 🚀 **Zero Config** — 直接 `ccm init`，跟着提示走，无需阅读文档
+- 🌍 **i18n** — `ccm locale set zh/en` 切换界面语言
 
 ## 📦 安装
 
@@ -64,6 +64,8 @@ $ ccm init
 
 你也可以随时运行 `ccm sync` 将最新的 cc-switch 配置同步到 `~/.ccm/config.json`。
 
+> ⚠️ **已知问题**：ccm 修改 `~/.claude/settings.json` 后，cc-switch 会自动将该内容同步回数据库，覆盖当前 provider 的 `settings_config`。如果两个工具中的配置不一致，cc-switch 中存储的原始配置将被修改。
+
 ## ➕ 添加配置
 
 ### 交互式向导（推荐）
@@ -202,7 +204,11 @@ Claude Code 启动时读取 `~/.claude/settings.json`，`env` 字段控制 API
 - `~/.ccm/config.json` — 配置方案
 - `~/.claude/settings.json` — 可能仍包含 ccm 写入的 `env` 配置
 
-> 除非你也卸载了 cc-switch，否则**不要**删除 `~/.cc-switch/cc-switch.db`；该数据库由 cc-switch 管理。
+然后移除 CLI：
+
+```bash
+npm uninstall -g @daylenjeez/ccm-switch
+```
 
 ## 📄 License
 

package/dist/claude.d.ts

@@ -1,4 +1,3 @@
 export declare function readClaudeSettings(): Record<string, unknown>;
-export declare function applyProfile(settingsConfig: Record<string, unknown>): void;
-export declare function clearEnvFromSettings(): void;
+export declare function applyProfile(_name: string, settingsConfig: Record<string, unknown>): void;
 export declare function getSettingsPath(): string;

package/dist/claude.js

@@ -7,7 +7,7 @@ export function readClaudeSettings() {
         return {};
     return JSON.parse(readFileSync(SETTINGS_PATH, "utf-8"));
 }
-export function applyProfile(settingsConfig) {
+export function applyProfile(_name, settingsConfig) {
     const current = readClaudeSettings();
     // 保留用户级字段，用 profile 的配置覆盖
     const preserved = {};
@@ -20,15 +20,6 @@ export function applyProfile(settingsConfig) {
     const merged = { ...preserved, ...settingsConfig };
     writeFileSync(SETTINGS_PATH, JSON.stringify(merged, null, 2));
 }
-export function clearEnvFromSettings() {
-    if (!existsSync(SETTINGS_PATH))
-        return;
-    const current = readClaudeSettings();
-    if (!("env" in current))
-        return;
-    delete current.env;
-    writeFileSync(SETTINGS_PATH, JSON.stringify(current, null, 2));
-}
 export function getSettingsPath() {
     return SETTINGS_PATH;
 }

package/dist/i18n/en.js

@@ -121,8 +121,6 @@ const en = {
     "clear.confirm": "Delete all ccm data files? (y/N) ",
     "clear.cancelled": "Cancelled",
     "clear.removed": "✓ Deleted {path}",
-    "clear.clear_env": "Also clear env config in ~/.claude/settings.json? (y/N) ",
-    "clear.env_cleared": "✓ Cleared env config",
     "clear.done": "✓ Cleanup complete",
     // store errors
     "store.db_not_found": "cc-switch database not found: {path}",

package/dist/i18n/zh.d.ts

@@ -102,8 +102,6 @@ declare const zh: {
     readonly "clear.confirm": "确认删除所有 ccm 数据文件？(y/N) ";
     readonly "clear.cancelled": "已取消清理";
     readonly "clear.removed": "✓ 已删除 {path}";
-    readonly "clear.clear_env": "是否同时清除 ~/.claude/settings.json 中的 env 配置？(y/N) ";
-    readonly "clear.env_cleared": "✓ 已清除 env 配置";
     readonly "clear.done": "✓ 清理完成";
     readonly "store.db_not_found": "cc-switch 数据库不存在: {path}";
 };

package/dist/i18n/zh.js

@@ -121,8 +121,6 @@ const zh = {
     "clear.confirm": "确认删除所有 ccm 数据文件？(y/N) ",
     "clear.cancelled": "已取消清理",
     "clear.removed": "✓ 已删除 {path}",
-    "clear.clear_env": "是否同时清除 ~/.claude/settings.json 中的 env 配置？(y/N) ",
-    "clear.env_cleared": "✓ 已清除 env 配置",
     "clear.done": "✓ 清理完成",
     // store errors
     "store.db_not_found": "cc-switch 数据库不存在: {path}",

package/dist/index.js

@@ -3,7 +3,7 @@ import { Command } from "commander";
 import chalk from "chalk";
 import { readRc, writeRc, getStore } from "./utils.js";
 import { ccSwitchExists } from "./store/cc-switch.js";
-import { readClaudeSettings, applyProfile, clearEnvFromSettings, getSettingsPath } from "./claude.js";
+import { readClaudeSettings, applyProfile } from "./claude.js";
 import { createInterface } from "readline";
 import { spawnSync } from "child_process";
 import { writeFileSync, readFileSync, unlinkSync, existsSync } from "fs";
@@ -240,17 +240,6 @@ program
         unlinkSync(rcPath);
         console.log(chalk.green(t("clear.removed", { path: rcPath })));
     }
-    const settingsPath = getSettingsPath();
-    if (existsSync(settingsPath)) {
-        const settings = readClaudeSettings();
-        if ("env" in settings) {
-            const clearEnv = await ask(t("clear.clear_env"));
-            if (clearEnv.toLowerCase() === "y") {
-                clearEnvFromSettings();
-                console.log(chalk.green(t("clear.env_cleared")));
-            }
-        }
-    }
     console.log(chalk.green(t("clear.done")));
 });
 // ccm list
@@ -271,8 +260,8 @@ program
         if (name === current)
             return;
         const profile = store.get(name);
-        applyProfile(profile.settingsConfig);
         store.setCurrent(profile.name);
+        applyProfile(profile.name, profile.settingsConfig);
         const env = (profile.settingsConfig.env || {});
         const model = env["ANTHROPIC_MODEL"] || t("common.model_default");
         console.log(chalk.green(t("use.done", { name: chalk.bold(profile.name) })));
@@ -366,8 +355,8 @@ program
     const profile = await resolveProfile(store, name);
     if (!profile)
         return;
-    applyProfile(profile.settingsConfig);
     store.setCurrent(profile.name);
+    applyProfile(profile.name, profile.settingsConfig);
     const env = (profile.settingsConfig.env || {});
     const model = env["ANTHROPIC_MODEL"] || t("common.model_default");
     console.log(chalk.green(t("use.done", { name: chalk.bold(profile.name) })));
@@ -425,8 +414,8 @@ async function saveAndSwitch(store, name, settingsConfig) {
     console.log(chalk.green(t("add.done", { name })));
     const switchChoice = await ask(t("add.switch_confirm"));
     if (switchChoice.toLowerCase() !== "n") {
-        applyProfile(settingsConfig);
         store.setCurrent(name);
+        applyProfile(name, settingsConfig);
         console.log(chalk.green(t("use.done", { name: chalk.bold(name) })));
         console.log(chalk.gray(`  ${t("use.restart")}`));
     }
@@ -685,14 +674,14 @@ program
     if (profile.name !== current) {
         const switchChoice = await ask(t("add.switch_confirm"));
         if (switchChoice.toLowerCase() !== "n") {
-            applyProfile(settingsConfig);
             store.setCurrent(profile.name);
+            applyProfile(profile.name, settingsConfig);
             console.log(chalk.green(t("use.done", { name: chalk.bold(profile.name) })));
             console.log(chalk.gray(`  ${t("use.restart")}`));
         }
     }
     else {
-        applyProfile(settingsConfig);
+        applyProfile(profile.name, settingsConfig);
         console.log(chalk.gray(`  ${t("use.restart")}`));
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daylenjeez/ccm-switch",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "description": "Claude Code Model Switcher - 快速切换 Claude Code 自定义模型配置",
   "type": "module",
   "main": "dist/index.js",

package/src/claude.ts

@@ -9,7 +9,7 @@ export function readClaudeSettings(): Record<string, unknown> {
   return JSON.parse(readFileSync(SETTINGS_PATH, "utf-8"));
 }
 
-export function applyProfile(settingsConfig: Record<string, unknown>): void {
+export function applyProfile(_name: string, settingsConfig: Record<string, unknown>): void {
   const current = readClaudeSettings();
 
   // 保留用户级字段，用 profile 的配置覆盖
@@ -25,14 +25,6 @@ export function applyProfile(settingsConfig: Record<string, unknown>): void {
   writeFileSync(SETTINGS_PATH, JSON.stringify(merged, null, 2));
 }
 
-export function clearEnvFromSettings(): void {
-  if (!existsSync(SETTINGS_PATH)) return;
-  const current = readClaudeSettings();
-  if (!("env" in current)) return;
-  delete current.env;
-  writeFileSync(SETTINGS_PATH, JSON.stringify(current, null, 2));
-}
-
 export function getSettingsPath(): string {
   return SETTINGS_PATH;
 }

package/src/i18n/en.ts

@@ -141,8 +141,6 @@ const en: Record<TranslationKey, string> = {
   "clear.confirm": "Delete all ccm data files? (y/N) ",
   "clear.cancelled": "Cancelled",
   "clear.removed": "✓ Deleted {path}",
-  "clear.clear_env": "Also clear env config in ~/.claude/settings.json? (y/N) ",
-  "clear.env_cleared": "✓ Cleared env config",
   "clear.done": "✓ Cleanup complete",
 
   // store errors

package/src/i18n/zh.ts

@@ -139,8 +139,6 @@ const zh = {
   "clear.confirm": "确认删除所有 ccm 数据文件？(y/N) ",
   "clear.cancelled": "已取消清理",
   "clear.removed": "✓ 已删除 {path}",
-  "clear.clear_env": "是否同时清除 ~/.claude/settings.json 中的 env 配置？(y/N) ",
-  "clear.env_cleared": "✓ 已清除 env 配置",
   "clear.done": "✓ 清理完成",
 
   // store errors

package/src/index.ts

@@ -4,7 +4,7 @@ import { Command } from "commander";
 import chalk from "chalk";
 import { readRc, writeRc, getStore } from "./utils.js";
 import { ccSwitchExists } from "./store/cc-switch.js";
-import { readClaudeSettings, applyProfile, clearEnvFromSettings, getSettingsPath } from "./claude.js";
+import { readClaudeSettings, applyProfile } from "./claude.js";
 import { createInterface } from "readline";
 import { spawnSync } from "child_process";
 import { writeFileSync, readFileSync, unlinkSync, existsSync } from "fs";
@@ -270,18 +270,6 @@ program
       console.log(chalk.green(t("clear.removed", { path: rcPath })));
     }
 
-    const settingsPath = getSettingsPath();
-    if (existsSync(settingsPath)) {
-      const settings = readClaudeSettings();
-      if ("env" in settings) {
-        const clearEnv = await ask(t("clear.clear_env"));
-        if (clearEnv.toLowerCase() === "y") {
-          clearEnvFromSettings();
-          console.log(chalk.green(t("clear.env_cleared")));
-        }
-      }
-    }
-
     console.log(chalk.green(t("clear.done")));
   });
 
@@ -304,8 +292,8 @@ program
     const switchTo = (name: string) => {
       if (name === current) return;
       const profile = store.get(name)!;
-      applyProfile(profile.settingsConfig);
       store.setCurrent(profile.name);
+      applyProfile(profile.name, profile.settingsConfig);
       const env = (profile.settingsConfig.env || {}) as Record<string, string>;
       const model = env["ANTHROPIC_MODEL"] || t("common.model_default");
       console.log(chalk.green(t("use.done", { name: chalk.bold(profile.name) })));
@@ -406,8 +394,8 @@ program
     const profile = await resolveProfile(store, name);
     if (!profile) return;
 
-    applyProfile(profile.settingsConfig);
     store.setCurrent(profile.name);
+    applyProfile(profile.name, profile.settingsConfig);
 
     const env = (profile.settingsConfig.env || {}) as Record<string, string>;
     const model = env["ANTHROPIC_MODEL"] || t("common.model_default");
@@ -469,8 +457,8 @@ async function saveAndSwitch(store: ReturnType<typeof ensureStore>, name: string
 
   const switchChoice = await ask(t("add.switch_confirm"));
   if (switchChoice.toLowerCase() !== "n") {
-    applyProfile(settingsConfig);
     store.setCurrent(name);
+    applyProfile(name, settingsConfig);
     console.log(chalk.green(t("use.done", { name: chalk.bold(name) })));
     console.log(chalk.gray(`  ${t("use.restart")}`));
   }
@@ -758,13 +746,13 @@ program
     if (profile.name !== current) {
       const switchChoice = await ask(t("add.switch_confirm"));
       if (switchChoice.toLowerCase() !== "n") {
-        applyProfile(settingsConfig);
         store.setCurrent(profile.name);
+        applyProfile(profile.name, settingsConfig);
         console.log(chalk.green(t("use.done", { name: chalk.bold(profile.name) })));
         console.log(chalk.gray(`  ${t("use.restart")}`));
       }
     } else {
-      applyProfile(settingsConfig);
+      applyProfile(profile.name, settingsConfig);
       console.log(chalk.gray(`  ${t("use.restart")}`));
     }
   });