claude-code-provider-switch 1.1.4 → 1.1.6

package/README.md

@@ -72,13 +72,16 @@ claude-switch show-defaults
 
 # Clear all defaults
 claude-switch clear-defaults
+
+# Manage API keys interactively
+claude-switch api-keys
 ```
 
 ## ⚙️ Configuration
 
 ### Environment Variables
 
-The CLI is designed to create a `.env` file in your project directory with this syntax:
+The CLI is designed to create a `~/.claude/.claude-switch-env` (in your home directory) with this syntax:
 
 ```env
 # API Keys for different providers
@@ -92,12 +95,69 @@ ANTHROPIC_MODEL=claude-3-5-sonnet-latest
 OLLAMA_MODEL=minimax-m2.5:cloud
 
 # Default provider and model settings
-DEFAULT_PROVIDER=original
+DEFAULT_PROVIDER=default  # Use 'default' to show menu on startup, or set to 'openrouter', 'anthropic', 'ollama', or 'original'
 DEFAULT_MODEL=
 ```
 
 When you run the CLI for the first time, based on your selection, it will ask for the API keys or Auth Tokens and after this will be saved in the `.env` file for future use.
 
+### Global vs Local Configuration
+
+The CLI supports two configuration modes:
+
+#### Global Configuration (Default)
+
+- **Location**: `~/.claude/.claude-switch-env` (in your home directory)
+- **Priority**: Used when no local `.env` file exists
+- **Benefit**: Share configuration across all projects
+- **Creation**: Automatically created on first run when no local `.env` exists
+
+#### Local Configuration
+
+- **Location**: `.env` file in your project directory
+- **Priority**: Overrides global configuration when present
+- **Benefit**: Project-specific settings
+- **Creation**: Create manually or use "Save Configuration Locally" menu option
+
+#### Configuration Display
+
+The main menu shows which configuration source is active:
+
+```
+Configuration: Global (~/.claude/.claude-switch-en)
+Configuration: Local (current_folder/.env)
+```
+
+#### Menu Behavior
+
+- **No defaults set**: Shows interactive menu for provider selection
+- **Defaults set**: Auto-launches with configured provider
+- **Fresh install**: Always shows menu until you set defaults
+
+#### Switching Between Modes
+
+- **To Local**: Use "Save Configuration Locally" option from main menu
+- **To Global**: Delete local `.env` file to fall back to global config
+- **Priority**: Local always takes precedence over global when both exist
+
+### API Key Management
+
+For easier API key management, use the interactive menu:
+
+```bash
+# Launch interactive API key management
+claude-switch api-keys
+```
+
+Or access it through the main menu (option 6) when you run `claude-switch` without arguments.
+
+**Features:**
+
+- 🔐 **Secure**: API keys are masked for display (shows only first 4 and last 4 characters)
+- 🎯 **Visual**: Clear status indicators (✅/❌) show which providers have keys configured
+- ⚡ **Interactive**: Arrow key navigation with visual selection indicators
+- 🔄 **Flexible**: Update, remove, or set new API keys interactively
+
 ### Provider Setup
 
 #### OpenRouter
@@ -137,13 +197,14 @@ When you run the CLI for the first time, based on your selection, it will ask fo
 
 ### Configuration Commands
 
-| Command          | Description               | Example                        |
-| ---------------- | ------------------------- | ------------------------------ |
-| `set-default`    | Interactive default setup | `claude-switch set-default`    |
-| `show-defaults`  | View current defaults     | `claude-switch show-defaults`  |
-| `clear-defaults` | Reset all defaults        | `claude-switch clear-defaults` |
-| `help`           | Show help information     | `claude-switch --help`         |
-| `version`        | Show Version information  | `claude-switch --version`      |
+| Command          | Description                   | Example                        |
+| ---------------- | ----------------------------- | ------------------------------ |
+| `set-default`    | Interactive default setup     | `claude-switch set-default`    |
+| `show-defaults`  | View current defaults         | `claude-switch show-defaults`  |
+| `clear-defaults` | Reset all defaults            | `claude-switch clear-defaults` |
+| `api-keys`       | Manage API keys interactively | `claude-switch api-keys`       |
+| `help`           | Show help information         | `claude-switch --help`         |
+| `version`        | Show Version information      | `claude-switch --version`      |
 
 ### Aliases
 
@@ -154,7 +215,8 @@ When you run the CLI for the first time, based on your selection, it will ask fo
 | `ollama`     | `oll`                          |
 | `original`   | `original`, `orig`, `def`, `d` |
 
-## ⚠️ Important: Clearing Default Settings
+
+### ⚠️ Important:Clearing Defaults
 
 **If the interactive menu doesn't show and Claude Code opens directly with a predefined provider**, you need to clear the default settings:
 
@@ -164,7 +226,7 @@ claude-switch clear-defaults
 
 ### Why This Happens
 
-If you go through the option `set-default`, you are setting a default provider and model and the application remembers your last provider choice to provide a faster experience. However, if you want to change providers or access the full menu again, you must clear these defaults first.
+When you use the "Set as Default" option, the application saves your provider and model choices to provide a faster experience. However, if you want to change providers or access the full menu again, you must clear these defaults first.
 
 ### What Clearing Defaults Does
 
@@ -197,12 +259,13 @@ Available providers:
   3) Anthropic      Aliases: (anthropic, ant)
   4) Original Claude Code  Aliases: (original, orig, def, d)
   5) Set as Default  Aliases: (set-default)
-  6) Help           Aliases: (help, -h, --help)
+  6) Manage API Keys  Aliases: (api-keys, keys)
+  7) Help           Aliases: (help, -h, --help)
 
 Controls:
 ↑/↓ - Navigate
 Enter - Select provider
-1-6 - Quick select
+1-7 - Quick select
 ESC - Exit
 ```
 
@@ -218,6 +281,9 @@ const {
   getDefaultProvider,
   launchOpenRouter,
   launchAnthropic,
+  showApiKeyMenu,
+  updateApiKey,
+  maskApiKey,
 } = require("claude-code-provider-switch");
 
 // Set default provider programmatically
@@ -229,6 +295,15 @@ console.log(`Current provider: ${current}`);
 
 // Launch specific provider
 await launchOpenRouter(false, [], "gpt-4");
+
+// Manage API keys programmatically
+await showApiKeyMenu(); // Show interactive API key menu
+await updateApiKey({
+  id: "openrouter",
+  name: "OpenRouter",
+  envVar: "OPENROUTER_AUTH_TOKEN",
+}); // Update specific API key
+console.log(maskApiKey("sk-1234567890abcdef")); // "sk-1234...cdef"
 ```
 
 ### Development

package/bin/claude-switch.js

@@ -187,6 +187,18 @@ async function main(forceMenu = false) {
     return;
   }
 
+  if (args[0] === "save-local" || args[0] === "save-locally") {
+    const { saveConfigurationLocally } = require("../lib/config");
+    await saveConfigurationLocally();
+    return;
+  }
+
+  if (args[0] === "api-keys") {
+    const { showApiKeyMenu } = require("../lib/config");
+    await showApiKeyMenu();
+    return;
+  }
+
   // Handle --version flag
   if (args[0] === "--version" || args[0] === "-v") {
     try {
@@ -206,7 +218,11 @@ async function main(forceMenu = false) {
     const defaultProvider = getDefaultProvider();
     const defaultModel = getDefaultModel();
 
-    if (defaultProvider && defaultProvider !== "default") {
+    if (
+      defaultProvider &&
+      defaultProvider !== null &&
+      defaultProvider !== "default"
+    ) {
       const { log } = require("../lib/config");
       log(
         `Using default: ${defaultProvider}${defaultModel ? ` (${defaultModel})` : ""}`,
@@ -234,45 +250,70 @@ async function main(forceMenu = false) {
       return;
     }
 
-    // No defaults set, show interactive menu
-    const selectedProvider = await showProviderMenu();
-
-    // Handle special menu options
-    switch (selectedProvider.id) {
-      case "help":
-        showUsage();
-        return;
-      case "set-default":
-        await setupDefaults();
-        handlePostConfiguration("restart", true);
-        return;
-      case "show-defaults":
-        showDefaults();
-        return;
-    }
+    // No defaults set, show interactive menu - use loop to prevent recursion issues
+    mainLoop: while (true) {
+      const selectedProvider = await showProviderMenu();
+
+      // Handle special menu options
+      switch (selectedProvider.id) {
+        case "help":
+          showUsage();
+          return;
+        case "set-default":
+          await setupDefaults();
+          handlePostConfiguration("restart", true);
+          return;
+        case "show-defaults":
+          showDefaults();
+          return;
+        case "api-keys":
+          const { showApiKeyMenu } = require("../lib/config");
+          await showApiKeyMenu();
+          // Continue the loop to show menu again
+          continue mainLoop;
+        case "save-local":
+          const { saveConfigurationLocally, log } = require("../lib/config");
+          await saveConfigurationLocally();
+          // Show menu again after saving locally
+          log("Press Enter to continue...", "cyan");
+          const continueRl = require("readline").createInterface({
+            input: process.stdin,
+            output: process.stdout,
+          });
+          await new Promise((resolve) => {
+            continueRl.question("", () => {
+              continueRl.close();
+              resolve();
+            });
+          });
+          // Continue the loop to show menu again
+          continue mainLoop;
+      }
 
-    // For provider selection, show model selection
-    let selectedModel = null;
-    if (selectedProvider.id !== "original") {
-      selectedModel = await showModelSelectionForProvider(selectedProvider);
-    }
+      // For provider selection, show model selection
+      let selectedModel = null;
+      if (selectedProvider.id !== "original") {
+        selectedModel = await showModelSelectionForProvider(selectedProvider);
+      }
 
-    // Launch the selected provider with the selected model
-    switch (selectedProvider.id) {
-      case "openrouter":
-        await launchOpenRouter(false, [], selectedModel);
-        break;
-      case "anthropic":
-        await launchAnthropic(false, [], selectedModel);
-        break;
-      case "ollama":
-        await launchOllama(false, [], selectedModel);
-        break;
-      case "original":
-        await launchDefault([]);
-        break;
+      // Launch the selected provider with the selected model
+      switch (selectedProvider.id) {
+        case "openrouter":
+          await launchOpenRouter(false, [], selectedModel);
+          break;
+        case "anthropic":
+          await launchAnthropic(false, [], selectedModel);
+          break;
+        case "ollama":
+          const modelToUse = selectedModel || getProviderDefaultModel("ollama");
+          await launchOllama(false, [], modelToUse);
+          break;
+        case "original":
+          await launchDefault([]);
+          break;
+      }
+      return;
     }
-    return;
   }
 
   const command = args[0].toLowerCase();

package/index.js

@@ -1,24 +1,30 @@
 /**
  * Claude Code Provider Switcher - Main Entry Point
- * 
+ *
  * This is the main entry point for importing the package as a module.
  * For CLI usage, use the bin/claude-switch.js file.
  */
 
 module.exports = {
   // Configuration utilities
-  ...require('./lib/config'),
-  
+  ...require("./lib/config"),
+
   // Provider launchers
-  launchOpenRouter: require('./lib/openrouter').launchOpenRouter,
-  launchAnthropic: require('./lib/anthropic').launchAnthropic,
-  launchOllama: require('./lib/ollama').launchOllama,
-  launchDefault: require('./lib/default').launchDefault,
-  
+  launchOpenRouter: require("./lib/openrouter").launchOpenRouter,
+  launchAnthropic: require("./lib/anthropic").launchAnthropic,
+  launchOllama: require("./lib/ollama").launchOllama,
+  launchDefault: require("./lib/default").launchDefault,
+
   // Menu functions
-  showProviderMenu: require('./lib/menu').showProviderMenu,
-  showUsage: require('./lib/menu').showUsage,
-  showDefaults: require('./lib/menu').showDefaults,
-  setupDefaults: require('./lib/menu').setupDefaults,
-  showModelSelectionForProvider: require('./lib/menu').showModelSelectionForProvider,
+  showProviderMenu: require("./lib/menu").showProviderMenu,
+  showUsage: require("./lib/menu").showUsage,
+  showDefaults: require("./lib/menu").showDefaults,
+  setupDefaults: require("./lib/menu").setupDefaults,
+  showModelSelectionForProvider:
+    require("./lib/menu").showModelSelectionForProvider,
+
+  // API key management
+  showApiKeyMenu: require("./lib/config").showApiKeyMenu,
+  updateApiKey: require("./lib/config").updateApiKey,
+  maskApiKey: require("./lib/config").maskApiKey,
 };

package/lib/anthropic.js

@@ -8,7 +8,7 @@ const {
   log,
   loadEnvFile,
   promptForApiKey,
-  updateEnvFile,
+  updateConfigFile,
   findBestMatchingModel,
 } = require("./config");
 const { modelCache } = require("./cache");
@@ -151,7 +151,7 @@ async function showModelSelection() {
       log("Anthropic API key is required for model selection", "red");
       process.exit(1);
     }
-    updateEnvFile("ANTHROPIC_API_KEY", newApiKey);
+    updateConfigFile("ANTHROPIC_API_KEY", newApiKey, null);
     apiKey = newApiKey;
   }
 
@@ -436,8 +436,6 @@ async function launchAnthropic(
   extraArgs = [],
   directModel = null,
 ) {
-  log("Launching Claude Code with Anthropic settings...", "green");
-
   const envVars = loadEnvFile();
   log(`Loading environment from: ${envVars.envFile}`, "yellow");
 
@@ -448,7 +446,7 @@ async function launchAnthropic(
       log("Error: Anthropic API key is required", "red");
       process.exit(1);
     }
-    updateEnvFile("ANTHROPIC_API_KEY", apiKey);
+    updateConfigFile("ANTHROPIC_API_KEY", apiKey, null);
     envVars.ANTHROPIC_API_KEY = apiKey;
   }