@dexto/agent-management 1.3.0 → 1.5.0

package/dist/resolver.js

@@ -1,6 +1,6 @@
 import { promises as fs } from "fs";
 import path from "path";
-import { isPath } from "./utils/path.js";
+import { isPath, getDextoGlobalPath, resolveBundledScript } from "./utils/path.js";
 import {
   getExecutionContext,
   findDextoSourceRoot,
@@ -9,7 +9,10 @@ import {
 import { logger } from "@dexto/core";
 import { loadGlobalPreferences, globalPreferencesExist } from "./preferences/loader.js";
 import { ConfigError } from "./config/index.js";
-async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreferences = true) {
+import { RegistryError } from "./registry/errors.js";
+import { AgentManager } from "./AgentManager.js";
+import { installBundledAgent } from "./installation.js";
+async function resolveAgentPath(nameOrPath, autoInstall = true) {
   if (nameOrPath && isPath(nameOrPath)) {
     const resolved = path.resolve(nameOrPath);
     try {
@@ -23,32 +26,67 @@ async function resolveAgentPath(nameOrPath, autoInstall = true, injectPreference
     }
   }
   if (nameOrPath) {
-    const { getAgentRegistry } = await import("./registry/registry.js");
-    const registry = getAgentRegistry();
-    return await registry.resolveAgent(nameOrPath, autoInstall, injectPreferences);
+    return await resolveAgentByName(nameOrPath, autoInstall);
   }
-  return await resolveDefaultAgentByContext(autoInstall, injectPreferences);
+  return await resolveDefaultAgentByContext(autoInstall);
 }
-async function resolveDefaultAgentByContext(autoInstall = true, injectPreferences = true) {
+async function resolveAgentByName(agentId, autoInstall) {
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  try {
+    const manager = new AgentManager(installedRegistryPath);
+    await manager.loadRegistry();
+    if (manager.hasAgent(agentId)) {
+      const agentPath = await getAgentConfigPath(agentId);
+      return agentPath;
+    }
+  } catch (error) {
+    logger.debug(`Agent '${agentId}' not found in installed registry: ${error}`);
+  }
+  if (autoInstall) {
+    try {
+      logger.info(`Auto-installing agent '${agentId}' from bundled registry`);
+      const configPath = await installBundledAgent(agentId);
+      return configPath;
+    } catch (error) {
+      logger.debug(`Failed to auto-install agent '${agentId}': ${error}`);
+      throw RegistryError.agentNotFound(agentId, []);
+    }
+  }
+  throw RegistryError.agentNotInstalledAutoInstallDisabled(agentId, []);
+}
+async function getAgentConfigPath(agentId) {
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  const registryContent = await fs.readFile(installedRegistryPath, "utf-8");
+  const registry = JSON.parse(registryContent);
+  const agentEntry = registry.agents.find((a) => a.id === agentId);
+  if (!agentEntry) {
+    const available = registry.agents.map((a) => a.id);
+    throw RegistryError.agentNotFound(agentId, available);
+  }
+  return path.resolve(path.dirname(installedRegistryPath), agentEntry.configPath);
+}
+async function resolveDefaultAgentByContext(autoInstall = true) {
   const executionContext = getExecutionContext();
   switch (executionContext) {
     case "dexto-source":
-      return await resolveDefaultAgentForDextoSource(autoInstall, injectPreferences);
+      return await resolveDefaultAgentForDextoSource(autoInstall);
     case "dexto-project":
-      return await resolveDefaultAgentForDextoProject(autoInstall, injectPreferences);
+      return await resolveDefaultAgentForDextoProject(autoInstall);
     case "global-cli":
-      return await resolveDefaultAgentForGlobalCLI(autoInstall, injectPreferences);
+      return await resolveDefaultAgentForGlobalCLI(autoInstall);
     default:
       throw ConfigError.unknownContext(executionContext);
   }
 }
-async function resolveDefaultAgentForDextoSource(autoInstall = true, injectPreferences = true) {
+async function resolveDefaultAgentForDextoSource(autoInstall = true) {
   logger.debug("Resolving default agent for dexto source context");
   const sourceRoot = findDextoSourceRoot();
   if (!sourceRoot) {
     throw ConfigError.bundledNotFound("dexto source directory not found");
   }
-  const repoConfigPath = path.join(sourceRoot, "agents", "default-agent.yml");
+  const repoConfigPath = path.join(sourceRoot, "agents", "coding-agent", "coding-agent.yml");
   const isDevMode = process.env.DEXTO_DEV_MODE === "true";
   if (isDevMode) {
     logger.debug("Dev mode: using repository config file");
@@ -65,13 +103,7 @@ async function resolveDefaultAgentForDextoSource(autoInstall = true, injectPrefe
       if (preferences.setup.completed) {
         logger.debug("Using user preferences in dexto-source context");
         const preferredAgentName = preferences.defaults.defaultAgent;
-        const { getAgentRegistry } = await import("./registry/registry.js");
-        const registry = getAgentRegistry();
-        return await registry.resolveAgent(
-          preferredAgentName,
-          autoInstall,
-          injectPreferences
-        );
+        return await resolveAgentByName(preferredAgentName, autoInstall);
       }
     } catch (error) {
       logger.warn(`Failed to load preferences, falling back to repo config: ${error}`);
@@ -85,16 +117,16 @@ async function resolveDefaultAgentForDextoSource(autoInstall = true, injectPrefe
     throw ConfigError.bundledNotFound(repoConfigPath);
   }
 }
-async function resolveDefaultAgentForDextoProject(autoInstall = true, injectPreferences = true) {
+async function resolveDefaultAgentForDextoProject(autoInstall = true) {
   logger.debug("Resolving default agent for dexto project context");
   const projectRoot = findDextoProjectRoot();
   if (!projectRoot) {
     throw ConfigError.unknownContext("dexto-project: project root not found");
   }
   const candidatePaths = [
-    path.join(projectRoot, "default-agent.yml"),
-    path.join(projectRoot, "agents", "default-agent.yml"),
-    path.join(projectRoot, "src", "dexto", "agents", "default-agent.yml")
+    path.join(projectRoot, "coding-agent.yml"),
+    path.join(projectRoot, "agents", "coding-agent.yml"),
+    path.join(projectRoot, "src", "dexto", "agents", "coding-agent.yml")
   ];
   for (const p of candidatePaths) {
     try {
@@ -103,7 +135,7 @@ async function resolveDefaultAgentForDextoProject(autoInstall = true, injectPref
     } catch {
     }
   }
-  logger.debug(`No project-local default-agent.yml found in ${projectRoot}`);
+  logger.debug(`No project-local coding-agent.yml found in ${projectRoot}`);
   if (!globalPreferencesExist()) {
     throw ConfigError.noProjectDefault(projectRoot);
   }
@@ -112,11 +144,9 @@ async function resolveDefaultAgentForDextoProject(autoInstall = true, injectPref
     throw ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall);
 }
-async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPreferences = true) {
+async function resolveDefaultAgentForGlobalCLI(autoInstall = true) {
   logger.debug("Resolving default agent for global CLI context");
   if (!globalPreferencesExist()) {
     throw ConfigError.noGlobalPreferences();
@@ -126,24 +156,33 @@ async function resolveDefaultAgentForGlobalCLI(autoInstall = true, injectPrefere
     throw ConfigError.setupIncomplete();
   }
   const preferredAgentName = preferences.defaults.defaultAgent;
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const registry = getAgentRegistry();
-  return await registry.resolveAgent(preferredAgentName, autoInstall, injectPreferences);
+  return await resolveAgentByName(preferredAgentName, autoInstall);
 }
 async function updateDefaultAgentPreference(agentName) {
-  const { getAgentRegistry } = await import("./registry/registry.js");
-  const { RegistryError } = await import("./registry/errors.js");
-  const { isPath: isPath2 } = await import("@dexto/core");
-  const registry = getAgentRegistry();
-  if (isPath2(agentName) || !registry.hasAgent(agentName)) {
-    const available = Object.keys(registry.getAvailableAgents());
-    throw RegistryError.agentNotFound(agentName, available);
-  }
-  const { updateGlobalPreferences } = await import("./preferences/loader.js");
-  await updateGlobalPreferences({
-    defaults: { defaultAgent: agentName }
-  });
-  logger.info(`Updated default agent preference to: ${agentName}`);
+  const agentsDir = getDextoGlobalPath("agents");
+  const installedRegistryPath = path.join(agentsDir, "registry.json");
+  const bundledRegistryPath = resolveBundledScript("agents/agent-registry.json");
+  const registriesToCheck = [
+    { path: installedRegistryPath, name: "installed" },
+    { path: bundledRegistryPath, name: "bundled" }
+  ];
+  for (const registry of registriesToCheck) {
+    try {
+      const manager = new AgentManager(registry.path);
+      await manager.loadRegistry();
+      if (manager.hasAgent(agentName)) {
+        const { updateGlobalPreferences } = await import("./preferences/loader.js");
+        await updateGlobalPreferences({
+          defaults: { defaultAgent: agentName }
+        });
+        logger.info(`Updated default agent preference to: ${agentName}`);
+        return;
+      }
+    } catch (error) {
+      logger.debug(`Agent '${agentName}' not found in ${registry.name} registry: ${error}`);
+    }
+  }
+  throw RegistryError.agentNotFound(agentName, []);
 }
 export {
   resolveAgentPath,

package/dist/utils/api-key-resolver.cjs

@@ -31,7 +31,25 @@ const PROVIDER_API_KEY_MAP = {
   google: ["GOOGLE_GENERATIVE_AI_API_KEY", "GOOGLE_API_KEY", "GEMINI_API_KEY"],
   groq: ["GROQ_API_KEY"],
   cohere: ["COHERE_API_KEY"],
-  xai: ["XAI_API_KEY", "X_AI_API_KEY"]
+  xai: ["XAI_API_KEY", "X_AI_API_KEY"],
+  openrouter: ["OPENROUTER_API_KEY"],
+  litellm: ["LITELLM_API_KEY", "LITELLM_KEY"],
+  glama: ["GLAMA_API_KEY"],
+  // Vertex uses ADC (Application Default Credentials), not API keys
+  // GOOGLE_APPLICATION_CREDENTIALS points to service account JSON (optional)
+  // Primary config is GOOGLE_VERTEX_PROJECT (required) + GOOGLE_VERTEX_LOCATION (optional)
+  vertex: [],
+  // Bedrock supports two auth methods:
+  // 1. AWS_BEARER_TOKEN_BEDROCK - Bedrock API key (simplest)
+  // 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY + AWS_REGION (IAM credentials)
+  // AWS_SESSION_TOKEN (optional, for temporary credentials)
+  bedrock: ["AWS_BEARER_TOKEN_BEDROCK"],
+  // Local providers don't require API keys
+  local: [],
+  // Native node-llama-cpp execution
+  ollama: []
+  // Ollama server (may optionally use OLLAMA_API_KEY for remote servers)
+  // TODO: dexto: ['DEXTO_API_KEY'],
   // perplexity: ['PERPLEXITY_API_KEY'],
   // together: ['TOGETHER_API_KEY'],
   // fireworks: ['FIREWORKS_API_KEY'],

package/dist/utils/api-key-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-key-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CAY9D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAelF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAGpE"}
+{"version":3,"file":"api-key-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CA4B9D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAelF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM,CAGpE"}

package/dist/utils/api-key-resolver.js

@@ -6,7 +6,25 @@ const PROVIDER_API_KEY_MAP = {
   google: ["GOOGLE_GENERATIVE_AI_API_KEY", "GOOGLE_API_KEY", "GEMINI_API_KEY"],
   groq: ["GROQ_API_KEY"],
   cohere: ["COHERE_API_KEY"],
-  xai: ["XAI_API_KEY", "X_AI_API_KEY"]
+  xai: ["XAI_API_KEY", "X_AI_API_KEY"],
+  openrouter: ["OPENROUTER_API_KEY"],
+  litellm: ["LITELLM_API_KEY", "LITELLM_KEY"],
+  glama: ["GLAMA_API_KEY"],
+  // Vertex uses ADC (Application Default Credentials), not API keys
+  // GOOGLE_APPLICATION_CREDENTIALS points to service account JSON (optional)
+  // Primary config is GOOGLE_VERTEX_PROJECT (required) + GOOGLE_VERTEX_LOCATION (optional)
+  vertex: [],
+  // Bedrock supports two auth methods:
+  // 1. AWS_BEARER_TOKEN_BEDROCK - Bedrock API key (simplest)
+  // 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY + AWS_REGION (IAM credentials)
+  // AWS_SESSION_TOKEN (optional, for temporary credentials)
+  bedrock: ["AWS_BEARER_TOKEN_BEDROCK"],
+  // Local providers don't require API keys
+  local: [],
+  // Native node-llama-cpp execution
+  ollama: []
+  // Ollama server (may optionally use OLLAMA_API_KEY for remote servers)
+  // TODO: dexto: ['DEXTO_API_KEY'],
   // perplexity: ['PERPLEXITY_API_KEY'],
   // together: ['TOGETHER_API_KEY'],
   // fireworks: ['FIREWORKS_API_KEY'],

package/dist/utils/api-key-store.cjs

@@ -18,6 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_key_store_exports = {};
 __export(api_key_store_exports, {
+  SHARED_API_KEY_PROVIDERS: () => SHARED_API_KEY_PROVIDERS,
+  determineApiKeyStorage: () => determineApiKeyStorage,
   getProviderKeyStatus: () => getProviderKeyStatus,
   listProviderKeyStatus: () => listProviderKeyStatus,
   saveProviderApiKey: () => saveProviderApiKey
@@ -37,6 +39,27 @@ async function saveProviderApiKey(provider, apiKey, startPath) {
   return { envVar, targetEnvPath };
 }
 function getProviderKeyStatus(provider) {
+  if (provider === "vertex") {
+    const projectId = process.env.GOOGLE_VERTEX_PROJECT;
+    return {
+      hasApiKey: Boolean(projectId && projectId.trim()),
+      envVar: "GOOGLE_VERTEX_PROJECT"
+    };
+  }
+  if (provider === "bedrock") {
+    const apiKey = process.env.AWS_BEARER_TOKEN_BEDROCK;
+    if (apiKey && apiKey.trim()) {
+      return {
+        hasApiKey: true,
+        envVar: "AWS_BEARER_TOKEN_BEDROCK"
+      };
+    }
+    const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
+    return {
+      hasApiKey: Boolean(region && region.trim()),
+      envVar: "AWS_REGION"
+    };
+  }
   const envVar = (0, import_api_key_resolver.getPrimaryApiKeyEnvVar)(provider);
   const key = (0, import_api_key_resolver.resolveApiKeyForProvider)(provider);
   return { hasApiKey: Boolean(key && key.trim()), envVar };
@@ -48,8 +71,31 @@ function listProviderKeyStatus() {
   }
   return result;
 }
+const SHARED_API_KEY_PROVIDERS = ["glama", "openrouter", "litellm"];
+function determineApiKeyStorage(provider, userEnteredKey, providerHasKey, existingProviderKey) {
+  const result = {
+    saveToProviderEnvVar: false,
+    saveAsPerModel: false
+  };
+  if (!userEnteredKey) {
+    return result;
+  }
+  const hasSharedEnvVarKey = SHARED_API_KEY_PROVIDERS.includes(provider);
+  if (hasSharedEnvVarKey) {
+    if (!providerHasKey) {
+      result.saveToProviderEnvVar = true;
+    } else if (existingProviderKey && userEnteredKey !== existingProviderKey) {
+      result.saveAsPerModel = true;
+    }
+  } else {
+    result.saveAsPerModel = true;
+  }
+  return result;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  SHARED_API_KEY_PROVIDERS,
+  determineApiKeyStorage,
   getProviderKeyStatus,
   listProviderKeyStatus,
   saveProviderApiKey

package/dist/utils/api-key-store.d.ts

@@ -15,4 +15,31 @@ export declare function listProviderKeyStatus(): Record<string, {
     hasApiKey: boolean;
     envVar: string;
 }>;
+/**
+ * Providers that use a shared env var for API keys (vs per-endpoint like openai-compatible).
+ * For these providers, we save to the env var if none exists, otherwise per-model override.
+ */
+export declare const SHARED_API_KEY_PROVIDERS: readonly ["glama", "openrouter", "litellm"];
+export type ApiKeyStorageStrategy = {
+    /** Save the key to provider env var (e.g., GLAMA_API_KEY) */
+    saveToProviderEnvVar: boolean;
+    /** Save the key as per-model override in custom model config */
+    saveAsPerModel: boolean;
+};
+/**
+ * Determine where to store an API key for a custom model.
+ *
+ * Logic:
+ * - For glama/openrouter/litellm (shared env var providers):
+ *   - If NO provider key exists → save to provider env var for reuse
+ *   - If provider key EXISTS and user entered SAME key → don't save (uses fallback)
+ *   - If provider key EXISTS and user entered DIFFERENT key → save as per-model override
+ * - For openai-compatible: always save as per-model (each endpoint needs own key)
+ *
+ * @param provider - The custom model provider
+ * @param userEnteredKey - The API key entered by user (trimmed, may be empty)
+ * @param providerHasKey - Whether the provider already has a key configured
+ * @param existingProviderKey - The existing provider key value (for comparison)
+ */
+export declare function determineApiKeyStorage(provider: string, userEnteredKey: string | undefined, providerHasKey: boolean, existingProviderKey: string | undefined): ApiKeyStorageStrategy;
 //# sourceMappingURL=api-key-store.d.ts.map

package/dist/utils/api-key-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-key-store.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM/C;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAYpD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,WAAW,GAAG;IACzD,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAClB,CAIA;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAM9F"}
+{"version":3,"file":"api-key-store.d.ts","sourceRoot":"","sources":["../../src/utils/api-key-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM/C;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAYpD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,WAAW,GAAG;IACzD,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAClB,CA4CA;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAM9F;AAED;;;GAGG;AACH,eAAO,MAAM,wBAAwB,6CAA8C,CAAC;AAEpF,MAAM,MAAM,qBAAqB,GAAG;IAChC,6DAA6D;IAC7D,oBAAoB,EAAE,OAAO,CAAC;IAC9B,gEAAgE;IAChE,cAAc,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CAClC,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,cAAc,EAAE,OAAO,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,GACxC,qBAAqB,CA2BvB"}

package/dist/utils/api-key-store.js

@@ -12,6 +12,27 @@ async function saveProviderApiKey(provider, apiKey, startPath) {
   return { envVar, targetEnvPath };
 }
 function getProviderKeyStatus(provider) {
+  if (provider === "vertex") {
+    const projectId = process.env.GOOGLE_VERTEX_PROJECT;
+    return {
+      hasApiKey: Boolean(projectId && projectId.trim()),
+      envVar: "GOOGLE_VERTEX_PROJECT"
+    };
+  }
+  if (provider === "bedrock") {
+    const apiKey = process.env.AWS_BEARER_TOKEN_BEDROCK;
+    if (apiKey && apiKey.trim()) {
+      return {
+        hasApiKey: true,
+        envVar: "AWS_BEARER_TOKEN_BEDROCK"
+      };
+    }
+    const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
+    return {
+      hasApiKey: Boolean(region && region.trim()),
+      envVar: "AWS_REGION"
+    };
+  }
   const envVar = getPrimaryApiKeyEnvVar(provider);
   const key = resolveApiKeyForProvider(provider);
   return { hasApiKey: Boolean(key && key.trim()), envVar };
@@ -23,7 +44,30 @@ function listProviderKeyStatus() {
   }
   return result;
 }
+const SHARED_API_KEY_PROVIDERS = ["glama", "openrouter", "litellm"];
+function determineApiKeyStorage(provider, userEnteredKey, providerHasKey, existingProviderKey) {
+  const result = {
+    saveToProviderEnvVar: false,
+    saveAsPerModel: false
+  };
+  if (!userEnteredKey) {
+    return result;
+  }
+  const hasSharedEnvVarKey = SHARED_API_KEY_PROVIDERS.includes(provider);
+  if (hasSharedEnvVarKey) {
+    if (!providerHasKey) {
+      result.saveToProviderEnvVar = true;
+    } else if (existingProviderKey && userEnteredKey !== existingProviderKey) {
+      result.saveAsPerModel = true;
+    }
+  } else {
+    result.saveAsPerModel = true;
+  }
+  return result;
+}
 export {
+  SHARED_API_KEY_PROVIDERS,
+  determineApiKeyStorage,
   getProviderKeyStatus,
   listProviderKeyStatus,
   saveProviderApiKey

package/dist/utils/env-file.cjs

@@ -33,84 +33,36 @@ __export(env_file_exports, {
 module.exports = __toCommonJS(env_file_exports);
 var path = __toESM(require("node:path"), 1);
 var import_node_fs = require("node:fs");
-const DEXTO_ENV_KEYS = [
-  "OPENAI_API_KEY",
-  "ANTHROPIC_API_KEY",
-  "GOOGLE_GENERATIVE_AI_API_KEY",
-  "GROQ_API_KEY",
-  "COHERE_API_KEY",
-  "XAI_API_KEY",
-  "DEXTO_LOG_LEVEL"
-];
-function isDextoEnvKey(value) {
-  return DEXTO_ENV_KEYS.includes(value);
-}
 async function updateEnvFile(envFilePath, updates) {
   await import_node_fs.promises.mkdir(path.dirname(envFilePath), { recursive: true });
-  let envLines = [];
+  let content = "";
   try {
-    const existingEnv = await import_node_fs.promises.readFile(envFilePath, "utf8");
-    envLines = existingEnv.split("\n");
+    content = await import_node_fs.promises.readFile(envFilePath, "utf8");
   } catch {
   }
-  const currentValues = {};
-  envLines.forEach((line) => {
-    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
-    if (match && match[1] && isDextoEnvKey(match[1])) {
-      const value = match[2] ?? "";
-      currentValues[match[1]] = value;
+  const lines = content.split("\n");
+  const updatedKeys = /* @__PURE__ */ new Set();
+  const updatedLines = lines.map((line) => {
+    const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
+    if (match && match[1] && match[1] in updates) {
+      const key = match[1];
+      updatedKeys.add(key);
+      return `${key}=${updates[key]}`;
     }
+    return line;
   });
-  const updatedValues = Object.fromEntries(
-    DEXTO_ENV_KEYS.map((key) => {
-      const update = updates[key];
-      const current = currentValues[key];
-      const fallback = key === "DEXTO_LOG_LEVEL" ? "info" : "";
-      const value = update !== void 0 ? update : current ?? fallback;
-      return [key, value];
-    })
-  );
-  const sectionHeader = "## Dexto env variables";
-  const headerIndex = envLines.findIndex((line) => line.trim() === sectionHeader);
-  let contentLines;
-  if (headerIndex !== -1) {
-    const beforeSection = envLines.slice(0, headerIndex);
-    let sectionEnd = headerIndex + 1;
-    while (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() !== "") {
-      sectionEnd++;
-    }
-    if (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() === "") {
-      sectionEnd++;
+  for (const [key, value] of Object.entries(updates)) {
+    if (!updatedKeys.has(key)) {
+      if (updatedLines.length > 0 && updatedLines[updatedLines.length - 1] !== "") {
+        updatedLines.push("");
+      }
+      updatedLines.push(`${key}=${value}`);
     }
-    const afterSection = envLines.slice(sectionEnd);
-    contentLines = [...beforeSection, ...afterSection];
-  } else {
-    contentLines = envLines;
   }
-  const existingEnvVars = {};
-  contentLines.forEach((line) => {
-    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
-    if (match && match[1] && isDextoEnvKey(match[1])) {
-      const value = match[2] ?? "";
-      existingEnvVars[match[1]] = value;
-    }
-  });
-  if (contentLines.length > 0) {
-    if (contentLines[contentLines.length - 1]?.trim() !== "") {
-      contentLines.push("");
-    }
-  } else {
-    contentLines.push("");
-  }
-  contentLines.push(sectionHeader);
-  for (const key of DEXTO_ENV_KEYS) {
-    if (key in existingEnvVars && !(key in updates)) {
-      continue;
-    }
-    contentLines.push(`${key}=${updatedValues[key]}`);
+  if (updatedLines[updatedLines.length - 1] !== "") {
+    updatedLines.push("");
   }
-  contentLines.push("");
-  await import_node_fs.promises.writeFile(envFilePath, contentLines.join("\n"), "utf8");
+  await import_node_fs.promises.writeFile(envFilePath, updatedLines.join("\n"), "utf8");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/utils/env-file.d.ts

@@ -1,5 +1,6 @@
 /**
- * Update a .env file with Dexto environment variables, ensuring our section stays consistent.
+ * Update a .env file with the provided key-value pairs.
+ * Existing keys are updated in place, new keys are appended.
  */
 export declare function updateEnvFile(envFilePath: string, updates: Record<string, string>): Promise<void>;
 //# sourceMappingURL=env-file.d.ts.map

package/dist/utils/env-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-file.d.ts","sourceRoot":"","sources":["../../src/utils/env-file.ts"],"names":[],"mappings":"AAsBA;;GAEG;AACH,wBAAsB,aAAa,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAgFf"}
+{"version":3,"file":"env-file.d.ts","sourceRoot":"","sources":["../../src/utils/env-file.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,aAAa,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAyCf"}

package/dist/utils/env-file.js

@@ -1,83 +1,35 @@
 import * as path from "node:path";
 import { promises as fs } from "node:fs";
-const DEXTO_ENV_KEYS = [
-  "OPENAI_API_KEY",
-  "ANTHROPIC_API_KEY",
-  "GOOGLE_GENERATIVE_AI_API_KEY",
-  "GROQ_API_KEY",
-  "COHERE_API_KEY",
-  "XAI_API_KEY",
-  "DEXTO_LOG_LEVEL"
-];
-function isDextoEnvKey(value) {
-  return DEXTO_ENV_KEYS.includes(value);
-}
 async function updateEnvFile(envFilePath, updates) {
   await fs.mkdir(path.dirname(envFilePath), { recursive: true });
-  let envLines = [];
+  let content = "";
   try {
-    const existingEnv = await fs.readFile(envFilePath, "utf8");
-    envLines = existingEnv.split("\n");
+    content = await fs.readFile(envFilePath, "utf8");
   } catch {
   }
-  const currentValues = {};
-  envLines.forEach((line) => {
-    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
-    if (match && match[1] && isDextoEnvKey(match[1])) {
-      const value = match[2] ?? "";
-      currentValues[match[1]] = value;
+  const lines = content.split("\n");
+  const updatedKeys = /* @__PURE__ */ new Set();
+  const updatedLines = lines.map((line) => {
+    const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
+    if (match && match[1] && match[1] in updates) {
+      const key = match[1];
+      updatedKeys.add(key);
+      return `${key}=${updates[key]}`;
     }
+    return line;
   });
-  const updatedValues = Object.fromEntries(
-    DEXTO_ENV_KEYS.map((key) => {
-      const update = updates[key];
-      const current = currentValues[key];
-      const fallback = key === "DEXTO_LOG_LEVEL" ? "info" : "";
-      const value = update !== void 0 ? update : current ?? fallback;
-      return [key, value];
-    })
-  );
-  const sectionHeader = "## Dexto env variables";
-  const headerIndex = envLines.findIndex((line) => line.trim() === sectionHeader);
-  let contentLines;
-  if (headerIndex !== -1) {
-    const beforeSection = envLines.slice(0, headerIndex);
-    let sectionEnd = headerIndex + 1;
-    while (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() !== "") {
-      sectionEnd++;
-    }
-    if (sectionEnd < envLines.length && envLines[sectionEnd]?.trim() === "") {
-      sectionEnd++;
+  for (const [key, value] of Object.entries(updates)) {
+    if (!updatedKeys.has(key)) {
+      if (updatedLines.length > 0 && updatedLines[updatedLines.length - 1] !== "") {
+        updatedLines.push("");
+      }
+      updatedLines.push(`${key}=${value}`);
     }
-    const afterSection = envLines.slice(sectionEnd);
-    contentLines = [...beforeSection, ...afterSection];
-  } else {
-    contentLines = envLines;
   }
-  const existingEnvVars = {};
-  contentLines.forEach((line) => {
-    const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
-    if (match && match[1] && isDextoEnvKey(match[1])) {
-      const value = match[2] ?? "";
-      existingEnvVars[match[1]] = value;
-    }
-  });
-  if (contentLines.length > 0) {
-    if (contentLines[contentLines.length - 1]?.trim() !== "") {
-      contentLines.push("");
-    }
-  } else {
-    contentLines.push("");
-  }
-  contentLines.push(sectionHeader);
-  for (const key of DEXTO_ENV_KEYS) {
-    if (key in existingEnvVars && !(key in updates)) {
-      continue;
-    }
-    contentLines.push(`${key}=${updatedValues[key]}`);
+  if (updatedLines[updatedLines.length - 1] !== "") {
+    updatedLines.push("");
   }
-  contentLines.push("");
-  await fs.writeFile(envFilePath, contentLines.join("\n"), "utf8");
+  await fs.writeFile(envFilePath, updatedLines.join("\n"), "utf8");
 }
 export {
   updateEnvFile