orquesta-agent 0.1.81 → 0.1.86

package/dist/executor.d.ts

@@ -38,7 +38,14 @@ export interface AuthConfig {
 }
 export declare function configureAuth(config: AuthConfig): void;
 export declare function setPermissionMode(mode: PermissionMode): void;
+export type CliPreference = 'auto' | 'orquesta' | 'claude';
+export declare function setCliPreference(preference: CliPreference): void;
+export declare function isOrquestaCliAvailable(): boolean;
 export declare function isClaudeCliAvailable(): boolean;
+export declare function selectCli(): {
+    cli: 'orquesta' | 'claude' | null;
+    reason: string;
+};
 export declare function checkClaudeAuth(): {
     authenticated: boolean;
     method: string | null;

package/dist/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}

package/dist/executor.js

@@ -261,6 +261,23 @@ export function setPermissionMode(mode) {
     globalPermissionMode = mode;
     logger.info(`Permission mode set to: ${mode}`);
 }
+let globalCliPreference = 'auto';
+// Set CLI preference
+export function setCliPreference(preference) {
+    globalCliPreference = preference;
+    logger.info(`CLI preference set to: ${preference}`);
+}
+// Check if Orquesta CLI command is available in PATH
+export function isOrquestaCliAvailable() {
+    try {
+        // Try to get Orquesta CLI version - this verifies the command exists
+        execSync('orquesta --version', { stdio: 'pipe', timeout: 5000 });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 // Check if Claude CLI command is available in PATH
 export function isClaudeCliAvailable() {
     try {
@@ -272,6 +289,39 @@ export function isClaudeCliAvailable() {
         return false;
     }
 }
+// Select which CLI to use based on availability and preference
+export function selectCli() {
+    const hasOrquesta = isOrquestaCliAvailable();
+    const hasClaude = isClaudeCliAvailable();
+    // If neither available, return null
+    if (!hasOrquesta && !hasClaude) {
+        return { cli: null, reason: 'No CLI found (neither orquesta nor claude)' };
+    }
+    // If preference is explicit and that CLI is available, use it
+    if (globalCliPreference === 'orquesta' && hasOrquesta) {
+        return { cli: 'orquesta', reason: 'User preference: orquesta' };
+    }
+    if (globalCliPreference === 'claude' && hasClaude) {
+        return { cli: 'claude', reason: 'User preference: claude' };
+    }
+    // If preference is explicit but that CLI is NOT available, warn and fallback
+    if (globalCliPreference === 'orquesta' && !hasOrquesta) {
+        logger.warn('Orquesta CLI preferred but not available, falling back to Claude CLI');
+        return { cli: 'claude', reason: 'Fallback: orquesta not available' };
+    }
+    if (globalCliPreference === 'claude' && !hasClaude) {
+        logger.warn('Claude CLI preferred but not available, falling back to Orquesta CLI');
+        return { cli: 'orquesta', reason: 'Fallback: claude not available' };
+    }
+    // Auto mode: prefer orquesta if available, fallback to claude
+    if (hasOrquesta) {
+        return { cli: 'orquesta', reason: 'Auto: orquesta available (local LLM)' };
+    }
+    if (hasClaude) {
+        return { cli: 'claude', reason: 'Auto: claude available (Anthropic API)' };
+    }
+    return { cli: null, reason: 'No CLI found' };
+}
 // Check if Claude CLI is authenticated
 export function checkClaudeAuth() {
     // First check if claude command is available
@@ -843,26 +893,36 @@ ${content}${attachmentContext}`;
     if (anthropicApiKey) {
         env.ANTHROPIC_API_KEY = anthropicApiKey;
     }
-    // Spawn Claude CLI using script to provide a PTY
-    // Claude CLI requires a TTY to output properly
+    // Select CLI based on availability and preference
+    const { cli: selectedCli, reason } = selectCli();
+    if (!selectedCli) {
+        throw new Error('No CLI available. Please install either orquesta-cli or claude CLI.');
+    }
+    const cliCommand = selectedCli;
     const cwd = workingDirectory || process.cwd();
-    logger.info(`Spawning: claude -p "${fullContent.slice(0, 50)}..." in ${cwd}`);
+    logger.info(`CLI Selection: ${cliCommand} (${reason})`);
+    logger.info(`Spawning: ${cliCommand} -p "${fullContent.slice(0, 50)}..." in ${cwd}`);
     // Escape content for shell - replace single quotes
     const escapedContent = fullContent.replace(/'/g, "'\\''");
     // Build command based on permission mode
     // Use stream-json format to get structured output including thinking
     let command;
-    const baseFlags = '--verbose --output-format stream-json';
+    // Different flags for different CLIs
+    // Claude CLI supports --output-format stream-json
+    // Orquesta CLI doesn't need special format flags - it outputs directly
+    const baseFlags = cliCommand === 'orquesta'
+        ? '--verbose' // Orquesta: simple verbose output
+        : '--verbose --output-format stream-json'; // Claude: stream-json format
     const permFlags = mode === 'auto' ? '--dangerously-skip-permissions' : '';
     // If we have image files, pass them BEFORE the -p flag
-    // Claude CLI syntax: claude [files...] -p "prompt" [flags]
+    // CLI syntax: [cli-command] [files...] -p "prompt" [flags]
     if (imageReferences.length > 0) {
         const imageArgs = imageReferences.map(f => `'${f.replace(/'/g, "'\\''")}'`).join(' ');
-        command = `claude ${imageArgs} -p '${escapedContent}' ${permFlags} ${baseFlags}`;
+        command = `${cliCommand} ${imageArgs} -p '${escapedContent}' ${permFlags} ${baseFlags}`;
         logger.info(`Including ${imageReferences.length} image file(s) in command`);
     }
     else {
-        command = `claude -p '${escapedContent}' ${permFlags} ${baseFlags}`;
+        command = `${cliCommand} -p '${escapedContent}' ${permFlags} ${baseFlags}`;
     }
     const claude = spawn('script', ['-q', '-c', command, '/dev/null'], {
         cwd,
@@ -901,6 +961,68 @@ ${content}${attachmentContext}`;
             try {
                 const json = JSON.parse(line);
                 hadValidJson = true; // Successfully parsed JSON
+                // Handle Orquesta CLI eval format (has 'event' field)
+                if (json.event) {
+                    if (json.event === 'start') {
+                        output += `\n🎯 Starting task...\n`;
+                        logs.push(createSystemLog('init', 'Task started', 'info', promptId, json.data));
+                    }
+                    else if (json.event === 'todo') {
+                        const { action, id, title } = json.data;
+                        if (action === 'created') {
+                            output += `\n📝 Task ${id}: ${title}\n`;
+                        }
+                        else if (action === 'started') {
+                            output += `\n▶️  Working on: ${title}\n`;
+                        }
+                        else if (action === 'completed') {
+                            output += `\n✅ Completed: ${title}\n`;
+                        }
+                        else if (action === 'failed') {
+                            output += `\n❌ Failed: ${title}\n`;
+                        }
+                    }
+                    else if (json.event === 'tool_call') {
+                        const { tool, args } = json.data;
+                        output += `\n🔧 Tool: ${tool}\n`;
+                        const argsStr = JSON.stringify(args, null, 2);
+                        if (argsStr.length < 500) {
+                            output += `${argsStr}\n`;
+                        }
+                        logs.push(createToolCallLog(tool, args, 'info', promptId));
+                        currentToolName = tool;
+                    }
+                    else if (json.event === 'tool_result') {
+                        const { tool, success, result, error } = json.data;
+                        if (success && result) {
+                            const preview = result.slice(0, 1000);
+                            output += `\n📋 Result: ${preview}${result.length > 1000 ? '...' : ''}\n`;
+                            logs.push(createToolResultLog(tool, true, result.slice(0, 5000), undefined, 'success', promptId));
+                        }
+                        else if (error) {
+                            output += `\n❌ Error: ${error}\n`;
+                            logs.push(createToolResultLog(tool, false, undefined, error, 'error', promptId));
+                        }
+                    }
+                    else if (json.event === 'response') {
+                        const { content } = json.data;
+                        if (content) {
+                            output += `\n${content}\n`;
+                            logs.push(createOutputLog(content, 'markdown', 'info', promptId));
+                        }
+                    }
+                    else if (json.event === 'end') {
+                        const { success, duration_ms, usage } = json.data;
+                        const duration = (duration_ms / 1000).toFixed(1);
+                        output += `\n${success ? '✅' : '❌'} Completed in ${duration}s\n`;
+                        if (usage) {
+                            output += `📊 Tokens: ${usage.total_tokens || 0}\n`;
+                        }
+                        logs.push(createSystemLog('complete', `Execution ${success ? 'succeeded' : 'failed'}`, success ? 'success' : 'error', promptId, json.data));
+                    }
+                    // Continue to next line - don't process as Claude format
+                    continue;
+                }
                 // Handle different message types from Claude CLI stream-json
                 if (json.type === 'assistant') {
                     // Assistant message with content blocks
@@ -1207,80 +1329,85 @@ ${content}${attachmentContext}`;
     else {
         logger.warn('No stderr pipe available');
     }
-    // Handle completion
-    claude.on('close', async (code) => {
-        runningProcesses.delete(commandId);
-        if (promptId)
-            promptIdToCommandId.delete(promptId);
-        pendingSupervisionCallbacks.delete(commandId);
-        const exitCode = code ?? 0;
-        const duration = Date.now() - startTime;
-        const status = exitCode === 0 ? 'completed' : 'failed';
-        if (exitCode === 0) {
-            logger.success(`Completed in ${(duration / 1000).toFixed(1)}s`);
-        }
-        else {
-            logger.warn(`Exited with code ${exitCode}`);
-        }
-        // Add completion log entry
-        addLog(promptId, exitCode === 0 ? 'success' : 'error', 'system', `Execution ${status} with exit code ${exitCode} in ${(duration / 1000).toFixed(1)}s`);
-        // Stop periodic log persistence and flush any remaining logs
-        stopLogPersistence(promptId);
-        try {
-            await flushLogs(promptId);
-            logger.debug('All logs flushed to database');
-        }
-        catch (err) {
-            logger.error(`Failed to flush final logs: ${err}`);
-        }
-        // Clear output buffer for this command
-        clearOutputBuffer(commandId);
-        // Clean up attachment temp files
-        if (attachmentCleanup) {
-            attachmentCleanup();
-        }
-        // Send completion via WebSocket (for real-time UI update)
-        sendComplete(channel, commandId, exitCode, startTime);
-        // Generate execution summary for project memory
-        const summary = generateExecutionSummary(promptId, content, exitCode);
-        if (summary) {
-            logger.info(`Generated summary: ${summary.text.slice(0, 100)}...`);
-            logger.debug(`Files modified: ${summary.files_modified.length}, Actions: ${summary.key_actions.length}`);
-        }
-        // Update prompt status in database with summary (backend fix - don't rely on frontend)
-        updatePromptStatus(promptId, status, summary || undefined).catch(err => {
-            logger.error(`Failed to update prompt status: ${err}`);
+    // Wrap process lifecycle in a Promise so callers can await completion
+    return new Promise((resolveExecution) => {
+        // Handle completion
+        claude.on('close', async (code) => {
+            runningProcesses.delete(commandId);
+            if (promptId)
+                promptIdToCommandId.delete(promptId);
+            pendingSupervisionCallbacks.delete(commandId);
+            const exitCode = code ?? 0;
+            const duration = Date.now() - startTime;
+            const status = exitCode === 0 ? 'completed' : 'failed';
+            if (exitCode === 0) {
+                logger.success(`Completed in ${(duration / 1000).toFixed(1)}s`);
+            }
+            else {
+                logger.warn(`Exited with code ${exitCode}`);
+            }
+            // Add completion log entry
+            addLog(promptId, exitCode === 0 ? 'success' : 'error', 'system', `Execution ${status} with exit code ${exitCode} in ${(duration / 1000).toFixed(1)}s`);
+            // Stop periodic log persistence and flush any remaining logs
+            stopLogPersistence(promptId);
+            try {
+                await flushLogs(promptId);
+                logger.debug('All logs flushed to database');
+            }
+            catch (err) {
+                logger.error(`Failed to flush final logs: ${err}`);
+            }
+            // Clear output buffer for this command
+            clearOutputBuffer(commandId);
+            // Clean up attachment temp files
+            if (attachmentCleanup) {
+                attachmentCleanup();
+            }
+            // Send completion via WebSocket (for real-time UI update)
+            sendComplete(channel, commandId, exitCode, startTime);
+            // Generate execution summary for project memory
+            const summary = generateExecutionSummary(promptId, content, exitCode);
+            if (summary) {
+                logger.info(`Generated summary: ${summary.text.slice(0, 100)}...`);
+                logger.debug(`Files modified: ${summary.files_modified.length}, Actions: ${summary.key_actions.length}`);
+            }
+            // Update prompt status in database with summary (backend fix - don't rely on frontend)
+            updatePromptStatus(promptId, status, summary || undefined).catch(err => {
+                logger.error(`Failed to update prompt status: ${err}`);
+            });
+            resolveExecution();
+        });
+        // Handle errors
+        claude.on('error', async (err) => {
+            runningProcesses.delete(commandId);
+            if (promptId)
+                promptIdToCommandId.delete(promptId);
+            pendingSupervisionCallbacks.delete(commandId);
+            logger.error(`Execution error: ${err.message}`);
+            // Add error log entry
+            addLog(promptId, 'error', 'system', `Execution error: ${err.message}`);
+            // Stop log persistence and flush remaining logs
+            stopLogPersistence(promptId);
+            try {
+                await flushLogs(promptId);
+            }
+            catch (flushErr) {
+                logger.error(`Failed to flush logs on error: ${flushErr}`);
+            }
+            // Clear output buffer
+            clearOutputBuffer(commandId);
+            // Clean up attachment temp files
+            if (attachmentCleanup) {
+                attachmentCleanup();
+            }
+            if (err.message.includes('ENOENT')) {
+                sendError(channel, commandId, 'Claude CLI not found. Please install it with: npm install -g @anthropic-ai/claude-code', 'CLAUDE_NOT_FOUND');
+            }
+            else {
+                sendError(channel, commandId, err.message);
+            }
+            resolveExecution();
         });
-    });
-    // Handle errors
-    claude.on('error', async (err) => {
-        runningProcesses.delete(commandId);
-        if (promptId)
-            promptIdToCommandId.delete(promptId);
-        pendingSupervisionCallbacks.delete(commandId);
-        logger.error(`Execution error: ${err.message}`);
-        // Add error log entry
-        addLog(promptId, 'error', 'system', `Execution error: ${err.message}`);
-        // Stop log persistence and flush remaining logs
-        stopLogPersistence(promptId);
-        try {
-            await flushLogs(promptId);
-        }
-        catch (flushErr) {
-            logger.error(`Failed to flush logs on error: ${flushErr}`);
-        }
-        // Clear output buffer
-        clearOutputBuffer(commandId);
-        // Clean up attachment temp files
-        if (attachmentCleanup) {
-            attachmentCleanup();
-        }
-        if (err.message.includes('ENOENT')) {
-            sendError(channel, commandId, 'Claude CLI not found. Please install it with: npm install -g @anthropic-ai/claude-code', 'CLAUDE_NOT_FOUND');
-        }
-        else {
-            sendError(channel, commandId, err.message);
-        }
     });
 }
 // Handle a detected permission request
@@ -1425,8 +1552,11 @@ Return ONLY valid JSON in this exact format (no markdown, no explanation):
     }
     // Escape content for shell
     const escapedContent = evaluationPrompt.replace(/'/g, "'\\''");
-    // Run Claude CLI for evaluation (quick, no permissions needed)
-    const command = `claude -p '${escapedContent}' --dangerously-skip-permissions --output-format text`;
+    // Use selected CLI
+    const { cli: selectedCli } = selectCli();
+    const cliCommand = selectedCli || 'claude';
+    // Run CLI for evaluation (quick, no permissions needed)
+    const command = `${cliCommand} -p '${escapedContent}' --dangerously-skip-permissions --output-format text`;
     const { execSync } = await import('child_process');
     try {
         const output = execSync(`script -q -c "${command.replace(/"/g, '\\"')}" /dev/null`, {
@@ -1631,8 +1761,11 @@ export async function generatePlanItems(options) {
     }
     // Escape content for shell - handle single quotes properly
     const escapedContent = prompt.replace(/'/g, "'\"'\"'");
-    // Run Claude CLI for generation (quick, no permissions needed)
-    const command = `claude -p '${escapedContent}' --dangerously-skip-permissions --output-format text`;
+    // Use selected CLI
+    const { cli: selectedCli } = selectCli();
+    const cliCommand = selectedCli || 'claude';
+    // Run CLI for generation (quick, no permissions needed)
+    const command = `${cliCommand} -p '${escapedContent}' --dangerously-skip-permissions --output-format text`;
     logger.debug(`Running Claude CLI...`);
     try {
         const output = execSync(`script -q -c "${command.replace(/"/g, '\\"')}" /dev/null`, {
@@ -1724,10 +1857,13 @@ export function startSession(options) {
     if (anthropicApiKey) {
         env.ANTHROPIC_API_KEY = anthropicApiKey;
     }
-    // Spawn Claude CLI in interactive mode with PTY
+    // Use selected CLI
+    const { cli: selectedCli } = selectCli();
+    const cliCommand = selectedCli || 'claude';
+    // Spawn CLI in interactive mode with PTY
     // Using script command to provide a proper TTY
     // Wrap with stdbuf to disable output buffering for real-time streaming
-    const claude = spawn('script', ['-q', '-c', 'stdbuf -oL -eL claude --dangerously-skip-permissions', '/dev/null'], {
+    const claude = spawn('script', ['-q', '-c', `stdbuf -oL -eL ${cliCommand} --dangerously-skip-permissions`, '/dev/null'], {
         cwd,
         env,
         stdio: ['pipe', 'pipe', 'pipe'],