daedalus-cli 0.5.18 → 0.5.20

package/dist/index.js

@@ -183,7 +183,7 @@ const COMMANDS = [
     '/index', '/find', '/refs', '/def',
     '/commit', '/undo', '/test', '/paste',
     '/models', '/tools', '/config', '/project', '/doctor', '/session', '/onboard',
-    '/help', 'exit', 'quit', '?', '/prune', '/branch', '/pr', '/debug',
+    '/help', 'exit', 'quit', '?', '/prune', '/branch', '/pr', '/debug', '/ensemble',
 ];
 const rl = readline.createInterface({
     input: process.stdin,
@@ -773,11 +773,19 @@ async function callModelWithTools(userContent, imageBase64) {
                 return { content: '', toolCalls: [] };
             }
             spinner.stop();
-            console.error(pc.red(`\n[ERROR] Error calling model: ${error.message}`));
+            const firstLine = (error.message || '').split('\n')[0];
+            console.log(pc.yellow(`\n  ${pc.bold('[WARN]')} Error calling model: ${firstLine}`));
+            console.log(pc.dim(`         (Tip: Run /doctor to diagnose connection or loading issues)`));
             throw error;
         }
         currentAbortController = null;
-        const toolCallArray = Array.from(toolCallMap.values()).filter(tc => tc.function.name);
+        let toolCallArray = Array.from(toolCallMap.values()).filter(tc => tc.function.name);
+        if (toolCallArray.length === 0) {
+            const parsedCalls = parseTextToolCalls(fullContent);
+            if (parsedCalls.length > 0) {
+                toolCallArray = parsedCalls;
+            }
+        }
         lastContent = fullContent;
         // Close assistant block after streaming, before tool results
         if (blockOpened) {
@@ -865,7 +873,7 @@ async function callModelWithFallback(userContent, imageBase64) {
     else {
         messages.push({ role: 'user', content: userContent });
     }
-    console.log(pc.gray('[THINK] Thinking (fallback mode)...'));
+    console.log(pc.gray('  [THINK] Thinking (fallback mode)...'));
     try {
         const response = await router.chat.completions.create({
             model: 'auto',
@@ -882,7 +890,9 @@ async function callModelWithFallback(userContent, imageBase64) {
         return reply;
     }
     catch (error) {
-        console.error(pc.red(`\n[ERROR] Fallback error: ${error.message}`));
+        const firstLine = (error.message || '').split('\n')[0];
+        console.log(pc.yellow(`\n  ${pc.bold('[WARN]')} Fallback error: ${firstLine}`));
+        console.log(pc.dim(`         (Tip: Run /doctor to diagnose connection or loading issues)`));
         throw error;
     }
 }
@@ -1035,6 +1045,50 @@ function writeAssistantChunk(chunk) {
         }
     }
 }
+export function parseTextToolCalls(text) {
+    const toolCalls = [];
+    const regex = /<(longcat_)?tool_call>([\s\S]*?)<\/(longcat_)?tool_call>/g;
+    let match;
+    while ((match = regex.exec(text)) !== null) {
+        const blockContent = match[2].trim();
+        const lines = blockContent.split('\n').map(l => l.trim()).filter(Boolean);
+        if (lines.length === 0)
+            continue;
+        const toolName = lines[0].replace(/<[^>]+>/g, '').trim();
+        const args = {};
+        const keyRegex = /<(longcat_)?arg_key>([\s\S]*?)<\/(longcat_)?arg_key>/g;
+        const valRegex = /<(longcat_)?arg_value>([\s\S]*?)<\/(longcat_)?arg_value>/g;
+        const keys = [];
+        const values = [];
+        let keyMatch;
+        while ((keyMatch = keyRegex.exec(blockContent)) !== null) {
+            keys.push(keyMatch[2].trim());
+        }
+        let valMatch;
+        while ((valMatch = valRegex.exec(blockContent)) !== null) {
+            values.push(valMatch[2].trim());
+        }
+        for (let i = 0; i < Math.min(keys.length, values.length); i++) {
+            const k = keys[i];
+            const v = values[i];
+            try {
+                args[k] = JSON.parse(v);
+            }
+            catch {
+                args[k] = v;
+            }
+        }
+        toolCalls.push({
+            id: `call_parsed_${Date.now()}_${toolCalls.length}`,
+            type: 'function',
+            function: {
+                name: toolName,
+                arguments: JSON.stringify(args),
+            }
+        });
+    }
+    return toolCalls;
+}
 function closeAssistantBlock(tokens, elapsedMs, toolCount) {
     if (_assistantLineBuf) {
         for (const part of wrapLine(_assistantLineBuf, termW)) {
@@ -1042,9 +1096,10 @@ function closeAssistantBlock(tokens, elapsedMs, toolCount) {
         }
         _assistantLineBuf = '';
     }
+    const modelStr = router.lastRoutedModel ? `${router.lastRoutedModel}  ·  ` : '';
     const meta = toolCount !== undefined
-        ? `${toolCount} tool(s)  ·  ~${Math.round(tokens / 4)}t out  ·  ${elapsedMs}ms`
-        : `~${Math.round(tokens / 4)}t out  ·  ${elapsedMs}ms`;
+        ? `${modelStr}${toolCount} tool(s)  ·  ~${Math.round(tokens / 4)}t out  ·  ${elapsedMs}ms`
+        : `${modelStr}~${Math.round(tokens / 4)}t out  ·  ${elapsedMs}ms`;
     console.log(`  ${pc.dim(meta)}\n`);
 }
 function turnSeparator() {
@@ -1098,6 +1153,7 @@ async function chatLoop() {
             console.log(`  ${pc.cyan('/paste')}   Paste clipboard text/image as message`);
             console.log(`  ${pc.cyan('/test')}     Run tests and auto-fix failures`);
             console.log(`  ${pc.cyan('/debug')}    Run a command and autonomously fix failures`);
+            console.log(`  ${pc.cyan('/ensemble')} Run multi-model ensemble drafting pipeline`);
             console.log(`  ${pc.cyan('/index')}    Index codebase for symbol search`);
             console.log(`  ${pc.cyan('/find')}     Search indexed symbols`);
             console.log(`  ${pc.cyan('/refs')}    Find symbol references`);
@@ -1176,16 +1232,16 @@ async function chatLoop() {
                             sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                         }
                         catch (error) {
-                            console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
                             try {
                                 const filesContext = buildFileContext();
                                 const userContent = `${filesContext}User Prompt: ${message}`;
-                                console.log(pc.yellow('\n[RETRY] Trying fallback mode...'));
+                                console.log(pc.yellow('\n  [RETRY] Trying fallback mode...'));
                                 await callModelWithFallback(userContent, base64);
                                 sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                             }
                             catch (fallbackErr) {
-                                console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
+                                const firstLine = (fallbackErr.message || '').split('\n')[0];
+                                console.log(pc.red(`\n  ${pc.bold('[ERROR]')} Fallback also failed: ${firstLine}`));
                             }
                         }
                         turnSeparator();
@@ -1209,16 +1265,16 @@ async function chatLoop() {
                     sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                 }
                 catch (error) {
-                    console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
                     try {
                         const filesContext = buildFileContext();
                         const userContent = `${filesContext}User Prompt: ${message}`;
-                        console.log(pc.yellow('\n[RETRY] Trying fallback mode...'));
+                        console.log(pc.yellow('\n  [RETRY] Trying fallback mode...'));
                         await callModelWithFallback(userContent, base64);
                         sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                     }
                     catch (fallbackErr) {
-                        console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
+                        const firstLine = (fallbackErr.message || '').split('\n')[0];
+                        console.log(pc.red(`\n  ${pc.bold('[ERROR]')} Fallback also failed: ${firstLine}`));
                     }
                 }
                 turnSeparator();
@@ -1240,7 +1296,6 @@ async function chatLoop() {
                 sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
             }
             catch (error) {
-                console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
             }
             turnSeparator();
             continue;
@@ -1730,6 +1785,23 @@ Once you have finished making changes, I will automatically re-run the command t
             turnSeparator();
             continue;
         }
+        // Command: /ensemble <goal> — run multi-model ensemble drafting pipeline
+        if (lowerInput.startsWith('/ensemble ') || lowerInput === '/ensemble') {
+            const ensembleGoal = trimmedInput.substring(9).trim();
+            if (!ensembleGoal) {
+                console.log(pc.red('  Error: Please specify a goal for the ensemble draft. Example: /ensemble Implement feature X'));
+                continue;
+            }
+            try {
+                const { runEnsembleWorkflow } = await import('./agents/ensemble.js');
+                await runEnsembleWorkflow(ensembleGoal, toolContext, config, router);
+            }
+            catch (err) {
+                console.log(pc.red(`\n  Error in ensemble drafting: ${err.message}`));
+            }
+            turnSeparator();
+            continue;
+        }
         // Command: /commit — stage and commit changes
         if (lowerInput === '/commit' || lowerInput.startsWith('/commit ')) {
             const forcedMsg = trimmedInput.startsWith('/commit ') ? trimmedInput.substring(8).trim() : '';
@@ -1939,11 +2011,10 @@ Once you have finished making changes, I will automatically re-run the command t
             await extractAndSave(router, sessionManager, messages);
         }
         catch (error) {
-            console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
             try {
                 const filesContext = buildFileContext();
                 const userContent = `${filesContext}User Prompt: ${trimmedInput}`;
-                console.log(pc.yellow('\n[RETRY] Trying fallback mode...'));
+                console.log(pc.yellow('\n  [RETRY] Trying fallback mode...'));
                 const fallbackResult = await callModelWithFallback(userContent);
                 if (fallbackResult) {
                     // Persist session after fallback too
@@ -1952,8 +2023,9 @@ Once you have finished making changes, I will automatically re-run the command t
                 }
             }
             catch (fallbackErr) {
-                console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
-                console.error(pc.gray('Check that at least one local server is running.'));
+                const firstLine = (fallbackErr.message || '').split('\n')[0];
+                console.log(pc.red(`\n  ${pc.bold('[ERROR]')} Fallback also failed: ${firstLine}`));
+                console.log(pc.dim('         Check that at least one local server is running or run /doctor to debug.'));
             }
         }
         turnSeparator();