@cc-claw/code 0.6.78 → 0.6.80

package/install.js

@@ -122,29 +122,8 @@ function extractZip(buffer, dest) {
   zip.extractAllTo(dest, true);
 }
 
-function migrateFromClaudeCode(home = homedir()) {
-  const claudeSettingsPath = join(home, ".claude", "settings.json");
-  const ccCodeDir = join(home, ".cc-code");
-  const ccCodeSettingsPath = join(ccCodeDir, "settings.json");
-
-  // 已有 cc-code 配置，跳过
-  if (existsSync(ccCodeSettingsPath)) {
-    return true;
-  }
-
-  // 无 Claude Code 配置
-  if (!existsSync(claudeSettingsPath)) {
-    return false;
-  }
-
-  let claudeSettings;
-  try {
-    claudeSettings = JSON.parse(require("fs").readFileSync(claudeSettingsPath, "utf-8"));
-  } catch {
-    return false;
-  }
-
-  const env = claudeSettings.env || {};
+// 从 Claude Code env 推导应迁移的 provider 列表（含各档模型别名）
+function detectProvidersFromEnv(env) {
   const providers = [];
 
   // 检测 Anthropic
@@ -155,6 +134,7 @@ function migrateFromClaudeCode(home = homedir()) {
     if (env.ANTHROPIC_DEFAULT_OPUS_MODEL) models.opus = env.ANTHROPIC_DEFAULT_OPUS_MODEL;
     if (env.ANTHROPIC_DEFAULT_SONNET_MODEL) models.sonnet = env.ANTHROPIC_DEFAULT_SONNET_MODEL;
     if (env.ANTHROPIC_DEFAULT_HAIKU_MODEL) models.haiku = env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+    if (env.ANTHROPIC_DEFAULT_FABLE_MODEL) models.fable = env.ANTHROPIC_DEFAULT_FABLE_MODEL;
     const p = {
       id: "anthropic",
       type: "anthropic",
@@ -181,8 +161,80 @@ function migrateFromClaudeCode(home = homedir()) {
     providers.push(p);
   }
 
+  return providers;
+}
+
+// 已有 ~/.cc-code/settings.json 时，按 provider id 增量补齐缺失的模型别名。
+// 只补空缺（undefined / null / 空串），绝不覆盖用户已有值，也不新增 provider。
+// 这样新版本新增的别名（如 fable）能自动补进老配置，而用户的改动（key、baseUrl、
+// thinking 等）与已填别名一律保持原样。
+function backfillModels(ccCodeSettingsPath, detected) {
+  let existing;
+  try {
+    existing = JSON.parse(require("fs").readFileSync(ccCodeSettingsPath, "utf-8"));
+  } catch {
+    return true; // 读不动就保持原样，不破坏用户配置
+  }
+
+  const providers = existing && existing.config && existing.config.providers;
+  if (!Array.isArray(providers)) {
+    return true;
+  }
+
+  let changed = false;
+  for (const det of detected) {
+    if (!det.models) continue;
+    const target = providers.find((p) => p && p.id === det.id);
+    if (!target) continue; // 找不到同 id provider → 不动（不新增）
+    if (!target.models || typeof target.models !== "object") {
+      target.models = {};
+    }
+    for (const alias of Object.keys(det.models)) {
+      const cur = target.models[alias];
+      if (cur === undefined || cur === null || cur === "") {
+        target.models[alias] = det.models[alias];
+        changed = true;
+      }
+    }
+  }
+
+  if (changed) {
+    writeFileSync(ccCodeSettingsPath, JSON.stringify(existing, null, 2) + "\n");
+    console.log("");
+    console.log("  Backfilled new model aliases into ~/.cc-code/settings.json");
+  }
+  return true;
+}
+
+function migrateFromClaudeCode(home = homedir()) {
+  const claudeSettingsPath = join(home, ".claude", "settings.json");
+  const ccCodeDir = join(home, ".cc-code");
+  const ccCodeSettingsPath = join(ccCodeDir, "settings.json");
+
+  const hasCcCode = existsSync(ccCodeSettingsPath);
+
+  // 无 Claude Code 配置：已有 cc-code 视为成功（无需 Quick Start），否则失败
+  if (!existsSync(claudeSettingsPath)) {
+    return hasCcCode;
+  }
+
+  let claudeSettings;
+  try {
+    claudeSettings = JSON.parse(require("fs").readFileSync(claudeSettingsPath, "utf-8"));
+  } catch {
+    return hasCcCode;
+  }
+
+  const env = claudeSettings.env || {};
+  const providers = detectProvidersFromEnv(env);
+
   if (providers.length === 0) {
-    return false;
+    return hasCcCode;
+  }
+
+  // 已有 cc-code 配置 → 增量补齐缺失别名（不覆盖、不新增 provider）
+  if (hasCcCode) {
+    return backfillModels(ccCodeSettingsPath, providers);
   }
 
   if (!existsSync(ccCodeDir)) {

package/install.test.js

@@ -43,17 +43,68 @@ test("migrateFromClaudeCode returns false when no claude settings exist", (home)
   if (result !== false) throw new Error("expected false");
 });
 
-test("migrateFromClaudeCode skips when cc-code settings already exist", (home) => {
+test("migrateFromClaudeCode backfills missing aliases when cc-code settings already exist", (home) => {
   const ccCodeDir = join(home, ".cc-code");
   fs.mkdirSync(ccCodeDir, { recursive: true });
-  fs.writeFileSync(join(ccCodeDir, "settings.json"), JSON.stringify({ config: {} }));
-  writeClaudeSettings(home, { env: { ANTHROPIC_API_KEY: "sk-ant" } });
+  // 已有配置：anthropic provider，缺少 fable 别名，且 opus 是用户手改过的值
+  const existing = {
+    config: {
+      active_alias: "haiku",
+      providers: [
+        {
+          id: "anthropic",
+          type: "anthropic",
+          apiKey: "sk-user-own-key",
+          models: { opus: "claude-opus-user-custom", sonnet: "claude-sonnet-4-6", haiku: "claude-haiku-4-5" },
+        },
+      ],
+    },
+  };
+  fs.writeFileSync(join(ccCodeDir, "settings.json"), JSON.stringify(existing, null, 2));
+  writeClaudeSettings(home, {
+    env: {
+      ANTHROPIC_API_KEY: "sk-ant",
+      ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-opus-4-7",
+      ANTHROPIC_DEFAULT_FABLE_MODEL: "claude-fable-5",
+    },
+  });
   const result = migrateFromClaudeCode(home);
   if (result !== true) throw new Error("expected true");
-  const content = fs.readFileSync(join(ccCodeDir, "settings.json"), "utf-8");
-  if (content !== JSON.stringify({ config: {} })) {
-    throw new Error("should not overwrite existing settings");
-  }
+  const cfg = readCcCodeSettings(home);
+  const p = cfg.config.providers[0];
+  // 缺失的 fable 被补上
+  if (p.models.fable !== "claude-fable-5") throw new Error("expected fable backfilled");
+  // 用户已有的 opus 值不被覆盖
+  if (p.models.opus !== "claude-opus-user-custom") throw new Error("must not overwrite existing opus");
+  // 用户已有值不被 env 覆盖
+  if (p.apiKey !== "sk-user-own-key") throw new Error("must not overwrite user apiKey");
+  // active_alias 保持原样
+  if (cfg.config.active_alias !== "haiku") throw new Error("must not change active_alias");
+});
+
+test("migrateFromClaudeCode backfill leaves unknown provider ids untouched", (home) => {
+  const ccCodeDir = join(home, ".cc-code");
+  fs.mkdirSync(ccCodeDir, { recursive: true });
+  const existing = {
+    config: {
+      providers: [{ id: "my-custom-id", type: "anthropic", apiKey: "sk-x", models: {} }],
+    },
+  };
+  fs.writeFileSync(join(ccCodeDir, "settings.json"), JSON.stringify(existing));
+  writeClaudeSettings(home, { env: { ANTHROPIC_API_KEY: "sk-ant", ANTHROPIC_DEFAULT_FABLE_MODEL: "claude-fable-5" } });
+  const result = migrateFromClaudeCode(home);
+  if (result !== true) throw new Error("expected true");
+  const cfg = readCcCodeSettings(home);
+  if (cfg.config.providers.length !== 1) throw new Error("must not add providers");
+  if (cfg.config.providers[0].models.fable !== undefined) throw new Error("must not touch unknown provider id");
+});
+
+test("migrateFromClaudeCode returns true when cc-code exists but no claude settings", (home) => {
+  const ccCodeDir = join(home, ".cc-code");
+  fs.mkdirSync(ccCodeDir, { recursive: true });
+  fs.writeFileSync(join(ccCodeDir, "settings.json"), JSON.stringify({ config: {} }));
+  const result = migrateFromClaudeCode(home);
+  if (result !== true) throw new Error("expected true (has cc-code, no quick start)");
 });
 
 test("migrateFromClaudeCode produces camelCase provider config for Anthropic", (home) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-claw/code",
-    "version": "0.6.78",
+    "version": "0.6.80",
     "description": "cc-code — Terminal coding agent powered by open-source models — Rust-built, Claude Code compatible",
     "keywords": [
         "agent",