dexto 1.3.0 → 1.5.0

package/dist/config/cli-overrides.d.ts

@@ -1,13 +1,22 @@
 /**
  * CLI-specific configuration types and utilities
  * This file handles CLI argument processing and config merging logic
+ *
+ * TODO: Future preference system enhancement
+ * Currently, global preferences are only applied to the coding-agent at runtime.
+ * Future improvements could include:
+ * - Per-agent preference overrides (~/.dexto/agents/{id}/preferences.yml)
+ * - Agent capability requirements (requires: { vision: true, toolUse: true })
+ * - Merge strategy configuration (global > agent, agent > global, field-specific)
+ * - User-controlled preference scopes via CLI flags (--prefer-global-llm)
  */
-import type { AgentConfig, LLMConfig } from '@dexto/core';
+import type { AgentConfig, LLMConfig, LLMProvider } from '@dexto/core';
+import type { GlobalPreferences } from '@dexto/agent-management';
 /**
  * CLI config override type for fields that can be overridden via CLI
  * Uses input type (LLMConfig) since these represent user-provided CLI arguments
  */
-export interface CLIConfigOverrides extends Partial<Pick<LLMConfig, 'provider' | 'model' | 'router' | 'apiKey'>> {
+export interface CLIConfigOverrides extends Partial<Pick<LLMConfig, 'provider' | 'model' | 'apiKey'>> {
     autoApprove?: boolean;
 }
 /**
@@ -20,4 +29,38 @@ export interface CLIConfigOverrides extends Partial<Pick<LLMConfig, 'provider' |
  * @returns Merged configuration (unvalidated)
  */
 export declare function applyCLIOverrides(baseConfig: AgentConfig, cliOverrides?: CLIConfigOverrides): AgentConfig;
+/**
+ * Applies global user preferences to an agent configuration at runtime.
+ * This is used for the coding-agent to ensure user's LLM preferences are applied.
+ *
+ * Unlike writeLLMPreferences() which modifies files, this performs an in-memory merge.
+ *
+ * @param baseConfig The configuration loaded from agent file
+ * @param preferences Global user preferences
+ * @returns Merged configuration with user preferences applied
+ */
+export declare function applyUserPreferences(baseConfig: AgentConfig, preferences: GlobalPreferences): AgentConfig;
+/**
+ * Result of agent compatibility check
+ */
+export interface AgentCompatibilityResult {
+    compatible: boolean;
+    warnings: string[];
+    instructions: string[];
+    agentProvider: LLMProvider;
+    agentModel: string;
+    userProvider: LLMProvider | undefined;
+    userModel: string | undefined;
+    userHasApiKey: boolean;
+}
+/**
+ * Check if user's current setup is compatible with an agent's requirements.
+ * Used when switching to non-default agents to warn users about potential issues.
+ *
+ * @param agentConfig The agent's configuration
+ * @param preferences User's global preferences (if available)
+ * @param resolvedApiKey Whether user has a valid API key for the agent's provider
+ * @returns Compatibility result with warnings and instructions
+ */
+export declare function checkAgentCompatibility(agentConfig: AgentConfig, preferences: GlobalPreferences | null, resolvedApiKey: string | undefined): AgentCompatibilityResult;
 //# sourceMappingURL=cli-overrides.d.ts.map

package/dist/config/cli-overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-overrides.d.ts","sourceRoot":"","sources":["../../src/config/cli-overrides.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,kBACb,SAAQ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAC;IAC5E,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,WAAW,EACvB,YAAY,CAAC,EAAE,kBAAkB,GAClC,WAAW,CAuCb"}
+{"version":3,"file":"cli-overrides.d.ts","sourceRoot":"","sources":["../../src/config/cli-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;GAGG;AACH,MAAM,WAAW,kBACb,SAAQ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,WAAW,EACvB,YAAY,CAAC,EAAE,kBAAkB,GAClC,WAAW,CA+Bb;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,WAAW,EACvB,WAAW,EAAE,iBAAiB,GAC/B,WAAW,CAwBb;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,WAAW,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACnC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,cAAc,EAAE,MAAM,GAAG,SAAS,GACnC,wBAAwB,CAwC1B"}

package/dist/config/cli-overrides.js

@@ -1,6 +1,14 @@
 /**
  * CLI-specific configuration types and utilities
  * This file handles CLI argument processing and config merging logic
+ *
+ * TODO: Future preference system enhancement
+ * Currently, global preferences are only applied to the coding-agent at runtime.
+ * Future improvements could include:
+ * - Per-agent preference overrides (~/.dexto/agents/{id}/preferences.yml)
+ * - Agent capability requirements (requires: { vision: true, toolUse: true })
+ * - Merge strategy configuration (global > agent, agent > global, field-specific)
+ * - User-controlled preference scopes via CLI flags (--prefer-global-llm)
  */
 /**
  * Applies CLI overrides to an agent configuration
@@ -18,30 +26,119 @@ export function applyCLIOverrides(baseConfig, cliOverrides) {
     }
     // Create a deep copy of the base config for modification
     const mergedConfig = JSON.parse(JSON.stringify(baseConfig));
-    // Ensure llm section exists
-    if (!mergedConfig.llm) {
-        mergedConfig.llm = {};
-    }
-    // Apply CLI overrides to LLM config
+    // Apply CLI overrides to LLM config (llm is required in AgentConfig)
     if (cliOverrides.provider) {
         mergedConfig.llm.provider = cliOverrides.provider;
     }
     if (cliOverrides.model) {
         mergedConfig.llm.model = cliOverrides.model;
     }
-    if (cliOverrides.router) {
-        mergedConfig.llm.router = cliOverrides.router;
-    }
     if (cliOverrides.apiKey) {
         mergedConfig.llm.apiKey = cliOverrides.apiKey;
     }
     if (cliOverrides.autoApprove) {
         // Ensure toolConfirmation section exists before overriding
         if (!mergedConfig.toolConfirmation) {
-            mergedConfig.toolConfirmation = {};
+            mergedConfig.toolConfirmation = { mode: 'auto-approve' };
+        }
+        else {
+            mergedConfig.toolConfirmation.mode = 'auto-approve';
         }
-        mergedConfig.toolConfirmation.mode = 'auto-approve';
     }
     // Return merged config without validation - validation happens later
     return mergedConfig;
 }
+/**
+ * Applies global user preferences to an agent configuration at runtime.
+ * This is used for the coding-agent to ensure user's LLM preferences are applied.
+ *
+ * Unlike writeLLMPreferences() which modifies files, this performs an in-memory merge.
+ *
+ * @param baseConfig The configuration loaded from agent file
+ * @param preferences Global user preferences
+ * @returns Merged configuration with user preferences applied
+ */
+export function applyUserPreferences(baseConfig, preferences) {
+    // Create a deep copy to avoid mutating the original
+    const mergedConfig = JSON.parse(JSON.stringify(baseConfig));
+    // Apply LLM preferences (user preferences override agent defaults)
+    if (preferences.llm) {
+        mergedConfig.llm = {
+            ...mergedConfig.llm,
+            provider: preferences.llm.provider,
+            model: preferences.llm.model,
+        };
+        // Only override apiKey if user has one configured
+        if (preferences.llm.apiKey) {
+            mergedConfig.llm.apiKey = preferences.llm.apiKey;
+        }
+        // Only override baseURL if user has one configured
+        if (preferences.llm.baseURL) {
+            mergedConfig.llm.baseURL = preferences.llm.baseURL;
+        }
+    }
+    return mergedConfig;
+}
+/**
+ * Check if user's current setup is compatible with an agent's requirements.
+ * Used when switching to non-default agents to warn users about potential issues.
+ *
+ * @param agentConfig The agent's configuration
+ * @param preferences User's global preferences (if available)
+ * @param resolvedApiKey Whether user has a valid API key for the agent's provider
+ * @returns Compatibility result with warnings and instructions
+ */
+export function checkAgentCompatibility(agentConfig, preferences, resolvedApiKey) {
+    const warnings = [];
+    const instructions = [];
+    const agentProvider = agentConfig.llm.provider;
+    const agentModel = agentConfig.llm.model;
+    const userProvider = preferences?.llm?.provider;
+    const userModel = preferences?.llm?.model;
+    const userHasApiKey = Boolean(resolvedApiKey);
+    // Check if user has API key for this agent's provider
+    if (!userHasApiKey) {
+        warnings.push(`This agent uses ${agentProvider} but you don't have an API key configured for it.`);
+        instructions.push(`Run: dexto setup --provider ${agentProvider}`);
+    }
+    // Check if agent uses a different provider than user's default
+    // Only show this as a warning if API key is missing; otherwise just informational
+    if (userProvider && agentProvider !== userProvider && !userHasApiKey) {
+        const userDefault = userModel ? `${userProvider}/${userModel}` : userProvider;
+        warnings.push(`This agent uses ${agentProvider}/${agentModel} (your default is ${userDefault}).`);
+        instructions.push(`Make sure you have ${getEnvVarForProvider(agentProvider)} set in your environment.`);
+    }
+    return {
+        compatible: warnings.length === 0,
+        warnings,
+        instructions,
+        agentProvider,
+        agentModel,
+        userProvider,
+        userModel,
+        userHasApiKey,
+    };
+}
+/**
+ * Get the environment variable name for a provider's API key
+ */
+function getEnvVarForProvider(provider) {
+    const envVarMap = {
+        openai: 'OPENAI_API_KEY',
+        'openai-compatible': 'OPENAI_API_KEY',
+        anthropic: 'ANTHROPIC_API_KEY',
+        google: 'GOOGLE_GENERATIVE_AI_API_KEY',
+        groq: 'GROQ_API_KEY',
+        xai: 'XAI_API_KEY',
+        cohere: 'COHERE_API_KEY',
+        openrouter: 'OPENROUTER_API_KEY',
+        litellm: 'LITELLM_API_KEY',
+        glama: 'GLAMA_API_KEY',
+        vertex: 'GOOGLE_APPLICATION_CREDENTIALS',
+        bedrock: 'AWS_ACCESS_KEY_ID',
+        // Local providers don't require API keys (empty string signals no key needed)
+        local: '',
+        ollama: '',
+    };
+    return envVarMap[provider];
+}