dexto 1.6.20 → 1.6.22

package/dist/config/cli-overrides.js

@@ -18,6 +18,7 @@
  * - Agent capability requirements (requires: { vision: true, toolUse: true })
  * - Merge strategy configuration for non-LLM fields
  */
+import { EnvExpandedString, LLM_PROVIDERS, getDefaultModelForProvider, requiresApiKey, requiresBaseURL, resolveApiKeyForProvider, } from '@dexto/core';
 /**
  * Applies CLI overrides to an agent configuration
  * This merges CLI arguments into the base config without validation.
@@ -96,6 +97,62 @@ export function applyUserPreferences(baseConfig, preferences) {
     }
     return mergedConfig;
 }
+export function applyStartupLLMFallback(baseConfig, options) {
+    const mergedConfig = JSON.parse(JSON.stringify(baseConfig));
+    if (options.hasCompletedSetup ||
+        options.hasExplicitProviderOverride ||
+        options.hasExplicitModelOverride ||
+        options.hasExplicitApiKeyOverride) {
+        return mergedConfig;
+    }
+    if (hasUsableCredentials(mergedConfig.llm.provider, mergedConfig.llm)) {
+        return mergedConfig;
+    }
+    for (const provider of LLM_PROVIDERS) {
+        if (!hasExplicitStartupFallbackConfiguration(provider)) {
+            continue;
+        }
+        const model = getDefaultModelForProvider(provider);
+        if (!model) {
+            continue;
+        }
+        mergedConfig.llm.provider = provider;
+        mergedConfig.llm.model = model;
+        delete mergedConfig.llm.baseURL;
+        const apiKey = resolveApiKeyForProvider(provider);
+        if (apiKey) {
+            mergedConfig.llm.apiKey = apiKey;
+        }
+        else {
+            delete mergedConfig.llm.apiKey;
+        }
+        return mergedConfig;
+    }
+    return mergedConfig;
+}
+function hasExplicitStartupFallbackConfiguration(provider) {
+    if (resolveApiKeyForProvider(provider)?.trim()) {
+        return true;
+    }
+    if (requiresBaseURL(provider) && process.env.OPENAI_BASE_URL?.trim()) {
+        return true;
+    }
+    return false;
+}
+export function hasUsableCredentials(provider, llmConfig) {
+    const baseURL = llmConfig?.baseURL ? EnvExpandedString().parse(llmConfig.baseURL) : undefined;
+    if (requiresBaseURL(provider) && !baseURL?.trim()) {
+        return false;
+    }
+    if (!requiresApiKey(provider)) {
+        return true;
+    }
+    const inlineApiKey = llmConfig?.apiKey ? EnvExpandedString().parse(llmConfig.apiKey) : '';
+    if (inlineApiKey.trim()) {
+        return true;
+    }
+    return Boolean(resolveApiKeyForProvider(provider)?.trim());
+}
 /**
  * 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.

package/dist/index-main.js

@@ -48,7 +48,7 @@ import { applyImageDefaults, cleanNullValues, AgentConfigSchema, loadImage, reso
 import { getDextoPackageRoot, resolveAgentPath, loadAgentConfig, findDextoProjectRoot, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, enrichAgentConfig, isDextoAuthEnabled, } from '@dexto/agent-management';
 import { validateCliOptions, handleCliOptionsError } from './cli/utils/options.js';
 import { validateAgentConfig } from './cli/utils/config-validation.js';
-import { applyCLIOverrides, applyUserPreferences } from './config/cli-overrides.js';
+import { applyCLIOverrides, applyStartupLLMFallback, applyUserPreferences, } from './config/cli-overrides.js';
 import { registerRunCommand } from './cli/commands/run/register.js';
 import { registerSessionCommand } from './cli/commands/session/register.js';
 import { registerSearchCommand } from './cli/commands/search/register.js';
@@ -112,7 +112,7 @@ program
     .option('--no-elicitation', 'Disable elicitation (agent cannot prompt user for input)')
     .option('-c, --continue', 'Continue most recent session (CLI mode)')
     .option('-r, --resume <sessionId>', 'Resume a session by ID (CLI mode)')
-    .option('--mode <mode>', 'The application in which dexto should talk to you - web | cli | server | mcp', 'web')
+    .option('--mode <mode>', 'The application in which dexto should talk to you - web | cli | server | mcp', 'cli')
     .option('--port <port>', 'port for the server (default: 3000 for web, 3001 for server mode)')
     .option('--no-auto-install', 'Disable automatic installation of missing agents from registry')
     .option('--image <package>', 'Image package to load (e.g., @dexto/image-local). Overrides config image field.')
@@ -387,8 +387,8 @@ program
     // Main customer facing description
     .description('Dexto CLI - AI-powered assistant with session management.\n\n' +
     'Basic Usage:\n' +
-    '  dexto                    Start web UI (default)\n' +
-    '  dexto --mode cli         Start interactive CLI\n' +
+    '  dexto or dexto --mode cli  Start interactive CLI (default)\n' +
+    '  dexto --mode web         Start web UI\n' +
     '  dexto --prompt "query"   Start interactive CLI and run the prompt\n' +
     '  dexto run "query"        Run one-off headless task\n\n' +
     'Session Management Commands:\n' +
@@ -451,8 +451,8 @@ program
     // the first positional argument as an agent name to avoid ambiguity with prompts.
     // ——— FORCE CLI MODE FOR PROMPT/SESSION FLAGS ———
     // If a prompt or session flag was provided, force CLI mode.
-    if ((initialPrompt || opts.continue || opts.resume || opts.cloudAgent) &&
-        opts.mode !== 'cli') {
+    const modeForcedByChatFlags = Boolean(initialPrompt || opts.continue || opts.resume || opts.cloudAgent);
+    if (modeForcedByChatFlags && opts.mode !== 'cli') {
         console.error(`ℹ️  Forcing CLI mode due to --prompt/--continue/--resume/--cloud-agent.`);
         console.error(`   Original mode: ${opts.mode} → Overridden to: cli`);
         opts.mode = 'cli';
@@ -524,7 +524,34 @@ program
     // Determine validation mode early - used throughout config loading and agent creation
     // Use relaxed validation for interactive modes (web/cli) where users can configure later
     // Use strict validation for non-interactive modes (server/mcp) that need full config upfront
-    const isInteractiveMode = opts.mode === 'web' || opts.mode === 'cli';
+    let isInteractiveMode = opts.mode === 'web' || opts.mode === 'cli';
+    const shouldCheckSetupState = !opts.skipSetup && !(opts.agent && isPath(opts.agent));
+    let setupRequired = false;
+    if (shouldCheckSetupState) {
+        const { requiresSetup } = await import('./cli/utils/setup-utils.js');
+        setupRequired = await requiresSetup();
+    }
+    const canRunInteractiveSetup = isInteractiveMode && opts.interactive !== false;
+    if (setupRequired && !canRunInteractiveSetup) {
+        console.error('❌ Setup required before starting in this mode.');
+        console.error('💡 Run `dexto setup` first, or use --skip-setup to bypass global setup.');
+        safeExit('main', 1, 'setup-required-non-interactive');
+    }
+    const shouldRunSetupBeforeStartup = setupRequired && canRunInteractiveSetup && !opts.provider && !opts.model;
+    if (shouldRunSetupBeforeStartup) {
+        const { handleSetupCommand } = await import('./cli/commands/setup.js');
+        await handleSetupCommand({
+            interactive: true,
+            defaultMode: opts.mode === 'cli' ? 'cli' : undefined,
+        });
+        if (!explicitModeProvided && !modeForcedByChatFlags) {
+            const preferences = await loadGlobalPreferences();
+            if (preferences.defaults.defaultMode) {
+                opts.mode = preferences.defaults.defaultMode;
+            }
+            isInteractiveMode = opts.mode === 'web' || opts.mode === 'cli';
+        }
+    }
     try {
         // Case 1: File path - skip all validation and setup
         if (opts.agent && isPath(opts.agent)) {
@@ -559,31 +586,9 @@ program
                     // Continue anyway - resolver will handle it
                 }
             }
-            // Check setup state and auto-trigger if needed
-            // Skip if --skip-setup flag is set (for MCP mode, automation, etc.)
-            const { requiresSetup } = await import('./cli/utils/setup-utils.js');
-            if (!opts.skipSetup && (await requiresSetup())) {
-                if (opts.interactive === false) {
-                    console.error('❌ Setup required but --no-interactive flag is set.');
-                    console.error('💡 Run `dexto setup` first, or use --skip-setup to bypass global setup.');
-                    safeExit('main', 1, 'setup-required-non-interactive');
-                }
-                const { handleSetupCommand } = await import('./cli/commands/setup.js');
-                await handleSetupCommand({ interactive: true });
-                // Reload preferences after setup to get the newly selected default mode
-                // (setup may have just saved a different mode than the default 'web')
-                try {
-                    const newPreferences = await loadGlobalPreferences();
-                    if (newPreferences.defaults?.defaultMode) {
-                        opts.mode = newPreferences.defaults.defaultMode;
-                        logger.debug(`Updated mode from setup preferences: ${opts.mode}`);
-                    }
-                }
-                catch {
-                    // Ignore errors - will use default mode
-                }
-            }
-            // Now resolve agent (will auto-install since setup is complete)
+            // Resolve the configured agent after setup has been established for
+            // interactive startup. This keeps provider selection generic instead of
+            // letting bundled agent defaults decide first-run behavior.
             resolvedPath = await resolveAgentPath(opts.agent, opts.autoInstall !== false);
             if (opts.interactive !== false) {
                 const { getBundledSyncTargetForAgentPath, shouldPromptForSync, handleSyncAgentsCommand, } = await import('./cli/commands/agents/sync.js');
@@ -611,9 +616,11 @@ program
         // See feature-plans/auto-update.md section 8.11 - Three-Layer LLM Resolution
         const agentId = opts.agent ?? 'coding-agent';
         let preferences = null;
+        let hasCompletedSetup = false;
         if (globalPreferencesExist()) {
             try {
                 preferences = await loadGlobalPreferences();
+                hasCompletedSetup = preferences.setup.completed;
             }
             catch {
                 // Preferences exist but couldn't load - continue without them
@@ -646,6 +653,7 @@ program
                     await handleSetupCommand({ interactive: true, force: true });
                     // Reload preferences after setup
                     preferences = await loadGlobalPreferences();
+                    hasCompletedSetup = preferences.setup.completed;
                 }
                 else {
                     // User cancelled
@@ -689,7 +697,15 @@ program
         // See feature-plans/auto-update.md section 8.11 - Three-Layer LLM Resolution:
         //   local.llm ?? preferences.llm ?? bundled.llm
         // The preferences.llm acts as a "global .local.yml" for LLM settings
-        if (preferences?.llm?.provider && preferences?.llm?.model) {
+        mergedConfig = applyStartupLLMFallback(mergedConfig, {
+            hasCompletedSetup,
+            hasExplicitProviderOverride: Boolean(opts.provider),
+            hasExplicitModelOverride: Boolean(opts.model),
+            hasExplicitApiKeyOverride: Boolean(opts.apiKey),
+        });
+        if (hasCompletedSetup &&
+            preferences?.llm?.provider &&
+            preferences?.llm?.model) {
             mergedConfig = applyUserPreferences(mergedConfig, preferences);
             logger.debug(`Applied user preferences to ${agentId}`, {
                 provider: preferences.llm.provider,