dexto 1.5.8 → 1.6.1

package/dist/cli/ink-cli/utils/soundNotification.js

@@ -4,12 +4,35 @@
  * Plays system sounds for CLI notifications like approval requests and task completion.
  * Uses platform-specific commands with fallback to terminal bell.
  *
- * Sound files should be placed in ~/.dexto/sounds/ or use system defaults.
+ * Sound files should be placed in the Dexto sounds directory (typically ~/.dexto/sounds/).
+ * In dexto source + DEXTO_DEV_MODE=true, this uses <repo>/.dexto/sounds/ for isolated dev.
  */
-import { exec } from 'child_process';
 import { existsSync } from 'fs';
-import { join } from 'path';
-import { homedir, platform } from 'os';
+import { isAbsolute, normalize, resolve, sep } from 'path';
+import { fileURLToPath } from 'node:url';
+import { execFile } from 'child_process';
+import { getDextoGlobalPath } from '@dexto/agent-management';
+export const CUSTOM_SOUND_EXTENSIONS = ['.wav', '.mp3', '.ogg', '.oga', '.aiff', '.m4a'];
+function getSoundFileKey(soundType) {
+    switch (soundType) {
+        case 'startup':
+            return 'startupSoundFile';
+        case 'approval':
+            return 'approvalSoundFile';
+        case 'complete':
+            return 'completeSoundFile';
+    }
+}
+function resolvePathWithinSoundsDir(soundPath) {
+    if (soundPath.trim().length === 0)
+        return null;
+    const soundsDir = normalize(getDextoGlobalPath('sounds'));
+    const resolved = isAbsolute(soundPath) ? normalize(soundPath) : resolve(soundsDir, soundPath);
+    if (resolved === soundsDir || resolved.startsWith(soundsDir + sep)) {
+        return resolved;
+    }
+    return null;
+}
 /**
  * Platform-specific default sound paths
  */
@@ -30,64 +53,81 @@ const PLATFORM_SOUNDS = {
         complete: 'SystemHand',
     },
 };
-/**
- * Get custom sound path from ~/.dexto/sounds/
- */
-function getCustomSoundPath(soundType) {
-    const dextoSoundsDir = join(homedir(), '.dexto', 'sounds');
-    const extensions = ['.wav', '.mp3', '.ogg', '.aiff', '.m4a'];
-    for (const ext of extensions) {
-        const customPath = join(dextoSoundsDir, `${soundType}${ext}`);
-        if (existsSync(customPath)) {
-            return customPath;
-        }
+const BUNDLED_STARTUP_SOUND_PATH = fileURLToPath(new URL('../../assets/sounds/startup.wav', import.meta.url));
+export function getDefaultSoundSpec(soundType) {
+    if (soundType === 'startup') {
+        return BUNDLED_STARTUP_SOUND_PATH;
     }
-    return null;
+    const platformSounds = PLATFORM_SOUNDS[process.platform];
+    return platformSounds?.[soundType] ?? null;
 }
 /**
  * Play a sound file using platform-specific command
  */
 function playSound(soundPath) {
-    const currentPlatform = platform();
-    let command;
-    switch (currentPlatform) {
-        case 'darwin':
-            // macOS: use afplay
-            command = `afplay "${soundPath}"`;
-            break;
-        case 'linux':
-            // Linux: try paplay (PulseAudio), then aplay (ALSA)
-            if (soundPath.endsWith('.oga') || soundPath.endsWith('.ogg')) {
-                command = `paplay "${soundPath}" 2>/dev/null || ogg123 -q "${soundPath}" 2>/dev/null`;
+    const execOrBell = (cmd, args, onError) => {
+        execFile(cmd, args, { windowsHide: true }, (error) => {
+            if (!error)
+                return;
+            if (onError) {
+                onError();
+                return;
+            }
+            playTerminalBell();
+        });
+    };
+    switch (process.platform) {
+        case 'darwin': {
+            execOrBell('afplay', [soundPath]);
+            return;
+        }
+        case 'linux': {
+            const lowerSoundPath = soundPath.toLowerCase();
+            const isOgg = lowerSoundPath.endsWith('.oga') || lowerSoundPath.endsWith('.ogg');
+            if (isOgg) {
+                execOrBell('paplay', [soundPath], () => {
+                    execOrBell('ogg123', ['-q', soundPath]);
+                });
             }
             else {
-                command = `paplay "${soundPath}" 2>/dev/null || aplay -q "${soundPath}" 2>/dev/null`;
+                execOrBell('paplay', [soundPath], () => {
+                    execOrBell('aplay', ['-q', soundPath]);
+                });
             }
-            break;
-        case 'win32':
+            return;
+        }
+        case 'win32': {
             // Windows: use PowerShell with System.Media.SystemSounds
             // For Windows system sounds, soundPath is the sound name
             if (['SystemAsterisk', 'SystemHand', 'SystemExclamation', 'SystemQuestion'].includes(soundPath)) {
-                command = `powershell -c "[System.Media.SystemSounds]::${soundPath.replace('System', '')}.Play()"`;
+                const systemSoundName = soundPath.replace('System', '');
+                execOrBell('powershell', [
+                    '-NoProfile',
+                    '-NonInteractive',
+                    '-Command',
+                    `[System.Media.SystemSounds]::${systemSoundName}.Play()`,
+                ]);
+                return;
             }
-            else {
-                // For custom files, use SoundPlayer
-                command = `powershell -c "(New-Object System.Media.SoundPlayer '${soundPath}').PlaySync()"`;
-            }
-            break;
-        default:
+            // For custom files, use SoundPlayer
+            execOrBell('powershell', [
+                '-NoProfile',
+                '-NonInteractive',
+                '-Command',
+                '& { param([string]$p) (New-Object System.Media.SoundPlayer $p).PlaySync() }',
+                soundPath,
+            ]);
+            return;
+        }
+        default: {
             // Fallback: try to use terminal bell
             playTerminalBell();
             return;
-    }
-    // Execute sound command asynchronously (fire and forget)
-    // Use 5s timeout to prevent hanging processes (e.g., audio device issues)
-    exec(command, { timeout: 5000 }, (error) => {
-        if (error) {
-            // Silently fall back to terminal bell on error
-            playTerminalBell();
         }
-    });
+    }
+}
+export function playSoundFile(soundPath) {
+    playSound(soundPath);
 }
 /**
  * Play terminal bell (works in most terminals)
@@ -95,10 +135,26 @@ function playSound(soundPath) {
 function playTerminalBell() {
     process.stdout.write('\x07');
 }
+function resolveNotificationSoundSpec(soundType, config) {
+    const configuredRelativePath = config?.[getSoundFileKey(soundType)];
+    if (configuredRelativePath) {
+        const resolved = resolvePathWithinSoundsDir(configuredRelativePath);
+        if (resolved && existsSync(resolved)) {
+            return resolved;
+        }
+    }
+    const defaultSpec = getDefaultSoundSpec(soundType);
+    if (!defaultSpec)
+        return null;
+    if (process.platform === 'win32') {
+        return defaultSpec;
+    }
+    return existsSync(defaultSpec) ? defaultSpec : null;
+}
 /**
  * Play a notification sound
  *
- * @param soundType - Type of sound to play ('approval' or 'complete')
+ * @param soundType - Type of sound to play ('startup', 'approval', or 'complete')
  *
  * @example
  * ```typescript
@@ -107,40 +163,18 @@ function playTerminalBell() {
  *
  * // Play task complete sound
  * playNotificationSound('complete');
+ *
+ * // Play startup sound
+ * playNotificationSound('startup');
  * ```
  */
-export function playNotificationSound(soundType) {
-    const currentPlatform = platform();
-    // Check for custom sound first
-    const customSound = getCustomSoundPath(soundType);
-    if (customSound) {
-        playSound(customSound);
+export function playNotificationSound(soundType, config) {
+    const soundSpec = resolveNotificationSoundSpec(soundType, config);
+    if (!soundSpec) {
+        playTerminalBell();
         return;
     }
-    // Use platform default
-    const platformSounds = PLATFORM_SOUNDS[currentPlatform];
-    if (platformSounds) {
-        const defaultSound = platformSounds[soundType];
-        if (defaultSound) {
-            // For macOS and Linux, check if file exists
-            if (currentPlatform !== 'win32') {
-                if (existsSync(defaultSound)) {
-                    playSound(defaultSound);
-                }
-                else {
-                    // File doesn't exist, use bell
-                    playTerminalBell();
-                }
-            }
-            else {
-                // Windows uses system sound names
-                playSound(defaultSound);
-            }
-            return;
-        }
-    }
-    // Fallback to terminal bell
-    playTerminalBell();
+    playSound(soundSpec);
 }
 /**
  * Sound notification service that respects configuration
@@ -165,12 +199,20 @@ export class SoundNotificationService {
     getConfig() {
         return { ...this.config };
     }
+    /**
+     * Play CLI startup sound if enabled
+     */
+    playStartupSound() {
+        if (this.config.enabled && this.config.onStartup) {
+            playNotificationSound('startup', this.config);
+        }
+    }
     /**
      * Play approval required sound if enabled
      */
     playApprovalSound() {
         if (this.config.enabled && this.config.onApprovalRequired) {
-            playNotificationSound('approval');
+            playNotificationSound('approval', this.config);
         }
     }
     /**
@@ -178,26 +220,7 @@ export class SoundNotificationService {
      */
     playCompleteSound() {
         if (this.config.enabled && this.config.onTaskComplete) {
-            playNotificationSound('complete');
+            playNotificationSound('complete', this.config);
         }
     }
 }
-/**
- * Singleton instance for global use
- * Initialize with loadGlobalPreferences() in CLI startup
- */
-let globalSoundService = null;
-/**
- * Get the global sound notification service
- * @returns The global service, or null if not initialized
- */
-export function getSoundService() {
-    return globalSoundService;
-}
-/**
- * Initialize the global sound service with configuration
- */
-export function initializeSoundService(config) {
-    globalSoundService = new SoundNotificationService(config);
-    return globalSoundService;
-}

package/dist/cli/ink-cli/utils/toolUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/utils/toolUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CASrE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAMtE;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEhF"}
+{"version":3,"file":"toolUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/utils/toolUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAErE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEhF"}

package/dist/cli/ink-cli/utils/toolUtils.js

@@ -6,12 +6,7 @@
  * Used for "accept all edits" mode which auto-approves these tools.
  */
 export function isEditWriteTool(toolName) {
-    return (toolName === 'internal--edit_file' ||
-        toolName === 'internal--write_file' ||
-        toolName === 'custom--write_file' ||
-        toolName === 'custom--edit_file' ||
-        toolName === 'edit_file' ||
-        toolName === 'write_file');
+    return toolName === 'edit_file' || toolName === 'write_file';
 }
 /**
  * Check if a tool is a plan update tool.
@@ -19,9 +14,7 @@ export function isEditWriteTool(toolName) {
  * (typically marking tasks as complete during implementation).
  */
 export function isPlanUpdateTool(toolName) {
-    return (toolName === 'plan_update' ||
-        toolName === 'custom--plan_update' ||
-        toolName === 'internal--plan_update');
+    return toolName === 'plan_update';
 }
 /**
  * Check if a tool should be auto-approved in "accept all edits" mode.

package/dist/cli/utils/config-validation.d.ts

@@ -1,13 +1,18 @@
-import { type AgentConfig, type ValidatedAgentConfig, type LLMValidationOptions } from '@dexto/core';
+import { type AgentConfig, type ValidatedAgentConfig } from '@dexto/agent-config';
 export interface ValidationResult {
     success: boolean;
     config?: ValidatedAgentConfig;
     errors?: string[];
+    warnings?: string[];
     skipped?: boolean;
 }
+export interface ValidationOptions {
+    agentPath?: string;
+    credentialPolicy?: 'warn' | 'error' | 'ignore';
+}
 /**
  * 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
@@ -15,16 +20,11 @@ export interface ValidationResult {
  *
  * @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 declare function validateAgentConfig(config: AgentConfig, interactive?: boolean, validationOptions?: LLMValidationOptions & {
-    agentPath?: string;
-}): Promise<ValidationResult>;
+export declare function validateAgentConfig(config: AgentConfig, interactive?: boolean, options?: ValidationOptions): Promise<ValidationResult>;
 /**
- * Legacy function for backwards compatibility
- * @deprecated Use validateAgentConfig with result handling instead
+ * Note: validateAgentConfig never exits. Callers own exit behavior.
  */
-export declare function validateAgentConfigOrExit(config: AgentConfig, interactive?: boolean): Promise<ValidatedAgentConfig>;
 //# sourceMappingURL=config-validation.d.ts.map

package/dist/cli/utils/config-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-validation.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/config-validation.ts"],"names":[],"mappings":"AAGA,OAAO,EAGH,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAC5B,MAAM,aAAa,CAAC;AAYrB,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,WAAW,EACnB,WAAW,GAAE,OAAe,EAC5B,iBAAiB,CAAC,EAAE,oBAAoB,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAClE,OAAO,CAAC,gBAAgB,CAAC,CAyC3B;AAkbD;;;GAGG;AACH,wBAAsB,yBAAyB,CAC3C,MAAM,EAAE,WAAW,EACnB,WAAW,GAAE,OAAe,GAC7B,OAAO,CAAC,oBAAoB,CAAC,CAgC/B"}
+{"version":3,"file":"config-validation.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/config-validation.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,KAAK,WAAW,EAChB,KAAK,oBAAoB,EAC5B,MAAM,qBAAqB,CAAC;AAW7B,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;CAClD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,WAAW,EACnB,WAAW,GAAE,OAAe,EAC5B,OAAO,CAAC,EAAE,iBAAiB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAsC3B;AAsLD;;GAEG"}