zcf 2.9.4 → 2.9.5

package/dist/chunks/simple-config.mjs

@@ -18,7 +18,7 @@ import { promisify as promisify$1 } from 'node:util';
 import { homedir, platform } from 'node:os';
 import { join as join$2 } from 'node:path';
 
-const version = "2.9.4";
+const version = "2.9.5";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const common$1 = {
@@ -2583,39 +2583,51 @@ async function cleanupOldVersionFiles(scriptLang) {
 
 const execAsync$1 = promisify$1(exec$2);
 async function isCcrInstalled() {
+  let commandExists = false;
   try {
     await execAsync$1("ccr version");
-    return true;
+    commandExists = true;
   } catch {
     try {
       await execAsync$1("which ccr");
-      return true;
+      commandExists = true;
     } catch {
-      return false;
+      commandExists = false;
     }
   }
-}
-async function installCcr(scriptLang) {
-  const i18n = getTranslation(scriptLang);
-  let hasIncorrectPackage = false;
+  let hasCorrectPackage = false;
   try {
-    await execAsync$1("npm list -g claude-code-router");
-    hasIncorrectPackage = true;
-    console.log(ansis.yellow(`\u26A0 ${i18n.ccr.detectedIncorrectPackage}`));
-    try {
-      await execAsync$1("npm uninstall -g claude-code-router");
-      console.log(ansis.green(`\u2714 ${i18n.ccr.uninstalledIncorrectPackage}`));
-    } catch (uninstallError) {
-      console.log(ansis.yellow(`\u26A0 ${i18n.ccr.failedToUninstallIncorrectPackage}`));
-    }
+    await execAsync$1("npm list -g @musistudio/claude-code-router");
+    hasCorrectPackage = true;
   } catch {
+    hasCorrectPackage = false;
   }
-  const installed = await isCcrInstalled();
-  if (installed && !hasIncorrectPackage) {
+  return {
+    isInstalled: commandExists,
+    hasCorrectPackage
+  };
+}
+async function installCcr(scriptLang) {
+  const i18n = getTranslation(scriptLang);
+  const { isInstalled, hasCorrectPackage } = await isCcrInstalled();
+  if (hasCorrectPackage) {
     console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
     await updateCcr(scriptLang);
     return;
   }
+  if (isInstalled && !hasCorrectPackage) {
+    try {
+      await execAsync$1("npm list -g claude-code-router");
+      console.log(ansis.yellow(`\u26A0 ${i18n.ccr.detectedIncorrectPackage}`));
+      try {
+        await execAsync$1("npm uninstall -g claude-code-router");
+        console.log(ansis.green(`\u2714 ${i18n.ccr.uninstalledIncorrectPackage}`));
+      } catch (uninstallError) {
+        console.log(ansis.yellow(`\u26A0 ${i18n.ccr.failedToUninstallIncorrectPackage}`));
+      }
+    } catch {
+    }
+  }
   console.log(ansis.cyan(`\u{1F4E6} ${i18n.ccr.installingCcr}`));
   try {
     await execAsync$1("npm install -g @musistudio/claude-code-router --force");
@@ -3168,9 +3180,8 @@ async function init(options = {}) {
         } else if (apiAction === "modify-all") {
           apiConfig = await configureApiCompletely(i18n, scriptLang);
         } else if (apiAction === "use-ccr") {
-          const ccrInstalled = await isCcrInstalled();
-          if (!ccrInstalled) {
-            console.log(ansis.yellow(`${i18n.ccr.installingCcr}`));
+          const ccrStatus = await isCcrInstalled();
+          if (!ccrStatus.hasCorrectPackage) {
             await installCcr(scriptLang);
           } else {
             console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
@@ -3213,8 +3224,8 @@ async function init(options = {}) {
           process.exit(0);
         }
         if (apiChoice === "ccr_proxy") {
-          const ccrInstalled = await isCcrInstalled();
-          if (!ccrInstalled) {
+          const ccrStatus = await isCcrInstalled();
+          if (!ccrStatus.hasCorrectPackage) {
             await installCcr(scriptLang);
           } else {
             console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));

package/dist/cli.mjs

@@ -67,9 +67,8 @@ async function configureApiFeature(scriptLang) {
       await modifyApiConfigPartially(existingApiConfig, i18n, scriptLang);
       return;
     } else if (action === "use-ccr") {
-      const ccrInstalled = await isCcrInstalled();
-      if (!ccrInstalled) {
-        console.log(ansis.yellow(`${i18n.ccr.installingCcr}`));
+      const ccrStatus = await isCcrInstalled();
+      if (!ccrStatus.hasCorrectPackage) {
         await installCcr(scriptLang);
       } else {
         console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
@@ -108,9 +107,8 @@ async function configureApiFeature(scriptLang) {
     return;
   }
   if (apiChoice === "ccr_proxy") {
-    const ccrInstalled = await isCcrInstalled();
-    if (!ccrInstalled) {
-      console.log(ansis.yellow(`${i18n.ccr.installingCcr}`));
+    const ccrStatus = await isCcrInstalled();
+    if (!ccrStatus.hasCorrectPackage) {
       await installCcr(scriptLang);
     } else {
       console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
@@ -562,9 +560,8 @@ async function showCcrMenu(scriptLang) {
     });
     switch (choice) {
       case "1":
-        const ccrInstalled = await isCcrInstalled();
-        if (!ccrInstalled) {
-          console.log(ansis.yellow(`${i18n.ccr.installingCcr}`));
+        const ccrStatus = await isCcrInstalled();
+        if (!ccrStatus.hasCorrectPackage) {
           await installCcr(scriptLang);
         } else {
           console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "description": "Zero-Config Claude-Code Flow - One-click configuration tool for Claude Code",
   "license": "MIT",
   "homepage": "https://github.com/UfoMiao/zcf",