dexto 1.5.8 → 1.6.0

package/dist/cli/utils/config-validation.js

@@ -1,14 +1,12 @@
 import chalk from 'chalk';
 import * as p from '@clack/prompts';
-import { AgentConfigSchema, createAgentConfigSchema, } from '@dexto/core';
-import { interactiveApiKeySetup } from './api-key-setup.js';
-import { LLMErrorCode } from '@dexto/core';
-import { logger } from '@dexto/core';
-import { getGlobalPreferencesPath, loadGlobalPreferences, saveGlobalPreferences, } from '@dexto/agent-management';
+import { AgentConfigSchema, } from '@dexto/agent-config';
+import { getPrimaryApiKeyEnvVar, logger, requiresApiKey, requiresBaseURL, resolveApiKeyForProvider, } from '@dexto/core';
+import { getGlobalPreferencesPath } from '@dexto/agent-management';
 import { handleSyncAgentsCommand } from '../commands/sync-agents.js';
 /**
  * Validates agent config with optional interactive fixes for user experience.
- * Uses schema parsing to detect API key issues and provides targeted setup.
+ * Uses schema parsing for structural validation and performs targeted credential checks.
  * Returns validated config with all defaults applied.
  *
  * IMPORTANT: This function NEVER exits the process. It always returns a result
@@ -16,20 +14,27 @@ import { handleSyncAgentsCommand } from '../commands/sync-agents.js';
  *
  * @param config - The agent configuration to validate
  * @param interactive - Whether to allow interactive prompts to fix issues
- * @param validationOptions - Validation strictness options
- * @param validationOptions.strict - When true (default), enforces API key requirements.
- *                                   When false, allows missing credentials for interactive config.
+ * @param options.credentialPolicy - Behavior when credentials are missing (warn, error, ignore)
+ * @param options.agentPath - Agent config path (used for manual-edit instructions).
  */
-export async function validateAgentConfig(config, interactive = false, validationOptions) {
-    // Use appropriate schema based on validation options
-    // Default to strict validation unless explicitly relaxed
-    const schema = validationOptions?.strict === false
-        ? createAgentConfigSchema({ strict: false })
-        : AgentConfigSchema;
+export async function validateAgentConfig(config, interactive = false, options) {
     // Parse with schema to detect issues
-    const parseResult = schema.safeParse(config);
+    const parseResult = AgentConfigSchema.safeParse(config);
     if (parseResult.success) {
-        return { success: true, config: parseResult.data };
+        const credentialIssues = preflightCredentials(parseResult.data);
+        if (credentialIssues.length > 0) {
+            const policy = options?.credentialPolicy ?? 'error';
+            if (policy === 'error') {
+                showValidationErrors(credentialIssues);
+                showNextSteps();
+                return { success: false, errors: credentialIssues };
+            }
+            if (policy === 'warn') {
+                showCredentialWarnings(credentialIssues);
+                return { success: true, config: parseResult.data, warnings: credentialIssues };
+            }
+        }
+        return { success: true, config: parseResult.data, warnings: [] };
     }
     // Validation failed - handle based on mode
     logger.debug(`Agent config validation error: ${JSON.stringify(parseResult.error)}`);
@@ -40,196 +45,52 @@ export async function validateAgentConfig(config, interactive = false, validatio
         showNextSteps();
         return { success: false, errors };
     }
-    // Interactive mode: try to help the user fix the issue
-    // Check for API key errors first
-    const apiKeyError = findApiKeyError(parseResult.error, config);
-    if (apiKeyError) {
-        return await handleApiKeyError(apiKeyError.provider, config, errors, validationOptions);
-    }
-    // Check for baseURL errors next
-    const baseURLError = findBaseURLError(parseResult.error, config);
-    if (baseURLError) {
-        return await handleBaseURLError(baseURLError.provider, config, errors, validationOptions);
-    }
     // Other validation errors - show options
-    return await handleOtherErrors(errors, validationOptions);
+    return await handleOtherErrors(errors, options);
 }
 /**
- * Handle API key validation errors interactively
+ * Perform a best-effort credential preflight for startup UX.
+ *
+ * Notes:
+ * - This does not guarantee runtime success (e.g. Vertex/Bedrock auth is not fully validated here).
+ * - It only checks whether required fields are present via config or env fallback.
  */
-async function handleApiKeyError(provider, config, errors, validationOptions) {
-    console.log(chalk.rgb(255, 165, 0)(`\n🔑 API key issue detected for ${provider} provider\n`));
-    const action = await p.select({
-        message: 'How would you like to proceed?',
-        options: [
-            {
-                value: 'setup',
-                label: 'Set up API key now',
-                hint: 'Configure the API key interactively',
-            },
-            {
-                value: 'skip',
-                label: 'Continue anyway',
-                hint: 'Try to start without fixing (may fail)',
-            },
-            {
-                value: 'edit',
-                label: 'Edit configuration manually',
-                hint: 'Show file path and instructions',
-            },
-        ],
-    });
-    if (p.isCancel(action)) {
-        showNextSteps();
-        return { success: false, errors, skipped: true };
-    }
-    if (action === 'setup') {
-        const result = await interactiveApiKeySetup(provider, { exitOnCancel: false });
-        if (result.success && !result.skipped) {
-            // Retry validation after API key setup
-            return validateAgentConfig(config, true, validationOptions);
+function preflightCredentials(config) {
+    const issues = [];
+    const provider = config.llm.provider;
+    // Mirror runtime behavior: config apiKey takes precedence, but env can satisfy missing config
+    const resolvedApiKey = config.llm.apiKey || resolveApiKeyForProvider(provider);
+    if (requiresApiKey(provider) && !resolvedApiKey?.trim()) {
+        const envVar = getPrimaryApiKeyEnvVar(provider);
+        issues.push(`llm.apiKey: Missing API key for provider '${provider}' – set $${envVar}`);
+    }
+    if (requiresBaseURL(provider)) {
+        const baseURL = config.llm.baseURL;
+        const envFallbackBaseURL = provider === 'openai-compatible'
+            ? process.env.OPENAI_BASE_URL?.replace(/\/$/, '')
+            : undefined;
+        if (!baseURL && !envFallbackBaseURL) {
+            issues.push(`llm.baseURL: Provider '${provider}' requires a 'baseURL'. ` +
+                `Set llm.baseURL (or $OPENAI_BASE_URL for openai-compatible).`);
         }
-        // Setup was skipped or cancelled - let them continue anyway
-        return { success: false, errors, skipped: true };
-    }
-    if (action === 'edit') {
-        showManualEditInstructions(undefined);
-        return { success: false, errors, skipped: true };
     }
-    // 'skip' - continue anyway
-    p.log.warn('Continuing with validation errors - some features may not work correctly');
-    return { success: false, errors, skipped: true };
+    return issues;
 }
 /**
- * Handle baseURL validation errors interactively
+ * Show credential warnings in a user-friendly way.
  */
-async function handleBaseURLError(provider, config, errors, validationOptions) {
-    console.log(chalk.rgb(255, 165, 0)(`\n🌐 Base URL required for ${provider} provider\n`));
-    const providerExamples = {
-        'openai-compatible': 'http://localhost:11434/v1 (Ollama)',
-        litellm: 'http://localhost:4000 (LiteLLM proxy)',
-    };
-    const example = providerExamples[provider] || 'http://localhost:8080/v1';
-    p.note([
-        `The ${provider} provider requires a base URL to connect to your`,
-        `local or custom LLM endpoint.`,
-        ``,
-        `${chalk.gray('Example:')} ${example}`,
-    ].join('\n'), 'Base URL Required');
-    const action = await p.select({
-        message: 'How would you like to proceed?',
-        options: [
-            {
-                value: 'setup',
-                label: 'Enter base URL now',
-                hint: 'Configure the base URL interactively',
-            },
-            {
-                value: 'skip',
-                label: 'Continue anyway',
-                hint: 'Try to start without fixing (may fail)',
-            },
-            {
-                value: 'edit',
-                label: 'Edit configuration manually',
-                hint: 'Show file path and instructions',
-            },
-        ],
-    });
-    if (p.isCancel(action)) {
-        showNextSteps();
-        return { success: false, errors, skipped: true };
-    }
-    if (action === 'setup') {
-        const result = await interactiveBaseURLSetup(provider, config.llm?.baseURL);
-        if (result.success && !result.skipped && result.baseURL && config.llm) {
-            // Update config with the new baseURL for retry validation
-            const updatedConfig = {
-                ...config,
-                llm: { ...config.llm, baseURL: result.baseURL },
-            };
-            // Retry validation after baseURL setup
-            return validateAgentConfig(updatedConfig, true, validationOptions);
-        }
-        // Setup was skipped or cancelled
-        return { success: false, errors, skipped: true };
-    }
-    if (action === 'edit') {
-        showManualEditInstructions(undefined);
-        return { success: false, errors, skipped: true };
-    }
-    // 'skip' - continue anyway
-    p.log.warn('Continuing with validation errors - some features may not work correctly');
-    return { success: false, errors, skipped: true };
-}
-/**
- * Interactive baseURL setup
- */
-async function interactiveBaseURLSetup(provider, existingBaseURL) {
-    const providerDefaults = {
-        'openai-compatible': 'http://localhost:11434/v1',
-        litellm: 'http://localhost:4000',
-    };
-    // Use existing baseURL if available, otherwise fall back to provider defaults
-    const defaultURL = existingBaseURL || providerDefaults[provider] || '';
-    const baseURL = await p.text({
-        message: `Enter base URL for ${provider}`,
-        placeholder: defaultURL,
-        initialValue: defaultURL,
-        validate: (value) => {
-            if (!value.trim()) {
-                return 'Base URL is required';
-            }
-            try {
-                new URL(value.trim());
-                return undefined;
-            }
-            catch {
-                return 'Please enter a valid URL (e.g., http://localhost:11434/v1)';
-            }
-        },
-    });
-    if (p.isCancel(baseURL)) {
-        p.log.warn('Skipping base URL setup. You can configure it later with: dexto setup');
-        return { success: false, skipped: true };
-    }
-    const trimmedURL = baseURL.trim();
-    // Save to preferences
-    const spinner = p.spinner();
-    spinner.start('Saving base URL to preferences...');
-    try {
-        const preferences = await loadGlobalPreferences();
-        // Update the LLM section with baseURL (complete replacement as per schema design)
-        const updatedPreferences = {
-            ...preferences,
-            llm: {
-                ...preferences.llm,
-                baseURL: trimmedURL,
-            },
-        };
-        await saveGlobalPreferences(updatedPreferences);
-        spinner.stop(chalk.green('✓ Base URL saved to preferences'));
-        return { success: true, baseURL: trimmedURL };
-    }
-    catch (error) {
-        spinner.stop(chalk.red('✗ Failed to save base URL'));
-        logger.error(`Failed to save baseURL: ${error instanceof Error ? error.message : String(error)}`);
-        // Show manual instructions
-        p.note([
-            `Add this to your preferences file:`,
-            ``,
-            `  ${chalk.cyan('baseURL:')} ${trimmedURL}`,
-            ``,
-            `File: ${getGlobalPreferencesPath()}`,
-        ].join('\n'), chalk.rgb(255, 165, 0)('Manual Setup Required'));
-        // Still return success with the URL for in-memory use
-        return { success: true, baseURL: trimmedURL, skipped: true };
+function showCredentialWarnings(warnings) {
+    console.log(chalk.rgb(255, 165, 0)('\n⚠️  Credential warnings:\n'));
+    for (const warning of warnings) {
+        console.log(chalk.yellow(`  • ${warning}`));
+        logger.warn(warning);
     }
+    console.log(chalk.gray('\n💡 Run `dexto setup` to configure credentials.\n'));
 }
 /**
  * Handle non-API-key validation errors interactively
  */
-async function handleOtherErrors(errors, validationOptions) {
+async function handleOtherErrors(errors, options) {
     console.log(chalk.rgb(255, 165, 0)('\n⚠️  Configuration issues detected:\n'));
     for (const error of errors) {
         console.log(chalk.red(`  • ${error}`));
@@ -273,7 +134,7 @@ async function handleOtherErrors(errors, validationOptions) {
         }
     }
     if (action === 'edit') {
-        showManualEditInstructions(validationOptions?.agentPath);
+        showManualEditInstructions(options?.agentPath);
         return { success: false, errors, skipped: true };
     }
     // 'skip' - continue anyway
@@ -331,72 +192,6 @@ function showManualEditInstructions(agentPath) {
             ]),
     ].join('\n'), 'Manual Configuration');
 }
-/**
- * Extract API key error details from Zod validation error
- */
-function findApiKeyError(error, configData) {
-    for (const issue of error.issues) {
-        // Check for our custom LLM_MISSING_API_KEY error code in params
-        if (issue.code === 'custom' && hasErrorCode(issue.params, LLMErrorCode.API_KEY_MISSING)) {
-            // Extract provider from error params (added by our schema)
-            const provider = getProviderFromParams(issue.params);
-            if (provider) {
-                return { provider };
-            }
-        }
-        // Fallback: check for apiKey path errors and extract provider from config
-        if (issue.path.includes('apiKey') && issue.message.includes('Missing API key')) {
-            const provider = configData.llm?.provider;
-            if (provider) {
-                return { provider };
-            }
-        }
-    }
-    return null;
-}
-/**
- * Extract baseURL error details from Zod validation error
- */
-function findBaseURLError(error, configData) {
-    for (const issue of error.issues) {
-        // Check for our custom BASE_URL_MISSING error code in params
-        if (issue.code === 'custom' && hasErrorCode(issue.params, LLMErrorCode.BASE_URL_MISSING)) {
-            const provider = getProviderFromParams(issue.params) || configData.llm?.provider;
-            if (provider) {
-                return { provider };
-            }
-        }
-        // Fallback: check for baseURL path errors
-        if (issue.path.includes('baseURL') && issue.message.includes('requires')) {
-            const provider = configData.llm?.provider;
-            if (provider) {
-                return { provider };
-            }
-        }
-    }
-    return null;
-}
-/**
- * Type guard to check if params contains the expected error code
- */
-function hasErrorCode(params, expectedCode) {
-    return (typeof params === 'object' &&
-        params !== null &&
-        'code' in params &&
-        params.code === expectedCode);
-}
-/**
- * Extract provider from Zod issue params
- */
-function getProviderFromParams(params) {
-    if (typeof params === 'object' &&
-        params !== null &&
-        'provider' in params &&
-        typeof params.provider === 'string') {
-        return params.provider;
-    }
-    return null;
-}
 /**
  * Format Zod validation errors in a user-friendly way
  */
@@ -407,34 +202,5 @@ function formatZodErrors(error) {
     });
 }
 /**
- * Legacy function for backwards compatibility
- * @deprecated Use validateAgentConfig with result handling instead
+ * Note: validateAgentConfig never exits. Callers own exit behavior.
  */
-export async function validateAgentConfigOrExit(config, interactive = false) {
-    const result = await validateAgentConfig(config, interactive);
-    if (result.success && result.config) {
-        return result.config;
-    }
-    // If validation failed but was skipped, return config as-is with defaults applied
-    // This allows the app to launch in a limited capacity (e.g., web UI for configuration)
-    // Runtime errors will occur when actually trying to use the LLM
-    if (result.skipped) {
-        logger.warn('Starting with validation warnings - some features may not work');
-        // Apply defaults manually without strict validation
-        // This allows launching web UI for interactive configuration
-        // Use unknown cast to bypass branded type checking since we're intentionally
-        // returning a partially valid config that the user acknowledged
-        const configWithDefaults = {
-            ...config,
-            llm: {
-                ...config.llm,
-                maxIterations: config.llm?.maxIterations ?? 50,
-            },
-        };
-        return configWithDefaults;
-    }
-    // Last resort: exit with helpful message
-    console.log(chalk.rgb(255, 165, 0)('\nUnable to start with current configuration.'));
-    showNextSteps();
-    process.exit(1);
-}

package/dist/cli/utils/image-store.d.ts

@@ -0,0 +1,16 @@
+export interface InstallImageOptions {
+    force?: boolean;
+    activate?: boolean;
+    storeDir?: string;
+    npmTimeoutMs?: number;
+}
+export interface InstallImageResult {
+    id: string;
+    version: string;
+    entryFile: string;
+    installDir: string;
+    installMode: 'store' | 'linked';
+}
+export declare function installImageToStore(specifier: string, options?: InstallImageOptions): Promise<InstallImageResult>;
+export declare function importImageModule(imageName: string, storeDir?: string): Promise<unknown>;
+//# sourceMappingURL=image-store.d.ts.map

package/dist/cli/utils/image-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"image-store.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/image-store.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,mBAAmB;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;CACnC;AA6ND,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,kBAAkB,CAAC,CAmI7B;AAED,wBAAsB,iBAAiB,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,GAAE,MAAkC,GAC7C,OAAO,CAAC,OAAO,CAAC,CAuBlB"}