cc-x10ded 3.0.15 → 3.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-x10ded",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "Extend Claude Code with custom OpenAI-compatible model providers",
   "repository": {
     "type": "git",

package/src/commands/doctor.ts

@@ -3,71 +3,125 @@ import { ShellIntegrator } from "../core/shell";
 import { ConfigManager } from "../core/config";
 import * as pc from "picocolors";
 import { existsSync } from "fs";
+import { join } from "path";
+import { homedir } from "os";
 
 export async function doctorCommand() {
   intro(pc.bgBlue(pc.white(" ccx Doctor 🩺 ")));
 
   const s = spinner();
   const issues: string[] = [];
+  const warnings: string[] = [];
   const checks: string[] = [];
+  const home = homedir();
 
-  // 1. Check Config
+  // 1. Check for old/shadowing binaries
+  s.start("Checking for conflicting binaries...");
+  const oldLocations = [
+    join(home, ".local", "bin", "ccx"),
+    join(home, ".npm-global", "bin", "ccx"),
+    join(home, "bin", "ccx"),
+  ];
+
+  const foundOld: string[] = [];
+  for (const loc of oldLocations) {
+    if (existsSync(loc)) foundOld.push(loc);
+  }
+
+  if (foundOld.length > 0) {
+    issues.push("❌ Old ccx binaries found that may shadow the new one:");
+    foundOld.forEach(p => issues.push(`   ${p}`));
+    issues.push("   👉 Run 'ccx update' to remove them automatically");
+  } else {
+    checks.push("✅ No conflicting binaries");
+  }
+  s.stop("Binary check complete");
+
+  // 2. Check PATH priority
+  s.start("Checking PATH configuration...");
+  const shellInt = new ShellIntegrator();
+
+  if (!shellInt.isBunBinFirst()) {
+    warnings.push("⚠️  ~/.bun/bin is not first in PATH");
+    warnings.push("   This may cause the wrong ccx to run.");
+    warnings.push('   👉 Add to TOP of your shell config: export PATH="$HOME/.bun/bin:$PATH"');
+  } else {
+    checks.push("✅ PATH is correctly configured");
+  }
+  s.stop("PATH check complete");
+
+  // 3. Check Config
   s.start("Checking configuration...");
   const configManager = new ConfigManager();
   const config = await configManager.read();
-  
+
   if (!config.zaiApiKey && !config.minimaxApiKey && Object.keys(config.providers).length === 0) {
-      issues.push("❌ No API keys configured. Run 'ccx setup'.");
+    issues.push("❌ No API keys configured. Run 'ccx setup'.");
   } else {
-      checks.push("✅ Configuration loaded");
+    const keys = [];
+    if (config.zaiApiKey) keys.push("Z.AI");
+    if (config.minimaxApiKey) keys.push("Minimax");
+    if (config.providers.openai?.apiKey) keys.push("OpenAI");
+    if (config.providers.gemini?.apiKey) keys.push("Gemini");
+    checks.push(`✅ API keys configured: ${keys.join(", ")}`);
   }
   s.stop("Configuration check complete");
 
-  // 2. Check Claude Binary
+  // 4. Check Claude Binary
   s.start("Checking Claude Code installation...");
-  const shellInt = new ShellIntegrator();
   const claudePath = await shellInt.findClaudeBinary();
-  
+
   if (claudePath) {
-      checks.push(`✅ Claude binary found: ${claudePath}`);
+    checks.push(`✅ Claude binary: ${claudePath}`);
   } else {
-      issues.push("❌ 'claude' command not found in common locations.");
-      issues.push("   👉 Suggestion: Run 'npm install -g @anthropic-ai/claude-code'");
+    issues.push("❌ 'claude' command not found.");
+    issues.push("   👉 Run: npm install -g @anthropic-ai/claude-code");
   }
   s.stop("Claude check complete");
 
-  // 3. Check Shell Integration
+  // 5. Check Shell Integration
   s.start("Checking shell integration...");
   const shell = shellInt.detectShell();
   const profile = shellInt.getProfilePath(shell);
-  
+
   if (shell === "unknown") {
-      issues.push("⚠️  Could not detect shell type.");
+    warnings.push("⚠️  Could not detect shell type.");
   } else {
-      checks.push(`✅ Shell detected: ${shell}`);
-      if (profile && existsSync(profile)) {
-          const content = await Bun.file(profile).text();
-          if (content.includes("ccx")) {
-              checks.push("✅ Aliases found in profile");
-          } else {
-              issues.push(`⚠️  Aliases missing in ${profile}. Run 'ccx setup'.`);
-          }
+    checks.push(`✅ Shell: ${shell}`);
+    if (profile && existsSync(profile)) {
+      const content = await Bun.file(profile).text();
+      if (content.includes("claude-glm-wrapper")) {
+        // Check if using old bunx-based aliases
+        if (content.includes("bunx cc-x10ded")) {
+          warnings.push("⚠️  Old bunx-based aliases detected");
+          warnings.push("   👉 Run 'ccx update' to migrate to faster direct aliases");
+        } else {
+          checks.push("✅ Aliases installed (new format)");
+        }
+      } else {
+        warnings.push(`⚠️  Aliases missing. Run 'ccx setup' to install.`);
       }
+    }
   }
   s.stop("Shell check complete");
 
-  // 4. Check Network/Proxy (Port 17870)
-  // We won't actually bind, just check if we can
-  
+  // Report
   console.log("\n" + pc.bold("Diagnostic Report:"));
   checks.forEach(c => console.log(c));
-  console.log("");
-  
+
+  if (warnings.length > 0) {
+    console.log("");
+    warnings.forEach(w => console.log(pc.yellow(w)));
+  }
+
   if (issues.length > 0) {
-      issues.forEach(i => console.log(i));
-      outro(pc.yellow("Issues found. Please resolve them above."));
-      process.exit(1);
+    console.log("");
+    issues.forEach(i => console.log(pc.red(i)));
+    outro(pc.red("Issues found. Please resolve them above."));
+    process.exit(1);
+  } else if (warnings.length > 0) {
+    outro(pc.yellow("Some warnings. ccx should work, but consider fixing them."));
   } else {
-      outro(pc.green("All systems operational! 🚀"));
+    outro(pc.green("All systems operational! 🚀"));
   }
 }

package/src/commands/setup.ts

@@ -88,21 +88,32 @@ export async function setupCommand() {
     if (mmKey) config.minimaxApiKey = mmKey as string;
   }
 
-  // 4. Install ccx globally
+  // 4. Clean up old binaries and install ccx globally
   const s2 = spinner();
-  s2.start("Installing ccx globally...");
+  s2.start("Cleaning up old installations...");
+
+  // Remove old binaries that might shadow the new one
+  const removed = await shellInt.cleanupOldBinaries();
+  if (removed.length > 0) {
+    s2.stop(pc.yellow(`Removed ${removed.length} old ccx binary(s)`));
+  } else {
+    s2.stop("No old binaries found");
+  }
+
+  const s3 = spinner();
+  s3.start("Installing ccx globally...");
   try {
     const proc = spawn(["bun", "install", "-g", "cc-x10ded@latest"], {
       stdio: ["ignore", "ignore", "ignore"]
     });
     await proc.exited;
     if (proc.exitCode === 0) {
-      s2.stop(pc.green("ccx installed globally!"));
+      s3.stop(pc.green("ccx installed globally!"));
     } else {
-      s2.stop(pc.yellow("Global install may have failed. You can still use: bunx cc-x10ded"));
+      s3.stop(pc.yellow("Global install may have failed. You can still use: bunx cc-x10ded"));
     }
   } catch {
-    s2.stop(pc.yellow("Could not install globally (bun not found?). Use: bunx cc-x10ded"));
+    s3.stop(pc.yellow("Could not install globally (bun not found?). Use: bunx cc-x10ded"));
   }
 
   // 5. Shell Config

package/src/core/shell.ts

@@ -180,6 +180,53 @@ Function ccm { ccx --model=MiniMax-M2.1 @args }`;
       return await this.installAliases(shell);
   }
 
+  /**
+   * Remove old ccx binaries from common locations that might shadow the bun global
+   */
+  async cleanupOldBinaries(): Promise<string[]> {
+    const removed: string[] = [];
+    const oldLocations = [
+      join(this.home, ".local", "bin", "ccx"),
+      join(this.home, ".npm-global", "bin", "ccx"),
+      join(this.home, "bin", "ccx"),
+      "/usr/local/bin/ccx",
+    ];
+
+    for (const loc of oldLocations) {
+      if (existsSync(loc)) {
+        try {
+          const { unlinkSync } = await import("fs");
+          unlinkSync(loc);
+          removed.push(loc);
+        } catch {
+          // Ignore permission errors
+        }
+      }
+    }
+
+    return removed;
+  }
+
+  /**
+   * Check if bun bin is properly prioritized in PATH
+   */
+  isBunBinFirst(): boolean {
+    const bunBin = join(this.home, ".bun", "bin");
+    const path = process.env.PATH || "";
+    const paths = path.split(":");
+
+    // Check if bun bin comes before other common locations
+    const bunIndex = paths.findIndex(p => p.includes(".bun/bin"));
+    const localIndex = paths.findIndex(p => p.includes(".local/bin"));
+    const npmGlobalIndex = paths.findIndex(p => p.includes(".npm-global/bin"));
+
+    if (bunIndex === -1) return false;
+    if (localIndex !== -1 && localIndex < bunIndex) return false;
+    if (npmGlobalIndex !== -1 && npmGlobalIndex < bunIndex) return false;
+
+    return true;
+  }
+
   /**
    * Hunt for the 'claude' binary in common locations
    */

package/src/index.ts

@@ -22,15 +22,27 @@ cli
 
 cli
   .command("update", "Update ccx to the latest version")
-  .option("--migrate-aliases", "Also migrate old bunx-based aliases to new format")
-  .action(async (options: { migrateAliases?: boolean }) => {
+  .option("--skip-aliases", "Skip alias installation")
+  .option("--skip-cleanup", "Skip removal of old binaries")
+  .action(async (options: { skipAliases?: boolean; skipCleanup?: boolean }) => {
     const { spawn } = await import("bun");
     const { ShellIntegrator } = await import("./core/shell");
     const pc = await import("picocolors");
 
-    console.log(pc.default.blue("Updating ccx..."));
+    const shellInt = new ShellIntegrator();
+    const shell = shellInt.detectShell();
 
-    // Update via bun global install
+    // 1. Clean up old binaries first
+    if (!options.skipCleanup) {
+      const removed = await shellInt.cleanupOldBinaries();
+      if (removed.length > 0) {
+        console.log(pc.default.yellow("🧹 Removed old ccx binaries:"));
+        removed.forEach(p => console.log(pc.default.dim(`   ${p}`)));
+      }
+    }
+
+    // 2. Update via bun global install
+    console.log(pc.default.blue("📦 Updating ccx..."));
     const proc = spawn(["bun", "install", "-g", "cc-x10ded@latest"], {
       stdio: ["inherit", "inherit", "inherit"]
     });
@@ -43,19 +55,29 @@ cli
 
     console.log(pc.default.green("✅ ccx updated!"));
 
-    // Migrate aliases
-    const shellInt = new ShellIntegrator();
-    const shell = shellInt.detectShell();
-
+    // 3. Ensure bun bin is in PATH (and prioritized)
     if (shell !== "unknown") {
-      const migrated = await shellInt.migrateAliases(shell);
-      if (migrated) {
-        console.log(pc.default.green("✅ Aliases migrated to new format!"));
-        console.log(pc.default.dim(`   Run: source ~/.${shell}rc (or restart your terminal)`));
+      await shellInt.ensureBunBinInPath(shell);
+
+      if (!shellInt.isBunBinFirst()) {
+        console.log(pc.default.yellow("⚠️  ~/.bun/bin should be first in PATH for ccx to work correctly."));
+        console.log(pc.default.dim("   Add this to the TOP of your shell config:"));
+        console.log(pc.default.cyan('   export PATH="$HOME/.bun/bin:$PATH"'));
+      }
+    }
+
+    // 4. Reinstall aliases (unless skipped)
+    if (!options.skipAliases && shell !== "unknown") {
+      const success = await shellInt.installAliases(shell);
+      if (success) {
+        console.log(pc.default.green("✅ Aliases updated!"));
       }
     }
 
     console.log(pc.default.green("\n🎉 Update complete!"));
+    if (shell !== "unknown") {
+      console.log(pc.default.dim(`   Run: source ~/.${shell}rc (or restart your terminal)`));
+    }
   });
 
 cli