ccjk 2.2.2 → 2.2.4

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, checkCcrVersion, handleDuplicateInstallations, checkCometixLineVersion } from './version-checker.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:url';
@@ -128,8 +128,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/ccr.mjs

@@ -37,7 +37,7 @@ import './init.mjs';
 import '../shared/ccjk.qYAnUMuy.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.Bi-m3LKY.mjs';

package/dist/chunks/check-updates.mjs

@@ -23,7 +23,7 @@ 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';

package/dist/chunks/features2.mjs

@@ -31,7 +31,7 @@ import 'node:util';
 import './auto-updater.mjs';
 import 'ora';
 import 'tinyexec';
-import '../shared/ccjk.Cy-RH2qV.mjs';
+import './version-checker.mjs';
 import 'node:path';
 import 'semver';
 import 'inquirer-toggle';

package/dist/chunks/init.mjs

@@ -28,7 +28,7 @@ import ora from 'ora';
 import { exec as exec$1 } from 'tinyexec';
 import { resolveAiOutputLanguage } from './prompts.mjs';
 import { readFile } from 'node:fs/promises';
-import { c as checkClaudeCodeVersionAndPrompt } from '../shared/ccjk.Cy-RH2qV.mjs';
+import { checkClaudeCodeVersionAndPrompt } from './version-checker.mjs';
 
 const PROVIDER_PRESETS_URL = "https://pub-0dc3e1677e894f07bbea11b17a29e032.r2.dev/providers.json";
 async function fetchProviderPresets() {

package/dist/chunks/package.mjs

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

package/dist/chunks/update.mjs

@@ -8,7 +8,7 @@ import { E as runCodexUpdate } from './codex.mjs';
 import { u as updatePromptOnly, s as selectAndInstallWorkflows } from '../shared/ccjk.qYAnUMuy.mjs';
 import { h as handleExitPromptError, a as handleGeneralError } from '../shared/ccjk.B7169qud.mjs';
 import { resolveAiOutputLanguage } from './prompts.mjs';
-import { c as checkClaudeCodeVersionAndPrompt } from '../shared/ccjk.Cy-RH2qV.mjs';
+import { checkClaudeCodeVersionAndPrompt } from './version-checker.mjs';
 import 'node:os';
 import 'pathe';
 import 'node:fs';

package/dist/{shared/ccjk.Cy-RH2qV.mjs → chunks/version-checker.mjs}

@@ -4,7 +4,225 @@ import * as path from 'node:path';
 import process from 'node:process';
 import { promisify } from 'node:util';
 import semver from 'semver';
-import { getPlatform, findCommandPath, getHomebrewCommandPaths } from '../chunks/platform.mjs';
+import { findCommandPath, getPlatform, getHomebrewCommandPaths } from './platform.mjs';
+import 'node:os';
+import 'pathe';
+import 'tinyexec';
+
+function getHome() {
+  return process.env.HOME || process.env.USERPROFILE || "";
+}
+const INSTALLATION_SOURCES = [
+  // ==================== macOS Sources ====================
+  {
+    type: "homebrew-cask",
+    name: "Homebrew Cask",
+    priority: 100,
+    // Highest priority on macOS
+    platforms: ["macos"],
+    pathPatterns: [
+      /\/Caskroom\/claude-code\//,
+      /\/opt\/homebrew\/Caskroom\//,
+      /\/usr\/local\/Caskroom\//
+    ],
+    commonPaths: [
+      "/opt/homebrew/Caskroom/claude-code",
+      "/usr/local/Caskroom/claude-code"
+    ],
+    getUpdateCommand: () => ({ command: "brew", args: ["upgrade", "--cask", "claude-code"] }),
+    isRecommended: true,
+    description: "Official recommended installation method for macOS"
+  },
+  // ==================== Cross-platform Sources ====================
+  {
+    type: "curl",
+    name: "Official Installer (curl)",
+    priority: 90,
+    // High priority - official method
+    platforms: ["macos", "linux"],
+    pathPatterns: [
+      // ~/.local/bin/claude (Linux/macOS curl default)
+      new RegExp(`${getHome().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/\\.local/bin/claude`),
+      // ~/.claude/bin/claude (alternative location)
+      new RegExp(`${getHome().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/\\.claude/`),
+      // Generic patterns
+      /\.local\/bin\/claude$/,
+      /\.claude\/bin\/claude$/,
+      /\.claude\/local\/bin\/claude$/
+    ],
+    commonPaths: [
+      `${getHome()}/.local/bin/claude`,
+      `${getHome()}/.claude/bin/claude`,
+      `${getHome()}/.claude/local/bin/claude`
+    ],
+    getUpdateCommand: () => ({
+      command: "sh",
+      args: ["-c", "curl -fsSL https://claude.ai/install.sh | sh"]
+    }),
+    isRecommended: true,
+    description: "Official curl installer from claude.ai"
+  },
+  {
+    type: "npm",
+    name: "npm Global",
+    priority: 50,
+    // Medium priority
+    platforms: ["macos", "linux", "windows"],
+    pathPatterns: [
+      /\/node_modules\/@anthropic-ai\/claude-code/,
+      /\/npm\//,
+      /\/fnm_multishells\//,
+      /\/\.nvm\//,
+      /\/\.volta\//,
+      /\/\.asdf\/installs\/nodejs\//,
+      /\/\.nodenv\//,
+      /\/\.n\/bin\//
+    ],
+    commonPaths: [
+      "/usr/local/bin/claude",
+      "/usr/bin/claude",
+      `${getHome()}/.npm-global/bin/claude`,
+      // Node version manager paths
+      `${getHome()}/.nvm/versions/node`,
+      `${getHome()}/.fnm/node-versions`,
+      `${getHome()}/.volta/bin/claude`,
+      `${getHome()}/.asdf/shims/claude`
+    ],
+    getUpdateCommand: () => ({ command: "npm", args: ["update", "-g", "@anthropic-ai/claude-code"] }),
+    isRecommended: false,
+    description: "npm global installation"
+  },
+  {
+    type: "npm-homebrew-node",
+    name: "npm via Homebrew Node",
+    priority: 45,
+    // Slightly lower than regular npm
+    platforms: ["macos"],
+    pathPatterns: [
+      /\/Cellar\/node\//,
+      /\/opt\/homebrew\/lib\/node_modules\//,
+      /\/usr\/local\/lib\/node_modules\//
+    ],
+    commonPaths: [
+      "/opt/homebrew/Cellar/node",
+      "/usr/local/Cellar/node",
+      "/opt/homebrew/lib/node_modules/@anthropic-ai/claude-code",
+      "/usr/local/lib/node_modules/@anthropic-ai/claude-code"
+    ],
+    getUpdateCommand: () => ({ command: "npm", args: ["update", "-g", "@anthropic-ai/claude-code"] }),
+    isRecommended: false,
+    description: "npm installation via Homebrew-managed Node.js"
+  },
+  // ==================== Future Linux Sources ====================
+  {
+    type: "snap",
+    name: "Snap Package",
+    priority: 80,
+    platforms: ["linux"],
+    pathPatterns: [
+      /\/snap\/claude-code\//,
+      /\/snap\/bin\/claude/
+    ],
+    commonPaths: [
+      "/snap/bin/claude",
+      "/snap/claude-code/current/bin/claude"
+    ],
+    getUpdateCommand: () => ({ command: "snap", args: ["refresh", "claude-code"] }),
+    isRecommended: false,
+    description: "Snap package (future support)"
+  },
+  {
+    type: "flatpak",
+    name: "Flatpak",
+    priority: 75,
+    platforms: ["linux"],
+    pathPatterns: [
+      /\/flatpak\//,
+      /com\.anthropic\.claude/
+    ],
+    commonPaths: [
+      `${getHome()}/.local/share/flatpak/exports/bin/com.anthropic.claude`,
+      "/var/lib/flatpak/exports/bin/com.anthropic.claude"
+    ],
+    getUpdateCommand: () => ({ command: "flatpak", args: ["update", "com.anthropic.claude"] }),
+    isRecommended: false,
+    description: "Flatpak package (future support)"
+  },
+  {
+    type: "apt",
+    name: "APT Package",
+    priority: 85,
+    platforms: ["linux"],
+    pathPatterns: [
+      /\/usr\/bin\/claude$/,
+      /\/usr\/local\/bin\/claude$/
+    ],
+    commonPaths: [
+      "/usr/bin/claude",
+      "/usr/local/bin/claude"
+    ],
+    getUpdateCommand: () => ({ command: "apt", args: ["upgrade", "claude-code"] }),
+    isRecommended: false,
+    description: "APT package (future support)"
+  }
+];
+function detectSourceFromPath(path, platform) {
+  const sortedSources = [...INSTALLATION_SOURCES].filter((s) => s.platforms.includes(platform)).sort((a, b) => b.priority - a.priority);
+  for (const source of sortedSources) {
+    for (const pattern of source.pathPatterns) {
+      if (pattern.test(path)) {
+        return source;
+      }
+    }
+  }
+  return null;
+}
+function getCommonPathsForPlatform(platform) {
+  const paths = [];
+  for (const source of INSTALLATION_SOURCES) {
+    if (source.platforms.includes(platform)) {
+      paths.push(...source.commonPaths);
+    }
+  }
+  return [...new Set(paths)];
+}
+function findInstallationByCommonPaths(platform) {
+  const sortedSources = [...INSTALLATION_SOURCES].filter((s) => s.platforms.includes(platform)).sort((a, b) => b.priority - a.priority);
+  for (const source of sortedSources) {
+    for (const commonPath of source.commonPaths) {
+      if (nodeFs.existsSync(commonPath)) {
+        const stats = nodeFs.statSync(commonPath);
+        if (stats.isDirectory()) {
+          const possibleBinaries = findClaudeBinaryInDirectory(commonPath);
+          if (possibleBinaries.length > 0) {
+            return { path: possibleBinaries[0], source };
+          }
+        } else if (stats.isFile()) {
+          return { path: commonPath, source };
+        }
+      }
+    }
+  }
+  return null;
+}
+function findClaudeBinaryInDirectory(dir, depth = 0) {
+  if (depth > 3)
+    return [];
+  const results = [];
+  try {
+    const entries = nodeFs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isFile() && entry.name === "claude") {
+        results.push(fullPath);
+      } else if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        results.push(...findClaudeBinaryInDirectory(fullPath, depth + 1));
+      }
+    }
+  } catch {
+  }
+  return results;
+}
 
 const execAsync = promisify(exec);
 async function getInstalledVersion(command, maxRetries = 3) {
@@ -44,35 +262,64 @@ async function getLatestVersion(packageName, maxRetries = 3) {
   return null;
 }
 async function getClaudeCodeInstallationSource() {
-  if (getPlatform() !== "macos") {
-    const commandPath2 = await findCommandPath("claude");
-    return {
-      isHomebrew: false,
-      commandPath: commandPath2,
-      source: commandPath2 ? "other" : "not-found"
-    };
+  const platform = getPlatform();
+  let commandPath = await findCommandPath("claude");
+  if (!commandPath) {
+    const commonPaths = getCommonPathsForPlatform(platform);
+    for (const path of commonPaths) {
+      if (nodeFs.existsSync(path)) {
+        try {
+          const stats = nodeFs.statSync(path);
+          if (stats.isFile()) {
+            commandPath = path;
+            break;
+          }
+        } catch {
+        }
+      }
+    }
+    if (!commandPath) {
+      const found = findInstallationByCommonPaths(platform);
+      if (found) {
+        commandPath = found.path;
+      }
+    }
   }
-  const commandPath = await findCommandPath("claude");
   if (!commandPath) {
     return { isHomebrew: false, commandPath: null, source: "not-found" };
   }
-  const isFromCaskroom = commandPath.includes("/Caskroom/claude-code/");
-  if (isFromCaskroom) {
-    return { isHomebrew: true, commandPath, source: "homebrew-cask" };
-  }
+  let resolvedPath = commandPath;
   try {
-    const { stdout: realPath } = await execAsync(`readlink -f "${commandPath}" 2>/dev/null || realpath "${commandPath}" 2>/dev/null || echo "${commandPath}"`);
-    const resolvedPath = realPath.trim();
-    if (resolvedPath.includes("/Caskroom/claude-code/")) {
-      return { isHomebrew: true, commandPath, source: "homebrew-cask" };
-    }
+    const { stdout } = await execAsync(
+      `readlink -f "${commandPath}" 2>/dev/null || realpath "${commandPath}" 2>/dev/null || echo "${commandPath}"`
+    );
+    resolvedPath = stdout.trim();
   } catch {
   }
-  if (commandPath.includes("/node_modules/") || commandPath.includes("/npm/") || commandPath.includes("/Cellar/node/")) {
-    return { isHomebrew: false, commandPath, source: "npm" };
+  const detectedSource = detectSourceFromPath(resolvedPath, platform) || detectSourceFromPath(commandPath, platform);
+  if (detectedSource) {
+    const sourceType = mapSourceType(detectedSource.type);
+    return {
+      isHomebrew: detectedSource.type === "homebrew-cask",
+      commandPath,
+      source: sourceType
+    };
   }
   return { isHomebrew: false, commandPath, source: "other" };
 }
+function mapSourceType(type) {
+  switch (type) {
+    case "homebrew-cask":
+      return "homebrew-cask";
+    case "npm":
+    case "npm-homebrew-node":
+      return "npm";
+    case "curl":
+      return "curl";
+    default:
+      return "other";
+  }
+}
 async function detectAllClaudeCodeInstallations() {
   const installations = [];
   const checkedPaths = /* @__PURE__ */ new Set();
@@ -286,7 +533,7 @@ async function performNpmRemovalAndActivateHomebrew(_npmInstallation, homebrewIn
   const ora = (await import('ora')).default;
   const spinner = ora(i18n.t("installation:removingDuplicateInstallation")).start();
   try {
-    const { wrapCommandWithSudo } = await import('../chunks/platform.mjs');
+    const { wrapCommandWithSudo } = await import('./platform.mjs');
     const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["uninstall", "-g", "@anthropic-ai/claude-code"]);
     if (usedSudo) {
       spinner.info(i18n.t("installation:usingSudo"));
@@ -297,7 +544,7 @@ async function performNpmRemovalAndActivateHomebrew(_npmInstallation, homebrewIn
     if (homebrewInstallation && !homebrewInstallation.isActive) {
       console.log("");
       console.log(ansis.cyan(`\u{1F517} ${i18n.t("installation:activatingHomebrew")}`));
-      const { createHomebrewSymlink } = await import('../chunks/init.mjs').then(function (n) { return n.G; });
+      const { createHomebrewSymlink } = await import('./init.mjs').then(function (n) { return n.G; });
       const symlinkResult = await createHomebrewSymlink("claude", homebrewInstallation.path);
       if (symlinkResult.success) {
         console.log(ansis.green(`\u2714 ${i18n.t("installation:symlinkCreated", { path: symlinkResult.symlinkPath || "/usr/local/bin/claude" })}`));
@@ -321,7 +568,7 @@ async function performNpmRemovalAndActivateHomebrew(_npmInstallation, homebrewIn
   }
 }
 async function handleDuplicateInstallations(skipPrompt = false) {
-  const { ensureI18nInitialized, format, i18n } = await import('../chunks/index2.mjs');
+  const { ensureI18nInitialized, format, i18n } = await import('./index2.mjs');
   const ansis = (await import('ansis')).default;
   ensureI18nInitialized();
   const duplicateInfo = await checkDuplicateInstallations();
@@ -450,13 +697,28 @@ async function checkClaudeCodeVersion() {
   let installationInfo = await getClaudeCodeInstallationSource();
   if (!currentVersion) {
     const installations = await detectAllClaudeCodeInstallations();
-    const bestInstall = installations.find((i) => i.source === "homebrew-cask") || installations.find((i) => i.source === "npm") || installations[0];
+    const bestInstall = installations.find((i) => i.source === "homebrew-cask") || installations.find((i) => i.source === "npm") || installations.find((i) => i.source === "curl") || installations[0];
     if (bestInstall && bestInstall.version) {
       currentVersion = bestInstall.version;
+      let mappedSource;
+      switch (bestInstall.source) {
+        case "homebrew-cask":
+          mappedSource = "homebrew-cask";
+          break;
+        case "npm":
+        case "npm-homebrew-node":
+          mappedSource = "npm";
+          break;
+        case "curl":
+          mappedSource = "curl";
+          break;
+        default:
+          mappedSource = "other";
+      }
       installationInfo = {
         isHomebrew: bestInstall.source === "homebrew-cask",
         commandPath: bestInstall.path,
-        source: bestInstall.source === "npm" ? "npm" : bestInstall.source === "homebrew-cask" ? "homebrew-cask" : "other"
+        source: mappedSource
       };
     }
   }
@@ -495,7 +757,7 @@ async function checkClaudeCodeVersionAndPrompt(skipPrompt = false) {
     if (!versionInfo.needsUpdate) {
       return;
     }
-    const { updateClaudeCode } = await import('../chunks/auto-updater.mjs');
+    const { updateClaudeCode } = await import('./auto-updater.mjs');
     await updateClaudeCode(false, skipPrompt);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
@@ -503,4 +765,4 @@ async function checkClaudeCodeVersionAndPrompt(skipPrompt = false) {
   }
 }
 
-export { checkClaudeCodeVersion as a, checkCcrVersion as b, checkClaudeCodeVersionAndPrompt as c, checkCometixLineVersion as d, handleDuplicateInstallations as h };
+export { checkCcrVersion, checkClaudeCodeVersion, checkClaudeCodeVersionAndPrompt, checkCometixLineVersion, checkDuplicateInstallations, compareVersions, detectAllClaudeCodeInstallations, getClaudeCodeInstallationSource, getHomebrewClaudeCodeVersion, getInstalledVersion, getLatestVersion, getSourceDisplayName, handleDuplicateInstallations, shouldUpdate };

package/dist/i18n/locales/en/updater.json

@@ -22,5 +22,6 @@
   "updateSkipped": "Update skipped",
   "updateSuccess": "{tool} updated successfully!",
   "updateSummary": "Update Summary",
-  "updating": "Updating {tool}..."
+  "updating": "Updating {tool}...",
+  "curlReinstallRequired": "Cannot auto-update curl-installed Claude Code. Please run manually: curl -fsSL https://claude.ai/install.sh | sh"
 }

package/dist/i18n/locales/zh-CN/updater.json

@@ -22,5 +22,6 @@
   "updateSkipped": "跳过更新",
   "updateSuccess": "{tool} 更新成功！",
   "updateSummary": "更新摘要",
-  "updating": "正在更新 {tool}..."
+  "updating": "正在更新 {tool}...",
+  "curlReinstallRequired": "无法自动更新 curl 安装的 Claude Code。请手动运行: curl -fsSL https://claude.ai/install.sh | sh"
 }

package/dist/index.mjs

@@ -39,7 +39,7 @@ import 'node:util';
 import './chunks/auto-updater.mjs';
 import 'ora';
 import 'tinyexec';
-import './shared/ccjk.Cy-RH2qV.mjs';
+import './chunks/version-checker.mjs';
 import 'node:path';
 import 'semver';
 import './shared/ccjk.CUdzQluX.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ccjk",
   "type": "module",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "packageManager": "pnpm@10.17.1",
   "description": "Claude Code JinKu - Advanced AI-powered development assistant with skills, agents, and LLM-driven audit",
   "author": {