ccjk 8.1.4 → 8.1.6

package/dist/chunks/ccr.mjs

@@ -41,7 +41,7 @@ import './workflows.mjs';
 import './auto-updater.mjs';
 import './version-checker.mjs';
 import 'node:path';
-import '../shared/ccjk.BF-4_Yho.mjs';
+import '../shared/ccjk.BWFuYEZc.mjs';
 import './installer2.mjs';
 import '../shared/ccjk.DcXM9drZ.mjs';
 import 'node:stream';

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { join } from 'pathe';
 import { ZCF_CONFIG_FILE, ZCF_CONFIG_DIR, SETTINGS_FILE } from './constants.mjs';
 import { readDefaultTomlConfig, createDefaultTomlConfig, writeTomlConfig } from './ccjk-config.mjs';
-import { c as clearModelEnv } from './config2.mjs';
+import { a as clearModelEnv } from './config2.mjs';
 import { ensureDir, exists, copyFile } from './fs-operations.mjs';
 import { readJsonConfig } from './json-config.mjs';
 import 'node:os';

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

@@ -4,7 +4,7 @@ import { ensureI18nInitialized, i18n } from './index.mjs';
 import { ClaudeCodeConfigManager } from './claude-code-config-manager.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';
 import { p as promptBoolean } from '../shared/ccjk.DHbrGcgg.mjs';
-import { v as validateApiKey } from '../shared/ccjk.BF-4_Yho.mjs';
+import { v as validateApiKey } from '../shared/ccjk.BWFuYEZc.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:url';

package/dist/chunks/codex.mjs

@@ -11,7 +11,7 @@ import { x } from 'tinyexec';
 import { SUPPORTED_LANGS, CODEX_DIR, CODEX_AGENTS_FILE, CODEX_CONFIG_FILE, CODEX_PROMPTS_DIR, CODEX_AUTH_FILE, AI_OUTPUT_LANGUAGES, ZCF_CONFIG_FILE } from './constants.mjs';
 import { ensureI18nInitialized, i18n, format } from './index.mjs';
 import { updateZcfConfig, readZcfConfig, readDefaultTomlConfig, updateTomlConfig } from './ccjk-config.mjs';
-import { a as applyAiLanguageDirective } from './config2.mjs';
+import { d as applyAiLanguageDirective } from './config2.mjs';
 import { exists, readFile, ensureDir, writeFileAtomic, writeFile, copyFile, copyDir } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
 import { k as isWindows, l as getMcpCommand, m as getSystemRoot, w as wrapCommandWithSudo, n as normalizeTomlPath } from './platform.mjs';

package/dist/chunks/config2.mjs

@@ -200,10 +200,18 @@ function mergeSettingsFile(templatePath, targetPath) {
       ...existingSettings.env || {}
       // User's env vars override (preserving API keys, etc.)
     };
-    const mergedSettings = deepMerge(templateSettings, existingSettings, {
-      mergeArrays: true,
-      arrayMergeStrategy: "unique"
-    });
+    const mergedSettings = { ...templateSettings };
+    const schemaCriticalFields = [
+      "$schema",
+      "attribution",
+      "fileSuggestion",
+      "permissions"
+    ];
+    for (const [key, value] of Object.entries(existingSettings)) {
+      if (!schemaCriticalFields.includes(key)) {
+        mergedSettings[key] = value;
+      }
+    }
     mergedSettings.env = mergedEnv;
     if (mergedSettings.permissions && mergedSettings.permissions.allow) {
       mergedSettings.permissions.allow = mergeAndCleanPermissions(
@@ -349,4 +357,4 @@ const config = {
   updateDefaultModel: updateDefaultModel
 };
 
-export { applyAiLanguageDirective as a, backupExistingConfig as b, clearModelEnv as c, updateDefaultModel as d, getExistingApiConfig as e, configureApi as f, getExistingModelConfig as g, ensureClaudeDir as h, copyConfigFiles as i, config as j, mergeAndCleanPermissions as m, promptApiConfigurationAction as p, switchToOfficialLogin as s, updateCustomModel as u };
+export { clearModelEnv as a, backupExistingConfig as b, copyConfigFiles as c, applyAiLanguageDirective as d, updateDefaultModel as e, getExistingApiConfig as f, getExistingModelConfig as g, configureApi as h, ensureClaudeDir as i, config as j, mergeAndCleanPermissions as m, promptApiConfigurationAction as p, switchToOfficialLogin as s, updateCustomModel as u };

package/dist/chunks/doctor.mjs

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, statSync, writeFileSync, readFileSync, readdirSync } from 'node:fs';
+import { existsSync, mkdirSync, statSync, writeFileSync, readFileSync, copyFileSync, readdirSync } from 'node:fs';
 import process__default from 'node:process';
 import ansis from 'ansis';
 import inquirer from 'inquirer';
@@ -552,15 +552,57 @@ async function checkClaudeDir() {
   };
 }
 async function checkSettings() {
-  if (existsSync(SETTINGS_FILE)) {
-    return { name: "settings.json", status: "ok", message: "Configured" };
+  if (!existsSync(SETTINGS_FILE)) {
+    return {
+      name: "settings.json",
+      status: "warning",
+      message: "Not found",
+      fix: "Run: npx ccjk init"
+    };
+  }
+  try {
+    const { readFileSync: readFileSync2 } = await import('node:fs');
+    const content = readFileSync2(SETTINGS_FILE, "utf-8");
+    const settings = JSON.parse(content);
+    const issues = [];
+    if (settings.$schema && settings.$schema !== "https://json.schemastore.org/claude-code-settings.json") {
+      issues.push("Invalid $schema URL");
+    }
+    if (typeof settings.attribution === "string") {
+      issues.push("attribution should be an object, not a string");
+    }
+    if (settings.fileSuggestion && settings.fileSuggestion.type !== "command") {
+      issues.push('fileSuggestion.type must be "command"');
+    }
+    if (settings.permissions?.allow) {
+      const lowerCaseTools = settings.permissions.allow.filter(
+        (t) => /^[a-z]/.test(t) && !t.startsWith("Allow")
+      );
+      if (lowerCaseTools.length > 0) {
+        issues.push(`${lowerCaseTools.length} permission(s) with lowercase names`);
+      }
+    }
+    if (settings.plansDirectory === null) {
+      issues.push("plansDirectory should not be null");
+    }
+    if (issues.length > 0) {
+      return {
+        name: "settings.json",
+        status: "error",
+        message: `Validation issues: ${issues.length} problem(s)`,
+        fix: "Run: npx ccjk doctor --fix-settings",
+        details: issues
+      };
+    }
+    return { name: "settings.json", status: "ok", message: "Valid configuration" };
+  } catch (error) {
+    return {
+      name: "settings.json",
+      status: "error",
+      message: "Invalid JSON",
+      fix: "Run: npx ccjk init"
+    };
   }
-  return {
-    name: "settings.json",
-    status: "warning",
-    message: "Not found",
-    fix: "Run: npx ccjk init"
-  };
 }
 async function checkWorkflows() {
   const commandsDir = join(CLAUDE_DIR, "commands");
@@ -589,8 +631,8 @@ async function checkMcp() {
   const settingsPath = SETTINGS_FILE;
   if (existsSync(settingsPath)) {
     try {
-      const { readFileSync } = await import('node:fs');
-      const settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+      const { readFileSync: readFileSync2 } = await import('node:fs');
+      const settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
       if (settings.mcpServers && Object.keys(settings.mcpServers).length > 0) {
         const count = Object.keys(settings.mcpServers).length;
         return { name: "MCP Services", status: "ok", message: `${count} services configured` };
@@ -755,8 +797,48 @@ async function checkPermissionRules() {
     };
   }
 }
+async function fixSettingsFile() {
+  const isZh = i18n.language === "zh-CN";
+  const { copyConfigFiles } = await import('./config2.mjs').then(function (n) { return n.j; });
+  console.log("");
+  console.log(ansis.bold.cyan("\u{1F527} Fixing settings.json"));
+  console.log(ansis.dim("\u2500".repeat(50)));
+  console.log("");
+  const backupPath = join(CLAUDE_DIR, "backup", `settings.backup.${Date.now()}.json`);
+  try {
+    if (existsSync(SETTINGS_FILE)) {
+      mkdirSync(join(CLAUDE_DIR, "backup"), { recursive: true });
+      copyFileSync(SETTINGS_FILE, backupPath);
+      console.log(ansis.green(`\u2714 ${isZh ? "\u5DF2\u5907\u4EFD\u65E7\u8BBE\u7F6E" : "Backed up settings"}: ${backupPath}`));
+    }
+  } catch (error) {
+    console.log(ansis.yellow(`\u26A0\uFE0F ${isZh ? "\u5907\u4EFD\u5931\u8D25\uFF0C\u7EE7\u7EED..." : "Backup failed, continuing..."}`));
+  }
+  console.log("");
+  console.log(ansis.dim(isZh ? "\u6B63\u5728\u5408\u5E76\u6A21\u677F\u8BBE\u7F6E..." : "Merging template settings..."));
+  copyConfigFiles(false);
+  const checkResult = await checkSettings();
+  console.log("");
+  if (checkResult.status === "ok") {
+    console.log(ansis.green(`\u2705 ${isZh ? "\u8BBE\u7F6E\u5DF2\u4FEE\u590D\uFF01" : "Settings fixed successfully!"}`));
+  } else {
+    console.log(ansis.yellow(`\u26A0\uFE0F ${isZh ? "\u4ECD\u6709\u4E00\u4E9B\u95EE\u9898" : "Some issues remain"}:`));
+    if (checkResult.details) {
+      for (const detail of checkResult.details) {
+        console.log(ansis.dim(`   \u2022 ${detail}`));
+      }
+    }
+  }
+  console.log("");
+  console.log(ansis.dim(isZh ? "\u63D0\u793A: \u8BF7\u91CD\u542F Claude Code \u4EE5\u5E94\u7528\u66F4\u6539" : "Tip: Restart Claude Code to apply changes"));
+  console.log("");
+}
 async function doctor(options = {}) {
   const isZh = i18n.language === "zh-CN";
+  if (options.fixSettings) {
+    await fixSettingsFile();
+    return;
+  }
   console.log("");
   console.log(ansis.bold.cyan("\u{1F50D} CCJK Health Check"));
   console.log(ansis.dim("\u2500".repeat(50)));

package/dist/chunks/features.mjs

@@ -7,8 +7,8 @@ import { updateZcfConfig, readZcfConfig } from './ccjk-config.mjs';
 import { setupCcrConfiguration } from './config3.mjs';
 import { i as isCcrInstalled, a as installCcr } from './init.mjs';
 import { r as readMcpConfig, f as fixWindowsMcpConfig, w as writeMcpConfig, b as backupMcpConfig, a as buildMcpServerConfig, m as mergeMcpServers } from './claude-config.mjs';
-import { m as mergeAndCleanPermissions, a as applyAiLanguageDirective, g as getExistingModelConfig, u as updateCustomModel, d as updateDefaultModel, e as getExistingApiConfig, p as promptApiConfigurationAction, f as configureApi, s as switchToOfficialLogin } from './config2.mjs';
-import { c as configureOutputStyle, a as modifyApiConfigPartially, v as validateApiKey, f as formatApiKeyDisplay } from '../shared/ccjk.BF-4_Yho.mjs';
+import { m as mergeAndCleanPermissions, d as applyAiLanguageDirective, g as getExistingModelConfig, u as updateCustomModel, e as updateDefaultModel, f as getExistingApiConfig, p as promptApiConfigurationAction, h as configureApi, s as switchToOfficialLogin } from './config2.mjs';
+import { c as configureOutputStyle, a as modifyApiConfigPartially, v as validateApiKey, f as formatApiKeyDisplay } from '../shared/ccjk.BWFuYEZc.mjs';
 import { g as getPlatform, k as isWindows } from './platform.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';
 import { existsSync, readFileSync } from 'node:fs';

package/dist/chunks/init.mjs

@@ -18,8 +18,8 @@ import { c as addCompletedOnboarding, s as setPrimaryApiKey, b as backupMcpConfi
 import { r as resolveCodeType } from '../shared/ccjk.SIo9I8q3.mjs';
 import { exists } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
-import { p as promptApiConfigurationAction, h as ensureClaudeDir, e as getExistingApiConfig, s as switchToOfficialLogin, b as backupExistingConfig, i as copyConfigFiles, a as applyAiLanguageDirective, f as configureApi } from './config2.mjs';
-import { a as modifyApiConfigPartially, b as configureApiCompletely, n as needsMigration, m as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, s as selectAndInstallWorkflows, c as configureOutputStyle, f as formatApiKeyDisplay } from '../shared/ccjk.BF-4_Yho.mjs';
+import { p as promptApiConfigurationAction, i as ensureClaudeDir, f as getExistingApiConfig, s as switchToOfficialLogin, b as backupExistingConfig, c as copyConfigFiles, d as applyAiLanguageDirective, h as configureApi } from './config2.mjs';
+import { a as modifyApiConfigPartially, b as configureApiCompletely, n as needsMigration, m as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, s as selectAndInstallWorkflows, c as configureOutputStyle, f as formatApiKeyDisplay } from '../shared/ccjk.BWFuYEZc.mjs';
 import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.DvIrK0wz.mjs';
 import { getInstallationStatus, installClaudeCode } from './installer2.mjs';
 import { a as addNumbersToChoices } from '../shared/ccjk.BFQ7yr5S.mjs';

package/dist/chunks/package.mjs

@@ -1,4 +1,4 @@
-const version = "8.1.4";
+const version = "8.1.6";
 const homepage = "https://github.com/miounet11/ccjk";
 
 export { homepage, version };

package/dist/chunks/update.mjs

@@ -6,10 +6,11 @@ import { i18n } from './index.mjs';
 import { a as displayBanner } from '../shared/ccjk.BpHTUkb8.mjs';
 import { readZcfConfig, updateZcfConfig } from './ccjk-config.mjs';
 import { r as runCodexUpdate } from './codex.mjs';
-import { n as needsMigration, m as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, u as updatePromptOnly, s as selectAndInstallWorkflows } from '../shared/ccjk.BF-4_Yho.mjs';
+import { n as needsMigration, m as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, u as updatePromptOnly, s as selectAndInstallWorkflows } from '../shared/ccjk.BWFuYEZc.mjs';
 import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.DvIrK0wz.mjs';
 import { resolveAiOutputLanguage } from './prompts.mjs';
 import { checkClaudeCodeVersionAndPrompt } from './version-checker.mjs';
+import { c as copyConfigFiles } from './config2.mjs';
 import 'node:os';
 import 'pathe';
 import 'node:process';
@@ -26,8 +27,6 @@ import 'inquirer';
 import 'ora';
 import 'semver';
 import 'tinyexec';
-import './config2.mjs';
-import './claude-config.mjs';
 import './platform.mjs';
 import '../shared/ccjk.BFQ7yr5S.mjs';
 import '../shared/ccjk.DHbrGcgg.mjs';
@@ -36,6 +35,7 @@ import 'node:child_process';
 import './workflows.mjs';
 import 'node:path';
 import 'node:util';
+import './claude-config.mjs';
 
 function resolveCodeToolType(optionValue, savedValue) {
   if (optionValue !== void 0) {
@@ -99,6 +99,8 @@ async function update(options = {}) {
     console.log(ansis.green(`
 ${i18n.t("configuration:updatingPrompts")}
 `));
+    console.log(ansis.dim("\u2714 Checking and fixing configuration format...\n"));
+    copyConfigFiles(false);
     await updatePromptOnly(aiOutputLang);
     await selectAndInstallWorkflows(configLang);
     await checkClaudeCodeVersionAndPrompt(false);

package/dist/cli.mjs

@@ -65,14 +65,16 @@ const COMMANDS = [
     tier: "core",
     options: [
       { flags: "--check-providers", description: "Check API provider health" },
-      { flags: "--code-type, -T <type>", description: "Code tool type" }
+      { flags: "--code-type, -T <type>", description: "Code tool type" },
+      { flags: "--fix-settings", description: "Fix settings.json validation issues" }
     ],
     loader: async () => {
       const { doctor } = await import('./chunks/doctor.mjs');
       return async (options) => {
         await doctor({
           checkProviders: options.checkProviders,
-          codeType: options.codeType
+          codeType: options.codeType,
+          fixSettings: options.fixSettings
         });
       };
     }

package/dist/index.d.mts

@@ -1090,6 +1090,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'd
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * BUT ensures schema-critical fields use template values for validation
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/dist/index.d.ts

@@ -1090,6 +1090,7 @@ declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'd
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
+ * BUT ensures schema-critical fields use template values for validation
  */
 declare function mergeSettingsFile(templatePath: string, targetPath: string): void;
 /**

package/dist/shared/{ccjk.BF-4_Yho.mjs → ccjk.BWFuYEZc.mjs}

@@ -2,7 +2,7 @@ import ansis from 'ansis';
 import inquirer from 'inquirer';
 import { CLAUDE_DIR, SETTINGS_FILE } from '../chunks/constants.mjs';
 import { ensureI18nInitialized, i18n } from '../chunks/index.mjs';
-import { e as getExistingApiConfig, f as configureApi, s as switchToOfficialLogin, b as backupExistingConfig, a as applyAiLanguageDirective } from '../chunks/config2.mjs';
+import { f as getExistingApiConfig, h as configureApi, s as switchToOfficialLogin, b as backupExistingConfig, d as applyAiLanguageDirective } from '../chunks/config2.mjs';
 import { fileURLToPath } from 'node:url';
 import { join, dirname } from 'pathe';
 import { updateZcfConfig } from '../chunks/ccjk-config.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "8.1.4",
+  "version": "8.1.6",
   "packageManager": "pnpm@10.17.1",
   "description": "Ultimate AI Development Tool - Code Tool Abstraction Layer with 83% Token Savings - Now with Cloud Sync, Hot-Reload Skills, Multi-Agent Orchestration, and Full Claude Code CLI 2.1+ Compatibility",
   "author": {
@@ -174,4 +174,4 @@
     "unbuild": "^3.6.1",
     "vitest": "^3.2.4"
   }
-}
+}