dexto 1.6.2 → 1.6.4

package/dist/cli/auth/oauth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/cli/auth/oauth.ts"],"names":[],"mappings":"AA4CA,UAAU,WAAW;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EACC;QACI,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B,GACD,SAAS,CAAC;CACnB;AA4BD,UAAU,0BAA0B;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAqSD,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAsB,eAAe,CACjC,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE,0BAA+B,GACzC,OAAO,CAAC,iBAAiB,CAAC,CAyC5B;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CA8BjF;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAKlC,CAAC"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/cli/auth/oauth.ts"],"names":[],"mappings":"AA8EA,UAAU,WAAW;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EACC;QACI,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B,GACD,SAAS,CAAC;CACnB;AA4BD,UAAU,0BAA0B;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAqSD,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAsB,eAAe,CACjC,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE,0BAA+B,GACzC,OAAO,CAAC,iBAAiB,CAAC,CAyC5B;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CA8BjF;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAKlC,CAAC"}

package/dist/cli/auth/oauth.js

@@ -15,17 +15,43 @@ import * as querystring from 'querystring';
 import chalk from 'chalk';
 import * as p from '@clack/prompts';
 import { logger } from '@dexto/core';
-import { readFileSync } from 'node:fs';
+import { getDextoPackageRoot } from '@dexto/agent-management';
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
 import { SUPABASE_URL, SUPABASE_ANON_KEY } from './constants.js';
 // Track active OAuth callback servers by port for cleanup
 const oauthStateStore = new Map();
+function resolveLogoPath() {
+    const packageRoot = getDextoPackageRoot();
+    if (packageRoot) {
+        const standaloneAssetPath = path.join(packageRoot, 'dist', 'cli', 'assets', 'dexto-logo.svg');
+        if (existsSync(standaloneAssetPath)) {
+            return standaloneAssetPath;
+        }
+    }
+    try {
+        const localAssetPath = new URL('../assets/dexto-logo.svg', import.meta.url);
+        const resolvedPath = url.fileURLToPath(localAssetPath);
+        if (existsSync(resolvedPath)) {
+            return resolvedPath;
+        }
+    }
+    catch {
+        // Ignore URL/path errors and return null.
+    }
+    return null;
+}
 const DEXTO_LOGO_DATA_URL = (() => {
     try {
-        const svg = readFileSync(new URL('../assets/dexto-logo.svg', import.meta.url), 'utf-8');
+        const logoPath = resolveLogoPath();
+        if (!logoPath) {
+            return '';
+        }
+        const svg = readFileSync(logoPath, 'utf-8');
         return `data:image/svg+xml;base64,${Buffer.from(svg).toString('base64')}`;
     }
     catch (error) {
-        logger.warn(`Failed to load Dexto logo asset for OAuth screen: ${error instanceof Error ? error.message : String(error)}`);
+        logger.debug(`Failed to load Dexto logo asset for OAuth screen: ${error instanceof Error ? error.message : String(error)}`);
         return '';
     }
 })();

package/dist/cli/utils/scaffolding-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolding-utils.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/scaffolding-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AASpC,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAOrE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAYvE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAK5F;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMpE;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACtC,WAAW,GAAE,MAA2B,EACxC,aAAa,GAAE,MAAiD,GACjE,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACjC,WAAW,EAAE,MAAM,EACnB,iBAAiB,GAAE,MAAM,EAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACjC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,GAClC,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB7F;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC/E;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BjF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IACF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B,EACD,cAAc,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE"}
+{"version":3,"file":"scaffolding-utils.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/scaffolding-utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AA8CpC,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAOrE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAYvE;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAK5F;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMpE;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACtC,WAAW,GAAE,MAA2B,EACxC,aAAa,GAAE,MAAiD,GACjE,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACjC,WAAW,EAAE,MAAM,EACnB,iBAAiB,GAAE,MAAM,EAAO,GACjC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACjC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,GAClC,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB7F;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC/E;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BjF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;IACF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B,EACD,cAAc,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE"}

package/dist/cli/utils/scaffolding-utils.js

@@ -1,14 +1,48 @@
 import fs from 'fs-extra';
 import path from 'path';
+import { existsSync, readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
-import { createRequire } from 'module';
+import { getDextoPackageRoot } from '@dexto/agent-management';
 import { executeWithTimeout } from './execute.js';
 import { textOrExit } from './prompt-helpers.js';
 import { getPackageManager, getPackageManagerInstallCommand } from './package-mgmt.js';
-const require = createRequire(import.meta.url);
-const cliPackageJson = 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 resolveCliPackageVersion() {
+    const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+    const localPackageJsonPath = path.resolve(scriptDir, '../../../package.json');
+    const localVersion = readVersionFromPackageJson(localPackageJsonPath);
+    if (localVersion) {
+        return localVersion;
+    }
+    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;
+}
+const cliPackageVersion = resolveCliPackageVersion();
 export function getDextoCliVersion() {
-    const version = process.env.DEXTO_CLI_VERSION ?? cliPackageJson.version;
+    const version = process.env.DEXTO_CLI_VERSION ?? cliPackageVersion;
     if (!version) {
         throw new Error('Could not determine dexto CLI version');
     }

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')

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;
 }