dexto 1.5.8 → 1.6.1

package/dist/api/server-hono.js

@@ -1,34 +1,12 @@
 import os from 'node:os';
-import { DextoAgent, createAgentCard, logger, AgentError } from '@dexto/core';
-import { loadAgentConfig, enrichAgentConfig, deriveDisplayName, getAgentRegistry, AgentFactory, globalPreferencesExist, loadGlobalPreferences, } from '@dexto/agent-management';
+import { createAgentCard, logger, AgentError } from '@dexto/core';
+import { loadAgentConfig, deriveDisplayName, getAgentRegistry, AgentFactory, globalPreferencesExist, loadGlobalPreferences, createDextoAgentFromConfig, } from '@dexto/agent-management';
 import { applyUserPreferences } from '../config/cli-overrides.js';
+import { createFileSessionLoggerFactory } from '../utils/session-logger-factory.js';
 import { createDextoApp, createNodeServer, createMcpTransport as createServerMcpTransport, createMcpHttpHandlers, initializeMcpServer as initializeServerMcpServer, createManualApprovalHandler, WebhookEventSubscriber, A2ASseEventSubscriber, ApprovalCoordinator, } from '@dexto/server';
 import { registerGracefulShutdown } from '../utils/graceful-shutdown.js';
 const DEFAULT_AGENT_VERSION = '1.0.0';
-/**
- * Load image dynamically based on config and environment
- * Priority: Config image field > Environment variable > Default
- * Images are optional, but default to image-local for convenience
- *
- * @returns Image metadata including bundled plugins, or null if image has no metadata export
- */
-async function loadImageForConfig(config) {
-    const imageName = config.image || process.env.DEXTO_IMAGE || '@dexto/image-local';
-    try {
-        const imageModule = await import(imageName);
-        logger.debug(`Loaded image: ${imageName}`);
-        // Extract metadata if available (built images export imageMetadata)
-        if (imageModule.imageMetadata) {
-            return imageModule.imageMetadata;
-        }
-        return null;
-    }
-    catch (err) {
-        const errorMsg = `Failed to load image '${imageName}': ${err instanceof Error ? err.message : String(err)}`;
-        logger.error(errorMsg);
-        throw new Error(errorMsg);
-    }
-}
+const sessionLoggerFactory = createFileSessionLoggerFactory();
 /**
  * List all agents (installed and available)
  * Replacement for old Dexto.listAgents()
@@ -71,16 +49,13 @@ async function createAgentFromId(agentId) {
                 logger.debug('Could not load preferences, using bundled config');
             }
         }
-        // Load image to get bundled plugins
-        const imageMetadata = await loadImageForConfig(config);
-        // Enrich config with per-agent paths and bundled plugins
-        const enrichedConfig = enrichAgentConfig(config, agentPath, {
-            logLevel: 'info', // Server uses info-level logging for visibility
-            bundledPlugins: imageMetadata?.bundledPlugins || [],
-        });
-        // Create agent instance
         logger.info(`Creating agent: ${agentId} from ${agentPath}`);
-        return new DextoAgent(enrichedConfig, agentPath);
+        return await createDextoAgentFromConfig({
+            config,
+            configPath: agentPath,
+            enrichOptions: { logLevel: 'info' },
+            overrides: { sessionLoggerFactory },
+        });
     }
     catch (error) {
         throw new Error(`Failed to create agent '${agentId}': ${error instanceof Error ? error.message : String(error)}`);
@@ -97,10 +72,11 @@ function resolveBaseUrl(port) {
     return process.env.DEXTO_BASE_URL ?? `http://localhost:${port}`;
 }
 //TODO (migration): consider moving this to the server package
-export async function initializeHonoApi(agent, agentCardOverride, listenPort, agentId, webRoot, webUIConfig) {
+export async function initializeHonoApi(agent, agentCardOverride, listenPort, agentId, configFilePath, webRoot, webUIConfig) {
     // Declare before registering shutdown hook to avoid TDZ on signals
     let activeAgent = agent;
     let activeAgentId = agentId || 'coding-agent';
+    let activeAgentConfigPath = configFilePath;
     let isSwitchingAgent = false;
     registerGracefulShutdown(() => activeAgent);
     const resolvedPort = resolvePort(listenPort);
@@ -123,9 +99,9 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
      */
     async function wireServicesToAgent(agent) {
         logger.debug('Wiring services to agent...');
-        // Subscribe to event bus (methods handle aborting previous subscriptions)
-        webhookSubscriber.subscribe(agent.agentEventBus);
-        sseSubscriber.subscribe(agent.agentEventBus);
+        // Register subscribers (DextoAgent handles (re-)subscription on start/restart)
+        agent.registerSubscriber(webhookSubscriber);
+        agent.registerSubscriber(sseSubscriber);
         // Note: ApprovalCoordinator doesn't subscribe to agent event bus
         // It's a separate coordination channel between handler and server
     }
@@ -161,7 +137,7 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
     /**
      * Common agent switching logic shared by switchAgentById and switchAgentByPath.
      */
-    async function performAgentSwitch(newAgent, agentId, bridge) {
+    async function performAgentSwitch(newAgent, agentId, agentConfigPath, bridge) {
         logger.info('Preparing new agent for switch...');
         // Register webhook subscriber for LLM streaming events
         if (bridge.webhookSubscriber) {
@@ -171,9 +147,9 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
         const previousAgent = activeAgent;
         activeAgent = newAgent;
         activeAgentId = agentId;
+        activeAgentConfigPath = agentConfigPath;
         // Set approval handler if manual mode OR elicitation enabled (before start() for validation)
-        const needsHandler = newAgent.config.toolConfirmation?.mode === 'manual' ||
-            newAgent.config.elicitation.enabled;
+        const needsHandler = newAgent.config.permissions.mode === 'manual' || newAgent.config.elicitation.enabled;
         if (needsHandler) {
             logger.debug('Setting up manual approval handler for new agent...');
             const handler = createManualApprovalHandler(approvalCoordinator);
@@ -210,15 +186,18 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
         }
         isSwitchingAgent = true;
         let newAgent;
+        let newAgentConfigPath;
         try {
             // 1. SHUTDOWN OLD TELEMETRY FIRST (before creating new agent)
             logger.info('Shutting down telemetry for agent switch...');
             const { Telemetry } = await import('@dexto/core');
             await Telemetry.shutdownGlobal();
             // 2. Create new agent from registry (will initialize fresh telemetry in createAgentServices)
+            const registry = getAgentRegistry();
+            newAgentConfigPath = await registry.resolveAgent(agentId, true);
             newAgent = await createAgentFromId(agentId);
             // 3. Use common switch logic (register subscribers, start agent, stop previous)
-            return await performAgentSwitch(newAgent, agentId, bridge);
+            return await performAgentSwitch(newAgent, agentId, newAgentConfigPath, bridge);
         }
         catch (error) {
             logger.error(`Failed to switch to agent '${agentId}': ${error instanceof Error ? error.message : String(error)}`, { error });
@@ -264,20 +243,17 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
                     logger.debug('Could not load preferences, using bundled config');
                 }
             }
-            // 3. Load image first to get bundled plugins
-            const imageMetadata = await loadImageForConfig(config);
-            // 3.5. Enrich config with per-agent paths and bundled plugins from image
-            const enrichedConfig = enrichAgentConfig(config, filePath, {
-                logLevel: 'info', // Server uses info-level logging for visibility
-                bundledPlugins: imageMetadata?.bundledPlugins || [],
+            // 3. Create new agent instance (will initialize fresh telemetry in createAgentServices)
+            newAgent = await createDextoAgentFromConfig({
+                config,
+                configPath: filePath,
+                enrichOptions: { logLevel: 'info' },
+                overrides: { sessionLoggerFactory },
             });
-            // 4. Create new agent instance directly (will initialize fresh telemetry in createAgentServices)
-            newAgent = new DextoAgent(enrichedConfig, filePath);
-            // 5. Use enriched agentId (derived from config or filename during enrichment)
-            // enrichAgentConfig always sets agentId, so it's safe to assert non-null
-            const agentId = enrichedConfig.agentId;
-            // 6. Use common switch logic (register subscribers, start agent, stop previous)
-            return await performAgentSwitch(newAgent, agentId, bridge);
+            // 4. Use enriched agentId (derived from config or filename during enrichment)
+            const agentId = newAgent.config.agentId;
+            // 5. Use common switch logic (register subscribers, start agent, stop previous)
+            return await performAgentSwitch(newAgent, agentId, filePath, bridge);
         }
         catch (error) {
             logger.error(`Failed to switch to agent from path '${filePath}': ${error instanceof Error ? error.message : String(error)}`, { error });
@@ -306,12 +282,14 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
         return activeAgent;
     };
     const getAgentCard = () => agentCardData;
+    const getAgentConfigPath = (_ctx) => activeAgentConfigPath;
     // Declare bridge variable that will be set later
     let bridgeRef = null;
     // Create app with agentsContext using closure
     const app = createDextoApp({
         apiPrefix: '/api',
         getAgent,
+        getAgentConfigPath,
         getAgentCard,
         approvalCoordinator,
         webhookSubscriber,
@@ -361,8 +339,7 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
         defaultBaseUrl: baseApiUrl,
     }, overrides);
     // Set approval handler for initial agent if manual mode OR elicitation enabled (before start() for validation)
-    const needsHandler = activeAgent.config.toolConfirmation?.mode === 'manual' ||
-        activeAgent.config.elicitation.enabled;
+    const needsHandler = activeAgent.config.permissions.mode === 'manual' || activeAgent.config.elicitation.enabled;
     if (needsHandler) {
         logger.debug('Setting up manual approval handler for initial agent...');
         const handler = createManualApprovalHandler(approvalCoordinator);
@@ -399,8 +376,8 @@ export async function initializeHonoApi(agent, agentCardOverride, listenPort, ag
         getActiveAgentId: () => activeAgentId,
     };
 }
-export async function startHonoApiServer(agent, port = 3000, agentCardOverride, agentId, webRoot, webUIConfig) {
-    const { server, webhookSubscriber } = await initializeHonoApi(agent, agentCardOverride, port, agentId, webRoot, webUIConfig);
+export async function startHonoApiServer(agent, port = 3000, agentCardOverride, agentId, configFilePath, webRoot, webUIConfig) {
+    const { server, webhookSubscriber } = await initializeHonoApi(agent, agentCardOverride, port, agentId, configFilePath, webRoot, webUIConfig);
     server.listen(port, '0.0.0.0', () => {
         const networkInterfaces = os.networkInterfaces();
         let localIp = 'localhost';

package/dist/cli/approval/cli-approval-handler.d.ts

@@ -11,7 +11,13 @@
  * 2. User responds in TUI → EventBus emits 'approval:response' → Handler resolves
  * 3. For auto-approvals (parallel tools), handler emits 'approval:response' → TUI dismisses
  */
-import type { ApprovalHandler, AgentEventBus } from '@dexto/core';
+import type { ApprovalHandler, AgentEventMap } from '@dexto/core';
+type ApprovalEventBus = {
+    on: <K extends keyof AgentEventMap>(event: K, listener: AgentEventMap[K] extends void ? () => void : (payload: AgentEventMap[K]) => void, options?: {
+        signal?: AbortSignal;
+    }) => void;
+    emit: <K extends keyof AgentEventMap>(event: K, ...args: AgentEventMap[K] extends void ? [] : [AgentEventMap[K]]) => boolean;
+};
 /**
  * Creates a manual approval handler for CLI mode that uses AgentEventBus directly.
  *
@@ -20,9 +26,10 @@ import type { ApprovalHandler, AgentEventBus } from '@dexto/core';
  *
  * @example
  * ```typescript
- * const handler = createCLIApprovalHandler(agent.agentEventBus);
+ * const handler = createCLIApprovalHandler(agent);
  * agent.setApprovalHandler(handler);
  * ```
  */
-export declare function createCLIApprovalHandler(eventBus: AgentEventBus): ApprovalHandler;
+export declare function createCLIApprovalHandler(eventBus: ApprovalEventBus): ApprovalHandler;
+export {};
 //# sourceMappingURL=cli-approval-handler.d.ts.map

package/dist/cli/approval/cli-approval-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-approval-handler.d.ts","sourceRoot":"","sources":["../../../src/cli/approval/cli-approval-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACR,eAAe,EAGf,aAAa,EAChB,MAAM,aAAa,CAAC;AAGrB;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,aAAa,GAAG,eAAe,CAyJjF"}
+{"version":3,"file":"cli-approval-handler.d.ts","sourceRoot":"","sources":["../../../src/cli/approval/cli-approval-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACR,eAAe,EAGf,aAAa,EAChB,MAAM,aAAa,CAAC;AAGrB,KAAK,gBAAgB,GAAG;IACpB,EAAE,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAC9B,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,EAC1F,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,KACjC,IAAI,CAAC;IACV,IAAI,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAChC,KAAK,EAAE,CAAC,EACR,GAAG,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAC/D,OAAO,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,eAAe,CAyJpF"}

package/dist/cli/approval/cli-approval-handler.js

@@ -20,7 +20,7 @@ import { ApprovalStatus, DenialReason } from '@dexto/core';
  *
  * @example
  * ```typescript
- * const handler = createCLIApprovalHandler(agent.agentEventBus);
+ * const handler = createCLIApprovalHandler(agent);
  * agent.setApprovalHandler(handler);
  * ```
  */

package/dist/cli/assets/sounds/SOURCES.md

@@ -0,0 +1,35 @@
+# Sound sources / licensing
+
+This folder contains built-in sounds shipped with the Dexto CLI.
+
+Note: Some defaults are provided by the OS (e.g., macOS system sounds) and are not included here.
+
+## Third-party sources
+
+### `coin.wav`
+
+- Source: “Coins 1” by AceOfSpadesProduc100 (Freesound sound ID `341695`)
+- License: Creative Commons Attribution 4.0 (CC BY 4.0)
+- URL: https://freesound.org/s/341695/
+- Changes: none
+
+### `startup.wav`
+
+- Source: “Game Boy Classic - Startup Sound” by toumas (Freesound sound ID `610484`)
+- License: Creative Commons 0 (CC0)
+- URL: https://freesound.org/s/610484/
+- Changes: trimmed/processed for CLI use
+
+### `boot.wav`, `ping.wav`, `win.wav`
+
+- Source pack: “Game Audio - UI SFX” by GameAudio (Freesound pack ID `13940`)
+- License: Creative Commons 0 (CC0)
+- Pack URL: https://freesound.org/people/GameAudio/packs/13940/
+- Original sound IDs:
+  - `boot.wav`: `220207`
+  - `ping.wav`: `220212`
+  - `win.wav`: `220184`
+
+## First-party
+
+Other sounds in this folder were created for Dexto.

package/dist/cli/commands/create-app.d.ts

@@ -1,19 +1,9 @@
 type AppType = 'script' | 'webapp';
 export interface CreateAppOptions {
-    fromImage?: string;
-    fromCore?: boolean;
     type?: AppType;
 }
 /**
- * Creates a Dexto application with two possible modes:
- * - from-image: Use existing image (recommended)
- * - from-core: Build from @dexto/core with custom providers (advanced)
- *
- * Note: To create a new image that extends another image, use `dexto create-image` instead.
- *
- * @param name - Optional name of the app project
- * @param options - Optional flags to specify mode and base image
- * @returns The absolute path to the created project directory
+ * Creates a Dexto application that runs an agent using programmatic configuration.
  */
 export declare function createDextoProject(name?: string, options?: CreateAppOptions): Promise<string>;
 export {};

package/dist/cli/commands/create-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-app.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create-app.ts"],"names":[],"mappings":"AA8BA,KAAK,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACpC,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,MAAM,CAAC,CA0JjB"}
+{"version":3,"file":"create-app.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create-app.ts"],"names":[],"mappings":"AA2BA,KAAK,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,MAAM,CAAC,CA6DjB"}