claude-code-provider-switch 1.1.5 → 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,12 @@ 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();
@@ -212,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})` : ""}`,
@@ -240,52 +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;
-      case "api-keys":
-        const { showApiKeyMenu } = require("../lib/config");
-        await showApiKeyMenu();
-        // Show menu again after API key management
-        const newSelectedProvider = await showProviderMenu();
-        // Handle the new selection recursively
-        return main(true);
-    }
+    // 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/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;
   }
 

package/lib/config.js

@@ -23,14 +23,236 @@ function log(message, color = "reset") {
   console.log(`${colorCode}${message}${colors.reset}`);
 }
 
+// Get user home directory for global configuration
+const os = require("os");
+const homeDir = os.homedir();
+const claudeDir = path.join(homeDir, ".claude");
+const globalEnvFile = path.join(claudeDir, ".claude-switch-env");
+
 // Get script directory (use current working directory for global installs)
 const scriptPath = process.cwd();
-const envFile = path.join(scriptPath, ".env");
+const localEnvFile = path.join(scriptPath, ".env");
+
+// Use global env file by default, fallback to local
+const envFile = globalEnvFile;
+
+/**
+ * Get configuration source (Local or Global)
+ */
+function getConfigurationSource() {
+  if (fs.existsSync(localEnvFile)) {
+    return "Local";
+  }
+  return "Global";
+}
+
+/**
+ * Get configuration file path for display
+ */
+function getConfigurationPath() {
+  if (fs.existsSync(localEnvFile)) {
+    return localEnvFile;
+  }
+  return globalEnvFile;
+}
+
+/**
+ * Check if global configuration exists and has meaningful content
+ */
+function hasGlobalConfiguration() {
+  try {
+    if (!fs.existsSync(globalEnvFile)) {
+      return false;
+    }
+
+    const globalConfig = loadSingleEnvFile(globalEnvFile);
+
+    // Check for at least one API key or default setting
+    const hasApiKey =
+      globalConfig.OPENROUTER_AUTH_TOKEN ||
+      globalConfig.ANTHROPIC_API_KEY ||
+      globalConfig.OLLAMA_AUTH_TOKEN;
+
+    const hasDefaultSetting =
+      globalConfig.DEFAULT_PROVIDER || globalConfig.DEFAULT_MODEL;
+
+    return !!(hasApiKey || hasDefaultSetting);
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * Save configuration locally by copying global config to local .env
+ */
+async function saveConfigurationLocally() {
+  // Ensure log is available in this context
+  const localLog = log;
+
+  try {
+    // Check if global config exists
+    if (!fs.existsSync(globalEnvFile)) {
+      localLog("No global configuration found to copy.", "red");
+      return false;
+    }
+
+    // Check if local file already exists
+    if (fs.existsSync(localEnvFile)) {
+      localLog("Local .env file already exists.", "yellow");
+      localLog("This will overwrite your local configuration.", "yellow");
+
+      // Ask for confirmation
+      const readline = require("readline");
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+      });
+
+      const answer = await new Promise((resolve) => {
+        rl.question("Do you want to continue? (y/N): ", resolve);
+      });
+      rl.close();
+
+      if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+        localLog("Operation cancelled.", "yellow");
+        return false;
+      }
+    }
+
+    // Copy global config to local
+    const globalContent = fs.readFileSync(globalEnvFile, "utf8");
+    fs.writeFileSync(localEnvFile, globalContent, "utf8");
+
+    // Clear cache to reflect changes
+    envCache = null;
+    envCacheTime = null;
+
+    localLog("Configuration saved locally!", "green");
+    localLog(`Local file created: ${localEnvFile}`, "cyan");
+    localLog("All future updates will use the local configuration.", "yellow");
+
+    return true;
+  } catch (error) {
+    localLog(`Error saving configuration locally: ${error.message}`, "red");
+    return false;
+  }
+}
+
+/**
+ * Load a single environment file without recursion
+ */
+function loadSingleEnvFile(filePath) {
+  try {
+    // Handle file existence race condition
+    if (!fs.existsSync(filePath)) {
+      if (filePath === globalEnvFile) {
+        log("Global environment file not found. Creating one...", "yellow");
+        createEnvFile(globalEnvFile);
+      }
+      // Return empty object for missing files (don't try to read)
+      return {};
+    }
+
+    // Read file with error handling
+    const envContent = fs.readFileSync(filePath, "utf8");
+    const envVars = {};
+
+    envContent.split("\n").forEach((line) => {
+      const trimmed = line.trim();
+      if (trimmed && !trimmed.startsWith("#")) {
+        const [key, ...valueParts] = trimmed.split("=");
+        if (key && valueParts.length > 0) {
+          envVars[key.trim()] = valueParts.join("=").trim();
+        }
+      }
+    });
+
+    return envVars;
+  } catch (error) {
+    log(`Error loading environment file ${filePath}: ${error.message}`, "red");
+    // Return empty object on error to prevent crashes
+    return {};
+  }
+}
+
+/**
+ * Get configuration from both global and local files
+ * Local settings override global settings
+ */
+function loadConfigFiles() {
+  const globalConfig = loadSingleEnvFile(globalEnvFile);
+  const localConfig = loadSingleEnvFile(localEnvFile);
+
+  // Merge configs, local takes precedence
+  return { ...globalConfig, ...localConfig };
+}
+
+/**
+ * Update configuration with smart targeting (local if exists, global if not)
+ */
+function updateConfigFile(key, value, useGlobal = null) {
+  // Smart targeting: if useGlobal is null, determine based on file existence
+  let targetFile;
+  if (useGlobal === null) {
+    targetFile = fs.existsSync(localEnvFile) ? localEnvFile : globalEnvFile;
+  } else {
+    targetFile = useGlobal ? globalEnvFile : localEnvFile;
+  }
+
+  try {
+    // Ensure the directory exists
+    const targetDir = path.dirname(targetFile);
+    if (!fs.existsSync(targetDir)) {
+      fs.mkdirSync(targetDir, { recursive: true });
+    }
+
+    let content = "";
+
+    // Read existing file or create new one
+    if (fs.existsSync(targetFile)) {
+      content = fs.readFileSync(targetFile, "utf8");
+    } else {
+      createEnvFile(targetFile);
+      content = fs.readFileSync(targetFile, "utf8");
+    }
+
+    const lines = content.split("\n");
+    let keyFound = false;
+
+    // Update or add the key
+    const updatedLines = lines.map((line) => {
+      if (line.startsWith(`${key}=`)) {
+        keyFound = true;
+        return `${key}=${value}`;
+      }
+      return line;
+    });
+
+    if (!keyFound) {
+      updatedLines.push(`${key}=${value}`);
+    }
+
+    // Write back to file
+    fs.writeFileSync(targetFile, updatedLines.join("\n"), "utf8");
+
+    // Atomically invalidate cache
+    envCache = null;
+    envCacheTime = null;
+
+    log(
+      `Updated ${useGlobal ? "global" : "local"} configuration: ${key}`,
+      "green",
+    );
+  } catch (error) {
+    log(`Error updating configuration file: ${error.message}`, "red");
+    throw error;
+  }
+}
 
 /**
  * Create default .env file if it doesn't exist
  */
-function createEnvFile() {
+function createEnvFile(targetPath = globalEnvFile) {
   const defaultEnvContent = `# API Keys for different providers
 OPENROUTER_AUTH_TOKEN=
 ANTHROPIC_API_KEY=
@@ -42,14 +264,20 @@ ANTHROPIC_MODEL=claude-3-5-sonnet-latest
 OLLAMA_MODEL=minimax-m2.5:cloud
 
 # Default provider and model settings
-DEFAULT_PROVIDER=original
+DEFAULT_PROVIDER=default
 DEFAULT_MODEL=
 `;
 
   try {
-    fs.writeFileSync(envFile, defaultEnvContent, "utf8");
-    log(`Created environment file: ${envFile}`, "green");
-    log("Please add your API keys to .env file", "yellow");
+    // Ensure the directory exists
+    const targetDir = path.dirname(targetPath);
+    if (!fs.existsSync(targetDir)) {
+      fs.mkdirSync(targetDir, { recursive: true });
+      log(`Created directory: ${targetDir}`, "green");
+    }
+
+    fs.writeFileSync(targetPath, defaultEnvContent, "utf8");
+    log(`Created environment file: ${targetPath}`, "green");
     return true;
   } catch (error) {
     log(`Error creating .env file: ${error.message}`, "red");
@@ -127,6 +355,7 @@ const CACHE_TTL = 5 * 60 * 1000; // 5 minutes in milliseconds
 
 /**
  * Load environment variables from .env file with caching
+ * Uses merged configuration from global and local files
  */
 function loadEnvFile() {
   const now = Date.now();
@@ -137,38 +366,25 @@ function loadEnvFile() {
   }
 
   try {
-    // Handle file existence race condition
-    if (!fs.existsSync(envFile)) {
-      log("Environment file not found. Creating one...", "yellow");
-      createEnvFile();
-    }
-
-    // Read file with error handling
-    const envContent = fs.readFileSync(envFile, "utf8");
-    const envVars = {};
-
-    envContent.split("\n").forEach((line) => {
-      const trimmed = line.trim();
-      if (trimmed && !trimmed.startsWith("#")) {
-        const [key, ...valueParts] = trimmed.split("=");
-        if (key && valueParts.length > 0) {
-          envVars[key.trim()] = valueParts.join("=").trim();
-        }
-      }
-    });
+    // Load and merge global and local configurations
+    const mergedConfig = loadConfigFiles();
 
     // Atomically update cache
-    envCache = envVars;
+    envCache = mergedConfig;
     envCacheTime = now;
 
     // Include envFile path in the returned object for debugging
-    envVars.envFile = envFile;
+    // Point envFile to the actual active configuration source
+    mergedConfig.envFile = fs.existsSync(localEnvFile)
+      ? localEnvFile
+      : globalEnvFile;
+    mergedConfig.localEnvFile = localEnvFile;
 
-    return envVars;
+    return mergedConfig;
   } catch (error) {
-    log(`Error loading environment file: ${error.message}`, "red");
+    log(`Error loading environment files: ${error.message}`, "red");
     // Return empty object on error to prevent crashes
-    return { envFile };
+    return { envFile: globalEnvFile, localEnvFile };
   }
 }
 
@@ -210,7 +426,7 @@ function findBestMatchingModel(searchTerm, models) {
  */
 function getDefaultProvider(envVars = null) {
   const vars = envVars || loadEnvFile();
-  return vars.DEFAULT_PROVIDER || "original";
+  return vars.DEFAULT_PROVIDER || null;
 }
 
 /**
@@ -222,7 +438,7 @@ function getDefaultModel(envVars = null) {
 }
 
 /**
- * Set default provider in .env file
+ * Set default provider with smart targeting (local if exists, global if not)
  */
 function setDefaultProvider(provider) {
   // Validate input
@@ -230,12 +446,12 @@ function setDefaultProvider(provider) {
     throw new Error("Provider must be a non-empty string");
   }
 
-  updateEnvFile("DEFAULT_PROVIDER", provider.trim());
+  updateConfigFile("DEFAULT_PROVIDER", provider.trim(), null);
   log(`Default provider set to: ${provider.trim()}`, "green");
 }
 
 /**
- * Set default model in .env file
+ * Set default model with smart targeting (local if exists, global if not)
  */
 function setDefaultModel(model) {
   // Validate input (allow empty string for clearing)
@@ -243,7 +459,7 @@ function setDefaultModel(model) {
     throw new Error("Model must be a string");
   }
 
-  updateEnvFile("DEFAULT_MODEL", model.trim());
+  updateConfigFile("DEFAULT_MODEL", model.trim(), null);
   log(`Default model set to: ${model.trim()}`, "green");
 }
 
@@ -328,9 +544,9 @@ async function showApiKeyMenu() {
         process.stdin.removeAllListeners("keypress");
         rl.close();
         updateApiKey(providers[selectedIndex]).then(resolve);
-      } else if (key.name >= "1" && key.name <= "3") {
-        const index = parseInt(key.name) - 1;
-        if (index < providers.length) {
+      } else if (str && /^[1-3]$/.test(str)) {
+        const index = parseInt(str) - 1;
+        if (index >= 0 && index < providers.length) {
           selectedIndex = index;
           process.stdin.removeAllListeners("keypress");
           rl.close();
@@ -339,7 +555,16 @@ async function showApiKeyMenu() {
       }
     };
 
+    // Set up raw mode for arrow key detection
+    if (process.stdin.setRawMode) {
+      process.stdin.setRawMode(true);
+    }
+
+    // Enable keypress events
+    readline.emitKeypressEvents(process.stdin);
+
     process.stdin.on("keypress", handleKeyPress);
+    rl.question("", () => {});
   });
 }
 
@@ -428,11 +653,11 @@ async function updateApiKey(provider) {
     if (choice === "update") {
       const newKey = await promptForApiKey(provider.name, provider.envVar);
       if (newKey) {
-        updateEnvFile(provider.envVar, newKey);
+        updateConfigFile(provider.envVar, newKey, null);
         log(`${provider.name} API key updated successfully!`, "green");
       }
     } else if (choice === "remove") {
-      updateEnvFile(provider.envVar, "");
+      updateConfigFile(provider.envVar, "", null);
       log(`${provider.name} API key removed!`, "yellow");
     } else {
       log("Operation cancelled.", "yellow");
@@ -442,7 +667,7 @@ async function updateApiKey(provider) {
     log("", "reset");
     const newKey = await promptForApiKey(provider.name, provider.envVar);
     if (newKey) {
-      updateEnvFile(provider.envVar, newKey);
+      updateConfigFile(provider.envVar, newKey, null);
       log(`${provider.name} API key set successfully!`, "green");
     } else {
       log("Operation cancelled.", "yellow");
@@ -481,11 +706,17 @@ function maskApiKey(apiKey) {
 module.exports = {
   colors,
   log,
-  envFile,
+  envFile: globalEnvFile,
+  localEnvFile,
+  globalEnvFile,
+  claudeDir,
   createEnvFile,
   promptForApiKey,
   updateEnvFile,
+  updateConfigFile,
   loadEnvFile,
+  loadSingleEnvFile,
+  loadConfigFiles,
   findBestMatchingModel,
   getDefaultProvider,
   getDefaultModel,
@@ -495,4 +726,8 @@ module.exports = {
   showApiKeyMenu,
   updateApiKey,
   maskApiKey,
+  getConfigurationSource,
+  getConfigurationPath,
+  hasGlobalConfiguration,
+  saveConfigurationLocally,
 };

package/lib/menu.js

@@ -10,6 +10,9 @@ const {
   setDefaultProvider,
   setDefaultModel,
   showApiKeyMenu,
+  getConfigurationSource,
+  getConfigurationPath,
+  hasGlobalConfiguration,
 } = require("./config");
 const {
   showModelSelection: showOpenRouterModelSelection,
@@ -28,12 +31,6 @@ async function showModelSelectionForProvider(provider) {
 
   switch (provider.id) {
     case "openrouter":
-      if (!envVars.OPENROUTER_AUTH_TOKEN) {
-        log("OpenRouter auth token required for model selection", "red");
-        log("Please set OPENROUTER_AUTH_TOKEN in .env file", "yellow");
-        log("Using default model...", "yellow");
-        return getProviderDefaultModel("openrouter");
-      }
       return await showOpenRouterModelSelection();
 
     case "ollama":
@@ -60,10 +57,12 @@ function showProviderMenu() {
     output: process.stdout,
   });
 
-  // Get current defaults
+  // Get current defaults and configuration source
   const defaultProvider = getDefaultProvider();
   const defaultModel = getDefaultModel();
+  const configSource = getConfigurationSource();
 
+  // Build providers array dynamically
   const providers = [
     {
       id: "openrouter",
@@ -79,9 +78,24 @@ function showProviderMenu() {
     },
     { id: "set-default", name: "Set as Default", aliases: ["set-default"] },
     { id: "api-keys", name: "Manage API Keys", aliases: ["api-keys", "keys"] },
-    { id: "help", name: "Help", aliases: ["help", "-h", "--help"] },
   ];
 
+  // Add "Save Configuration Locally" option only if global configuration exists
+  if (hasGlobalConfiguration()) {
+    providers.push({
+      id: "save-local",
+      name: "Save Configuration Locally",
+      aliases: ["save-local", "local", "save-locally"],
+    });
+  }
+
+  // Always add Help at the end
+  providers.push({
+    id: "help",
+    name: "Help",
+    aliases: ["help", "-h", "--help"],
+  });
+
   let selectedIndex = 0;
 
   function displayMenu() {
@@ -89,8 +103,18 @@ function showProviderMenu() {
     log("Claude Code Provider Switcher", "green");
     log("", "reset");
 
+    // Show configuration source with file path
+    const configSource = getConfigurationSource();
+    const configPath = getConfigurationPath();
+    log(`Configuration: ${configSource} (${configPath})`, "cyan");
+    log("", "reset");
+
     // Show current defaults
-    if (defaultProvider && defaultProvider !== "default") {
+    if (
+      defaultProvider &&
+      defaultProvider !== null &&
+      defaultProvider !== "default"
+    ) {
       const providerName =
         providers.find((p) => p.id === defaultProvider)?.name ||
         defaultProvider;
@@ -100,10 +124,8 @@ function showProviderMenu() {
         `Current default: ${providerName}${currentModel ? ` (${currentModel})` : ""}`,
         "yellow",
       );
-    } else {
-      log("No default provider set", "yellow");
+      log("", "reset");
     }
-    log("", "reset");
 
     log("Available providers:", "yellow");
     log("", "reset");
@@ -135,51 +157,47 @@ function showProviderMenu() {
       );
     });
 
-    log("", "reset");
-    log("Controls:", "yellow");
-    log("↑/↓ - Navigate", "reset");
-    log("Enter - Select provider", "reset");
-    log("1-7 - Quick select", "reset");
-    log("ESC - Exit", "reset");
     log("", "reset");
 
     // Add helpful usage text
     log("💡 Quick Start:", "cyan");
     log("• Use ↑/↓ arrows to navigate providers", "reset");
     log("• Press Enter to launch selected provider", "reset");
+    log(`• Press 1-${providers.length} for quick select`, "reset");
     log("• Use 'Set as Default' to save your preferred provider", "reset");
     log("", "reset");
-    log("Commands:", "yellow");
-    log(
-      "  claude-switch                     - Show menu or use default",
-      "reset",
-    );
-    log(
-      "  claude-switch openrouter          - Use OpenRouter provider",
-      "reset",
-    );
-    log(
-      "  claude-switch anthropic           - Use Anthropic provider",
-      "reset",
-    );
-    log("  claude-switch ollama              - Use Ollama provider", "reset");
-    log(
-      "  claude-switch set-default         - Setup default provider",
-      "reset",
-    );
-    log("", "reset");
-    log("Model Selection:", "yellow");
-    log(
-      "  claude-switch openrouter --model  - Select OpenRouter model",
-      "reset",
-    );
-    log(
-      "  claude-switch anthropic --model   - Select Anthropic model",
-      "reset",
-    );
-    log("", "reset");
-    log("Type 'claude-switch --help' for complete documentation", "cyan");
-    log("", "reset");
+    // Commented out Commands section for cleaner menu
+    // log("Commands:", "yellow");
+    // log(
+    //   "  claude-switch                     - Show menu or use default",
+    //   "reset",
+    // );
+    // log(
+    //   "  claude-switch openrouter          - Use OpenRouter provider",
+    //   "reset",
+    // );
+    // log(
+    //   "  claude-switch anthropic           - Use Anthropic provider",
+    //   "reset",
+    // );
+    // log("  claude-switch ollama              - Use Ollama provider", "reset");
+    // log(
+    //   "  claude-switch set-default         - Setup default provider",
+    //   "reset",
+    // );
+    // log("", "reset");
+    // log("Model Selection:", "yellow");
+    // log(
+    //   "  claude-switch openrouter --model  - Select OpenRouter model",
+    //   "reset",
+    // );
+    // log(
+    //   "  claude-switch anthropic --model   - Select Anthropic model",
+    //   "reset",
+    // );
+    // log("", "reset");
+    // log("Type 'claude-switch --help' for complete documentation", "cyan");
+    // log("", "reset");
   }
 
   displayMenu();
@@ -489,6 +507,10 @@ function showUsage() {
   log("  show-defaults    - Display current default settings", "reset");
   log("  clear-defaults   - Reset all default settings", "reset");
   log("  api-keys         - Manage API keys for providers", "reset");
+  log(
+    "  save-local       - Save global configuration to local .env file",
+    "reset",
+  );
   log("", "reset");
   log("Options:", "reset");
   log("  --model            - Show interactive model selection menu", "reset");

package/lib/ollama.js

@@ -10,7 +10,7 @@ const {
   loadEnvFile,
   findBestMatchingModel,
   promptForApiKey,
-  updateEnvFile,
+  updateConfigFile,
 } = require("./config");
 const { modelCache } = require("./cache");
 const { OLLAMA, CACHE, HTTP_STATUS, DEFAULT_MODELS } = require("./constants");
@@ -97,7 +97,7 @@ async function showModelSelection() {
       log("Ollama auth token is required for model selection", "red");
       process.exit(1);
     }
-    updateEnvFile("OLLAMA_AUTH_TOKEN", newToken);
+    updateConfigFile("OLLAMA_AUTH_TOKEN", newToken, null);
     authToken = newToken;
   }
 
@@ -378,8 +378,6 @@ async function launchOllama(
   extraArgs = [],
   directModel = null,
 ) {
-  log("Launching Claude Code with Ollama settings...", "green");
-
   const envVars = loadEnvFile();
   log(`Loading environment from: ${envVars.envFile}`, "yellow");
 
@@ -391,7 +389,7 @@ async function launchOllama(
     log("Press Enter to skip, or provide an auth token:", "reset");
     authToken = await promptForApiKey("Ollama (optional)", "OLLAMA_AUTH_TOKEN");
     if (authToken) {
-      updateEnvFile("OLLAMA_AUTH_TOKEN", authToken);
+      updateConfigFile("OLLAMA_AUTH_TOKEN", authToken, null);
       envVars.OLLAMA_AUTH_TOKEN = authToken;
     }
   }

package/lib/openrouter.js

@@ -9,7 +9,7 @@ const {
   loadEnvFile,
   findBestMatchingModel,
   promptForApiKey,
-  updateEnvFile,
+  updateConfigFile,
 } = require("./config");
 const { modelCache } = require("./cache");
 const {
@@ -435,8 +435,6 @@ async function launchOpenRouter(
   extraArgs = [],
   directModel = null,
 ) {
-  log("Launching Claude Code with OpenRouter settings...", "green");
-
   const envVars = loadEnvFile();
   log(`Loading environment from: ${envVars.envFile}`, "yellow");
 
@@ -450,7 +448,7 @@ async function launchOpenRouter(
       log("Error: OpenRouter auth token is required", "red");
       process.exit(1);
     }
-    updateEnvFile("OPENROUTER_AUTH_TOKEN", authToken);
+    updateConfigFile("OPENROUTER_AUTH_TOKEN", authToken, null);
     envVars.OPENROUTER_AUTH_TOKEN = authToken;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-provider-switch",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Cross-platform Claude Code provider switcher (OpenRouter, Ollama, Anthropic)",
   "main": "index.js",
   "bin": {
@@ -9,7 +9,6 @@
   "scripts": {
     "start": "node bin/claude-switch.js",
     "dev": "node bin/claude-switch.js",
-    "version": "npm version",
     "link": "npm link",
     "unlink": "npm unlink -g claude-code-provider-switch",
     "pub": "npm version patch && npm publish && git push origin main --tags",
@@ -22,15 +21,16 @@
     "test:all": "node test/run-tests.js"
   },
   "keywords": [
-    "claude",
     "claude-code",
     "claude code provider switcher",
+    "claude code model switcher",
     "claude code llm switcher",
     "claude code llm provider switcher",
     "ai provider switcher",
     "claude code ai model switcher",
     "claude code ai model provider switcher",
-    "claude code OpenRouter Ollama Anthropic",
+    "claude code OpenRouter",
+    "claude code Ollama",
     "cli"
   ],
   "author": "Adrian R",