cc-x10ded 3.0.14 → 3.0.16

package/README.md

@@ -1,109 +1,75 @@
 # Claude-GLM Wrapper (ccx)
 
-> **📢 Community Fork Notice**
-> 
-> This is an actively maintained community fork of the original [claude-glm-wrapper](https://github.com/JoeInnsp23/claude-glm-wrapper). 
-> Now rewritten in **Bun** for 10x speed and single-binary simplicity.
-> 
-> Install via: `bunx cc-x10ded setup` or download the binary.
+> **Community Fork** of [claude-glm-wrapper](https://github.com/JoeInnsp23/claude-glm-wrapper), rewritten in **Bun** for speed and simplicity.
 
----
+Use [Z.AI GLM](https://z.ai), [Minimax](https://minimax.io), [OpenAI](https://openai.com), [Gemini](https://ai.google.dev), and more with [Claude Code](https://www.anthropic.com/claude-code).
 
-Use [Z.AI's GLM models](https://z.ai), [Minimax](https://minimax.io), [OpenAI](https://openai.com), and more with [Claude Code](https://www.anthropic.com/claude-code).
-
-**One Binary. Zero Friction.**
+## Quick Start
 
-## Why ccx?
+### Installation (Recommended)
 
-**🚀 10x Faster**: Native binary (written in Bun/TypeScript), starts instantly.
-**📦 Single Binary**: No more "wrapper hell". One `ccx` executable handles everything.
-**🛡️ Safe & Clean**: No more `eval` in shell scripts. Configs stored safely in `~/.config`.
-**🔀 Multi-Provider**: Switch between GLM, Minimax, OpenAI, Gemini, and Claude instantly.
-**🩺 Self-Healing**: Includes a `doctor` command to diagnose and fix configuration issues automatically.
+```bash
+# Install globally (fast startup, no resolution overhead)
+bun install -g cc-x10ded@latest
 
-## Quick Start
+# Run setup wizard
+ccx setup
+```
 
-### Installation
+### Alternative: One-liner with bunx
 
-**If you have Bun (recommended):**
 ```bash
 bunx cc-x10ded setup
 ```
 
-**Manual Download (Mac/Linux/Windows):**
-1. Download the latest release from [GitHub Releases](https://github.com/MohMaya/claude-glm-wrapper/releases).
-2. Run `./ccx setup` (or `.\ccx.exe setup` on Windows).
-
-### Setup Wizard
-
-Run `ccx setup` to:
-1. Configure your API keys (Z.AI, Minimax, OpenAI, etc.).
-2. Install shell aliases (`cc`, `ccg`, `ccm`...) automatically.
-3. Verify your Claude Code installation.
-
 ## Usage
 
 ### Commands
 
-| Command | Action |
-|---------|--------|
-| `ccx` | Run Claude Code with your default model (e.g. GLM-4.7) |
-| `ccx setup` | Run the interactive setup wizard |
+| Command | Description |
+|---------|-------------|
+| `ccx` | Run Claude Code with default model (GLM-4.7) |
+| `ccx setup` | Interactive setup wizard |
+| `ccx update` | Update ccx and migrate aliases |
+| `ccx doctor` | Diagnose configuration issues |
 | `ccx config` | Open configuration file |
-| `ccx doctor` | Run self-diagnostics to check API keys, paths, and dependencies |
-| `ccx update` | Update to the latest version |
-| `ccx --model=gpt-4o` | Run with a specific model override |
-
-### Aliases (Optional)
 
-If you enabled aliases during setup:
+### Model Aliases
 
+After setup, use these shortcuts:
 
-**🆕 New: ccx Multi-Provider Proxy**
-| Alias | Equivalent Command |
-|-------|-------------------|
-| `ccx` | `bunx cc-x10ded` |
-| `ccg` | `bunx cc-x10ded --model=glm-4.7` |
-| `ccg45` | `bunx cc-x10ded --model=glm-4.5` |
-| `ccf` | `bunx cc-x10ded --model=glm-4.5-air` |
-| `ccm` | `bunx cc-x10ded --model=MiniMax-M2.1` |
+| Alias | Model |
+|-------|-------|
+| `ccg` | GLM-4.7 (default) |
+| `ccg46` | GLM-4.6 |
+| `ccg45` | GLM-4.5 |
+| `ccf` | GLM-4.5-air (fast) |
+| `ccm` | MiniMax-M2.1 |
 
-### Multi-Provider Proxy
+### Multi-Provider Support
 
-`ccx` automatically acts as a local proxy. You can use ANY supported provider by specifying the prefix:
+Specify any provider with a prefix:
 
 ```bash
 ccx --model=openai:gpt-4o
-ccx --model=gemini:gemini-1.5-pro
+ccx --model=gemini:gemini-2.0-flash
 ccx --model=minimax:MiniMax-M2.1
+ccx --model=glm-4.7           # No prefix needed for GLM
 ```
 
-Or switch **in-session** using Claude's slash command:
-`/model openai:gpt-4o`
-
-### Auto-Discovery (Zero Config)
-
-`ccx` is smart! It automatically detects API keys in your environment variables, so you might not even need to run setup.
-
-Supported variables:
-- `ZAI_API_KEY` or `GLM_API_KEY`
-- `MINIMAX_API_KEY`
-- `OPENAI_API_KEY`
-- `ANTHROPIC_API_KEY`
-- `GEMINI_API_KEY`
-- `OPENROUTER_API_KEY`
+Or switch in-session: `/model openai:gpt-4o`
 
 ## Configuration
 
-Config is stored in `~/.config/claude-glm/config.json`.
-You can edit it with `ccx config`.
+Config is stored in `~/.config/claude-glm/config.json`:
 
 ```json
 {
-  "zaiApiKey": "sk-...",
-  "minimaxApiKey": "...",
+  "zaiApiKey": "your-zai-key",
+  "minimaxApiKey": "your-minimax-key",
   "providers": {
-    "openai": { "apiKey": "sk-..." }
+    "openai": { "apiKey": "sk-..." },
+    "gemini": { "apiKey": "..." }
   },
   "defaults": {
     "model": "glm-4.7"
@@ -111,33 +77,80 @@ You can edit it with `ccx config`.
 }
 ```
 
+### Environment Variables (Auto-Discovery)
+
+ccx automatically detects these environment variables:
+
+- `ZAI_API_KEY` / `GLM_API_KEY`
+- `MINIMAX_API_KEY`
+- `OPENAI_API_KEY`
+- `GEMINI_API_KEY`
+- `ANTHROPIC_API_KEY`
+- `OPENROUTER_API_KEY`
+
+## Updating
+
+```bash
+ccx update
+```
+
+This will:
+1. Install the latest version globally
+2. Migrate old `bunx`-based aliases to new format (if needed)
+
 ## Migrating from Old Versions
 
-If you're upgrading from `claude-glm-wrapper` (pre-3.0), you need to clean up the old installation:
+If upgrading from v3.0.14 or earlier (bunx-based aliases):
 
 ```bash
-# Remove old global package
-npm uninstall -g claude-glm-wrapper
+# Update and migrate aliases automatically
+ccx update
 
-# Remove old proxy files (no longer used)
+# Or manually reinstall
+bun install -g cc-x10ded@latest
+ccx setup
+```
+
+If upgrading from pre-3.0 (`claude-glm-wrapper`):
+
+```bash
+# Remove old installation
+npm uninstall -g claude-glm-wrapper
 rm -rf ~/.claude-proxy/
 
 # Install new version
-bunx cc-x10ded setup
+bun install -g cc-x10ded@latest
+ccx setup
 ```
 
-The new version:
-- Uses `bunx cc-x10ded` instead of `ccx` command
-- Runs proxy in-process (no separate process or `~/.claude-proxy/`)
-- Stores config in `~/.config/claude-glm/` (unchanged)
-
 ## Troubleshooting
 
 **"ccx: command not found"**
-Run `bunx cc-x10ded setup` to install shell aliases, then restart your terminal.
+
+Ensure bun's bin directory is in your PATH:
+```bash
+export PATH="$HOME/.bun/bin:$PATH"
+```
+
+Then reinstall: `bun install -g cc-x10ded@latest`
 
 **"Error: 'claude' command not found"**
-Run `bunx cc-x10ded doctor` — it will check your Claude Code installation.
+
+Run `ccx doctor` to check your Claude Code installation.
+
+**Aliases not working after update**
+
+Run `ccx update` to migrate aliases, then:
+```bash
+source ~/.zshrc  # or restart your terminal
+```
+
+## Why ccx?
+
+- **Fast startup**: Global binary, no bunx resolution overhead
+- **Multi-provider**: GLM, Minimax, OpenAI, Gemini, Anthropic, OpenRouter
+- **Self-healing**: `ccx doctor` diagnoses and fixes issues
+- **Zero config**: Auto-discovers API keys from environment
 
 ## License
 

package/package.json

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

package/src/commands/setup.ts

@@ -88,14 +88,34 @@ export async function setupCommand() {
     if (mmKey) config.minimaxApiKey = mmKey as string;
   }
 
-  // 4. Shell Config
+  // 4. Install ccx globally
+  const s2 = spinner();
+  s2.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!"));
+    } else {
+      s2.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"));
+  }
+
+  // 5. Shell Config
   const detectedShell = shellInt.detectShell();
 
   if (detectedShell !== "unknown") {
+    // Ensure bun bin is in PATH
+    await shellInt.ensureBunBinInPath(detectedShell);
+
     const installAliases = await select({
-      message: `Install shell aliases for ${detectedShell}? (cc, ccg, ccm...)`,
+      message: `Install shell aliases for ${detectedShell}? (ccg, ccm, ccf...)`,
       options: [
-        { value: "yes", label: "Yes, install standard aliases", hint: "Recommended" },
+        { value: "yes", label: "Yes, install aliases", hint: "Recommended" },
         { value: "no", label: "No, I will use 'ccx' directly" },
       ],
     });
@@ -106,9 +126,6 @@ export async function setupCommand() {
       const s = spinner();
       s.start("Installing aliases...");
       const success = await shellInt.installAliases(detectedShell);
-      
-      // Attempt to ensure local bin is in path
-      await shellInt.ensureLocalBinInPath(detectedShell);
 
       if (success) {
         s.stop("Aliases installed!");
@@ -120,6 +137,7 @@ export async function setupCommand() {
   }
 
   await configManager.write(config);
-  
-  outro(pc.green("Setup complete! Run 'ccx' to start."));
+
+  note(`To activate now, run: ${pc.cyan("source ~/.zshrc")} (or restart your terminal)`);
+  outro(pc.green("Setup complete! Run 'ccx' or 'ccg' to start."));
 }

package/src/core/shell.ts

@@ -83,51 +83,67 @@ export class ShellIntegrator {
   }
 
   private generateAliasBlock(shell: ShellType): string {
-    // Use bunx for zero-install experience
-    const cmd = "bunx cc-x10ded";
-
+    // Use global ccx binary for faster startup (no bunx resolution overhead)
+    // ccx is installed globally via: bun install -g cc-x10ded
     if (shell === "zsh" || shell === "bash") {
-      return `
-alias ccx='${cmd}'
-alias ccg='${cmd} --model=glm-4.7'
-alias ccg46='${cmd} --model=glm-4.6'
-alias ccg45='${cmd} --model=glm-4.5'
-alias ccf='${cmd} --model=glm-4.5-air'
-alias ccm='${cmd} --model=MiniMax-M2.1'
-`.trim();
+      return `# Installed via: bun install -g cc-x10ded
+# Update with: ccx update
+alias ccg='ccx --model=glm-4.7'
+alias ccg46='ccx --model=glm-4.6'
+alias ccg45='ccx --model=glm-4.5'
+alias ccf='ccx --model=glm-4.5-air'
+alias ccm='ccx --model=MiniMax-M2.1'`;
     }
     if (shell === "fish") {
-       return `
-alias ccx '${cmd}'
-alias ccg '${cmd} --model=glm-4.7'
-alias ccg46 '${cmd} --model=glm-4.6'
-alias ccg45 '${cmd} --model=glm-4.5'
-alias ccf '${cmd} --model=glm-4.5-air'
-alias ccm '${cmd} --model=MiniMax-M2.1'
-`.trim();
+       return `# Installed via: bun install -g cc-x10ded
+# Update with: ccx update
+alias ccg 'ccx --model=glm-4.7'
+alias ccg46 'ccx --model=glm-4.6'
+alias ccg45 'ccx --model=glm-4.5'
+alias ccf 'ccx --model=glm-4.5-air'
+alias ccm 'ccx --model=MiniMax-M2.1'`;
     }
     if (shell === "powershell") {
-        return `
-Function ccx { ${cmd} @args }
-Function ccg { ${cmd} --model=glm-4.7 @args }
-Function ccg46 { ${cmd} --model=glm-4.6 @args }
-Function ccg45 { ${cmd} --model=glm-4.5 @args }
-Function ccf { ${cmd} --model=glm-4.5-air @args }
-Function ccm { ${cmd} --model=MiniMax-M2.1 @args }
-`.trim();
+        return `# Installed via: bun install -g cc-x10ded
+# Update with: ccx update
+Function ccg { ccx --model=glm-4.7 @args }
+Function ccg46 { ccx --model=glm-4.6 @args }
+Function ccg45 { ccx --model=glm-4.5 @args }
+Function ccf { ccx --model=glm-4.5-air @args }
+Function ccm { ccx --model=MiniMax-M2.1 @args }`;
     }
     return "";
   }
   
+  async ensureBunBinInPath(shell: ShellType) {
+      if (platform() === "win32") return; // Windows handles PATH differently
+
+      const profile = this.getProfilePath(shell);
+      if (!profile || !existsSync(profile)) return;
+
+      const bunBin = join(this.home, ".bun", "bin");
+      const content = await Bun.file(profile).text();
+
+      // Check if bun bin is already in PATH (either via env or in profile)
+      const bunPathExport = `export PATH="$HOME/.bun/bin:$PATH"`;
+      const bunPathExportAlt = `export BUN_INSTALL="$HOME/.bun"`;
+
+      if (!content.includes(".bun/bin") && !process.env.PATH?.includes(bunBin)) {
+          // Add bun to PATH
+          const addition = `\n# Bun global binaries\nexport BUN_INSTALL="$HOME/.bun"\nexport PATH="$BUN_INSTALL/bin:$PATH"\n`;
+          await Bun.write(profile, content + addition);
+      }
+  }
+
   async ensureLocalBinInPath(shell: ShellType) {
       if (platform() === "win32") return; // Windows handles PATH differently (usually handled by installer or user)
 
       const profile = this.getProfilePath(shell);
       if (!profile || !existsSync(profile)) return;
-      
+
       const localBin = join(this.home, ".local", "bin");
       const content = await Bun.file(profile).text();
-      
+
       // Heuristic check
       if (!content.includes(localBin) && !process.env.PATH?.includes(localBin)) {
           const exportCmd = `export PATH="$HOME/.local/bin:$PATH"`;
@@ -137,6 +153,33 @@ Function ccm { ${cmd} --model=MiniMax-M2.1 @args }
       }
   }
 
+  /**
+   * Migrate old bunx-based aliases to new ccx-based aliases
+   */
+  async migrateAliases(shell: ShellType): Promise<boolean> {
+      const profile = this.getProfilePath(shell);
+      if (!profile || !existsSync(profile)) return false;
+
+      let content = await Bun.file(profile).text();
+
+      // Check if migration is needed (old bunx-based aliases exist)
+      if (!content.includes("bunx cc-x10ded")) {
+          return false; // No migration needed
+      }
+
+      // Remove old block and install new one
+      const startMarker = "# >>> claude-glm-wrapper";
+      const endMarker = "# <<< claude-glm-wrapper <<<";
+      const regex = new RegExp(`${startMarker}[\\s\\S]*?${endMarker}`, "g");
+      content = content.replace(regex, "").trim();
+
+      // Write cleaned content
+      await Bun.write(profile, content);
+
+      // Install new aliases
+      return await this.installAliases(shell);
+  }
+
   /**
    * Hunt for the 'claude' binary in common locations
    */

package/src/index.ts

@@ -22,16 +22,46 @@ cli
 
 cli
   .command("update", "Update ccx to the latest version")
-  .action(async () => {
-    console.log("Updating ccx...");
+  .option("--skip-aliases", "Skip alias installation")
+  .action(async (options: { skipAliases?: boolean }) => {
     const { spawn } = await import("bun");
-    const proc = spawn(["npm", "install", "-g", "cc-x10ded"], { stdio: ["inherit", "inherit", "inherit"] });
+    const { ShellIntegrator } = await import("./core/shell");
+    const pc = await import("picocolors");
+
+    console.log(pc.default.blue("Updating ccx..."));
+
+    // Update via bun global install
+    const proc = spawn(["bun", "install", "-g", "cc-x10ded@latest"], {
+      stdio: ["inherit", "inherit", "inherit"]
+    });
     await proc.exited;
-    if (proc.exitCode === 0) {
-        console.log("✅ Update complete!");
-    } else {
-        console.error("❌ Update failed.");
+
+    if (proc.exitCode !== 0) {
+      console.error(pc.default.red("❌ Update failed."));
+      process.exit(1);
     }
+
+    console.log(pc.default.green("✅ ccx updated!"));
+
+    // Always reinstall aliases (unless skipped)
+    if (!options.skipAliases) {
+      const shellInt = new ShellIntegrator();
+      const shell = shellInt.detectShell();
+
+      if (shell !== "unknown") {
+        // Ensure bun bin is in PATH
+        await shellInt.ensureBunBinInPath(shell);
+
+        // Install/update aliases
+        const success = await shellInt.installAliases(shell);
+        if (success) {
+          console.log(pc.default.green("✅ Aliases updated!"));
+          console.log(pc.default.dim(`   Run: source ~/.${shell}rc (or restart your terminal)`));
+        }
+      }
+    }
+
+    console.log(pc.default.green("\n🎉 Update complete!"));
   });
 
 cli