ccjk 2.2.2 → 2.2.5

package/dist/chunks/auto-updater.mjs

@@ -4,7 +4,7 @@ import { exec } from 'tinyexec';
 import { ensureI18nInitialized, i18n, format } from './index2.mjs';
 import { shouldUseSudoForGlobalInstall } from './platform.mjs';
 import { p as promptBoolean } from '../shared/ccjk.DhBeLRzf.mjs';
-import { a as checkClaudeCodeVersion, b as checkCcrVersion, h as handleDuplicateInstallations, d as checkCometixLineVersion } from '../shared/ccjk.Cy-RH2qV.mjs';
+import { checkClaudeCodeVersion, fixBrokenNpmSymlink, checkCcrVersion, handleDuplicateInstallations, checkCometixLineVersion } from './version-checker.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:url';
@@ -106,6 +106,20 @@ async function updateClaudeCode(force = false, skipPrompt = false) {
     console.log(ansis.cyan(format(i18n.t("updater:latestVersion"), { version: latestVersion })));
     if (isBroken) {
       console.log(ansis.yellow(i18n.t("updater:installationBroken")));
+      const fixResult = await fixBrokenNpmSymlink();
+      if (fixResult.fixed) {
+        console.log(ansis.green(`\u2714 ${i18n.t("updater:symlinkFixed")}: ${fixResult.message}`));
+        const recheckResult = await checkClaudeCodeVersion();
+        if (!recheckResult.isBroken) {
+          console.log(ansis.green(i18n.t("updater:installationRepaired")));
+          if (!recheckResult.needsUpdate && !force) {
+            console.log(ansis.green(format(i18n.t("updater:claudeCodeUpToDate"), { version: recheckResult.currentVersion || "" })));
+            return true;
+          }
+        }
+      } else {
+        console.log(ansis.gray(`\u2139 ${fixResult.message}`));
+      }
     }
     if (!skipPrompt) {
       const confirm = await promptBoolean({
@@ -128,8 +142,28 @@ async function updateClaudeCode(force = false, skipPrompt = false) {
           throw new Error(result.stderr || `Command failed with exit code ${result.exitCode}`);
         }
       } else {
-        if (isBroken && installationSource === "npm") {
-          await execWithSudoIfNeeded("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
+        if (isBroken) {
+          if (installationSource === "npm") {
+            await execWithSudoIfNeeded("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
+          } else if (installationSource === "curl") {
+            const { detectAllClaudeCodeInstallations } = await import('./version-checker.mjs');
+            const installations = await detectAllClaudeCodeInstallations();
+            const curlInstall = installations.find((i) => i.source === "curl" && i.version);
+            if (curlInstall?.path) {
+              await execWithSudoIfNeeded(curlInstall.path, ["update"]);
+            } else {
+              throw new Error(i18n.t("updater:curlReinstallRequired"));
+            }
+          } else {
+            const { detectAllClaudeCodeInstallations } = await import('./version-checker.mjs');
+            const installations = await detectAllClaudeCodeInstallations();
+            const activeInstall = installations.find((i) => i.version);
+            if (activeInstall?.path) {
+              await execWithSudoIfNeeded(activeInstall.path, ["update"]);
+            } else {
+              throw new Error(i18n.t("updater:curlReinstallRequired"));
+            }
+          }
         } else {
           await execWithSudoIfNeeded("claude", ["update"]);
         }

package/dist/chunks/ccjk-config.mjs

@@ -1,18 +1,67 @@
 import { existsSync, mkdirSync, renameSync, copyFileSync, rmSync } from 'node:fs';
-import { dirname } from 'pathe';
+import { join, dirname } from 'pathe';
 import { parse, stringify } from 'smol-toml';
 import { DEFAULT_CODE_TOOL_TYPE, ZCF_CONFIG_FILE, LEGACY_ZCF_CONFIG_FILES, ZCF_CONFIG_DIR, isCodeToolType, SUPPORTED_LANGS } from './constants.mjs';
-import { exists, readFile, ensureDir, writeFileAtomic } from './fs-operations.mjs';
-import { readJsonConfig } from './json-config.mjs';
-import 'node:os';
-import './index2.mjs';
-import 'node:process';
-import 'node:url';
-import 'i18next';
-import 'i18next-fs-backend';
-import 'node:crypto';
-import 'node:fs/promises';
-import 'dayjs';
+import { exists, readFile, writeFileAtomic, writeFile, ensureDir, copyFile } from './fs-operations.mjs';
+import dayjs from 'dayjs';
+
+function readJsonConfig(path, options = {}) {
+  const { defaultValue = null, validate, sanitize } = options;
+  if (!exists(path)) {
+    return defaultValue;
+  }
+  try {
+    const content = readFile(path);
+    const data = JSON.parse(content);
+    if (validate && !validate(data)) {
+      console.log(`Invalid configuration: ${path}`);
+      return defaultValue;
+    }
+    if (sanitize) {
+      return sanitize(data);
+    }
+    return data;
+  } catch (error) {
+    console.error(`Failed to parse JSON: ${path}`, error);
+    return defaultValue;
+  }
+}
+function writeJsonConfig(path, data, options = {}) {
+  const { pretty = true, backup = false, backupDir, atomic = true } = options;
+  if (backup && exists(path)) {
+    backupJsonConfig(path, backupDir);
+  }
+  const content = pretty ? JSON.stringify(data, null, 2) : JSON.stringify(data);
+  if (atomic) {
+    writeFileAtomic(path, content);
+  } else {
+    writeFile(path, content);
+  }
+}
+function backupJsonConfig(path, backupDir) {
+  if (!exists(path)) {
+    return null;
+  }
+  const timestamp = dayjs().format("YYYY-MM-DD_HH-mm-ss");
+  const fileName = path.split("/").pop() || "config.json";
+  const baseDir = backupDir || join(path, "..", "backup");
+  const backupPath = join(baseDir, `${fileName}.backup_${timestamp}`);
+  try {
+    ensureDir(baseDir);
+    copyFile(path, backupPath);
+    return backupPath;
+  } catch (error) {
+    console.error("Failed to backup config", error);
+    return null;
+  }
+}
+
+const jsonConfig = {
+  __proto__: null,
+  backupJsonConfig: backupJsonConfig,
+  readJsonConfig: readJsonConfig,
+  writeJsonConfig: writeJsonConfig
+};
 
 function isSupportedLang(value) {
   return SUPPORTED_LANGS.includes(value);
@@ -258,4 +307,19 @@ function readDefaultTomlConfig() {
   return readTomlConfig(ZCF_CONFIG_FILE);
 }
 
-export { createDefaultTomlConfig, migrateFromJsonConfig, migrateZcfConfigIfNeeded, readDefaultTomlConfig, readTomlConfig, readZcfConfig, readZcfConfigAsync, updateTomlConfig, updateZcfConfig, writeTomlConfig, writeZcfConfig };
+const ccjkConfig = {
+  __proto__: null,
+  createDefaultTomlConfig: createDefaultTomlConfig,
+  migrateFromJsonConfig: migrateFromJsonConfig,
+  migrateZcfConfigIfNeeded: migrateZcfConfigIfNeeded,
+  readDefaultTomlConfig: readDefaultTomlConfig,
+  readTomlConfig: readTomlConfig,
+  readZcfConfig: readZcfConfig,
+  readZcfConfigAsync: readZcfConfigAsync,
+  updateTomlConfig: updateTomlConfig,
+  updateZcfConfig: updateZcfConfig,
+  writeTomlConfig: writeTomlConfig,
+  writeZcfConfig: writeZcfConfig
+};
+
+export { readZcfConfig as a, backupJsonConfig as b, readDefaultTomlConfig as c, updateTomlConfig as d, readZcfConfigAsync as e, createDefaultTomlConfig as f, writeTomlConfig as g, ccjkConfig as h, jsonConfig as j, readJsonConfig as r, updateZcfConfig as u, writeJsonConfig as w };

package/dist/chunks/ccr.mjs

@@ -1,5 +1,5 @@
 import { a as displayBannerWithInfo } from '../shared/ccjk.BhKlRJ0h.mjs';
-import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.B7169qud.mjs';
+import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.tB4-Y4Qb.mjs';
 import { s as showCcrMenu, a as showMainMenu } from './menu.mjs';
 import 'ansis';
 import './package.mjs';
@@ -18,37 +18,34 @@ import 'smol-toml';
 import './fs-operations.mjs';
 import 'node:crypto';
 import 'node:fs/promises';
-import './json-config.mjs';
 import 'dayjs';
 import './codex.mjs';
 import 'ora';
 import 'semver';
 import 'tinyexec';
-import './claude-config.mjs';
 import './platform.mjs';
 import '../shared/ccjk.DhBeLRzf.mjs';
 import 'inquirer-toggle';
 import './prompts.mjs';
-import '../shared/ccjk.DwDtZ5cK.mjs';
 import 'node:child_process';
-import '../shared/ccjk.CUdzQluX.mjs';
-import './features2.mjs';
+import '../shared/ccjk.CURU8gbR.mjs';
+import './features.mjs';
 import './init.mjs';
-import '../shared/ccjk.qYAnUMuy.mjs';
+import '../shared/ccjk.CGTmRqsu.mjs';
 import 'node:util';
 import './auto-updater.mjs';
-import '../shared/ccjk.Cy-RH2qV.mjs';
+import './version-checker.mjs';
 import 'node:path';
-import '../shared/ccjk.DJM5aVQJ.mjs';
+import '../shared/ccjk.ByTIGCUC.mjs';
 import '../shared/ccjk.Bi-m3LKY.mjs';
 import './smart-guide.mjs';
 import './ccu.mjs';
-import './commands.mjs';
+import './commands2.mjs';
 import './check-updates.mjs';
 import './config-switch.mjs';
 import './claude-code-config-manager.mjs';
 import './doctor.mjs';
-import './mcp-market.mjs';
+import '../shared/ccjk.D-RZS4E2.mjs';
 import './notification.mjs';
 import 'node:buffer';
 import '@iarna/toml';

package/dist/chunks/ccu.mjs

@@ -1,4 +1,4 @@
-import process from 'node:process';
+import process__default from 'node:process';
 import ansis from 'ansis';
 import { x } from 'tinyexec';
 import { i18n } from './index2.mjs';
@@ -23,11 +23,11 @@ async function executeCcusage(args = []) {
   } catch (error) {
     console.error(ansis.red(i18n.t("tools:ccusageFailed")));
     console.error(ansis.yellow(i18n.t("tools:checkNetworkConnection")));
-    if (process.env.DEBUG) {
+    if (process__default.env.DEBUG) {
       console.error(ansis.gray(i18n.t("tools:errorDetails")), error);
     }
-    if (process.env.NODE_ENV !== "test") {
-      process.exit(1);
+    if (process__default.env.NODE_ENV !== "test") {
+      process__default.exit(1);
     }
     throw error;
   }

package/dist/chunks/check-updates.mjs

@@ -1,9 +1,9 @@
-import process from 'node:process';
+import process__default from 'node:process';
 import ansis from 'ansis';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
-import { r as resolveCodeType } from '../shared/ccjk.CUdzQluX.mjs';
+import { r as resolveCodeType } from '../shared/ccjk.CURU8gbR.mjs';
 import { checkAndUpdateTools } from './auto-updater.mjs';
-import { E as runCodexUpdate } from './codex.mjs';
+import { Q as runCodexUpdate } from './codex.mjs';
 import 'node:fs';
 import 'node:url';
 import 'i18next';
@@ -16,23 +16,20 @@ import 'smol-toml';
 import './fs-operations.mjs';
 import 'node:crypto';
 import 'node:fs/promises';
-import './json-config.mjs';
 import 'dayjs';
 import 'ora';
 import 'tinyexec';
 import './platform.mjs';
 import '../shared/ccjk.DhBeLRzf.mjs';
 import 'inquirer-toggle';
-import '../shared/ccjk.Cy-RH2qV.mjs';
+import './version-checker.mjs';
 import 'node:child_process';
 import 'node:path';
 import 'node:util';
 import 'semver';
 import 'inquirer';
-import './claude-config.mjs';
 import './prompts.mjs';
 import './package.mjs';
-import '../shared/ccjk.DwDtZ5cK.mjs';
 
 class ToolUpdateScheduler {
   /**
@@ -86,7 +83,7 @@ Defaulting to "claude-code".`));
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     console.error(ansis.red(`${i18n.t("updater:errorCheckingUpdates")} ${errorMessage}`));
-    process.exit(1);
+    process__default.exit(1);
   }
 }
 

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

@@ -1,10 +1,9 @@
 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 { a0 as clearModelEnv } from './codex.mjs';
+import { c as readDefaultTomlConfig, f as createDefaultTomlConfig, r as readJsonConfig, g as writeTomlConfig } from './ccjk-config.mjs';
+import { ae as clearModelEnv } from './codex.mjs';
 import { ensureDir, exists, copyFile } from './fs-operations.mjs';
-import { readJsonConfig } from './json-config.mjs';
 import 'node:os';
 import './index2.mjs';
 import 'node:fs';
@@ -13,20 +12,18 @@ import 'node:url';
 import 'i18next';
 import 'i18next-fs-backend';
 import 'smol-toml';
-import 'node:crypto';
-import 'node:fs/promises';
 import 'ansis';
 import 'inquirer';
 import 'ora';
 import 'semver';
 import 'tinyexec';
-import './claude-config.mjs';
 import './platform.mjs';
 import '../shared/ccjk.DhBeLRzf.mjs';
 import 'inquirer-toggle';
 import './prompts.mjs';
 import './package.mjs';
-import '../shared/ccjk.DwDtZ5cK.mjs';
+import 'node:crypto';
+import 'node:fs/promises';
 import 'node:child_process';
 
 class ClaudeCodeConfigManager {
@@ -198,11 +195,11 @@ class ClaudeCodeConfigManager {
     ensureI18nInitialized();
     try {
       if (!profile) {
-        const { switchToOfficialLogin } = await import('./codex.mjs').then(function (n) { return n.a1; });
+        const { switchToOfficialLogin } = await import('./codex.mjs').then(function (n) { return n.ah; });
         switchToOfficialLogin();
         return;
       }
-      const { readJsonConfig: readJsonConfig2, writeJsonConfig } = await import('./json-config.mjs');
+      const { readJsonConfig: readJsonConfig2, writeJsonConfig } = await import('./ccjk-config.mjs').then(function (n) { return n.j; });
       const settings = readJsonConfig2(SETTINGS_FILE) || {};
       if (!settings.env)
         settings.env = {};
@@ -250,11 +247,11 @@ class ClaudeCodeConfigManager {
         clearModelEnv(settings.env);
       }
       writeJsonConfig(SETTINGS_FILE, settings);
-      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./claude-config.mjs').then(function (n) { return n.j; });
+      const { setPrimaryApiKey, addCompletedOnboarding } = await import('./codex.mjs').then(function (n) { return n.ag; });
       setPrimaryApiKey();
       addCompletedOnboarding();
       if (shouldRestartCcr) {
-        const { runCcrRestart } = await import('./commands.mjs');
+        const { runCcrRestart } = await import('./commands2.mjs');
         await runCcrRestart();
       }
     } catch (error) {

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

@@ -3,7 +3,7 @@ import inquirer from 'inquirer';
 import { ensureI18nInitialized, i18n } from './index2.mjs';
 import { ClaudeCodeConfigManager } from './claude-code-config-manager.mjs';
 import { a as addNumbersToChoices, p as promptBoolean } from '../shared/ccjk.DhBeLRzf.mjs';
-import { v as validateApiKey } from '../shared/ccjk.qYAnUMuy.mjs';
+import { v as validateApiKey } from '../shared/ccjk.CGTmRqsu.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:url';
@@ -18,16 +18,13 @@ import 'smol-toml';
 import './fs-operations.mjs';
 import 'node:crypto';
 import 'node:fs/promises';
-import './json-config.mjs';
 import './codex.mjs';
 import 'ora';
 import 'semver';
 import 'tinyexec';
-import './claude-config.mjs';
 import './platform.mjs';
 import './prompts.mjs';
 import './package.mjs';
-import '../shared/ccjk.DwDtZ5cK.mjs';
 import 'node:child_process';
 import 'inquirer-toggle';
 
@@ -191,7 +188,7 @@ ${i18n.t("multi-config:addingNewProfile")}`));
   ]);
   let modelConfig = null;
   if (selectedProvider === "custom") {
-    const { promptCustomModels } = await import('./features2.mjs');
+    const { promptCustomModels } = await import('./features.mjs');
     modelConfig = await promptCustomModels();
   }
   const setAsDefault = await promptBoolean({
@@ -374,7 +371,7 @@ ${i18n.t("multi-config:editingProfile", { name: selectedProfile.name })}`));
   ]);
   let modelConfig = null;
   if (selectedProfile.authType !== "ccr_proxy") {
-    const { promptCustomModels } = await import('./features2.mjs');
+    const { promptCustomModels } = await import('./features.mjs');
     modelConfig = await promptCustomModels(
       selectedProfile.primaryModel,
       selectedProfile.defaultHaikuModel,
@@ -501,7 +498,7 @@ ${i18n.t("multi-config:copyingProfile", { name: selectedProfile.name })}`));
   const answers = await inquirer.prompt(questions);
   let modelConfig = null;
   if (selectedProfile.authType !== "ccr_proxy") {
-    const { promptCustomModels } = await import('./features2.mjs');
+    const { promptCustomModels } = await import('./features.mjs');
     modelConfig = await promptCustomModels(
       selectedProfile.primaryModel,
       selectedProfile.defaultHaikuModel,