cc-hub-cli 1.1.6 → 1.1.8

package/dist/index.js

@@ -254,6 +254,14 @@ var NoOpDesktopApp = class {
 import fs3 from "fs";
 import path3 from "path";
 import { randomUUID } from "crypto";
+var ANTHROPIC_ALIASES = ["claude-sonnet-4-5", "claude-opus-4-7", "claude-haiku-4-5-20251001"];
+function isAnthropicModel(model) {
+  const anthropicAliases = ["opus", "sonnet", "haiku", "best", "default", "opusplan", "opus[1m]", "sonnet[1m]"];
+  const lower = model.toLowerCase();
+  if (anthropicAliases.includes(lower)) return true;
+  if (lower.startsWith("claude-")) return true;
+  return false;
+}
 function toDesktopProfile(p) {
   const models = p.models || (p.model ? [p.model] : []);
   const isAnthropic = p.provider === "anthropic" || !p.provider && !p.url;
@@ -263,13 +271,24 @@ function toDesktopProfile(p) {
       inferenceModels: models.map((m) => ({ name: m, supports1m: true }))
     };
   }
-  return {
+  const mappings = [];
+  const mappedModels = models.map((m, index) => {
+    if (isAnthropicModel(m)) return m;
+    const alias = ANTHROPIC_ALIASES[Math.min(index, ANTHROPIC_ALIASES.length - 1)];
+    mappings.push({ alias, actual: m });
+    return alias;
+  });
+  const result = {
     inferenceProvider: "gateway",
     inferenceGatewayBaseUrl: p.url || void 0,
     inferenceGatewayApiKey: p.token || void 0,
     inferenceGatewayAuthScheme: "bearer",
-    inferenceModels: models.map((m) => ({ name: m, supports1m: true }))
+    inferenceModels: mappedModels.map((m) => ({ name: m, supports1m: true }))
   };
+  if (mappings.length > 0) {
+    result.inferenceModelMappings = mappings;
+  }
+  return result;
 }
 var DesktopProfileSyncer = class {
   constructor(app) {
@@ -471,6 +490,7 @@ function fixJsonFile(filePath, fallback = {}) {
   const raw = fs4.readFileSync(filePath, "utf-8");
   try {
     JSON.parse(raw);
+    fs4.mkdirSync(CLAUDE_DIR, { recursive: true });
     fs4.copyFileSync(filePath, backupPath);
     return;
   } catch {
@@ -500,14 +520,24 @@ function fixJsonFile(filePath, fallback = {}) {
     warn(`Fixed invalid JSON in ${path4.basename(filePath)}.`);
     console.error(`Fixed invalid JSON in ${path4.basename(filePath)}.`);
   } catch {
+    let restored = false;
     if (fs4.existsSync(backupPath)) {
-      fs4.copyFileSync(backupPath, filePath);
-      warn(`Restored ${path4.basename(filePath)} from backup.`);
-      console.error(`Restored ${path4.basename(filePath)} from backup.`);
-    } else {
+      try {
+        const backupRaw = fs4.readFileSync(backupPath, "utf-8");
+        JSON.parse(backupRaw);
+        fs4.copyFileSync(backupPath, filePath);
+        restored = true;
+        warn(`Restored ${path4.basename(filePath)} from backup.`);
+        console.error(`Restored ${path4.basename(filePath)} from backup.`);
+      } catch {
+        error(`Backup ${path4.basename(backupPath)} is also corrupt; using fallback.`);
+        console.error(`Backup ${path4.basename(backupPath)} is also corrupt; using fallback.`);
+      }
+    }
+    if (!restored) {
       writeJson(filePath, fallback);
-      error(`Could not fix ${path4.basename(filePath)}, no backup found, reset to default.`);
-      console.error(`Could not fix ${path4.basename(filePath)}, no backup found, reset to default.`);
+      error(`Could not fix ${path4.basename(filePath)}, no valid backup found, reset to default.`);
+      console.error(`Could not fix ${path4.basename(filePath)}, no valid backup found, reset to default.`);
     }
   }
 }
@@ -518,6 +548,9 @@ import { spawnSync as spawnSync2, spawn } from "child_process";
 // src/provider/index.ts
 import { Command } from "commander";
 
+// src/provider/server.ts
+import http from "http";
+
 // src/provider/transform.ts
 function sanitizeToolId(id) {
   let sanitized = id.replace(/[^a-zA-Z0-9_-]/g, "_");
@@ -675,7 +708,7 @@ function transformOpenAIResponseToAnthropic(openaiResponse, originalModel) {
     id: openaiResponse.id ?? `msg_${Date.now()}`,
     type: "message",
     role: "assistant",
-    model: openaiResponse.model ?? originalModel,
+    model: originalModel,
     content,
     stop_reason: finishMap[choice.finish_reason] ?? "end_turn",
     stop_sequence: null,
@@ -743,8 +776,7 @@ data: ${JSON.stringify(data)}
 }
 
 // src/provider/server.ts
-import http from "http";
-async function startOpenAIProxy(targetUrl, apiKey, model, models = []) {
+async function startOpenAIProxy(targetUrl, apiKey, model, models = [], modelMappings = {}) {
   const base = targetUrl.replace(/\/+$/, "");
   const server = http.createServer(async (req, res) => {
     debug(`Proxy request: ${req.method} ${req.url}`);
@@ -770,7 +802,9 @@ async function startOpenAIProxy(targetUrl, apiKey, model, models = []) {
           return;
         }
         const isStream = !!parsed.stream;
-        const openaiBody = transformAnthropicToOpenAI({ ...parsed, stream: false });
+        const requestModel = parsed.model ?? model;
+        const actualModel = modelMappings[requestModel] || requestModel;
+        const openaiBody = transformAnthropicToOpenAI({ ...parsed, model: actualModel, stream: false });
         if (isStream) {
           res.writeHead(200, {
             "Content-Type": "text/event-stream",
@@ -875,6 +909,17 @@ var PROVIDERS = [
     description: "Embedded proxy \u2014 translates Anthropic requests to OpenAI Chat Completions format"
   }
 ];
+var ANTHROPIC_ALIASES2 = ["claude-sonnet-4-5", "claude-opus-4-7", "claude-haiku-4-5-20251001"];
+function isAnthropicModel2(model) {
+  const anthropicAliases = ["opus", "sonnet", "haiku", "best", "default", "opusplan", "opus[1m]", "sonnet[1m]"];
+  const lower = model.toLowerCase();
+  if (anthropicAliases.includes(lower)) return true;
+  if (lower.startsWith("claude-")) return true;
+  return false;
+}
+function collect(value, previous) {
+  return previous.concat([value]);
+}
 function providerCommand() {
   const cmd = new Command("provider").description("Manage provider types");
   cmd.command("list").description("List available provider types").action(safeAction(() => {
@@ -887,8 +932,51 @@ function providerCommand() {
   }));
   return cmd;
 }
+function proxyCommand() {
+  return new Command("proxy").description("Start a standalone OpenAI proxy for the desktop app").option("--profile <name>", "Use configuration from a saved profile").option("-u, --url <url>", "Upstream base URL (e.g., https://api.openai.com)").option("-k, --api-key <key>", "Upstream API key").option("-m, --model <model>", "Default model", "gpt-4o").option("--mapping <mapping>", "Model alias mapping (format: alias:actual, can be used multiple times)", collect, []).action(safeAction(async (opts) => {
+    let targetUrl = opts.url || "https://api.openai.com";
+    let apiKey = opts.apiKey || "";
+    let defaultModel = opts.model || "gpt-4o";
+    let models = [];
+    const modelMappings = {};
+    if (opts.profile) {
+      ensureProfilesFile();
+      const data = readJson(PROFILES_FILE);
+      const p = data.profiles[opts.profile];
+      if (!p) {
+        throw new Error(`Profile '${opts.profile}' not found.`);
+      }
+      targetUrl = p.url || targetUrl;
+      apiKey = p.token || apiKey;
+      models = p.models || (p.model ? [p.model] : []);
+      defaultModel = models[0] || defaultModel;
+      models.forEach((m, i) => {
+        if (!isAnthropicModel2(m)) {
+          const alias = ANTHROPIC_ALIASES2[Math.min(i, ANTHROPIC_ALIASES2.length - 1)];
+          modelMappings[alias] = m;
+        }
+      });
+    } else {
+      for (const m of opts.mapping) {
+        const [alias, actual] = m.split(":");
+        if (alias && actual) {
+          modelMappings[alias] = actual;
+        }
+      }
+      models = [defaultModel];
+    }
+    const { baseUrl, stop } = await startOpenAIProxy(targetUrl, apiKey, defaultModel, models, modelMappings);
+    console.log(`Proxy running at ${baseUrl}`);
+    console.log("Press Ctrl+C to stop");
+    process.on("SIGINT", () => {
+      stop();
+      process.exit(0);
+    });
+  }));
+}
 
 // src/profiles/runner.ts
+var BUILT_IN_DEFAULT = "__builtin__";
 function resolveClaudeBinary() {
   return createBinaryResolver().resolve();
 }
@@ -909,7 +997,8 @@ function updateSettingsForProfile(p) {
     "ANTHROPIC_DEFAULT_HAIKU_MODEL",
     "ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME",
     "ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION",
-    "ANTHROPIC_CUSTOM_MODEL_OPTION"
+    "ANTHROPIC_CUSTOM_MODEL_OPTION",
+    "ANTHROPIC_API_KEY"
   ];
   if (settings2.env) {
     const env = settings2.env;
@@ -962,7 +1051,8 @@ function execClaude(profileName, p, extraArgs) {
       p.url || "https://api.openai.com",
       p.token || "",
       firstModel || "gpt-4o",
-      allModels
+      allModels,
+      {}
     ).then(({ baseUrl, stop }) => {
       env.ANTHROPIC_BASE_URL = baseUrl;
       debug(`execClaude: proxy running at ${baseUrl}`);
@@ -985,6 +1075,22 @@ function execClaude(profileName, p, extraArgs) {
     process.exit(result.status ?? 1);
   }
 }
+function execClaudeBuiltIn(extraArgs) {
+  const binary = resolveClaudeBinary();
+  const cmd = [binary, ...extraArgs];
+  const env = {
+    ...process.env,
+    CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS: "1",
+    CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS: "1"
+  };
+  info(`Launching Claude with built-in official models: binary=${binary}`);
+  const result = spawnSync2(cmd[0], cmd.slice(1), {
+    stdio: "inherit",
+    env,
+    shell: process.platform === "win32"
+  });
+  process.exit(result.status ?? 1);
+}
 
 // src/profiles/commands.ts
 function maskToken(token) {
@@ -994,10 +1100,10 @@ function maskToken(token) {
 }
 function formatModels(p) {
   if (p.models && p.models.length > 0) {
-    const nonAnthropicModels = p.models.filter((m) => !isAnthropicModel(m));
+    const nonAnthropicModels = p.models.filter((m) => !isAnthropicModel3(m));
     const parts = [];
     p.models.forEach((m, i) => {
-      if (!isAnthropicModel(m)) {
+      if (!isAnthropicModel3(m)) {
         const aliasIndex = nonAnthropicModels.indexOf(m);
         if (aliasIndex === 0) parts.push(`${m} (sonnet)`);
         else if (aliasIndex === 1) parts.push(`${m} (opus)`);
@@ -1015,20 +1121,20 @@ function formatModels(p) {
   }
   return p.model || "(unset)";
 }
-function isAnthropicModel(model) {
+function isAnthropicModel3(model) {
   const anthropicAliases = ["opus", "sonnet", "haiku", "best", "default", "opusplan", "opus[1m]", "sonnet[1m]"];
   const lower = model.toLowerCase();
   if (anthropicAliases.includes(lower)) return true;
   if (lower.startsWith("claude-")) return true;
   return false;
 }
-function collect(value, previous) {
+function collect2(value, previous) {
   return previous.concat([value]);
 }
 function profileCommand() {
   const profile = new Command2("profile").description("Manage Claude CLI profiles");
   const syncer = createProfileSyncer();
-  profile.command("add").description("Add or update a profile").argument("<name>", "Profile name").option("-m, --model <model>", "Model ID - can be used multiple times (max 3)", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type: anthropic (default) or openai").action(safeAction((name, opts) => {
+  profile.command("add").description("Add or update a profile").argument("<name>", "Profile name").option("-m, --model <model>", "Model ID - can be used multiple times (max 3)", collect2, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type: anthropic (default) or openai").action(safeAction((name, opts) => {
     const models = opts.model && opts.model.length > 0 ? opts.model : void 0;
     if (models && models.length > 3) {
       throw new Error("Error: A profile can have at most 3 models.");
@@ -1050,7 +1156,7 @@ function profileCommand() {
     debug(`profile add: wrote ${PROFILES_FILE}`);
     console.log(`Profile '${name}' saved.`);
   }));
-  profile.command("update").description("Update fields of an existing profile").argument("<name>", "Profile name (must already exist)").option("-m, --model <model>", "Model ID - can be used multiple times", collect, []).option("-d, --delete-model <model>", "Remove model ID - can be used multiple times", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type").action(safeAction((name, opts) => {
+  profile.command("update").description("Update fields of an existing profile").argument("<name>", "Profile name (must already exist)").option("-m, --model <model>", "Model ID - can be used multiple times", collect2, []).option("-d, --delete-model <model>", "Remove model ID - can be used multiple times", collect2, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[name]) {
@@ -1142,6 +1248,9 @@ function profileCommand() {
   profile.command("view").description("View full details of a profile (token unmasked)").argument("<name>", "Profile name").option("-j, --json", "Output as JSON").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
+    if (name === BUILT_IN_DEFAULT) {
+      throw new Error(`'${BUILT_IN_DEFAULT}' is not a stored profile. Use 'cc-hub run --built-in' or 'cc-hub use --built-in' for official Anthropic models.`);
+    }
     const p = data.profiles[name];
     if (!p) {
       throw new Error(`Profile '${name}' not found.`);
@@ -1153,10 +1262,10 @@ function profileCommand() {
       console.log(`Name:     ${name}`);
       console.log(`Model:    ${p.model || "(unset)"}`);
       if (p.models && p.models.length > 0) {
-        const nonAnthropicModels = p.models.filter((m) => !isAnthropicModel(m));
+        const nonAnthropicModels = p.models.filter((m) => !isAnthropicModel3(m));
         console.log(`Models:`);
         for (const m of p.models) {
-          if (!isAnthropicModel(m)) {
+          if (!isAnthropicModel3(m)) {
             const aliasIndex = nonAnthropicModels.indexOf(m);
             let alias = "";
             if (aliasIndex === 0) alias = " (sonnet)";
@@ -1203,9 +1312,19 @@ function profileCommand() {
     writeJson(PROFILES_FILE, data);
     console.log(`Profile '${oldName}' renamed to '${newName}'.`);
   }));
-  profile.command("default").description("Set the default profile").argument("<name>", "Profile name to set as default").action(safeAction((name) => {
+  profile.command("default").description("Set the default profile").option("--built-in", "Use official Anthropic models as default").argument("[name]", "Profile name to set as default (required unless --built-in)").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
+    if (opts.builtIn) {
+      data.default = BUILT_IN_DEFAULT;
+      writeJson(PROFILES_FILE, data);
+      debug(`profile default: wrote ${PROFILES_FILE}`);
+      console.log("Default set to built-in official Anthropic models.");
+      return;
+    }
+    if (!name) {
+      throw new Error("Profile name is required. Use --built-in for official Anthropic models.");
+    }
     if (!data.profiles[name]) {
       throw new Error(`Profile '${name}' not found.`);
     }
@@ -1228,6 +1347,7 @@ function profileCommand() {
       return;
     }
     for (const name of names) {
+      if (name === BUILT_IN_DEFAULT) continue;
       const p = data.profiles[name];
       debug(`profile sync: syncing '${name}' to desktop`);
       syncer.sync(name, p);
@@ -1240,9 +1360,19 @@ function profileCommand() {
 }
 function useCommand() {
   const syncer = createProfileSyncer();
-  return new Command2("use").description("Set a profile as the default").argument("<name>", "Profile name").action(safeAction((name) => {
+  return new Command2("use").description("Set a profile as the default").option("--built-in", "Use official Anthropic models as default").argument("[name]", "Profile name (required unless --built-in)").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
+    if (opts.builtIn) {
+      data.default = BUILT_IN_DEFAULT;
+      writeJson(PROFILES_FILE, data);
+      debug(`use: wrote ${PROFILES_FILE}`);
+      console.log("Default set to built-in official Anthropic models.");
+      return;
+    }
+    if (!name) {
+      throw new Error("Profile name is required. Use --built-in for official Anthropic models.");
+    }
     if (!data.profiles[name]) {
       throw new Error(`Profile '${name}' not found.`);
     }
@@ -1255,10 +1385,14 @@ function useCommand() {
   }));
 }
 function runCommand() {
-  return new Command2("run").description("Launch Claude Code using the default or a specified profile").allowUnknownOption().argument("[args...]", "Optional profile name followed by extra arguments").action(safeAction((args) => {
+  return new Command2("run").description("Launch Claude Code using the default or a specified profile").option("--built-in", "Use official Anthropic models (no custom profile)").allowUnknownOption().argument("[args...]", "Optional profile name followed by extra arguments").action(safeAction((args, opts) => {
     fixJsonFile(CLAUDE_JSON);
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
+    if (opts.builtIn) {
+      execClaudeBuiltIn(args);
+      return;
+    }
     let profileName = "";
     let claudeArgs;
     if (args.length > 0 && data.profiles[args[0]]) {
@@ -1268,8 +1402,12 @@ function runCommand() {
       profileName = data.default || "";
       claudeArgs = args;
     }
+    if (profileName === BUILT_IN_DEFAULT) {
+      execClaudeBuiltIn(claudeArgs);
+      return;
+    }
     if (!profileName) {
-      throw new Error("No default profile set. Use 'cc-hub use <name>' first.");
+      throw new Error("No default profile set. Use 'cc-hub use <name>' or 'cc-hub use --built-in' first.");
     }
     const p = data.profiles[profileName];
     debug(`run: launching claude with profile '${profileName}', args=[${claudeArgs.join(", ")}]`);
@@ -2025,7 +2163,7 @@ _cc-hub() {
   local -a commands
   commands=(
     'profile:Manage Claude CLI profiles'
-    'use:Launch Claude Code with a saved profile'
+    'use:Set a profile as the default'
     'run:Launch Claude Code using the default or a specified profile'
     'hook:Manage Claude Code hooks in settings.json'
     'session:Manage Claude Code sessions'
@@ -2104,8 +2242,10 @@ _cc-hub() {
         profile)
           if (( CURRENT == 2 )); then
             _describe -t profile-subcmds 'profile subcommand' profile_subcmds
-          elif [[ $words[2] == "view" || $words[2] == "remove" || $words[2] == "default" ]]; then
+          elif [[ $words[2] == "view" || $words[2] == "remove" ]]; then
             _cc_hub_profiles
+          elif [[ $words[2] == "default" ]]; then
+            _arguments -C -S               '--built-in[Use official Anthropic models as default]'               '*:profile:_cc_hub_profiles'
           elif [[ $words[2] == "rename" ]]; then
             if (( CURRENT == 3 )); then
               _cc_hub_profiles
@@ -2137,7 +2277,7 @@ _cc-hub() {
           fi
           ;;
         use|run)
-          _cc_hub_profiles
+          _arguments -C -S             '--built-in[Use official Anthropic models (no custom profile)]'             '*:profile:_cc_hub_profiles'
           ;;
         hook)
           if (( CURRENT == 2 )); then
@@ -2160,20 +2300,22 @@ compdef _cc-hub cc-hub
 `;
 
 // src/complete/bash.ts
-var BASH_COMPLETION = `_cc-hub_profiles() {
+var BASH_COMPLETION = `_cc-hub_profile_names() {
   local profiles_file="\${CLAUDE_PROFILES_FILE:-$HOME/.claude/profiles.json}"
   if [[ -f "$profiles_file" ]]; then
-    local names
-    names=$(command python3 -c "
+    command python3 -c "
 import json
 data = json.load(open('$profiles_file'))
 for name in data.get('profiles', {}):
     print(name)
-" 2>/dev/null)
-    COMPREPLY=($(compgen -W "$names" -- "\${cur}"))
+" 2>/dev/null
   fi
 }
 
+_cc-hub_profiles() {
+  COMPREPLY=($(compgen -W "$(_cc-hub_profile_names)" -- "\${cur}"))
+}
+
 _cc-hub_models_for_profile() {
   local profile_name="$1"
   local profiles_file="\${CLAUDE_PROFILES_FILE:-$HOME/.claude/profiles.json}"
@@ -2222,8 +2364,10 @@ _cc-hub() {
     profile)
       if [[ \${COMP_CWORD} -eq 2 ]]; then
         COMPREPLY=($(compgen -W "$profile_subcmds" -- "$cur"))
-      elif [[ "$prev" == "view" || "$prev" == "remove" || "$prev" == "default" ]]; then
+      elif [[ "$prev" == "view" || "$prev" == "remove" ]]; then
         _cc-hub_profiles
+      elif [[ "$prev" == "default" ]]; then
+        COMPREPLY=($(compgen -W "--built-in $(_cc-hub_profile_names)" -- "$cur"))
       elif [[ "$prev" == "rename" ]]; then
         _cc-hub_profiles
       elif [[ "$prev" == "profile" ]]; then
@@ -2249,7 +2393,11 @@ _cc-hub() {
       fi
       ;;
     use|run)
-      _cc-hub_profiles
+      if [[ "$prev" == "--built-in" ]]; then
+        :
+      else
+        COMPREPLY=($(compgen -W "--built-in $(_cc-hub_profile_names)" -- "$cur"))
+      fi
       ;;
     hook)
       if [[ \${COMP_CWORD} -eq 2 ]]; then
@@ -2311,6 +2459,10 @@ var POWERSHELL_COMPLETION = `Register-ArgumentCompleter -Native -CommandName cc-
         $profileSubcmds | ForEach-Object { if ($_ -like "$wordToComplete*") { $_ } }
         return
       }
+      if ($tokens[2] -eq 'default' -and $tokens.Count -ge 3) {
+        $opts = @('--built-in')
+        $opts | ForEach-Object { if ($_ -like "$wordToComplete*") { $_ } }
+      }
     }
     'hook' {
       if ($tokens.Count -eq 2 -or ($tokens.Count -eq 3 -and $wordToComplete -ne '')) {
@@ -2330,6 +2482,16 @@ var POWERSHELL_COMPLETION = `Register-ArgumentCompleter -Native -CommandName cc-
         return
       }
     }
+    'use' {
+      $opts = @('--built-in')
+      $opts | ForEach-Object { if ($_ -like "$wordToComplete*") { $_ } }
+      return
+    }
+    'run' {
+      $opts = @('--built-in')
+      $opts | ForEach-Object { if ($_ -like "$wordToComplete*") { $_ } }
+      return
+    }
   }
 }`;
 
@@ -2369,6 +2531,7 @@ program.addCommand(hooksCommand());
 program.addCommand(sessionCommand());
 program.addCommand(completionCommand());
 program.addCommand(providerCommand());
+program.addCommand(proxyCommand());
 try {
   program.parse();
 } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-hub-cli",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Manage Claude CLI profiles, hooks, and sessions",
   "type": "module",
   "bin": {