ccjk 9.6.1 → 9.8.0

package/dist/chunks/init.mjs

@@ -3,47 +3,106 @@ import process__default from 'node:process';
 import ansis from 'ansis';
 import inquirer from 'inquirer';
 import { version } from './package.mjs';
-import { s as selectMcpServices, a as getMcpServices, M as MCP_SERVICE_CONFIGS } from '../shared/ccjk.CtSfXUSh.mjs';
-import { WORKFLOW_CONFIG_BASE } from './workflows2.mjs';
+import { b as runCodexFullInit, s as selectMcpServices, c as getMcpServices, M as MCP_SERVICE_CONFIGS } from './codex.mjs';
+import { m as modifyApiConfigPartially, c as configureApiCompletely, n as needsMigration, a as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, s as selectAndInstallWorkflows, b as configureOutputStyle, f as formatApiKeyDisplay, W as WORKFLOW_CONFIG_BASE } from '../shared/ccjk.LsPZ2PYo.mjs';
 import { SETTINGS_FILE, DEFAULT_CODE_TOOL_TYPE, CODE_TOOL_BANNERS, API_DEFAULT_URL } from './constants.mjs';
 import { ensureI18nInitialized, i18n } from './index.mjs';
 import { d as displayBannerWithInfo, p as padToDisplayWidth } from '../shared/ccjk.Br91zBIG.mjs';
 import { readZcfConfig, updateZcfConfig } from './ccjk-config.mjs';
 import { readCcrConfig, backupCcrConfig, createDefaultCcrConfig, writeCcrConfig, configureCcrProxy, setupCcrConfiguration } from './config3.mjs';
-import { i as isCcrInstalled, a as installCcr } from '../shared/ccjk.xfAjmbJp.mjs';
-import { c as addCompletedOnboarding, s as setPrimaryApiKey, b as backupMcpConfig, a as buildMcpServerConfig, r as readMcpConfig, e as replaceMcpServers, f as fixWindowsMcpConfig, w as writeMcpConfig, g as syncMcpPermissions } from './claude-config.mjs';
-import { d as runCodexFullInit } from './codex.mjs';
-import { r as resolveCodeType } from '../shared/ccjk.q1koQxEE.mjs';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
+import { updateCcr } from './auto-updater.mjs';
+import { w as wrapCommandWithSudo, i as isWindows, a as isTermux } from './platform.mjs';
+import { c as addCompletedOnboarding, s as setPrimaryApiKey, b as backupMcpConfig, a as buildMcpServerConfig, r as readMcpConfig, e as replaceMcpServers, f as fixWindowsMcpConfig, w as writeMcpConfig, g as syncMcpPermissions } from './claude-config.mjs';
+import { r as resolveCodeType } from '../shared/ccjk.CeE8RLG2.mjs';
 import { exists } from './fs-operations.mjs';
 import { readJsonConfig, writeJsonConfig } from './json-config.mjs';
-import { i as isWindows, w as wrapCommandWithSudo, d as isTermux } from './platform.mjs';
-import { p as promptApiConfigurationAction, e as ensureClaudeDir, g as getExistingApiConfig, s as switchToOfficialLogin, b as backupExistingConfig, f as copyConfigFiles, d as applyAiLanguageDirective, h as configureApi } from './config.mjs';
-import { n as needsMigration, m as migrateSettingsForTokenRetrieval, d as displayMigrationResult, p as promptMigration, s as selectAndInstallWorkflows } from '../shared/ccjk.C0pb50xH.mjs';
-import { m as modifyApiConfigPartially, c as configureApiCompletely, a as configureOutputStyle, f as formatApiKeyDisplay } from '../shared/ccjk.ChMkBmdL.mjs';
-import { a as handleExitPromptError, h as handleGeneralError } from '../shared/ccjk.CItD1fpl.mjs';
+import { p as promptApiConfigurationAction, e as ensureClaudeDir, g as getExistingApiConfig, s as switchToOfficialLogin, b as backupExistingConfig, a as copyConfigFiles, d as applyAiLanguageDirective, f as configureApi } from './config.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';
 import { resolveAiOutputLanguage } from './prompts.mjs';
 import { c as checkSuperpowersInstalled, i as installSuperpowers } from '../shared/ccjk.DE91nClQ.mjs';
 import { p as promptBoolean } from '../shared/ccjk.DHbrGcgg.mjs';
 import { checkClaudeCodeVersionAndPrompt } from './version-checker.mjs';
-import 'node:os';
-import 'pathe';
-import 'node:url';
-import 'i18next';
-import 'i18next-fs-backend';
-import 'smol-toml';
-import 'node:crypto';
-import 'node:fs/promises';
-import 'dayjs';
-import 'tinyexec';
-import 'inquirer-toggle';
-import './auto-updater.mjs';
-import 'ora';
-import 'node:path';
-import 'semver';
+
+const execAsync$1 = promisify(exec);
+async function isCcrInstalled() {
+  let commandExists = false;
+  try {
+    await execAsync$1("ccr version");
+    commandExists = true;
+  } catch {
+    try {
+      await execAsync$1("which ccr");
+      commandExists = true;
+    } catch {
+      commandExists = false;
+    }
+  }
+  let hasCorrectPackage = false;
+  try {
+    await execAsync$1("npm list -g @musistudio/claude-code-router");
+    hasCorrectPackage = true;
+  } catch {
+    hasCorrectPackage = false;
+  }
+  return {
+    isInstalled: commandExists,
+    hasCorrectPackage
+  };
+}
+async function installCcr() {
+  ensureI18nInitialized();
+  const { isInstalled, hasCorrectPackage } = await isCcrInstalled();
+  if (hasCorrectPackage) {
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
+    await updateCcr();
+    return;
+  }
+  if (isInstalled && !hasCorrectPackage) {
+    try {
+      await execAsync$1("npm list -g claude-code-router");
+      console.log(ansis.yellow(`\u26A0 ${i18n.t("ccr:detectedIncorrectPackage")}`));
+      try {
+        await execAsync$1("npm uninstall -g claude-code-router");
+        console.log(ansis.green(`\u2714 ${i18n.t("ccr:uninstalledIncorrectPackage")}`));
+      } catch {
+        console.log(ansis.yellow(`\u26A0 ${i18n.t("ccr:failedToUninstallIncorrectPackage")}`));
+      }
+    } catch {
+    }
+  }
+  console.log(ansis.green(`\u{1F4E6} ${i18n.t("ccr:installingCcr")}`));
+  try {
+    const installArgs = ["install", "-g", "@musistudio/claude-code-router", "--force"];
+    const { command, args, usedSudo } = wrapCommandWithSudo("npm", installArgs);
+    if (usedSudo) {
+      console.log(ansis.yellow(`\u2139 ${i18n.t("installation:usingSudo")}`));
+    }
+    await execAsync$1([command, ...args].join(" "));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrInstallSuccess")}`));
+  } catch (error) {
+    if (error.message?.includes("EEXIST")) {
+      console.log(ansis.yellow(`\u26A0 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
+      await updateCcr();
+      return;
+    }
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrInstallFailed")}`));
+    throw error;
+  }
+}
+
+const COMETIX_PACKAGE_NAME = "@cometix/ccline";
+const COMETIX_COMMAND_NAME = "ccline";
+const COMETIX_COMMANDS = {
+  CHECK_INSTALL: `npm list -g ${COMETIX_PACKAGE_NAME}`,
+  INSTALL: `npm install -g ${COMETIX_PACKAGE_NAME}`,
+  UPDATE: `npm update -g ${COMETIX_PACKAGE_NAME}`,
+  PRINT_CONFIG: `${COMETIX_COMMAND_NAME} --print`,
+  TUI_CONFIG: `${COMETIX_COMMAND_NAME} -c`
+};
 
 function getPlatformStatusLineConfig() {
   return {
@@ -80,16 +139,6 @@ function hasCCometixLineConfig() {
   }
 }
 
-const COMETIX_PACKAGE_NAME = "@cometix/ccline";
-const COMETIX_COMMAND_NAME = "ccline";
-const COMETIX_COMMANDS = {
-  CHECK_INSTALL: `npm list -g ${COMETIX_PACKAGE_NAME}`,
-  INSTALL: `npm install -g ${COMETIX_PACKAGE_NAME}`,
-  UPDATE: `npm update -g ${COMETIX_PACKAGE_NAME}`,
-  PRINT_CONFIG: `${COMETIX_COMMAND_NAME} --print`,
-  TUI_CONFIG: `${COMETIX_COMMAND_NAME} -c`
-};
-
 const execAsync = promisify(exec);
 async function isCometixLineInstalled() {
   try {
@@ -1063,7 +1112,7 @@ async function handleCodexConfigs(configs) {
   }
   const defaultConfig = configs.find((c) => c.default);
   if (defaultConfig) {
-    const { switchCodexProvider } = await import('./codex.mjs').then(function (n) { return n.i; });
+    const { switchCodexProvider } = await import('./codex.mjs').then(function (n) { return n.m; });
     const displayName = defaultConfig.name || defaultConfig.provider || "custom";
     const providerId = displayName.toLowerCase().replace(/[^a-z0-9]/g, "-");
     if (addedProviderIds.includes(providerId)) {
@@ -1093,20 +1142,15 @@ async function saveSingleConfigToToml(apiConfig, provider, options) {
     console.warn(ansis.yellow(`${i18n.t("configuration:singleConfigSaveFailed")}: ${error instanceof Error ? error.message : String(error)}`));
   }
 }
-async function convertSingleConfigToProfile(apiConfig, provider, options) {
+async function buildClaudeCodeProfile(params) {
   const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
-  const configName = provider && provider !== "custom" ? provider : "custom-config";
-  let baseUrl = apiConfig.url || API_DEFAULT_URL;
-  let primaryModel = options?.apiModel;
-  let defaultHaikuModel = options?.apiHaikuModel;
-  let defaultSonnetModel = options?.apiSonnetModel;
-  let defaultOpusModel = options?.apiOpusModel;
-  let authType = apiConfig.authType;
-  if (provider && provider !== "custom") {
+  let { url: baseUrl, authType, primaryModel, defaultHaikuModel, defaultSonnetModel, defaultOpusModel } = params;
+  baseUrl = baseUrl || API_DEFAULT_URL;
+  if (params.provider && params.provider !== "custom") {
     const { getProviderPreset } = await import('./api-providers.mjs');
-    const preset = getProviderPreset(provider);
+    const preset = getProviderPreset(params.provider);
     if (preset?.claudeCode) {
-      baseUrl = apiConfig.url || preset.claudeCode.baseUrl;
+      baseUrl = params.url || preset.claudeCode.baseUrl;
       authType = preset.claudeCode.authType;
       if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length > 0) {
         const [p, h, s, o] = preset.claudeCode.defaultModels;
@@ -1117,54 +1161,43 @@ async function convertSingleConfigToProfile(apiConfig, provider, options) {
       }
     }
   }
-  const profile = {
-    name: configName,
+  return {
+    name: params.name,
     authType,
-    apiKey: apiConfig.key,
+    apiKey: params.key,
     baseUrl,
     primaryModel,
     defaultHaikuModel,
     defaultSonnetModel,
     defaultOpusModel,
-    id: ClaudeCodeConfigManager.generateProfileId(configName)
+    id: ClaudeCodeConfigManager.generateProfileId(params.name)
   };
-  return profile;
+}
+async function convertSingleConfigToProfile(apiConfig, provider, options) {
+  return buildClaudeCodeProfile({
+    name: provider && provider !== "custom" ? provider : "custom-config",
+    key: apiConfig.key,
+    authType: apiConfig.authType,
+    url: apiConfig.url,
+    provider,
+    primaryModel: options?.apiModel,
+    defaultHaikuModel: options?.apiHaikuModel,
+    defaultSonnetModel: options?.apiSonnetModel,
+    defaultOpusModel: options?.apiOpusModel
+  });
 }
 async function convertToClaudeCodeProfile(config) {
-  const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
-  let baseUrl = config.url;
-  let primaryModel = config.primaryModel;
-  let defaultHaikuModel = config.defaultHaikuModel;
-  let defaultSonnetModel = config.defaultSonnetModel;
-  let defaultOpusModel = config.defaultOpusModel;
-  let authType = config.type || "api_key";
-  if (config.provider && config.provider !== "custom") {
-    const { getProviderPreset } = await import('./api-providers.mjs');
-    const preset = getProviderPreset(config.provider);
-    if (preset?.claudeCode) {
-      baseUrl = baseUrl || preset.claudeCode.baseUrl;
-      authType = preset.claudeCode.authType;
-      if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length > 0) {
-        const [p, h, s, o] = preset.claudeCode.defaultModels;
-        primaryModel = primaryModel || p;
-        defaultHaikuModel = defaultHaikuModel || h;
-        defaultSonnetModel = defaultSonnetModel || s;
-        defaultOpusModel = defaultOpusModel || o;
-      }
-    }
-  }
-  const profile = {
+  return buildClaudeCodeProfile({
     name: config.name,
-    authType,
-    apiKey: config.key,
-    baseUrl,
-    primaryModel,
-    defaultHaikuModel,
-    defaultSonnetModel,
-    defaultOpusModel,
-    id: ClaudeCodeConfigManager.generateProfileId(config.name)
-  };
-  return profile;
+    key: config.key,
+    authType: (config.type === "ccr_proxy" ? "api_key" : config.type) || "api_key",
+    url: config.url,
+    provider: config.provider,
+    primaryModel: config.primaryModel,
+    defaultHaikuModel: config.defaultHaikuModel,
+    defaultSonnetModel: config.defaultSonnetModel,
+    defaultOpusModel: config.defaultOpusModel
+  });
 }
 async function convertToCodexProvider(config) {
   const displayName = config.name || config.provider || "custom";
@@ -1271,4 +1304,13 @@ async function smartInit(options = {}) {
   }
 }
 
-export { handleMultiConfigurations, init, smartInit, validateApiConfigs, validateSkipPromptOptions };
+const init$1 = {
+  __proto__: null,
+  handleMultiConfigurations: handleMultiConfigurations,
+  init: init,
+  smartInit: smartInit,
+  validateApiConfigs: validateApiConfigs,
+  validateSkipPromptOptions: validateSkipPromptOptions
+};
+
+export { isCcrInstalled as a, installCcr as b, init$1 as c, init as i };

package/dist/chunks/installer2.mjs

@@ -9,7 +9,7 @@ import { exec } from 'tinyexec';
 import { ensureI18nInitialized, i18n } from './index.mjs';
 import { updateClaudeCode } from './auto-updater.mjs';
 import { exists } from './fs-operations.mjs';
-import { f as findCommandPath, b as getPlatform, c as getHomebrewCommandPaths, d as isTermux, e as getTermuxPrefix, h as isWSL, j as getWSLInfo, w as wrapCommandWithSudo, k as commandExists, l as getRecommendedInstallMethods } from './platform.mjs';
+import { f as findCommandPath, d as getPlatform, e as getHomebrewCommandPaths, a as isTermux, h as getTermuxPrefix, j as isWSL, k as getWSLInfo, w as wrapCommandWithSudo, c as commandExists, l as getRecommendedInstallMethods } from './platform.mjs';
 import 'node:url';
 import 'i18next';
 import 'i18next-fs-backend';

package/dist/chunks/interview.mjs

@@ -5,7 +5,7 @@ import process__default from 'node:process';
 import ansis from 'ansis';
 import inquirer from 'inquirer';
 import { i18n } from './index.mjs';
-import { a as handleExitPromptError, h as handleGeneralError } from '../shared/ccjk.CItD1fpl.mjs';
+import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.DvIrK0wz.mjs';
 import { randomUUID } from 'node:crypto';
 import 'node:url';
 import 'i18next';