ccjk 13.3.21 → 13.3.22

package/dist/chunks/claude-code-config-manager.mjs

@@ -246,8 +246,11 @@ class ClaudeCodeConfigManager {
         profile.primaryModel || profile.defaultHaikuModel || profile.defaultSonnetModel || profile.defaultOpusModel
       );
       if (hasModelConfig) {
+        clearModelEnv(settings.env, "override");
         if (profile.primaryModel)
-          settings.env.ANTHROPIC_MODEL = profile.primaryModel;
+          settings.model = profile.primaryModel;
+        else
+          delete settings.model;
         if (profile.defaultHaikuModel) {
           settings.env.ANTHROPIC_SMALL_FAST_MODEL = profile.defaultHaikuModel;
           settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = profile.defaultHaikuModel;
@@ -256,9 +259,11 @@ class ClaudeCodeConfigManager {
           settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = profile.defaultSonnetModel;
         if (profile.defaultOpusModel)
           settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = profile.defaultOpusModel;
-        delete settings.model;
+        if (!profile.primaryModel)
+          delete settings.model;
       } else {
         clearModelEnv(settings.env);
+        delete settings.model;
       }
       writeJsonConfig(SETTINGS_FILE, settings);
       const { setPrimaryApiKey, addCompletedOnboarding } = await import('./claude-config.mjs').then(function (n) { return n.h; });

package/dist/chunks/config2.mjs

@@ -159,11 +159,12 @@ function updateCustomModel(primaryModel, haikuModel, sonnetModel, opusModel) {
   if (existingSettings) {
     settings = existingSettings;
   }
-  delete settings.model;
   settings.env = settings.env || {};
   clearModelEnv(settings.env, "override");
   if (primaryModel?.trim()) {
-    settings.env.ANTHROPIC_MODEL = primaryModel.trim();
+    settings.model = primaryModel.trim();
+  } else {
+    delete settings.model;
   }
   if (haikuModel?.trim()) {
     settings.env.ANTHROPIC_SMALL_FAST_MODEL = haikuModel.trim();
@@ -256,7 +257,7 @@ function getExistingModelConfig() {
   if (!settings) {
     return null;
   }
-  const hasModelEnv = MODEL_ENV_KEYS.some((key) => {
+  const hasModelEnv = MODEL_ENV_KEYS.filter((key) => key !== "ANTHROPIC_MODEL").some((key) => {
     const value = settings.env?.[key];
     return value !== void 0 && value !== null && value !== "";
   });
@@ -270,25 +271,25 @@ function getExistingModelConfig() {
   if (validModels.includes(settings.model)) {
     return settings.model;
   }
-  return "default";
+  return "custom";
 }
 function getExistingCustomModelConfig() {
   const settings = readJsonConfig(SETTINGS_FILE);
-  if (!settings || !settings.env) {
+  if (!settings) {
     return null;
   }
   const {
-    ANTHROPIC_MODEL,
     ANTHROPIC_SMALL_FAST_MODEL,
     ANTHROPIC_DEFAULT_HAIKU_MODEL,
     ANTHROPIC_DEFAULT_SONNET_MODEL,
     ANTHROPIC_DEFAULT_OPUS_MODEL
-  } = settings.env;
-  if (!ANTHROPIC_MODEL && !ANTHROPIC_DEFAULT_HAIKU_MODEL && !ANTHROPIC_DEFAULT_SONNET_MODEL && !ANTHROPIC_DEFAULT_OPUS_MODEL) {
+  } = settings.env || {};
+  const primaryModel = settings.model && !["opus", "sonnet", "sonnet[1m]"].includes(settings.model) ? settings.model : settings.env?.ANTHROPIC_MODEL;
+  if (!primaryModel && !ANTHROPIC_DEFAULT_HAIKU_MODEL && !ANTHROPIC_DEFAULT_SONNET_MODEL && !ANTHROPIC_DEFAULT_OPUS_MODEL) {
     return null;
   }
   return {
-    primaryModel: ANTHROPIC_MODEL,
+    primaryModel,
     haikuModel: ANTHROPIC_DEFAULT_HAIKU_MODEL || ANTHROPIC_SMALL_FAST_MODEL,
     sonnetModel: ANTHROPIC_DEFAULT_SONNET_MODEL,
     opusModel: ANTHROPIC_DEFAULT_OPUS_MODEL

package/dist/chunks/migrator.mjs

@@ -52,7 +52,7 @@ const DEFAULT_SETTINGS_V2 = {
 };
 function validateConfig(config) {
   const errors = [];
-  if (config.model && !["opus", "sonnet", "sonnet[1m]", "custom", "default"].includes(config.model)) {
+  if (config.model !== void 0 && (typeof config.model !== "string" || !config.model.trim())) {
     errors.push(`Invalid model: ${config.model}`);
   }
   if (config.thinking?.budgetTokens !== void 0) {

package/dist/chunks/package.mjs

@@ -1,3 +1,3 @@
-const version = "13.3.21";
+const version = "13.3.22";
 
 export { version };

package/dist/index.d.mts

@@ -3832,7 +3832,7 @@ declare function configureApi(apiConfig: ApiConfig | null): ApiConfig | null;
 declare function configureHooks(hooks: Record<string, unknown[]>): void;
 declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 /**
- * Update custom model configuration using environment variables
+ * Update custom model configuration using settings.model plus family-specific env overrides
  * @param primaryModel - Primary model name for general tasks
  * @param haikuModel - Default Haiku model (optional)
  * @param sonnetModel - Default Sonnet model (optional)
@@ -3842,7 +3842,7 @@ declare function updateCustomModel(primaryModel?: string, haikuModel?: string, s
 /**
  * Update the default model configuration in settings.json
  * @param model - The model type to set: opus, sonnet, sonnet[1m], default, or custom
- * Note: 'custom' model type is handled differently - it should use environment variables instead
+ * Note: 'custom' is configured by updateCustomModel().
  */
 declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom'): void;
 /**

package/dist/index.d.ts

@@ -3832,7 +3832,7 @@ declare function configureApi(apiConfig: ApiConfig | null): ApiConfig | null;
 declare function configureHooks(hooks: Record<string, unknown[]>): void;
 declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 /**
- * Update custom model configuration using environment variables
+ * Update custom model configuration using settings.model plus family-specific env overrides
  * @param primaryModel - Primary model name for general tasks
  * @param haikuModel - Default Haiku model (optional)
  * @param sonnetModel - Default Sonnet model (optional)
@@ -3842,7 +3842,7 @@ declare function updateCustomModel(primaryModel?: string, haikuModel?: string, s
 /**
  * Update the default model configuration in settings.json
  * @param model - The model type to set: opus, sonnet, sonnet[1m], default, or custom
- * Note: 'custom' model type is handled differently - it should use environment variables instead
+ * Note: 'custom' is configured by updateCustomModel().
  */
 declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom'): void;
 /**

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "13.3.21",
+  "version": "13.3.22",
+  "packageManager": "pnpm@10.17.1",
   "description": "Turn Claude Code into a production-ready AI dev environment with one-command setup, persistent memory, MCP automation, cloud sync, and zero-config browser workflows.",
   "author": {
     "name": "CCJK Team",
@@ -80,69 +81,6 @@
   "engines": {
     "node": ">=20"
   },
-  "dependencies": {
-    "better-sqlite3": "^12.6.2",
-    "fdir": "^6.5.0",
-    "globby": "^14.1.0",
-    "ioredis": "^5.9.3",
-    "node-cron": "^4.2.1",
-    "sql.js": "^1.14.0",
-    "tar": "^7.5.9",
-    "tinyglobby": "^0.2.15",
-    "web-tree-sitter": "^0.26.5"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^5.4.1",
-    "@anthropic-ai/sdk": "^0.52.0",
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/fs-extra": "^11.0.4",
-    "@types/inquirer": "^9.0.9",
-    "@types/node": "^22.18.6",
-    "@types/node-cron": "^3.0.11",
-    "@types/semver": "^7.7.1",
-    "@types/uuid": "^11.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
-    "ansis": "^4.2.0",
-    "cac": "^6.7.14",
-    "chokidar": "^4.0.3",
-    "concurrently": "^9.2.1",
-    "consola": "^3.4.2",
-    "dayjs": "^1.11.19",
-    "eslint": "^9.36.0",
-    "eslint-plugin-format": "^1.4.0",
-    "find-up-simple": "^1.0.1",
-    "fs-extra": "^11.3.3",
-    "gray-matter": "^4.0.3",
-    "handlebars": "^4.7.8",
-    "husky": "^9.1.7",
-    "i18next": "^25.8.13",
-    "i18next-fs-backend": "^2.6.1",
-    "inquirer": "^12.9.6",
-    "inquirer-toggle": "^1.0.1",
-    "lint-staged": "^16.2.7",
-    "lowdb": "^7.0.1",
-    "nanoid": "^5.1.6",
-    "ofetch": "^1.5.1",
-    "ohash": "^1.1.4",
-    "ora": "^8.2.0",
-    "pathe": "^2.0.3",
-    "pkgroll": "^2.26.3",
-    "prettier": "^3.8.1",
-    "semver": "^7.7.4",
-    "shx": "^0.4.0",
-    "smol-toml": "^1.6.0",
-    "tinyexec": "^1.0.2",
-    "trash": "^10.1.0",
-    "tsx": "^4.21.0",
-    "tweetnacl": "^1.0.3",
-    "typescript": "^5.9.3",
-    "unbuild": "^3.6.1",
-    "uuid": "^11.1.0",
-    "vitest": "^3.2.4"
-  },
   "scripts": {
     "dev": "tsx ./src/cli.ts",
     "build": "unbuild",
@@ -150,6 +88,7 @@
     "typecheck": "tsc --noEmit",
     "release:verify": "node scripts/release-verify.mjs",
     "release:verify:full": "node scripts/release-verify.mjs --with-tests",
+    "prepublishOnly": "node scripts/validate-prepublish.mjs && pnpm contract:check && pnpm build",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "test": "vitest",
@@ -171,6 +110,7 @@
     "test:integration:run": "NODE_ENV=test vitest run --config vitest.integration.config.ts",
     "test:integration:ui": "NODE_ENV=test vitest --config vitest.integration.config.ts --ui",
     "test:integration:coverage": "NODE_ENV=test vitest run --config vitest.integration.config.ts --coverage",
+    "prepare": "husky",
     "format": "prettier --write src/**/*.ts",
     "prepublish:fix": "node scripts/fix-package-catalog.mjs",
     "cleanup": "node scripts/cleanup.js",
@@ -205,5 +145,68 @@
     "i18n:check": "tsx scripts/check-i18n.ts",
     "i18n:report": "tsx scripts/check-i18n.ts --report",
     "contract:check": "node scripts/check-remote-contract.mjs"
+  },
+  "dependencies": {
+    "better-sqlite3": "^12.6.2",
+    "fdir": "^6.5.0",
+    "globby": "^14.1.0",
+    "ioredis": "^5.9.3",
+    "node-cron": "^4.2.1",
+    "sql.js": "^1.14.0",
+    "tar": "^7.5.9",
+    "tinyglobby": "^0.2.15",
+    "web-tree-sitter": "^0.26.5"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^5.4.1",
+    "@anthropic-ai/sdk": "^0.52.0",
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/fs-extra": "^11.0.4",
+    "@types/inquirer": "^9.0.9",
+    "@types/node": "^22.18.6",
+    "@types/node-cron": "^3.0.11",
+    "@types/semver": "^7.7.1",
+    "@types/uuid": "^11.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "ansis": "^4.2.0",
+    "cac": "^6.7.14",
+    "chokidar": "^4.0.3",
+    "concurrently": "^9.2.1",
+    "consola": "^3.4.2",
+    "dayjs": "^1.11.19",
+    "eslint": "^9.36.0",
+    "eslint-plugin-format": "^1.4.0",
+    "find-up-simple": "^1.0.1",
+    "fs-extra": "^11.3.3",
+    "gray-matter": "^4.0.3",
+    "handlebars": "^4.7.8",
+    "husky": "^9.1.7",
+    "i18next": "^25.8.13",
+    "i18next-fs-backend": "^2.6.1",
+    "inquirer": "^12.9.6",
+    "inquirer-toggle": "^1.0.1",
+    "lint-staged": "^16.2.7",
+    "lowdb": "^7.0.1",
+    "nanoid": "^5.1.6",
+    "ofetch": "^1.5.1",
+    "ohash": "^1.1.4",
+    "ora": "^8.2.0",
+    "pathe": "^2.0.3",
+    "pkgroll": "^2.26.3",
+    "prettier": "^3.8.1",
+    "semver": "^7.7.4",
+    "shx": "^0.4.0",
+    "smol-toml": "^1.6.0",
+    "tinyexec": "^1.0.2",
+    "trash": "^10.1.0",
+    "tsx": "^4.21.0",
+    "tweetnacl": "^1.0.3",
+    "typescript": "^5.9.3",
+    "unbuild": "^3.6.1",
+    "uuid": "^11.1.0",
+    "vitest": "^3.2.4"
   }
-}
+}