bashio 1.1.0 → 1.1.1

package/dist/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 // src/cli/index.ts
-import { createRequire } from "module";
 import { Builtins, Cli } from "clipanion";
 import pc17 from "picocolors";
 import updateNotifier from "update-notifier";
@@ -83,13 +82,24 @@ var Settings = z.object({
   historyMaxEntries: z.number().default(2e3),
   autoConfirmShortcuts: z.boolean().default(false)
 });
-var Config = z.object({
-  version: z.number().default(1),
+var ConfigV1 = z.object({
+  version: z.literal(1).default(1),
   provider: ProviderName,
   model: z.string(),
   credentials: Credentials,
   settings: Settings.optional()
 });
+var ProviderSettings = z.object({
+  model: z.string(),
+  credentials: Credentials
+});
+var ConfigV2 = z.object({
+  version: z.literal(2),
+  activeProvider: ProviderName,
+  providers: z.record(z.string(), ProviderSettings),
+  settings: Settings.optional()
+});
+var Config = z.union([ConfigV2, ConfigV1]);
 var ShortcutDefinition = z.object({
   template: z.string(),
   args: z.array(z.string()).default([]),
@@ -133,6 +143,19 @@ function ensureConfigDir() {
 function configExists() {
   return existsSync(CONFIG_FILE);
 }
+function migrateV1toV2(v1) {
+  return {
+    version: 2,
+    activeProvider: v1.provider,
+    providers: {
+      [v1.provider]: {
+        model: v1.model,
+        credentials: v1.credentials
+      }
+    },
+    settings: v1.settings
+  };
+}
 function loadConfig() {
   if (!configExists()) {
     return null;
@@ -140,7 +163,17 @@ function loadConfig() {
   try {
     const raw = readFileSync(CONFIG_FILE, "utf-8");
     const data = JSON.parse(raw);
-    return Config.parse(data);
+    const v2Result = ConfigV2.safeParse(data);
+    if (v2Result.success) {
+      return v2Result.data;
+    }
+    const v1Result = ConfigV1.safeParse(data);
+    if (v1Result.success) {
+      const migrated = migrateV1toV2(v1Result.data);
+      saveConfig(migrated);
+      return migrated;
+    }
+    return null;
   } catch {
     return null;
   }
@@ -157,6 +190,19 @@ function getConfigPath() {
 function getConfigDir() {
   return CONFIG_DIR;
 }
+function isProviderConfigured(config, provider) {
+  return provider in config.providers;
+}
+function setProviderConfig(config, provider, settings, setActive = true) {
+  return {
+    ...config,
+    activeProvider: setActive ? provider : config.activeProvider,
+    providers: {
+      ...config.providers,
+      [provider]: settings
+    }
+  };
+}
 
 // src/core/database.ts
 import { chmodSync as chmodSync2, existsSync as existsSync2 } from "fs";
@@ -1063,16 +1109,17 @@ var ChatGPTSubscriptionProvider = class {
           this.accountId = extractAccountIdFromToken(this.accessToken);
         }
         const currentConfig = loadConfig();
-        if (currentConfig && currentConfig.credentials.type === "chatgpt_subscription") {
-          currentConfig.credentials.accessToken = newTokens.accessToken;
+        const providerSettings = currentConfig?.providers["chatgpt-subscription"];
+        if (currentConfig && providerSettings?.credentials.type === "chatgpt_subscription") {
+          providerSettings.credentials.accessToken = newTokens.accessToken;
           if (newTokens.refreshToken) {
-            currentConfig.credentials.refreshToken = newTokens.refreshToken;
+            providerSettings.credentials.refreshToken = newTokens.refreshToken;
           }
           if (newTokens.expiresAt) {
-            currentConfig.credentials.expiresAt = newTokens.expiresAt;
+            providerSettings.credentials.expiresAt = newTokens.expiresAt;
           }
           if (this.accountId) {
-            currentConfig.credentials.accountId = this.accountId;
+            providerSettings.credentials.accountId = this.accountId;
           }
           saveConfig(currentConfig);
         }
@@ -1321,10 +1368,11 @@ var ClaudeSubscriptionProvider = class {
         this.refreshToken = newTokens.refreshToken;
         this.expiresAt = newTokens.expiresAt;
         const currentConfig = loadConfig();
-        if (currentConfig && currentConfig.credentials.type === "claude_subscription") {
-          currentConfig.credentials.accessToken = newTokens.accessToken;
-          currentConfig.credentials.refreshToken = newTokens.refreshToken;
-          currentConfig.credentials.expiresAt = newTokens.expiresAt;
+        const providerSettings = currentConfig?.providers["claude-subscription"];
+        if (currentConfig && providerSettings?.credentials.type === "claude_subscription") {
+          providerSettings.credentials.accessToken = newTokens.accessToken;
+          providerSettings.credentials.refreshToken = newTokens.refreshToken;
+          providerSettings.credentials.expiresAt = newTokens.expiresAt;
           saveConfig(currentConfig);
         }
       } catch (error) {
@@ -1485,10 +1533,11 @@ var CopilotProvider = class {
         this.copilotTokenExpiresAt = parsed.expiresAt;
         this.apiEndpoint = parsed.apiEndpoint;
         const currentConfig = loadConfig();
-        if (currentConfig && currentConfig.credentials.type === "copilot") {
-          currentConfig.credentials.copilotToken = newTokenData.token;
-          currentConfig.credentials.copilotTokenExpiresAt = parsed.expiresAt;
-          currentConfig.credentials.apiEndpoint = parsed.apiEndpoint;
+        const providerSettings = currentConfig?.providers.copilot;
+        if (currentConfig && providerSettings?.credentials.type === "copilot") {
+          providerSettings.credentials.copilotToken = newTokenData.token;
+          providerSettings.credentials.copilotTokenExpiresAt = parsed.expiresAt;
+          providerSettings.credentials.apiEndpoint = parsed.apiEndpoint;
           saveConfig(currentConfig);
         }
       } catch (error) {
@@ -1836,27 +1885,35 @@ var OPENROUTER_MODELS = [
 
 // src/providers/index.ts
 function createProvider(config) {
+  const activeProvider = config.activeProvider;
+  const settings = config.providers[activeProvider];
+  if (!settings) {
+    throw new Error(`Provider ${activeProvider} not configured`);
+  }
   const providerConfig = {
-    model: config.model,
-    credentials: config.credentials
+    model: settings.model,
+    credentials: settings.credentials
   };
-  switch (config.provider) {
+  return createProviderFromType(activeProvider, providerConfig);
+}
+function createProviderFromType(provider, config) {
+  switch (provider) {
     case "claude":
-      return new ClaudeProvider(providerConfig);
+      return new ClaudeProvider(config);
     case "claude-subscription":
-      return new ClaudeSubscriptionProvider(providerConfig);
+      return new ClaudeSubscriptionProvider(config);
     case "openai":
-      return new OpenAIProvider(providerConfig);
+      return new OpenAIProvider(config);
     case "chatgpt-subscription":
-      return new ChatGPTSubscriptionProvider(providerConfig);
+      return new ChatGPTSubscriptionProvider(config);
     case "copilot":
-      return new CopilotProvider(providerConfig);
+      return new CopilotProvider(config);
     case "ollama":
-      return new OllamaProvider(providerConfig);
+      return new OllamaProvider(config);
     case "openrouter":
-      return new OpenRouterProvider(providerConfig);
+      return new OpenRouterProvider(config);
     default:
-      throw new Error(`Unknown provider: ${config.provider}`);
+      throw new Error(`Unknown provider: ${provider}`);
   }
 }
 
@@ -1870,6 +1927,15 @@ function createSpinner(text) {
 }
 
 // src/core/auth.ts
+var PROVIDER_DISPLAY_NAMES = {
+  "claude-subscription": "Claude Pro/Max",
+  "chatgpt-subscription": "ChatGPT Plus/Pro",
+  copilot: "GitHub Copilot",
+  claude: "Claude (API Key)",
+  openai: "ChatGPT (API Key)",
+  ollama: "Ollama (Local)",
+  openrouter: "OpenRouter"
+};
 async function openBrowser(url) {
   try {
     const { exec: exec2 } = await import("child_process");
@@ -1943,6 +2009,7 @@ async function runAuthSetup(showBanner = true) {
     showWelcomeBanner();
   }
   console.log(pc3.bold("  Bashio Setup\n"));
+  const existingConfig = loadConfig();
   const provider = await select({
     message: "Select your AI provider:",
     choices: [
@@ -1983,6 +2050,26 @@ async function runAuthSetup(showBanner = true) {
       }
     ]
   });
+  if (existingConfig && isProviderConfigured(existingConfig, provider)) {
+    const currentModel = existingConfig.providers[provider]?.model;
+    console.log();
+    console.log(
+      pc3.yellow(`  ${PROVIDER_DISPLAY_NAMES[provider]} is already configured.`)
+    );
+    console.log(pc3.dim(`  Current model: ${currentModel}`));
+    console.log();
+    const action = await select({
+      message: "What would you like to do?",
+      choices: [
+        { value: "reauth", name: "Update credentials (re-authenticate)" },
+        { value: "cancel", name: "Cancel" }
+      ]
+    });
+    if (action === "cancel") {
+      console.log(pc3.dim("\n  Cancelled.\n"));
+      return false;
+    }
+  }
   let credentials;
   let model;
   switch (provider) {
@@ -2158,12 +2245,12 @@ async function runAuthSetup(showBanner = true) {
     default:
       throw new Error(`Unknown provider: ${provider}`);
   }
-  const config = {
-    version: 1,
-    provider,
-    model,
-    credentials,
-    settings: {
+  const providerSettings = { model, credentials };
+  const tempConfig = {
+    version: 2,
+    activeProvider: provider,
+    providers: { [provider]: providerSettings },
+    settings: existingConfig?.settings || {
       confirmBeforeExecute: true,
       historyEnabled: true,
       historyRetentionDays: 30,
@@ -2173,7 +2260,7 @@ async function runAuthSetup(showBanner = true) {
   };
   const spinner = createSpinner("Validating credentials...").start();
   try {
-    const providerInstance = createProvider(config);
+    const providerInstance = createProvider(tempConfig);
     const valid = await providerInstance.validateCredentials();
     if (!valid) {
       spinner.fail("Invalid credentials");
@@ -2186,10 +2273,11 @@ async function runAuthSetup(showBanner = true) {
     );
     return false;
   }
-  saveConfig(config);
+  const finalConfig = existingConfig ? setProviderConfig(existingConfig, provider, providerSettings, true) : tempConfig;
+  saveConfig(finalConfig);
   console.log();
   logger.success("Configuration saved!");
-  console.log(pc3.gray(`  Provider: ${provider}`));
+  console.log(pc3.gray(`  Provider: ${PROVIDER_DISPLAY_NAMES[provider]}`));
   console.log(pc3.gray(`  Model: ${model}`));
   console.log();
   return true;
@@ -2548,15 +2636,32 @@ var ConfigCommand = class extends Command4 {
       logger.error("Failed to load configuration.");
       return 1;
     }
+    const activeSettings = config.providers[config.activeProvider];
+    const configuredProviders = Object.keys(config.providers);
     console.log(pc7.bold("\n  Bashio Configuration\n"));
-    console.log(`  Provider:    ${pc7.cyan(config.provider)}`);
-    console.log(`  Model:       ${pc7.cyan(config.model)}`);
-    console.log(`  Auth:        ${pc7.green("Configured")}`);
+    console.log(
+      `  Active Provider: ${pc7.cyan(PROVIDER_DISPLAY_NAMES[config.activeProvider])}`
+    );
+    console.log(
+      `  Model:           ${pc7.cyan(activeSettings?.model || "N/A")}`
+    );
+    if (configuredProviders.length > 1) {
+      console.log();
+      console.log(pc7.bold("  Configured Providers"));
+      for (const p of configuredProviders) {
+        const settings2 = config.providers[p];
+        const isActive = p === config.activeProvider;
+        const marker = isActive ? pc7.green("\u25CF") : pc7.dim("\u25CB");
+        console.log(
+          `  ${marker} ${PROVIDER_DISPLAY_NAMES[p]} - ${pc7.dim(settings2?.model || "N/A")}`
+        );
+      }
+    }
     const settings = config.settings;
     console.log();
     console.log(pc7.bold("  Settings"));
     console.log(
-      `  History:              ${settings?.historyEnabled !== false ? pc7.green("enabled") : pc7.gray("disabled")}`
+      `  History:                ${settings?.historyEnabled !== false ? pc7.green("enabled") : pc7.gray("disabled")}`
     );
     console.log(
       `  Auto-confirm shortcuts: ${settings?.autoConfirmShortcuts ? pc7.green("enabled") : pc7.gray("disabled")}`
@@ -3297,16 +3402,35 @@ var selectWithEsc = async (config) => {
   }
 };
 var isPromptExit = (error) => {
-  if (!(error instanceof Error)) {
-    return false;
-  }
-  return error.name === "ExitPromptError" || error.name === "AbortPromptError" || error.name === "CancelPromptError";
+  if (!(error instanceof Error)) return false;
+  return error.name === "ExitPromptError" || error.name === "AbortPromptError" || error.name === "CancelPromptError" || error.message.includes("SIGINT") || error.message.includes("force closed");
 };
+function getModelsForProvider(provider) {
+  switch (provider) {
+    case "claude":
+      return CLAUDE_MODELS;
+    case "claude-subscription":
+      return CLAUDE_SUBSCRIPTION_MODELS;
+    case "openai":
+      return OPENAI_MODELS;
+    case "chatgpt-subscription":
+      return CHATGPT_SUBSCRIPTION_MODELS;
+    case "copilot":
+      return COPILOT_MODELS;
+    case "openrouter":
+      return OPENROUTER_MODELS;
+    case "ollama":
+      return [];
+    // Handled separately
+    default:
+      return [];
+  }
+}
 var ModelCommand = class extends Command8 {
   static paths = [["model"], ["--model"]];
   static usage = Command8.Usage({
-    description: "Change the AI model for current provider",
-    examples: [["Change model", "$0 --model"]]
+    description: "Change the AI provider and model",
+    examples: [["Change provider/model", "$0 --model"]]
   });
   async execute() {
     if (!configExists()) {
@@ -3321,103 +3445,95 @@ var ModelCommand = class extends Command8 {
       logger.error("Failed to load configuration.");
       return 1;
     }
-    console.log(pc12.bold("\n  Change AI Model\n"));
-    console.log(pc12.gray(`  Current provider: ${config.provider}`));
-    console.log(pc12.gray(`  Current model: ${config.model}`));
+    const configuredProviders = Object.keys(config.providers);
+    if (configuredProviders.length === 0) {
+      logger.warn("No providers configured.");
+      console.log(pc12.gray("Run 'b --auth' to set up a provider.\n"));
+      return 1;
+    }
+    const activeSettings = config.providers[config.activeProvider];
+    console.log(pc12.bold("\n  Change Provider & Model\n"));
+    console.log(
+      pc12.gray(
+        `  Current: ${PROVIDER_DISPLAY_NAMES[config.activeProvider]} / ${activeSettings?.model}`
+      )
+    );
     console.log(pc12.dim("  Press Esc to cancel\n"));
-    let newModel;
     try {
-      switch (config.provider) {
-        case "claude": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: CLAUDE_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
-        }
-        case "openai": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: OPENAI_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
+      const providerChoices = configuredProviders.map((p) => {
+        const settings = config.providers[p];
+        const isActive = p === config.activeProvider;
+        const marker = isActive ? pc12.green("\u25CF") : pc12.dim("\u25CB");
+        const name = `${marker} ${PROVIDER_DISPLAY_NAMES[p]}`;
+        const description = settings?.model || "Not configured";
+        return { value: p, name, description };
+      });
+      providerChoices.push({
+        value: "__add_new__",
+        name: pc12.cyan("+ Add new provider..."),
+        description: "Configure a new AI provider"
+      });
+      const selectedProvider = await selectWithEsc({
+        message: "Select provider:",
+        choices: providerChoices
+      });
+      if (selectedProvider === "__add_new__") {
+        console.log(pc12.dim("\n  Run 'b --auth' to add a new provider.\n"));
+        return 0;
+      }
+      const currentModel = config.providers[selectedProvider]?.model;
+      let newModel;
+      if (selectedProvider === "ollama") {
+        const host = config.providers.ollama?.credentials.type === "local" ? config.providers.ollama.credentials.host : "http://localhost:11434";
+        const spinner = createSpinner("Fetching available models...").start();
+        const availableModels = await OllamaProvider.getAvailableModels(host);
+        spinner.stop();
+        if (availableModels.length === 0) {
+          logger.warn("No models found. Make sure Ollama is running.");
+          console.log(pc12.gray("\n  Install a model: ollama pull llama3.2\n"));
+          return 1;
         }
-        case "ollama": {
-          const host = config.credentials.type === "local" ? config.credentials.host : "http://localhost:11434";
-          const spinner = createSpinner("Fetching available models...").start();
-          const availableModels = await OllamaProvider.getAvailableModels(host);
-          spinner.stop();
-          if (availableModels.length === 0) {
-            logger.warn("No models found. Make sure Ollama is running.");
-            console.log(pc12.gray("\n  Install a model: ollama pull llama3.2\n"));
-            return 1;
+        newModel = await selectWithEsc({
+          message: "Select model:",
+          choices: availableModels.map((m) => ({ value: m, name: m })),
+          default: currentModel
+        });
+      } else {
+        const models = getModelsForProvider(selectedProvider);
+        newModel = await selectWithEsc({
+          message: "Select model:",
+          choices: models.map((m) => ({ value: m.value, name: m.label })),
+          default: currentModel
+        });
+      }
+      const providerSettings = config.providers[selectedProvider];
+      if (!providerSettings) {
+        logger.error("Provider not configured.");
+        return 1;
+      }
+      const updatedConfig = {
+        ...config,
+        activeProvider: selectedProvider,
+        providers: {
+          ...config.providers,
+          [selectedProvider]: {
+            ...providerSettings,
+            model: newModel
           }
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: availableModels.map((m) => ({
-              value: m,
-              name: m
-            })),
-            default: config.model
-          });
-          break;
-        }
-        case "openrouter": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: OPENROUTER_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
-        }
-        case "claude-subscription": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: CLAUDE_SUBSCRIPTION_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
-        }
-        case "chatgpt-subscription": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: CHATGPT_SUBSCRIPTION_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
-        }
-        case "copilot": {
-          newModel = await selectWithEsc({
-            message: "Select new model:",
-            choices: COPILOT_MODELS.map((m) => ({
-              value: m.value,
-              name: m.label
-            })),
-            default: config.model
-          });
-          break;
         }
-        default:
-          logger.error(`Unknown provider: ${config.provider}`);
-          return 1;
+      };
+      saveConfig(updatedConfig);
+      const changed = selectedProvider !== config.activeProvider || newModel !== currentModel;
+      if (changed) {
+        console.log();
+        logger.success(
+          `Switched to: ${PROVIDER_DISPLAY_NAMES[selectedProvider]} / ${newModel}`
+        );
+      } else {
+        logger.info("No changes made.");
       }
+      console.log();
+      return 0;
     } catch (error) {
       if (isPromptExit(error)) {
         console.log(pc12.dim("\n  Cancelled.\n"));
@@ -3425,16 +3541,6 @@ var ModelCommand = class extends Command8 {
       }
       throw error;
     }
-    if (newModel === config.model) {
-      logger.info("Model unchanged.");
-      return 0;
-    }
-    config.model = newModel;
-    saveConfig(config);
-    console.log();
-    logger.success(`Model changed to: ${newModel}`);
-    console.log();
-    return 0;
   }
 };
 
@@ -3845,11 +3951,9 @@ var SuggestShortcutsCommand = class extends Command12 {
 };
 
 // src/cli/index.ts
-var require2 = createRequire(import.meta.url);
-var packageJson = require2("../../package.json");
 var pkg = {
-  name: packageJson.name,
-  version: packageJson.version
+  name: "bashio",
+  version: "1.1.1"
 };
 var notifier = updateNotifier({
   pkg,