dexto 1.6.1 → 1.6.3

package/dist/index-main.js

@@ -1,17 +1,50 @@
 import { existsSync, readFileSync } from 'fs';
-import { createRequire } from 'module';
 import path from 'path';
+import { fileURLToPath } from 'url';
 import { Command } from 'commander';
 import * as p from '@clack/prompts';
 import chalk from 'chalk';
 import { initAnalytics, capture, getWebUIAnalyticsConfig } from './analytics/index.js';
 import { withAnalytics, safeExit, ExitSignal } from './analytics/wrapper.js';
 import { createFileSessionLoggerFactory } from './utils/session-logger-factory.js';
-// Use createRequire to import package.json without experimental warning
-const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
+function readVersionFromPackageJson(packageJsonPath) {
+    if (!existsSync(packageJsonPath)) {
+        return undefined;
+    }
+    try {
+        const content = readFileSync(packageJsonPath, 'utf-8');
+        const pkg = JSON.parse(content);
+        if (typeof pkg.version === 'string' && pkg.version.length > 0) {
+            return pkg.version;
+        }
+    }
+    catch {
+        // Ignore parse/read errors and fall back.
+    }
+    return undefined;
+}
+function resolveCliVersion() {
+    // Regular installs (npm/pnpm): package.json is next to dist/.
+    const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+    const localPackageJsonPath = path.resolve(scriptDir, '..', 'package.json');
+    const localVersion = readVersionFromPackageJson(localPackageJsonPath);
+    if (localVersion) {
+        return localVersion;
+    }
+    // Standalone release archives ship package.json next to the executable.
+    const packageRoot = getDextoPackageRoot();
+    if (packageRoot) {
+        const packageJsonPath = path.join(packageRoot, 'package.json');
+        const packageVersion = readVersionFromPackageJson(packageJsonPath);
+        if (packageVersion) {
+            return packageVersion;
+        }
+    }
+    return process.env.DEXTO_CLI_VERSION || '0.0.0';
+}
+const cliVersion = resolveCliVersion();
 // Set CLI version for Dexto Gateway usage tracking
-process.env.DEXTO_CLI_VERSION = pkg.version;
+process.env.DEXTO_CLI_VERSION = cliVersion;
 // Populate DEXTO_API_KEY for Dexto gateway routing
 // Resolution order in getDextoApiKey():
 //   1. Explicit env var (CI, testing, account override)
@@ -26,7 +59,7 @@ if (isDextoAuthEnabled()) {
 }
 import { logger, getProviderFromModel, getAllSupportedModels, startLlmRegistryAutoUpdate, DextoAgent, isPath, resolveApiKeyForProvider, getPrimaryApiKeyEnvVar, } from '@dexto/core';
 import { applyImageDefaults, cleanNullValues, AgentConfigSchema, loadImage, resolveServicesFromConfig, setImageImporter, toDextoAgentOptions, } from '@dexto/agent-config';
-import { resolveAgentPath, loadAgentConfig, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, } from '@dexto/agent-management';
+import { getDextoPackageRoot, resolveAgentPath, loadAgentConfig, globalPreferencesExist, loadGlobalPreferences, resolveBundledScript, } 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';
@@ -50,10 +83,10 @@ const program = new Command();
 // Resolve images via the Dexto image store when installed; fall back to host imports (pnpm-safe).
 setImageImporter((specifier) => importImageModule(specifier));
 // Initialize analytics early (no-op if disabled)
-await initAnalytics({ appVersion: pkg.version });
+await initAnalytics({ appVersion: cliVersion });
 // Start version check early (non-blocking)
 // We'll check the result later and display notification for interactive modes
-const versionCheckPromise = checkForUpdates(pkg.version);
+const versionCheckPromise = checkForUpdates(cliVersion);
 // Start self-updating LLM registry refresh (models.dev + OpenRouter mapping).
 // Uses a cached snapshot on disk and refreshes in the background.
 startLlmRegistryAutoUpdate();
@@ -61,7 +94,7 @@ startLlmRegistryAutoUpdate();
 program
     .name('dexto')
     .description('AI-powered CLI and WebUI for interacting with MCP servers.')
-    .version(pkg.version, '-v, --version', 'output the current version')
+    .version(cliVersion, '-v, --version', 'output the current version')
     .option('-a, --agent <id|path>', 'Agent ID or path to agent config file')
     .option('-p, --prompt <text>', 'Start the interactive CLI and immediately run the prompt')
     .option('-s, --strict', 'Require all server connections to succeed')
@@ -70,6 +103,7 @@ program
     .option('--skip-setup', 'Skip global setup validation (useful for MCP mode, automation)')
     .option('-m, --model <model>', 'Specify the LLM model to use')
     .option('--auto-approve', 'Always approve tool executions without confirmation prompts')
+    .option('--bypass-permissions', 'Start the interactive CLI in bypass permissions mode (auto-approve approval prompts)')
     .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)')
@@ -908,6 +942,8 @@ program
     '  dexto -a agents/custom.yml       Short form with relative path\n\n' +
     'Tool Confirmation:\n' +
     '  dexto --auto-approve     Auto-approve all tool executions\n\n' +
+    'Ink CLI Modes:\n' +
+    '  dexto --bypass-permissions  Start in bypass permissions mode (skip approval prompts)\n\n' +
     'Advanced Modes:\n' +
     '  dexto --mode server      Run as API server\n' +
     '  dexto --mode mcp         Run as MCP server\n\n' +
@@ -1271,7 +1307,10 @@ program
         agent = new DextoAgent(toDextoAgentOptions({
             config: validatedConfig,
             services,
-            overrides: { sessionLoggerFactory, mcpAuthProviderFactory },
+            overrides: {
+                sessionLoggerFactory,
+                mcpAuthProviderFactory,
+            },
         }));
         // Start the agent (initialize async services)
         // - web/server modes: initializeHonoApi will set approval handler and start the agent
@@ -1402,11 +1441,39 @@ program
             console.info = noOp;
             let inkError = undefined;
             try {
-                const { startInkCliRefactored } = await import('./cli/ink-cli/InkCLIRefactored.js');
+                const [{ startInkCliRefactored, setTuiRuntimeServices }, { registerGracefulShutdown }, { applyLayeredEnvironmentLoading }, { getProviderDisplayName, isValidApiKeyFormat, getProviderInstructions, }, { beginOAuthLogin, DEFAULT_OAUTH_CONFIG, ensureDextoApiKeyForAuthToken, loadAuth, storeAuth, removeAuth, removeDextoApiKeyFromEnv, }, { isUsingDextoCredits }, { canUseDextoProvider },] = await Promise.all([
+                    import('@dexto/tui'),
+                    import('./utils/graceful-shutdown.js'),
+                    import('./utils/env.js'),
+                    import('./cli/utils/provider-setup.js'),
+                    import('./cli/auth/index.js'),
+                    import('./config/effective-llm.js'),
+                    import('./cli/utils/dexto-setup.js'),
+                ]);
+                setTuiRuntimeServices({
+                    registerGracefulShutdown,
+                    capture: (event, properties) => {
+                        capture(event, properties);
+                    },
+                    applyLayeredEnvironmentLoading,
+                    getProviderDisplayName,
+                    isValidApiKeyFormat,
+                    getProviderInstructions,
+                    beginOAuthLogin,
+                    defaultOAuthConfig: DEFAULT_OAUTH_CONFIG,
+                    ensureDextoApiKeyForAuthToken,
+                    loadAuth,
+                    storeAuth,
+                    removeAuth,
+                    removeDextoApiKeyFromEnv,
+                    isUsingDextoCredits,
+                    canUseDextoProvider,
+                });
                 await startInkCliRefactored(agent, cliSessionId, {
                     updateInfo: cliUpdateInfo ?? undefined,
                     configFilePath: resolvedPath,
                     ...(initialPrompt && { initialPrompt }),
+                    bypassPermissions: opts.bypassPermissions,
                 });
             }
             catch (error) {

package/dist/index.js

@@ -1,5 +1,17 @@
 #!/usr/bin/env node
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import { applyLayeredEnvironmentLoading } from './utils/env.js';
+/**
+ * Standalone binaries are distributed with a sibling `dist/` directory.
+ * When present, set package root so shared path resolvers can find bundled assets.
+ */
+if (!process.env.DEXTO_PACKAGE_ROOT) {
+    const executableDir = dirname(process.execPath);
+    if (existsSync(join(executableDir, 'dist'))) {
+        process.env.DEXTO_PACKAGE_ROOT = executableDir;
+    }
+}
 // Ensure layered env vars are loaded before the main CLI module executes.
 await applyLayeredEnvironmentLoading();
 await import('./index-main.js');

package/dist/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,GAAG,SAAS,CAkBnD"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,GAAG,SAAS,CAgBnD"}

package/dist/web.js

@@ -7,22 +7,29 @@
 import { existsSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { getDextoPackageRoot } from '@dexto/agent-management';
+function isValidWebRoot(webRootPath) {
+    if (!existsSync(webRootPath)) {
+        return false;
+    }
+    // Verify index.html exists (Vite output)
+    const indexPath = path.join(webRootPath, 'index.html');
+    return existsSync(indexPath);
+}
 /**
  * Discovers the webui path for embedded Vite build.
  * @returns Absolute path to webui dist folder, or undefined if not found
  */
 export function resolveWebRoot() {
-    // Path discovery logic for the built webui
     const scriptDir = path.dirname(fileURLToPath(import.meta.url));
-    // Look for embedded webui in CLI's dist folder
-    const webuiPath = path.resolve(scriptDir, 'webui');
-    if (!existsSync(webuiPath)) {
-        return undefined;
-    }
-    // Verify index.html exists (Vite output)
-    const indexPath = path.join(webuiPath, 'index.html');
-    if (!existsSync(indexPath)) {
-        return undefined;
+    const roots = Array.from(new Set([getDextoPackageRoot(), path.dirname(process.execPath), scriptDir])).filter((value) => Boolean(value));
+    for (const root of roots) {
+        const candidates = [path.resolve(root, 'webui'), path.resolve(root, 'dist', 'webui')];
+        for (const webRootPath of candidates) {
+            if (isValidWebRoot(webRootPath)) {
+                return webRootPath;
+            }
+        }
     }
-    return webuiPath;
+    return undefined;
 }