dexto 1.5.6 → 1.5.8

package/dist/index.js

@@ -14,16 +14,32 @@ import { withAnalytics, safeExit, ExitSignal } from './analytics/wrapper.js';
 // Use createRequire to import package.json without experimental warning
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
-import { logger, getProviderFromModel, getAllSupportedModels, DextoAgent, isPath, resolveApiKeyForProvider, getPrimaryApiKeyEnvVar, } from '@dexto/core';
-import { resolveAgentPath, loadAgentConfig, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, } from '@dexto/agent-management';
+// Set CLI version for Dexto Gateway usage tracking
+process.env.DEXTO_CLI_VERSION = pkg.version;
+// Populate DEXTO_API_KEY for Dexto gateway routing
+// Resolution order in getDextoApiKey():
+//   1. Explicit env var (CI, testing, account override)
+//   2. auth.json from `dexto login`
+import { isDextoAuthEnabled } from '@dexto/agent-management';
+if (isDextoAuthEnabled()) {
+    const { getDextoApiKey } = await import('./cli/auth/index.js');
+    const dextoApiKey = await getDextoApiKey();
+    if (dextoApiKey) {
+        process.env.DEXTO_API_KEY = dextoApiKey;
+    }
+}
+import { logger, DextoLogger, FileTransport, DextoLogComponent, getProviderFromModel, getAllSupportedModels, startLlmRegistryAutoUpdate, DextoAgent, isPath, resolveApiKeyForProvider, getPrimaryApiKeyEnvVar, } from '@dexto/core';
+import { resolveAgentPath, loadAgentConfig, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, getDextoPath, } from '@dexto/agent-management';
 import { startHonoApiServer } from './api/server-hono.js';
 import { validateCliOptions, handleCliOptionsError } from './cli/utils/options.js';
 import { validateAgentConfig } from './cli/utils/config-validation.js';
-import { applyCLIOverrides, applyUserPreferences, checkAgentCompatibility, } from './config/cli-overrides.js';
+import { applyCLIOverrides, applyUserPreferences } from './config/cli-overrides.js';
 import { enrichAgentConfig } from '@dexto/agent-management';
 import { getPort } from './utils/port-utils.js';
 import { createDextoProject, createImage, getUserInputToInitDextoApp, initDexto, postInitDexto, } from './cli/commands/index.js';
-import { handleSetupCommand, handleInstallCommand, handleUninstallCommand, handleListAgentsCommand, handleWhichCommand, handleSyncAgentsCommand, shouldPromptForSync, markSyncDismissed, clearSyncDismissed, } from './cli/commands/index.js';
+import { handleSetupCommand, handleInstallCommand, handleUninstallCommand, handleListAgentsCommand, handleWhichCommand, handleSyncAgentsCommand, shouldPromptForSync, markSyncDismissed, clearSyncDismissed, handleLoginCommand, handleLogoutCommand, handleStatusCommand, handleBillingStatusCommand, handlePluginListCommand, handlePluginInstallCommand, handlePluginUninstallCommand, handlePluginValidateCommand, 
+// Marketplace handlers
+handleMarketplaceAddCommand, handleMarketplaceRemoveCommand, handleMarketplaceUpdateCommand, handleMarketplaceListCommand, handleMarketplacePluginsCommand, handleMarketplaceInstallCommand, } from './cli/commands/index.js';
 import { handleSessionListCommand, handleSessionHistoryCommand, handleSessionDeleteCommand, handleSessionSearchCommand, } from './cli/commands/session-commands.js';
 import { requiresSetup } from './cli/utils/setup-utils.js';
 import { checkForFileInCurrentDirectory, FileNotFoundError } from './cli/utils/package-mgmt.js';
@@ -38,6 +54,9 @@ await initAnalytics({ appVersion: pkg.version });
 // Start version check early (non-blocking)
 // We'll check the result later and display notification for interactive modes
 const versionCheckPromise = checkForUpdates(pkg.version);
+// Start self-updating LLM registry refresh (models.dev + OpenRouter mapping).
+// Uses a cached snapshot on disk and refreshes in the background.
+startLlmRegistryAutoUpdate();
 /**
  * Recursively removes null values from an object.
  * This handles YAML files that have explicit `apiKey: null` entries
@@ -294,30 +313,203 @@ program
         safeExit('sync-agents', 1, 'error');
     }
 }));
+// 11) `plugin` SUB-COMMAND
+const pluginCommand = program.command('plugin').description('Manage plugins');
+pluginCommand
+    .command('list')
+    .description('List installed plugins')
+    .option('--verbose', 'Show detailed plugin information')
+    .action(withAnalytics('plugin list', async (options) => {
+    try {
+        await handlePluginListCommand(options);
+        safeExit('plugin list', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin list command failed: ${err}`);
+        safeExit('plugin list', 1, 'error');
+    }
+}));
+pluginCommand
+    .command('install')
+    .description('Install a plugin from a local directory')
+    .requiredOption('--path <path>', 'Path to the plugin directory')
+    .option('--scope <scope>', 'Installation scope: user, project, or local', 'user')
+    .option('--force', 'Force overwrite if already installed')
+    .action(withAnalytics('plugin install', async (options) => {
+    try {
+        await handlePluginInstallCommand(options);
+        safeExit('plugin install', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin install command failed: ${err}`);
+        safeExit('plugin install', 1, 'error');
+    }
+}));
+pluginCommand
+    .command('uninstall <name>')
+    .description('Uninstall a plugin by name')
+    .action(withAnalytics('plugin uninstall', async (name) => {
+    try {
+        await handlePluginUninstallCommand({ name });
+        safeExit('plugin uninstall', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin uninstall command failed: ${err}`);
+        safeExit('plugin uninstall', 1, 'error');
+    }
+}));
+pluginCommand
+    .command('validate [path]')
+    .description('Validate a plugin directory structure')
+    .action(withAnalytics('plugin validate', async (path) => {
+    try {
+        await handlePluginValidateCommand({ path: path || '.' });
+        safeExit('plugin validate', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin validate command failed: ${err}`);
+        safeExit('plugin validate', 1, 'error');
+    }
+}));
+// 12) `plugin marketplace` SUB-COMMANDS
+const marketplaceCommand = pluginCommand
+    .command('marketplace')
+    .alias('market')
+    .description('Manage plugin marketplaces');
+marketplaceCommand
+    .command('add <source>')
+    .description('Add a marketplace (GitHub: owner/repo, git URL, or local path)')
+    .option('--name <name>', 'Custom name for the marketplace')
+    .action(withAnalytics('plugin marketplace add', async (source, options) => {
+    try {
+        await handleMarketplaceAddCommand({ source, name: options.name });
+        safeExit('plugin marketplace add', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace add command failed: ${err}`);
+        safeExit('plugin marketplace add', 1, 'error');
+    }
+}));
+marketplaceCommand
+    .command('list')
+    .description('List registered marketplaces')
+    .option('--verbose', 'Show detailed marketplace information')
+    .action(withAnalytics('plugin marketplace list', async (options) => {
+    try {
+        await handleMarketplaceListCommand(options);
+        safeExit('plugin marketplace list', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace list command failed: ${err}`);
+        safeExit('plugin marketplace list', 1, 'error');
+    }
+}));
+marketplaceCommand
+    .command('remove <name>')
+    .alias('rm')
+    .description('Remove a registered marketplace')
+    .action(withAnalytics('plugin marketplace remove', async (name) => {
+    try {
+        await handleMarketplaceRemoveCommand({ name });
+        safeExit('plugin marketplace remove', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace remove command failed: ${err}`);
+        safeExit('plugin marketplace remove', 1, 'error');
+    }
+}));
+marketplaceCommand
+    .command('update [name]')
+    .description('Update marketplace(s) from remote (git pull)')
+    .action(withAnalytics('plugin marketplace update', async (name) => {
+    try {
+        await handleMarketplaceUpdateCommand({ name });
+        safeExit('plugin marketplace update', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace update command failed: ${err}`);
+        safeExit('plugin marketplace update', 1, 'error');
+    }
+}));
+marketplaceCommand
+    .command('plugins [marketplace]')
+    .description('List plugins available in marketplaces')
+    .option('--verbose', 'Show plugin descriptions')
+    .action(withAnalytics('plugin marketplace plugins', async (marketplace, options) => {
+    try {
+        await handleMarketplacePluginsCommand({
+            marketplace,
+            verbose: options?.verbose,
+        });
+        safeExit('plugin marketplace plugins', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace plugins command failed: ${err}`);
+        safeExit('plugin marketplace plugins', 1, 'error');
+    }
+}));
+marketplaceCommand
+    .command('install <plugin>')
+    .description('Install a plugin from marketplace (plugin or plugin@marketplace)')
+    .option('--scope <scope>', 'Installation scope: user, project, or local', 'user')
+    .option('--force', 'Force reinstall if already exists')
+    .action(withAnalytics('plugin marketplace install', async (plugin, options) => {
+    try {
+        await handleMarketplaceInstallCommand({ ...options, plugin });
+        safeExit('plugin marketplace install', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto plugin marketplace install command failed: ${err}`);
+        safeExit('plugin marketplace install', 1, 'error');
+    }
+}));
 // Helper to bootstrap a minimal agent for non-interactive session/search ops
 async function bootstrapAgentFromGlobalOpts() {
     const globalOpts = program.opts();
     const resolvedPath = await resolveAgentPath(globalOpts.agent, globalOpts.autoInstall !== false);
     const rawConfig = await loadAgentConfig(resolvedPath);
     const mergedConfig = applyCLIOverrides(rawConfig, globalOpts);
-    const enrichedConfig = enrichAgentConfig(mergedConfig, resolvedPath, {
-        logLevel: 'info', // CLI uses info-level logging for visibility
-    });
-    // Load image dynamically if specified (same priority as main command)
+    // Load image first to get bundled plugins
     // Priority: CLI flag > Agent config > Environment variable > Default
-    // Images are optional, but default to image-local for convenience
     const imageName = globalOpts.image || // --image flag
-        enrichedConfig.image || // image field in agent config
+        mergedConfig.image || // image field in agent config
         process.env.DEXTO_IMAGE || // DEXTO_IMAGE env var
         '@dexto/image-local'; // Default for convenience
+    let imageMetadata = null;
     try {
-        await import(imageName);
+        const imageModule = await import(imageName);
+        imageMetadata = imageModule.imageMetadata || null;
     }
     catch (_err) {
         console.error(`❌ Failed to load image '${imageName}'`);
         console.error(`💡 Install it with: ${existsSync('package.json') ? 'npm install' : 'npm install -g'} ${imageName}`);
         safeExit('bootstrap', 1, 'image-load-failed');
     }
+    // Enrich config with bundled plugins from image
+    const enrichedConfig = enrichAgentConfig(mergedConfig, resolvedPath, {
+        logLevel: 'info', // CLI uses info-level logging for visibility
+        bundledPlugins: imageMetadata?.bundledPlugins || [],
+    });
     // Override approval config for read-only commands (never run conversations)
     // This avoids needing to set up unused approval handlers
     enrichedConfig.toolConfirmation = {
@@ -469,7 +661,110 @@ program
         safeExit('search', 1, 'error');
     }
 }));
-// 13) `mcp` SUB-COMMAND
+// 13) `auth` SUB-COMMAND GROUP
+const authCommand = program.command('auth').description('Manage authentication');
+authCommand
+    .command('login')
+    .description('Login to Dexto')
+    .option('--api-key <key>', 'Use Dexto API key instead of browser login')
+    .option('--no-interactive', 'Disable interactive prompts')
+    .action(withAnalytics('auth login', async (options) => {
+    try {
+        await handleLoginCommand(options);
+        safeExit('auth login', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto auth login command failed: ${err}`);
+        safeExit('auth login', 1, 'error');
+    }
+}));
+authCommand
+    .command('logout')
+    .description('Logout from Dexto')
+    .option('--force', 'Skip confirmation prompt')
+    .option('--no-interactive', 'Disable interactive prompts')
+    .action(withAnalytics('auth logout', async (options) => {
+    try {
+        await handleLogoutCommand(options);
+        safeExit('auth logout', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto auth logout command failed: ${err}`);
+        safeExit('auth logout', 1, 'error');
+    }
+}));
+authCommand
+    .command('status')
+    .description('Show authentication status')
+    .action(withAnalytics('auth status', async () => {
+    try {
+        await handleStatusCommand();
+        safeExit('auth status', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto auth status command failed: ${err}`);
+        safeExit('auth status', 1, 'error');
+    }
+}));
+// Also add convenience aliases at root level
+program
+    .command('login')
+    .description('Login to Dexto (alias for `dexto auth login`)')
+    .option('--api-key <key>', 'Use Dexto API key instead of browser login')
+    .option('--no-interactive', 'Disable interactive prompts')
+    .action(withAnalytics('login', async (options) => {
+    try {
+        await handleLoginCommand(options);
+        safeExit('login', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto login command failed: ${err}`);
+        safeExit('login', 1, 'error');
+    }
+}));
+program
+    .command('logout')
+    .description('Logout from Dexto (alias for `dexto auth logout`)')
+    .option('--force', 'Skip confirmation prompt')
+    .option('--no-interactive', 'Disable interactive prompts')
+    .action(withAnalytics('logout', async (options) => {
+    try {
+        await handleLogoutCommand(options);
+        safeExit('logout', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto logout command failed: ${err}`);
+        safeExit('logout', 1, 'error');
+    }
+}));
+// 14) `billing` COMMAND
+program
+    .command('billing')
+    .description('Show billing status and credit balance')
+    .option('--buy', 'Open Dexto Nova credits purchase page')
+    .action(withAnalytics('billing', async (options) => {
+    try {
+        await handleBillingStatusCommand(options);
+        safeExit('billing', 0);
+    }
+    catch (err) {
+        if (err instanceof ExitSignal)
+            throw err;
+        console.error(`❌ dexto billing command failed: ${err}`);
+        safeExit('billing', 1, 'error');
+    }
+}));
+// 15) `mcp` SUB-COMMAND
 // For now, this mode simply aggregates and re-expose tools from configured MCP servers (no agent)
 // dexto --mode mcp will be moved to this sub-command in the future
 program
@@ -522,7 +817,7 @@ program
         safeExit('mcp', 1, 'mcp-agg-failed');
     }
 }, { timeoutMs: 0 }));
-// 14) Main dexto CLI - Interactive/One shot (CLI/HEADLESS) or run in other modes (--mode web/server/mcp)
+// 16) Main dexto CLI - Interactive/One shot (CLI/HEADLESS) or run in other modes (--mode web/server/mcp)
 program
     .argument('[prompt...]', 'Natural-language prompt to run once. If not passed, dexto will start as an interactive CLI')
     // Main customer facing description
@@ -622,6 +917,11 @@ program
     }
     // ——— Infer provider & API key from model ———
     if (opts.model) {
+        if (opts.model.includes('/')) {
+            console.error(`❌ Model '${opts.model}' looks like an OpenRouter-format ID (provider/model).`);
+            console.error(`   This is ambiguous for --model inference. Please also pass --provider (e.g. --provider dexto-nova or --provider openrouter).`);
+            safeExit('main', 1, 'ambiguous-model');
+        }
         let provider;
         try {
             provider = getProviderFromModel(opts.model);
@@ -716,9 +1016,9 @@ program
         const rawConfig = await loadAgentConfig(resolvedPath);
         let mergedConfig = applyCLIOverrides(rawConfig, opts);
         // ——— PREFERENCE-AWARE CONFIG HANDLING ———
-        // For coding-agent (no explicit agent specified): Apply user preferences
-        // For specific agents: Check compatibility and warn if needed
-        const isDefaultAgent = !opts.agent;
+        // User's LLM preferences from preferences.yml apply to ALL agents
+        // See feature-plans/auto-update.md section 8.11 - Three-Layer LLM Resolution
+        const agentId = opts.agent ?? 'coding-agent';
         let preferences = null;
         if (globalPreferencesExist()) {
             try {
@@ -729,10 +1029,42 @@ program
                 logger.debug('Could not load preferences, continuing without them');
             }
         }
+        // Check if user is configured for Dexto credits but not authenticated
+        // This can happen if user logged out after setting up with Dexto
+        // Now that preferences apply to ALL agents, we check for any agent
+        // Only run this check when Dexto auth feature is enabled
+        if (isDextoAuthEnabled()) {
+            const { checkDextoAuthState } = await import('./cli/utils/dexto-auth-check.js');
+            const authCheck = await checkDextoAuthState(opts.interactive !== false, agentId);
+            if (!authCheck.shouldContinue) {
+                if (authCheck.action === 'login') {
+                    // User wants to log in - run login flow then restart
+                    const { handleLoginCommand } = await import('./cli/commands/auth/login.js');
+                    await handleLoginCommand({ interactive: true });
+                    // Verify key was actually provisioned (provisionKeys silently catches errors)
+                    const { canUseDextoProvider } = await import('./cli/utils/dexto-setup.js');
+                    if (!(await canUseDextoProvider())) {
+                        console.error('\n❌ API key provisioning failed. Please try again or run `dexto setup` to use a different provider.\n');
+                        safeExit('main', 1, 'dexto-key-provisioning-failed');
+                    }
+                    // After login, continue with startup (preferences unchanged, now authenticated)
+                }
+                else if (authCheck.action === 'setup') {
+                    // User wants to configure different provider - run setup
+                    const { handleSetupCommand } = await import('./cli/commands/setup.js');
+                    await handleSetupCommand({ interactive: true, force: true });
+                    // Reload preferences after setup
+                    preferences = await loadGlobalPreferences();
+                }
+                else {
+                    // User cancelled
+                    safeExit('main', 0, 'dexto-auth-check-cancelled');
+                }
+            }
+        }
         // Check for pending API key setup (user skipped during initial setup)
-        if (isDefaultAgent &&
-            preferences?.setup?.apiKeyPending &&
-            opts.interactive !== false) {
+        // Since preferences now apply to ALL agents, this check runs for any agent
+        if (preferences?.setup?.apiKeyPending && opts.interactive !== false) {
             // Check if API key is still missing (user may have set it manually)
             const configuredApiKey = resolveApiKeyForProvider(preferences.llm.provider);
             if (!configuredApiKey) {
@@ -762,81 +1094,51 @@ program
                 logger.debug('API key found in environment, cleared pending flag');
             }
         }
-        if (isDefaultAgent && preferences) {
-            // Default-agent: Apply user's LLM preferences at runtime
-            // This ensures the base agent always uses user's preferred model/provider
+        // Apply user's LLM preferences to ALL agents (not just the default)
+        // 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 = applyUserPreferences(mergedConfig, preferences);
-            logger.debug('Applied user preferences to coding-agent', {
+            logger.debug(`Applied user preferences to ${agentId}`, {
                 provider: preferences.llm.provider,
                 model: preferences.llm.model,
             });
         }
-        else if (!isDefaultAgent && mergedConfig.llm) {
-            // Specific agent: Check if user has the required provider configured
-            const agentProvider = mergedConfig.llm.provider;
-            const resolvedApiKey = resolveApiKeyForProvider(agentProvider);
-            const compatibility = checkAgentCompatibility(mergedConfig, preferences, resolvedApiKey);
-            if (!compatibility.compatible && opts.interactive !== false) {
-                // User is missing API key for the agent's provider
-                if (!compatibility.userHasApiKey &&
-                    preferences?.llm?.provider &&
-                    preferences?.llm?.model) {
-                    // User has a default LLM configured - offer choice
-                    const { promptForMissingAgentApiKey } = await import('./cli/utils/api-key-setup.js');
-                    const result = await promptForMissingAgentApiKey(compatibility.agentProvider, compatibility.agentModel, preferences.llm.provider, preferences.llm.model);
-                    if (result.action === 'cancel') {
-                        safeExit('main', 0, 'agent-api-key-cancelled');
-                    }
-                    if (result.action === 'use-default') {
-                        // Apply user's default LLM to the agent config
-                        mergedConfig = applyUserPreferences(mergedConfig, preferences);
-                        // Also resolve the actual API key from environment
-                        // (preferences store env var reference like $GOOGLE_API_KEY, not the actual key)
-                        const userApiKey = resolveApiKeyForProvider(preferences.llm.provider);
-                        if (userApiKey) {
-                            mergedConfig.llm.apiKey = userApiKey;
-                        }
-                        logger.debug('Applied user preferences to agent (user chose default)', {
-                            provider: preferences.llm.provider,
-                            model: preferences.llm.model,
-                        });
-                    }
-                    if (result.action === 'add-key' && result.apiKey) {
-                        // User added the API key - update the config
-                        mergedConfig.llm.apiKey = result.apiKey;
-                        logger.debug('Applied new API key to agent config');
-                    }
-                }
-                else {
-                    // No default LLM to fall back to - show warnings only
-                    console.log(chalk.yellow('\n⚠️  Agent Compatibility Notice:'));
-                    for (const warning of compatibility.warnings) {
-                        console.log(chalk.yellow(`   ${warning}`));
-                    }
-                    if (compatibility.instructions.length > 0) {
-                        console.log(chalk.dim('\n   To fix:'));
-                        for (const instruction of compatibility.instructions) {
-                            console.log(chalk.dim(`   ${instruction}`));
-                        }
-                    }
-                    console.log(''); // Empty line for spacing
-                }
-            }
-        }
         // Clean up null values from config (can happen from YAML files with explicit nulls)
         // This prevents "Expected string, received null" errors for optional fields
         const cleanedConfig = cleanNullValues(mergedConfig);
-        // Enrich config with per-agent paths BEFORE validation
+        // Load image first to get bundled plugins
+        // Priority: CLI flag > Agent config > Environment variable > Default
+        const imageNameForEnrichment = opts.image || // --image flag
+            cleanedConfig.image || // image field in agent config
+            process.env.DEXTO_IMAGE || // DEXTO_IMAGE env var
+            '@dexto/image-local'; // Default for convenience
+        let imageMetadataForEnrichment = null;
+        try {
+            const imageModule = await import(imageNameForEnrichment);
+            imageMetadataForEnrichment = imageModule.imageMetadata || null;
+            logger.debug(`Loaded image for enrichment: ${imageNameForEnrichment}`);
+        }
+        catch (err) {
+            console.error(`❌ Failed to load image '${imageNameForEnrichment}'`);
+            if (err instanceof Error) {
+                logger.debug(`Image load error: ${err.message}`);
+            }
+            safeExit('main', 1, 'image-load-failed');
+        }
+        // Enrich config with per-agent paths and bundled plugins BEFORE validation
         // Enrichment adds filesystem paths to storage (schema has in-memory defaults)
         // Interactive CLI mode: only log to file (console would interfere with chat UI)
         const isInteractiveCli = opts.mode === 'cli' && !headlessInput;
         const enrichedConfig = enrichAgentConfig(cleanedConfig, resolvedPath, {
             isInteractiveCli,
             logLevel: 'info', // CLI uses info-level logging for visibility
+            bundledPlugins: imageMetadataForEnrichment?.bundledPlugins || [],
         });
         // Validate enriched config with interactive setup if needed (for API key issues)
         // isInteractiveMode is defined above the try block
-        const validationResult = await validateAgentConfig(enrichedConfig, opts.interactive !== false, { strict: !isInteractiveMode });
+        const validationResult = await validateAgentConfig(enrichedConfig, opts.interactive !== false, { strict: !isInteractiveMode, agentPath: resolvedPath });
         if (validationResult.success && validationResult.config) {
             validatedConfig = validationResult.config;
         }
@@ -852,31 +1154,13 @@ program
             // Validation failed and user didn't skip - show next steps and exit
             safeExit('main', 1, 'config-validation-failed');
         }
-        // ——— LOAD IMAGE DYNAMICALLY (if specified) ———
-        // Priority: CLI flag > Agent config > Environment variable > Default
-        // Images are optional, but default to image-local for convenience
-        const imageName = opts.image || // --image flag
-            validatedConfig.image || // image field in agent config
-            process.env.DEXTO_IMAGE || // DEXTO_IMAGE env var
-            '@dexto/image-local'; // Default for convenience
-        try {
-            await import(imageName);
-            logger.debug(`Loaded image: ${imageName}`);
-        }
-        catch (err) {
-            console.error(`❌ Failed to load image '${imageName}'`);
-            console.error(`💡 Install it with: ${existsSync('package.json') ? 'npm install' : 'npm install -g'} ${imageName}`);
-            if (err instanceof Error) {
-                logger.debug(`Image load error: ${err.message}`);
-            }
-            safeExit('main', 1, 'image-load-failed');
-        }
         // Validate that if config specifies an image, it matches what was loaded
         // Skip this check if user explicitly provided --image flag (intentional override)
+        // Note: Image was already loaded earlier before enrichment
         if (!opts.image &&
             validatedConfig.image &&
-            validatedConfig.image !== imageName) {
-            console.error(`❌ Config specifies image '${validatedConfig.image}' but '${imageName}' was loaded instead`);
+            validatedConfig.image !== imageNameForEnrichment) {
+            console.error(`❌ Config specifies image '${validatedConfig.image}' but '${imageNameForEnrichment}' was loaded instead`);
             console.error(`💡 Either remove 'image' from config or ensure it matches the loaded image`);
             safeExit('main', 1, 'image-mismatch');
         }
@@ -932,8 +1216,29 @@ program
         // Config is already enriched and validated - ready for agent creation
         // DextoAgent will parse/validate again (parse-twice pattern)
         // isInteractiveMode is already defined above for validateAgentConfig
+        const sessionLoggerFactory = ({ baseLogger, agentId, sessionId, }) => {
+            // Sanitize sessionId to prevent path traversal attacks
+            // Allow only alphanumeric, dots, hyphens, and underscores
+            const safeSessionId = sessionId.replace(/[^a-zA-Z0-9._-]/g, '_');
+            const logFilePath = getDextoPath('logs', path.join(agentId, `${safeSessionId}.log`));
+            // Standalone per-session file logger.
+            return new DextoLogger({
+                level: baseLogger.getLevel(),
+                agentId,
+                sessionId,
+                component: DextoLogComponent.SESSION,
+                transports: [new FileTransport({ path: logFilePath })],
+            });
+        };
+        const mcpAuthProviderFactory = opts.mode === 'cli'
+            ? (await import('./cli/mcp/oauth-factory.js')).createMcpAuthProviderFactory({
+                logger,
+            })
+            : null;
         agent = new DextoAgent(validatedConfig, resolvedPath, {
             strict: !isInteractiveMode,
+            sessionLoggerFactory,
+            mcpAuthProviderFactory,
         });
         // Start the agent (initialize async services)
         // - web/server modes: initializeHonoApi will set approval handler and start the agent
@@ -1283,5 +1588,5 @@ program
             safeExit('main', 1, 'unknown-mode');
     }
 }, { timeoutMs: 0 }));
-// 15) PARSE & EXECUTE
+// 17) PARSE & EXECUTE
 program.parseAsync(process.argv);