@jcanizalez7/clauxy 0.2.5 → 0.2.7

package/dist/cli.js

@@ -1028,7 +1028,7 @@ var init_providers = __esm(() => {
   };
 });
 
-// converter.ts
+// providers/converters/openai-chat.ts
 function convertTools(anthropicTools) {
   if (!anthropicTools || anthropicTools.length === 0)
     return;
@@ -1323,7 +1323,7 @@ function convertStreamChunk(chunk) {
   }
 }
 var streamState;
-var init_converter = __esm(() => {
+var init_openai_chat = __esm(() => {
   streamState = {
     messageStarted: false,
     activeBlocks: new Set,
@@ -1331,7 +1331,7 @@ var init_converter = __esm(() => {
   };
 });
 
-// converter-responses.ts
+// providers/converters/openai-responses.ts
 function parseToolResultContent(content) {
   if (content === null || content === undefined) {
     return "No content provided";
@@ -1656,7 +1656,7 @@ function convertResponsesResponse(response) {
 }
 var streamMessageId = "", streamContentIndex = 0, sentMessageStart = false, sentContentBlockStart = false, currentToolCall = null;
 
-// converter-gemini.ts
+// providers/converters/gemini.ts
 function sanitizeSchemaForGemini(schema) {
   if (!schema)
     return;
@@ -2026,7 +2026,7 @@ data: ${JSON.stringify({ type: "message_stop" })}
   return results;
 }
 var streamState2;
-var init_converter_gemini = __esm(() => {
+var init_gemini = __esm(() => {
   streamState2 = {
     messageId: "",
     contentIndex: 0,
@@ -2039,6 +2039,12 @@ var init_converter_gemini = __esm(() => {
   };
 });
 
+// providers/converters/index.ts
+var init_converters = __esm(() => {
+  init_openai_chat();
+  init_gemini();
+});
+
 // proxy.ts
 var exports_proxy = {};
 __export(exports_proxy, {
@@ -2399,8 +2405,7 @@ var LOG_LEVELS, DEFAULT_PORT = 3000, PORT_RANGE, c;
 var init_proxy = __esm(async () => {
   init_providers();
   init_config();
-  init_converter();
-  init_converter_gemini();
+  init_converters();
   LOG_LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
   PORT_RANGE = [3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009];
   c = {
@@ -2416,7 +2421,7 @@ var init_proxy = __esm(async () => {
 // cli/index.ts
 import { defineCommand, runMain } from "citty";
 
-// cli/commands/run.ts
+// cli/commands/shared-auth.ts
 init_auth();
 init_config();
 init_providers();
@@ -2434,12 +2439,79 @@ function handleCancel(value, message = "Cancelled") {
 var colors = {
   green: (s) => `\x1B[32m${s}\x1B[0m`,
   red: (s) => `\x1B[31m${s}\x1B[0m`,
+  cyan: (s) => `\x1B[36m${s}\x1B[0m`,
   yellow: (s) => `\x1B[33m${s}\x1B[0m`,
   dim: (s) => `\x1B[2m${s}\x1B[0m`,
+  bold: (s) => `\x1B[1m${s}\x1B[0m`,
   reset: "\x1B[0m"
 };
+function setTerminalTitle(title) {
+  process.stdout.write(`\x1B]0;${title}\x07`);
+}
 
-// cli/commands/run.ts
+// cli/errors.ts
+function printError(error) {
+  console.error(`${colors.red("Error:")} ${error.message}`);
+  if (error.suggestion) {
+    console.error(`${colors.dim("Suggestion:")} ${error.suggestion}`);
+  }
+  if (error.command) {
+    console.error(`${colors.dim("Try:")} ${colors.cyan(error.command)}`);
+  }
+}
+var Errors = {
+  claudeNotFound() {
+    return {
+      message: "Claude Code CLI not found",
+      suggestion: "Install it to use Clauxy",
+      command: "npm install -g @anthropic-ai/claude-code"
+    };
+  },
+  invalidProvider(provided, validProviders) {
+    return {
+      message: `Unknown provider "${provided}"`,
+      suggestion: `Valid providers are ${validProviders.join(", ")}`,
+      command: `clauxy -p ${validProviders[0]}`
+    };
+  },
+  authFailed(providerName, details) {
+    return {
+      message: `Authentication failed for ${providerName}${details ? `: ${details}` : ""}`,
+      suggestion: "Check your network connection and try again",
+      command: "clauxy -c"
+    };
+  },
+  invalidPort(provided) {
+    return {
+      message: `Invalid port number "${provided}"`,
+      suggestion: "Port must be a valid number between 1 and 65535",
+      command: "clauxy --port 3000"
+    };
+  },
+  proxyStartFailed(port, details) {
+    return {
+      message: `Failed to start proxy on port ${port}${details ? `: ${details}` : ""}`,
+      suggestion: "The port may be in use. Try a different port",
+      command: `clauxy --port ${port + 1}`
+    };
+  },
+  noCredentials(providerName) {
+    return {
+      message: `No credentials found for ${providerName}`,
+      suggestion: "Run clauxy with the connect flag to authenticate",
+      command: "clauxy -c"
+    };
+  },
+  noProvidersConfigured() {
+    return {
+      message: "No providers configured",
+      suggestion: "Run clauxy to set up a provider",
+      command: "clauxy"
+    };
+  }
+};
+
+// cli/commands/shared-auth.ts
 async function selectAndAuthenticate() {
   prompts2.intro("Clauxy - Connect to AI Provider");
   const providers = getProviderList();
@@ -2456,44 +2528,64 @@ async function selectAndAuthenticate() {
 }
 async function authenticateProvider(providerId) {
   const provider = await getProvider(providerId);
-  prompts2.intro(`Clauxy - Connecting to ${provider.info.name}`);
+  const spinner2 = prompts2.spinner();
+  spinner2.start(`Connecting to ${provider.info.name}...`);
   const result = await provider.authenticate();
   if (result.type === "failed") {
-    prompts2.cancel(`Authentication failed: ${result.error}`);
+    spinner2.stop(`Connection failed`);
+    printError(Errors.authFailed(provider.info.name, result.error));
     process.exit(1);
   }
+  spinner2.stop(`Connected to ${provider.info.name}`);
   await Config.setActiveProvider(providerId);
-  prompts2.outro(`Connected to ${provider.info.name}`);
   return providerId;
 }
-async function runCommand(options) {
-  const { port, logLevel, connect, provider } = options;
+async function resolveProvider(options) {
+  const { providerOverride, forceConnect } = options;
   const availableProviders = getProviderList().map((item) => item.id);
-  const providerOverride = provider?.toLowerCase();
-  if (providerOverride && !availableProviders.includes(providerOverride)) {
-    console.error(`Invalid provider: "${providerOverride}". Valid values: ${availableProviders.join(" | ")}.`);
+  const normalizedProvider = providerOverride?.toLowerCase();
+  if (normalizedProvider && !availableProviders.includes(normalizedProvider)) {
+    printError(Errors.invalidProvider(providerOverride, availableProviders));
     process.exit(1);
   }
   let activeProvider;
-  if (providerOverride) {
-    const credentials = await Auth.get(providerOverride);
-    if (credentials && !connect) {
-      activeProvider = providerOverride;
+  let didAuthenticate = false;
+  if (normalizedProvider) {
+    const credentials = await Auth.get(normalizedProvider);
+    if (credentials && !forceConnect) {
+      activeProvider = normalizedProvider;
     } else {
-      activeProvider = await authenticateProvider(providerOverride);
+      activeProvider = await authenticateProvider(normalizedProvider);
+      didAuthenticate = true;
     }
   } else {
     activeProvider = await Config.getActiveProvider();
-    if (!activeProvider || connect) {
+    if (!activeProvider || forceConnect) {
       activeProvider = await selectAndAuthenticate();
+      didAuthenticate = true;
     } else {
       const credentials = await Auth.get(activeProvider);
       if (!credentials) {
         activeProvider = await selectAndAuthenticate();
+        didAuthenticate = true;
       }
     }
   }
+  if (!didAuthenticate) {
+    const provider = await getProvider(activeProvider);
+    console.log(`${colors.dim("Using")} ${provider.info.name}`);
+  }
   await Config.setActiveProvider(activeProvider);
+  return activeProvider;
+}
+
+// cli/commands/run.ts
+async function runCommand(options) {
+  const { port, logLevel, connect, provider } = options;
+  const activeProvider = await resolveProvider({
+    providerOverride: provider,
+    forceConnect: connect
+  });
   const { startProxy: startProxy2 } = await init_proxy().then(() => exports_proxy);
   await startProxy2({
     port,
@@ -2504,21 +2596,7 @@ async function runCommand(options) {
 }
 
 // cli/commands/wrapper.ts
-init_auth();
-init_config();
 init_providers();
-import * as prompts3 from "@clack/prompts";
-var c2 = {
-  green: (s) => `\x1B[32m${s}\x1B[0m`,
-  cyan: (s) => `\x1B[36m${s}\x1B[0m`,
-  yellow: (s) => `\x1B[33m${s}\x1B[0m`,
-  dim: (s) => `\x1B[2m${s}\x1B[0m`,
-  bold: (s) => `\x1B[1m${s}\x1B[0m`,
-  red: (s) => `\x1B[31m${s}\x1B[0m`
-};
-function setTerminalTitle(title) {
-  process.stdout.write(`\x1B]0;${title}\x07`);
-}
 async function findClaudeCli() {
   try {
     const proc = Bun.spawn(["which", "claude"], {
@@ -2535,32 +2613,6 @@ async function findClaudeCli() {
     return null;
   }
 }
-async function selectAndAuthenticate2() {
-  prompts3.intro("Clauxy - Connect to AI Provider");
-  const providers = getProviderList();
-  const providerChoice = await prompts3.select({
-    message: "Select your AI provider",
-    options: providers.map((p) => ({
-      label: p.name,
-      value: p.id,
-      hint: p.description
-    }))
-  });
-  const providerId = handleCancel(providerChoice, "Setup cancelled");
-  return authenticateProvider2(providerId);
-}
-async function authenticateProvider2(providerId) {
-  const provider = await getProvider(providerId);
-  prompts3.intro(`Clauxy - Connecting to ${provider.info.name}`);
-  const result = await provider.authenticate();
-  if (result.type === "failed") {
-    prompts3.cancel(`Authentication failed: ${result.error}`);
-    process.exit(1);
-  }
-  await Config.setActiveProvider(providerId);
-  prompts3.outro(`Connected to ${provider.info.name}`);
-  return providerId;
-}
 async function isClauxyRunning(port) {
   try {
     const response = await fetch(`http://localhost:${port}/health`, {
@@ -2575,45 +2627,20 @@ async function wrapperCommand(options) {
   const { logLevel = "warn", connect = false, provider, port: requestedPort } = options;
   const claudePath = await findClaudeCli();
   if (!claudePath) {
-    console.error(c2.red("Error: Claude CLI not found."));
-    console.error(`
-Install it with: ${c2.cyan("npm i -g @anthropic-ai/claude-code")}`);
-    console.error(`Or visit: ${c2.cyan("https://docs.anthropic.com/en/docs/claude-code")}`);
+    printError(Errors.claudeNotFound());
     process.exit(1);
   }
-  const availableProviders = getProviderList().map((item) => item.id);
-  const providerOverride = provider?.toLowerCase();
-  if (providerOverride && !availableProviders.includes(providerOverride)) {
-    console.error(`Invalid provider: "${providerOverride}". Valid values: ${availableProviders.join(" | ")}.`);
-    process.exit(1);
-  }
-  let activeProvider;
-  if (providerOverride) {
-    const credentials = await Auth.get(providerOverride);
-    if (credentials && !connect) {
-      activeProvider = providerOverride;
-    } else {
-      activeProvider = await authenticateProvider2(providerOverride);
-    }
-  } else {
-    activeProvider = await Config.getActiveProvider();
-    if (!activeProvider || connect) {
-      activeProvider = await selectAndAuthenticate2();
-    } else {
-      const credentials = await Auth.get(activeProvider);
-      if (!credentials) {
-        activeProvider = await selectAndAuthenticate2();
-      }
-    }
-  }
-  await Config.setActiveProvider(activeProvider);
+  const activeProvider = await resolveProvider({
+    providerOverride: provider,
+    forceConnect: connect
+  });
   const providerInfo = await getProvider(activeProvider);
   setTerminalTitle(`${providerInfo.info.name} - Clauxy`);
   let proxyPort;
   let proxyServer = null;
   if (requestedPort && await isClauxyRunning(requestedPort)) {
     proxyPort = requestedPort;
-    console.log(`${c2.green(">")} ${c2.bold("Clauxy")} reusing proxy on ${c2.cyan(`localhost:${proxyPort}`)}`);
+    console.log(`${colors.green(">")} ${colors.bold("Clauxy")} reusing proxy on ${colors.cyan(`localhost:${proxyPort}`)}`);
   } else {
     const { startProxy: startProxy2 } = await init_proxy().then(() => exports_proxy);
     const server = await startProxy2({
@@ -2624,7 +2651,7 @@ Install it with: ${c2.cyan("npm i -g @anthropic-ai/claude-code")}`);
     });
     proxyServer = server;
     proxyPort = server.port;
-    console.log(`${c2.green(">")} ${c2.bold("Clauxy")} proxy on ${c2.cyan(`localhost:${proxyPort}`)} ${c2.dim(`(${providerInfo.info.name})`)}`);
+    console.log(`${colors.green(">")} ${colors.bold("Clauxy")} proxy on ${colors.cyan(`localhost:${proxyPort}`)} ${colors.dim(`(${providerInfo.info.name})`)}`);
   }
   const claude = Bun.spawn(["claude"], {
     env: {
@@ -2665,7 +2692,7 @@ Configured Providers:
   const providers = getProviderList();
   if (Object.keys(allAuth).length === 0) {
     console.log("  No providers configured yet.");
-    console.log(`  Run 'clauxy run' to set up a provider.
+    console.log(`  Run 'clauxy' to set up a provider.
 `);
     return;
   }
@@ -2686,7 +2713,7 @@ Configured Providers:
 init_config();
 init_providers();
 init_models();
-import * as prompts4 from "@clack/prompts";
+import * as prompts3 from "@clack/prompts";
 
 // cli/constants.ts
 var CUSTOM_MODEL_VALUE = "__custom__";
@@ -2710,21 +2737,21 @@ async function selectModel(tier, providerId, currentValue) {
     })),
     { label: "Enter custom model", value: CUSTOM_MODEL_VALUE, hint: "Type model name" }
   ];
-  const choice = await prompts4.select({
+  const choice = await prompts3.select({
     message: `Select ${tier} model`,
     options,
     initialValue: currentValue
   });
-  if (prompts4.isCancel(choice)) {
+  if (prompts3.isCancel(choice)) {
     return null;
   }
   if (choice === CUSTOM_MODEL_VALUE) {
-    const custom = await prompts4.text({
+    const custom = await prompts3.text({
       message: `Enter custom ${tier} model name`,
       placeholder: currentValue,
       defaultValue: currentValue
     });
-    if (prompts4.isCancel(custom)) {
+    if (prompts3.isCancel(custom)) {
       return null;
     }
     return custom;
@@ -2733,9 +2760,9 @@ async function selectModel(tier, providerId, currentValue) {
 }
 async function configureModels() {
   const activeProvider = await Config.getActiveProvider();
-  prompts4.intro("Clauxy - Model Configuration");
+  prompts3.intro("Clauxy - Model Configuration");
   const providers = getProviderList();
-  const providerChoice = await prompts4.select({
+  const providerChoice = await prompts3.select({
     message: "Select provider to configure models for",
     options: providers.map((p) => ({
       label: p.name,
@@ -2753,7 +2780,7 @@ Current models for ${PROVIDERS[providerId].name}:`);
   console.log(`   Mid:   ${currentModels.mid}`);
   console.log(`   Small: ${currentModels.small}
 `);
-  const action = await prompts4.select({
+  const action = await prompts3.select({
     message: "What would you like to do?",
     options: [
       { label: "Configure all models", value: "all" },
@@ -2771,7 +2798,7 @@ Models reset to defaults:`);
     console.log(`   Big:   ${defaults.big}`);
     console.log(`   Mid:   ${defaults.mid}`);
     console.log(`   Small: ${defaults.small}`);
-    prompts4.outro("Done");
+    prompts3.outro("Done");
     return;
   }
   const models = {
@@ -2783,7 +2810,7 @@ Models reset to defaults:`);
     if (action === "all" || action === tier.key) {
       const result = await selectModel(tier.label, providerId, models[tier.key]);
       if (result === null) {
-        prompts4.cancel("Cancelled");
+        prompts3.cancel("Cancelled");
         process.exit(0);
       }
       models[tier.key] = result;
@@ -2795,12 +2822,12 @@ Models configured:`);
   console.log(`   opus/big    -> ${models.big}`);
   console.log(`   sonnet/mid  -> ${models.mid}`);
   console.log(`   haiku/small -> ${models.small}`);
-  prompts4.outro("Model configuration saved");
+  prompts3.outro("Model configuration saved");
 }
 // package.json
 var package_default = {
   name: "@jcanizalez7/clauxy",
-  version: "0.2.5",
+  version: "0.2.7",
   description: "Multi-provider AI proxy for Claude Code (GitHub Copilot, ChatGPT Plus, Google Gemini)",
   type: "module",
   bin: {
@@ -2967,8 +2994,50 @@ var main = defineCommand({
     });
   }
 });
+var SUBCOMMANDS = ["run", "auth", "model", "models"];
 function cli() {
-  runMain(main);
+  const args = process.argv.slice(2);
+  const firstPositionalArg = args.find((arg) => !arg.startsWith("-"));
+  if (!firstPositionalArg || !SUBCOMMANDS.includes(firstPositionalArg)) {
+    let logLevel = "warn";
+    let connect = false;
+    let provider;
+    let port;
+    for (let i = 0;i < args.length; i++) {
+      const arg = args[i];
+      if (arg === "-h" || arg === "--help") {
+        runMain(main);
+        return;
+      }
+      if (arg === "-v" || arg === "--version") {
+        console.log(package_default.version);
+        return;
+      }
+      if (arg === "-l" || arg === "--log-level") {
+        logLevel = args[++i] || "warn";
+      } else if (arg === "-c" || arg === "--connect") {
+        connect = true;
+      } else if (arg === "-p" || arg === "--provider") {
+        provider = args[++i];
+      } else if (arg === "--port") {
+        const portStr = args[++i];
+        port = portStr ? parseInt(portStr, 10) : undefined;
+      } else if (arg.startsWith("--log-level=")) {
+        logLevel = arg.split("=")[1];
+      } else if (arg.startsWith("--provider=")) {
+        provider = arg.split("=")[1];
+      } else if (arg.startsWith("--port=")) {
+        port = parseInt(arg.split("=")[1], 10);
+      } else if (arg.startsWith("-p=")) {
+        provider = arg.split("=")[1];
+      } else if (arg.startsWith("-l=")) {
+        logLevel = arg.split("=")[1];
+      }
+    }
+    wrapperCommand({ logLevel, connect, provider, port });
+  } else {
+    runMain(main);
+  }
 }
 
 // cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcanizalez7/clauxy",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Multi-provider AI proxy for Claude Code (GitHub Copilot, ChatGPT Plus, Google Gemini)",
   "type": "module",
   "bin": {