daedalus-cli 0.5.9 → 0.5.11

package/dist/index.js

@@ -40,6 +40,13 @@ let turnStartTime = 0;
 let currentAbortController = null;
 // Compute stable projectHash once
 const projectHash = crypto.createHash('sha256').update(path.resolve(process.cwd())).digest('hex').slice(0, 12);
+// Max chars of tool output stored in message history (prevents context-window overflow)
+const TOOL_RESULT_MAX_CHARS = 32_000;
+// Single source of truth for the codebase index DB path — used by all REPL
+// handlers AND the indexing tools so they always share the same database.
+function getIndexDbPath() {
+    return path.join(os.homedir(), '.daedalus', 'indexing', `${projectHash}.sqlite`);
+}
 // Initialize session manager
 const sessionManager = new SessionManager();
 sessionManager.init();
@@ -144,11 +151,11 @@ A FTS5 symbol index is built automatically on startup. Use \`find_symbol\` to se
 
 | Result | Meaning | What YOU must do |
 |--------|---------|-----------------|
-| \`Patched <file>\` | ✅ Success — change written to disk | Continue to next step |
-| error contains \`PATCH_DECLINED\` | 🚫 User reviewed the diff and said No or Skip | STOP retrying. Tell the user what you tried to change and ask how they'd like to proceed |
-| error contains \`not found\` | ❌ old_string didn't match the file | Immediately call \`read_file\` on that file, find the exact text, then retry \`patch\` with the corrected old_string |
-| error contains \`multiple locations\` | ❌ old_string is too generic | Add more surrounding lines to old_string to make it unique, then retry |
-| error contains \`File not found\` | ❌ Wrong path | Use \`search_files\` or \`list_files\` to find the correct path |
+| \`Patched <file>\` | [OK] Success — change written to disk | Continue to next step |
+| \`PATCH_DECLINED\` | [SKIP] User reviewed the diff and said No or Skip | STOP retrying. Tell the user what you tried to change and ask how they'd like to proceed |
+| error contains \`not found\` | [ERROR] old_string didn't match the file | Immediately call \`read_file\` on that file, find the exact text, then retry \`patch\` with the corrected old_string |
+| error contains \`multiple locations\` | [ERROR] old_string is too generic | Add more surrounding lines to old_string to make it unique, then retry |
+| error contains \`File not found\` | [ERROR] Wrong path | Use \`search_files\` or \`list_files\` to find the correct path |
 
 **Never freeze or loop silently.** If a patch fails, take one corrective action and tell the user what happened.`;
 // Build system prompt with project memory and user profile
@@ -219,7 +226,6 @@ function printBanner() {
     const white = pc.white.bind(pc);
     const bold = pc.bold.bind(pc);
     const dim = pc.dim.bind(pc);
-    const mag = pc.magenta.bind(pc);
     // Top border
     console.log(hRule('╔', '╗', '═', W, cyan));
     console.log(box(' '.repeat(W), cyan));
@@ -304,8 +310,8 @@ async function buildIndexContext(userMessage) {
     if (!config.indexing.enabled || !toolContext.indexDb)
         return '';
     const indexDb = toolContext.indexDb;
-    // Extract likely symbol names from the user message (camelCase, snake_case, class names)
-    const symbolCandidates = userMessage.match(/\b[A-Z][a-zA-Z0-9_]*\b/g) || [];
+    // Extract likely symbol names from the user message (camelCase, PascalCase, snake_case, class names)
+    const symbolCandidates = userMessage.match(/\b(?:[a-z]+[A-Z]|[A-Z][a-z])[a-zA-Z0-9_]*\b/g) || [];
     const words = userMessage.split(/\s+/).filter(w => w.length > 2);
     const allTerms = [...symbolCandidates, ...words];
     if (allTerms.length === 0)
@@ -363,10 +369,10 @@ function initializeSessionState(loaded) {
 async function handleSpawn(role, task) {
     const validRoles = ['coder', 'reviewer', 'debugger', 'researcher', 'planner'];
     if (!validRoles.includes(role)) {
-        console.log(pc.red(`⚠ Unknown role: ${role}. Valid: ${validRoles.join(', ')}`));
+        console.log(pc.red(`[WARN] Unknown role: ${role}. Valid: ${validRoles.join(', ')}`));
         return;
     }
-    console.log(pc.cyan(`\n🤝 Spawning ${role} agent for: ${task.slice(0, 80)}...`));
+    console.log(pc.cyan(`\n[SPAWN] Spawning ${role} agent for: ${task.slice(0, 80)}...`));
     const context = `Active files: ${Array.from(activeFiles.values()).join(', ') || 'none'}`;
     const fakeToolCall = {
         id: `call_${Date.now()}`,
@@ -388,7 +394,7 @@ async function handleSpawn(role, task) {
 }
 // Handle /orchestrate command
 async function handleOrchestrate(goal) {
-    console.log(pc.cyan(`\n🎭 Starting orchestration for: ${goal}`));
+    console.log(pc.cyan(`\n[ORCHESTRATE] Starting orchestration for: ${goal}`));
     const { Orchestrator } = await import('./agents/orchestrator.js');
     const orchestrator = new Orchestrator(router, messages, toolContext);
     const result = await orchestrator.run(goal);
@@ -418,8 +424,6 @@ async function handleModels() {
 }
 // Handle /config command
 function handleConfig() {
-    // Max chars of tool output stored in message history (prevents context-window overflow)
-    const TOOL_RESULT_MAX_CHARS = 32_000;
     console.log(pc.bold('\n--- Current Configuration ---'));
     console.log(JSON.stringify(config, null, 2));
     console.log(pc.bold('-----------------------------'));
@@ -469,11 +473,10 @@ async function handleDoctor() {
     console.log(pc.bold('  Config:') + pc.gray(` ${configDir}\\config.json`));
     console.log(pc.bold('----------------------\n'));
 } // end handleDoctor
-// Handle /index command
 async function handleIndex(opts) {
     console.log(pc.bold('\n--- Indexing Codebase ---'));
     console.log(pc.gray(`Project: ${process.cwd()}`));
-    const indexDbPath = path.join(os.homedir(), '.daedalus', 'sessions', projectHash, 'index.sqlite');
+    const indexDbPath = getIndexDbPath();
     if (!fs.existsSync(path.dirname(indexDbPath))) {
         fs.mkdirSync(path.dirname(indexDbPath), { recursive: true });
     }
@@ -491,12 +494,13 @@ async function handleIndex(opts) {
                 return;
             lastPct = pct;
             const filled = Math.round((current / total) * barWidth);
-            const bar = '█'.repeat(filled) + '░'.repeat(barWidth - filled);
+            const bar = '\u2588'.repeat(filled) + '\u2591'.repeat(barWidth - filled);
             process.stdout.write(`\r  ${pc.cyan(bar)} ${pc.white(`${current}/${total}`)} ${pc.gray(file.slice(-40))}`);
         };
         const result = await indexCodebase(db, process.cwd(), projectHash, { ...opts, onProgress });
         process.stdout.write('\n');
         const elapsed = Date.now() - start;
+        toolContext.indexDb = db;
         console.log(pc.green(`\n✔ Indexing complete in ${elapsed}ms`));
         console.log(pc.white(`  Total files:     ${result.totalFiles}`));
         console.log(pc.white(`  Indexed files:   ${result.indexedFiles}`));
@@ -510,14 +514,13 @@ async function handleIndex(opts) {
         }
     }
     catch (err) {
-        console.error(pc.red(`\n❌ Indexing failed: ${err.message}`));
+        console.error(pc.red(`\n[ERROR] Indexing failed: ${err.message}`));
     }
 }
-// Handle /find <query> [limit]
 async function handleFindSymbol(query, limit) {
-    const indexDbPath = path.join(os.homedir(), '.daedalus', 'sessions', projectHash, 'index.sqlite');
+    const indexDbPath = getIndexDbPath();
     if (!fs.existsSync(indexDbPath)) {
-        console.log(pc.yellow('⚠ No index found. Run /index first.'));
+        console.log(pc.yellow('[WARN] No index found. Run /index first.'));
         return;
     }
     const { initIndexDb, searchSymbols } = await import('./indexing/fts.js');
@@ -538,11 +541,10 @@ async function handleFindSymbol(query, limit) {
         }
     }
 }
-// Handle /refs <symbol>
 async function handleGetReferences(symbol) {
-    const indexDbPath = path.join(os.homedir(), '.daedalus', 'sessions', projectHash, 'index.sqlite');
+    const indexDbPath = getIndexDbPath();
     if (!fs.existsSync(indexDbPath)) {
-        console.log(pc.yellow('⚠ No index found. Run /index first.'));
+        console.log(pc.yellow('[WARN] No index found. Run /index first.'));
         return;
     }
     const { initIndexDb, findReferences } = await import('./indexing/fts.js');
@@ -553,7 +555,6 @@ async function handleGetReferences(symbol) {
         console.log(pc.gray('  No references found.'));
         return;
     }
-    // Group by caller
     const byCaller = new Map();
     for (const r of refs) {
         const key = `${r.caller_name} (${r.caller_file}:${r.caller_line})`;
@@ -572,11 +573,10 @@ async function handleGetReferences(symbol) {
         }
     }
 }
-// Handle /def <symbol>
 async function handleGetDefinition(symbol) {
-    const indexDbPath = path.join(os.homedir(), '.daedalus', 'sessions', projectHash, 'index.sqlite');
+    const indexDbPath = getIndexDbPath();
     if (!fs.existsSync(indexDbPath)) {
-        console.log(pc.yellow('⚠ No index found. Run /index first.'));
+        console.log(pc.yellow('[WARN] No index found. Run /index first.'));
         return;
     }
     const { initIndexDb, findDefinitions } = await import('./indexing/fts.js');
@@ -597,8 +597,6 @@ async function handleGetDefinition(symbol) {
         }
     }
 }
-// Max chars of tool output stored in message history (prevents context-window overflow)
-const TOOL_RESULT_MAX_CHARS = 32_000;
 function truncateToolResult(content) {
     if (content.length <= TOOL_RESULT_MAX_CHARS)
         return content;
@@ -657,21 +655,20 @@ async function checkForUpdates() {
 // Streaming response handler with tool call support — iterative, not recursive
 const MAX_TOOL_TURNS = 40;
 async function callModelWithTools(userContent, imageBase64) {
-    // Auto-inject index context on first user turn (not on tool-result rounds)
+    // Push the user message as-is — callers in chatLoop are responsible for
+    // pre-augmenting userContent with file context and index context.
     if (userContent) {
-        const indexCtx = await buildIndexContext(userContent);
-        const augmentedContent = indexCtx ? indexCtx + userContent : userContent;
         if (imageBase64) {
             messages.push({
                 role: 'user',
                 content: [
-                    { type: 'text', text: augmentedContent },
+                    { type: 'text', text: userContent },
                     { type: 'image_url', image_url: { url: `data:image/png;base64,${imageBase64}` } },
                 ],
             });
         }
         else {
-            messages.push({ role: 'user', content: augmentedContent });
+            messages.push({ role: 'user', content: userContent });
         }
     }
     // Combine built-in tools with MCP tools (stable across turns)
@@ -746,7 +743,7 @@ async function callModelWithTools(userContent, imageBase64) {
             if (signal.aborted) {
                 if (blockOpened)
                     closeAssistantBlock(fullContent.length, Date.now() - turnStart);
-                console.log(pc.dim('\n  ⏹ Stopped'));
+                console.log(pc.dim('\n  [STOP] Stopped'));
                 currentAbortController = null;
                 return { content: fullContent, toolCalls: [] };
             }
@@ -754,12 +751,12 @@ async function callModelWithTools(userContent, imageBase64) {
         catch (error) {
             if (signal.aborted) {
                 spinner.stop();
-                console.log(pc.dim('\n  ⏹ Stopped'));
+                console.log(pc.dim('\n  [STOP] Stopped'));
                 currentAbortController = null;
                 return { content: '', toolCalls: [] };
             }
             spinner.stop();
-            console.error(pc.red(`\n❌ Error calling model: ${error.message}`));
+            console.error(pc.red(`\n[ERROR] Error calling model: ${error.message}`));
             throw error;
         }
         currentAbortController = null;
@@ -789,20 +786,20 @@ async function callModelWithTools(userContent, imageBase64) {
             if (dangerousTools.includes(tc.function.name) && !turnApproved) {
                 const args = tc.function.arguments;
                 const preview = args.length > 120 ? args.slice(0, 120) + '...' : args;
-                process.stdout.write(`\n  ${pc.yellow('⚠')} ${pc.bold(tc.function.name)} ${pc.dim(preview)}\n`);
+                process.stdout.write(`\n  ${pc.yellow('[WARN]')} ${pc.bold(tc.function.name)} ${pc.dim(preview)}\n`);
                 const line = await askLine(`  ${pc.dim('Allow? [y]es / [n]o / [a]ll for this turn: ')}`);
                 const char = line.trim().toLowerCase().slice(0, 1);
                 if (char === 'a')
                     turnApproved = true;
                 if (char === 'n') {
-                    console.log(`  ${pc.red('✗')} ${tc.function.name} ${pc.red('— rejected')}`);
+                    console.log(`  ${pc.red('[FAIL]')} ${tc.function.name} ${pc.red(' — rejected')}`);
                     continue;
                 }
             }
             approvedCallIndices.add(i);
         }
         const approvedCalls = toolCallArray.filter((_, i) => approvedCallIndices.has(i));
-        console.log(`\n  ${pc.dim('🔧')} ${pc.dim(`Executing ${approvedCalls.length} tool call(s)...`)}`);
+        console.log(`\n  ${pc.dim('[TOOL]')} ${pc.dim(`Executing ${approvedCalls.length} tool call(s)...`)}`);
         const results = await executeToolCalls(approvedCalls, toolContext);
         for (const result of results) {
             messages.push({
@@ -833,7 +830,7 @@ async function callModelWithTools(userContent, imageBase64) {
         turn++;
     }
     // Reached max turns without a clean stop
-    console.log(`\n  ${pc.yellow('⚠')} ${pc.yellow(`Reached max tool turns (${MAX_TOOL_TURNS}). Stopping.`)}`);
+    console.log(`\n  ${pc.yellow('[WARN]')} ${pc.yellow(`Reached max tool turns (${MAX_TOOL_TURNS}). Stopping.`)}`);
     messages.push({ role: 'assistant', content: lastContent });
     return { content: lastContent, toolCalls: [] };
 }
@@ -851,7 +848,7 @@ async function callModelWithFallback(userContent, imageBase64) {
     else {
         messages.push({ role: 'user', content: userContent });
     }
-    console.log(pc.gray('🤖 Thinking (fallback mode)...'));
+    console.log(pc.gray('[THINK] Thinking (fallback mode)...'));
     try {
         const response = await router.chat.completions.create({
             model: 'auto',
@@ -868,14 +865,38 @@ async function callModelWithFallback(userContent, imageBase64) {
         return reply;
     }
     catch (error) {
-        console.error(pc.red(`\n❌ Fallback error: ${error.message}`));
+        console.error(pc.red(`\n[ERROR] Fallback error: ${error.message}`));
         throw error;
     }
 }
-// Promisify a single readline question
+// Single-line prompt (approval gate, commit message)
 function askLine(prompt) {
     return new Promise((resolve) => rl.question(prompt, resolve));
 }
+// Multi-line input for main chat prompt — captures pasted text beyond the first newline.
+// Uses a timing heuristic: lines arriving within 80ms are treated as part of a single paste.
+function readMultiLineInput(prompt) {
+    return new Promise((resolve) => {
+        const lines = [];
+        let timer = null;
+        let resolved = false;
+        const onLine = (line) => {
+            if (resolved)
+                return;
+            lines.push(line);
+            if (timer)
+                clearTimeout(timer);
+            timer = setTimeout(() => {
+                resolved = true;
+                rl.off('line', onLine);
+                resolve(lines.join('\n'));
+            }, 80);
+        };
+        rl.on('line', onLine);
+        process.stdout.write(prompt);
+        rl.resume();
+    });
+}
 // ── Clipboard helpers ──────────────────────────────────────────────────────────
 function getClipboardText() {
     try {
@@ -1016,7 +1037,7 @@ async function chatLoop() {
         const prompt = activeFiles.size > 0
             ? `\n${pc.cyan('  ⬡')} ${pc.dim(`[${activeFiles.size} file${activeFiles.size > 1 ? 's' : ''}]`)} ${pc.bold(pc.white('›'))} `
             : `\n${pc.cyan('  ⬡')} ${pc.bold(pc.white('›'))} `;
-        const input = await askLine(prompt);
+        const input = await readMultiLineInput(prompt);
         const trimmedInput = input.trim();
         if (!trimmedInput)
             continue;
@@ -1025,10 +1046,10 @@ async function chatLoop() {
         if (lowerInput === 'exit' || lowerInput === 'quit') {
             const todos = getSessionTodos(sessionId);
             sessionManager.saveSessionState(messages, activeFiles, todos);
-            console.log(pc.dim('  🧠 Extracting facts from session...'));
+            console.log(pc.dim('  [EXTRACT] Extracting facts from session...'));
             await extractAndSave(router, sessionManager, messages);
             console.log(pc.gray(`Session saved: ${sessionManager.sessionId}`));
-            console.log(pc.yellow('\nEnding session. Goodbye! 👋\n'));
+            console.log(pc.yellow('\nEnding session. Goodbye!\n'));
             rl.close();
             process.exit(0);
         }
@@ -1060,13 +1081,13 @@ async function chatLoop() {
         if (trimmedInput.startsWith('/add ')) {
             const fileArg = trimmedInput.substring(5).trim();
             if (!fileArg) {
-                console.log(pc.red('⚠ Please specify a file path. Example: /add src/App.tsx'));
+                console.log(pc.red('[WARN] Please specify a file path. Example: /add src/App.tsx'));
             }
             else {
                 const absPath = path.resolve(fileArg);
                 activeFiles.set(absPath, fileArg);
                 toolContext.activeFiles = new Map(activeFiles);
-                console.log(pc.green(`✔ Added file to context: ${pc.bold(fileArg)}`));
+                console.log(pc.green(`[OK] Added file to context: ${pc.bold(fileArg)}`));
             }
             continue;
         }
@@ -1074,16 +1095,16 @@ async function chatLoop() {
         if (trimmedInput.startsWith('/remove ')) {
             const fileArg = trimmedInput.substring(8).trim();
             if (!fileArg) {
-                console.log(pc.red('⚠ Please specify a file path. Example: /remove src/App.tsx'));
+                console.log(pc.red('[WARN] Please specify a file path. Example: /remove src/App.tsx'));
             }
             else {
                 const absPath = path.resolve(fileArg);
                 if (activeFiles.delete(absPath)) {
                     toolContext.activeFiles = new Map(activeFiles);
-                    console.log(pc.green(`✔ Removed file from context: ${pc.bold(fileArg)}`));
+                    console.log(pc.green(`[OK] Removed file from context: ${pc.bold(fileArg)}`));
                 }
                 else {
-                    console.log(pc.yellow(`⚠ File was not in context: ${fileArg}`));
+                    console.log(pc.yellow(`[WARN] File was not in context: ${fileArg}`));
                 }
             }
             continue;
@@ -1091,6 +1112,41 @@ async function chatLoop() {
         // Command: /paste — paste clipboard content (text or image)
         if (lowerInput === '/paste' || lowerInput.startsWith('/paste ')) {
             const extra = trimmedInput.startsWith('/paste ') ? trimmedInput.substring(7).trim() : '';
+            // If extra looks like a file path, try reading it as an image
+            if (extra && !extra.startsWith('http')) {
+                const filePath = path.resolve(extra);
+                if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
+                    const ext = path.extname(filePath).toLowerCase();
+                    if (['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp'].includes(ext)) {
+                        const imgBuffer = fs.readFileSync(filePath);
+                        const base64 = imgBuffer.toString('base64');
+                        const message = 'What do you see in this image?';
+                        printUserTurn(`${path.basename(filePath)} (image)`);
+                        try {
+                            const filesContext = buildFileContext();
+                            const indexCtx = await buildIndexContext(message);
+                            const userContent = `${indexCtx}${filesContext}User Prompt: ${message}`;
+                            await callModelWithTools(userContent, base64);
+                            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...'));
+                                await callModelWithFallback(userContent, base64);
+                                sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
+                            }
+                            catch (fallbackErr) {
+                                console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
+                            }
+                        }
+                        turnSeparator();
+                        continue;
+                    }
+                }
+            }
             // Try image first
             const imgPath = getClipboardImage();
             if (imgPath) {
@@ -1104,17 +1160,19 @@ async function chatLoop() {
                     const indexCtx = await buildIndexContext(message);
                     const userContent = `${indexCtx}${filesContext}User Prompt: ${message}`;
                     await callModelWithTools(userContent, base64);
+                    sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                 }
                 catch (error) {
-                    console.error(pc.red(`\n❌ Error: ${error.message}`));
+                    console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
                     try {
                         const filesContext = buildFileContext();
                         const userContent = `${filesContext}User Prompt: ${message}`;
-                        console.log(pc.yellow('\n🔄 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❌ Fallback also failed: ${fallbackErr.message}`));
+                        console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
                     }
                 }
                 turnSeparator();
@@ -1123,7 +1181,7 @@ async function chatLoop() {
             // Fall back to text
             const clipboard = getClipboardText();
             if (!clipboard) {
-                console.log(pc.red('⚠ Clipboard is empty or inaccessible.'));
+                console.log(pc.red('[WARN] Clipboard is empty or inaccessible.'));
                 continue;
             }
             const fullMessage = extra ? `${clipboard}\n\n${extra}` : clipboard;
@@ -1133,9 +1191,10 @@ async function chatLoop() {
                 const indexCtx = await buildIndexContext(fullMessage);
                 const userContent = `${indexCtx}${filesContext}User Prompt: ${fullMessage}`;
                 await callModelWithTools(userContent);
+                sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
             }
             catch (error) {
-                console.error(pc.red(`\n❌ Error: ${error.message}`));
+                console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
             }
             turnSeparator();
             continue;
@@ -1176,7 +1235,7 @@ async function chatLoop() {
             else if (subCmd === 'load') {
                 const targetId = parts[1]?.trim();
                 if (!targetId) {
-                    console.log(pc.red('⚠ Usage: /session load <id>'));
+                    console.log(pc.red('[WARN] Usage: /session load <id>'));
                 }
                 else {
                     try {
@@ -1184,10 +1243,10 @@ async function chatLoop() {
                         sessionManager.saveSessionState(messages, activeFiles, todos);
                         const loaded = sessionManager.startSession(targetId);
                         initializeSessionState(loaded);
-                        console.log(pc.green(`✔ Loaded session: ${sessionManager.sessionTitle} (${sessionManager.sessionId})`));
+                        console.log(pc.green(`[OK] Loaded session: ${sessionManager.sessionTitle} (${sessionManager.sessionId})`));
                     }
                     catch (err) {
-                        console.log(pc.red(`⚠ Failed to load session: ${err.message}`));
+                        console.log(pc.red(`[WARN] Failed to load session: ${err.message}`));
                     }
                 }
             }
@@ -1197,20 +1256,20 @@ async function chatLoop() {
                 sessionManager.saveSessionState(messages, activeFiles, todos);
                 const loaded = sessionManager.startSession(undefined, title || undefined);
                 initializeSessionState(loaded);
-                console.log(pc.green(`✔ Started new session: ${sessionManager.sessionTitle} (${sessionManager.sessionId})`));
+                console.log(pc.green(`[OK] Started new session: ${sessionManager.sessionTitle} (${sessionManager.sessionId})`));
             }
             else if (subCmd === 'delete') {
                 const targetId = parts[1]?.trim();
                 if (!targetId) {
-                    console.log(pc.red('⚠ Usage: /session delete <id>'));
+                    console.log(pc.red('[WARN] Usage: /session delete <id>'));
                 }
                 else {
                     sessionManager.deleteSession(targetId);
-                    console.log(pc.green(`✔ Deleted session: ${targetId}`));
+                    console.log(pc.green(`[OK] Deleted session: ${targetId}`));
                 }
             }
             else {
-                console.log(pc.red('⚠ Usage: /session list | load <id> | new [title] | delete <id>'));
+                console.log(pc.red('[WARN] Usage: /session list | load <id> | new [title] | delete <id>'));
             }
             continue;
         }
@@ -1244,13 +1303,13 @@ async function chatLoop() {
             const argStr = trimmedInput.substring(6).trim();
             const eqIdx = argStr.indexOf('=');
             if (eqIdx < 0) {
-                console.log(pc.red('⚠ Usage: /fact <key> = <value>'));
+                console.log(pc.red('[WARN] Usage: /fact <key> = <value>'));
             }
             else {
                 const key = argStr.slice(0, eqIdx).trim();
                 const value = argStr.slice(eqIdx + 1).trim();
                 sessionManager.addFact(key, value, 'user');
-                console.log(pc.green(`✔ Saved fact: ${key} = ${value}`));
+                console.log(pc.green(`[OK] Saved fact: ${key} = ${value}`));
             }
             continue;
         }
@@ -1259,19 +1318,19 @@ async function chatLoop() {
             const argStr = trimmedInput.substring(12).trim();
             const eqIdx = argStr.indexOf('=');
             if (eqIdx < 0) {
-                console.log(pc.red('⚠ Usage: /convention <key> = <value>'));
+                console.log(pc.red('[WARN] Usage: /convention <key> = <value>'));
             }
             else {
                 const key = argStr.slice(0, eqIdx).trim();
                 const value = argStr.slice(eqIdx + 1).trim();
                 sessionManager.setConvention(key, value);
-                console.log(pc.green(`✔ Saved convention: ${key} = ${value}`));
+                console.log(pc.green(`[OK] Saved convention: ${key} = ${value}`));
             }
             continue;
         }
         // Command: /extract — manually trigger fact extraction
         if (lowerInput === '/extract') {
-            console.log(pc.dim('  🧠 Extracting facts from conversation...'));
+            console.log(pc.dim('  [EXTRACT] Extracting facts from conversation...'));
             await extractAndSave(router, sessionManager, messages);
             continue;
         }
@@ -1292,16 +1351,16 @@ async function chatLoop() {
             if (rest.startsWith('name ')) {
                 userProfile.name = rest.substring(5).trim();
                 saveProfile(userProfile);
-                console.log(pc.green(`✔ Profile name set: ${userProfile.name}`));
+                console.log(pc.green(`[OK] Profile name set: ${userProfile.name}`));
                 continue;
             }
             if (rest.startsWith('bio ')) {
                 userProfile.bio = rest.substring(4).trim();
                 saveProfile(userProfile);
-                console.log(pc.green(`✔ Profile bio set.`));
+                console.log(pc.green('[OK] Profile bio set.'));
                 continue;
             }
-            console.log(pc.red('⚠ Usage: /profile view | /profile name = <name> | /profile bio = <bio>'));
+            console.log(pc.red('[WARN] Usage: /profile view | /profile name = <name> | /profile bio = <bio>'));
             continue;
         }
         // Command: /style
@@ -1316,14 +1375,14 @@ async function chatLoop() {
             }
             userProfile.style = rest;
             saveProfile(userProfile);
-            console.log(pc.green('✔ Coding style saved. It will be injected into every session.'));
+            console.log(pc.green('[OK] Coding style saved. It will be injected into every session.'));
             continue;
         }
         // Command: /clear
         if (lowerInput === '/clear') {
             messages.length = 0;
             messages.push({ role: 'system', content: getSystemPromptWithMemory() });
-            console.log(pc.green('✔ Conversation history cleared!'));
+            console.log(pc.green('[OK] Conversation history cleared!'));
             continue;
         }
         // Command: /tools
@@ -1346,7 +1405,7 @@ async function chatLoop() {
         if (lowerInput.startsWith('/spawn ')) {
             const parts = trimmedInput.substring(7).trim().split(' ');
             if (parts.length < 2) {
-                console.log(pc.red('⚠ Usage: /spawn <role> <task>'));
+                console.log(pc.red('[WARN] Usage: /spawn <role> <task>'));
                 console.log(pc.gray('  Roles: coder, reviewer, debugger, researcher, planner'));
             }
             else {
@@ -1360,7 +1419,7 @@ async function chatLoop() {
         if (lowerInput.startsWith('/delegate ')) {
             const match = trimmedInput.substring(10).match(/^(.+)\s+to\s+(\w+)$/i);
             if (!match) {
-                console.log(pc.red('⚠ Usage: /delegate <task> to <role>'));
+                console.log(pc.red('[WARN] Usage: /delegate <task> to <role>'));
             }
             else {
                 const task = match[1].trim();
@@ -1373,7 +1432,7 @@ async function chatLoop() {
         if (lowerInput.startsWith('/orchestrate ')) {
             const goal = trimmedInput.substring(13).trim();
             if (!goal) {
-                console.log(pc.red('⚠ Usage: /orchestrate <goal>'));
+                console.log(pc.red('[WARN] Usage: /orchestrate <goal>'));
             }
             else {
                 await handleOrchestrate(goal);
@@ -1397,7 +1456,7 @@ async function chatLoop() {
         }
         // Command: /onboard
         if (lowerInput === '/onboard') {
-            console.log(pc.cyan('\n🔄 Re-running onboarding wizard...\n'));
+            console.log(pc.cyan('\n[RESTART] Re-running onboarding wizard...\n'));
             await runOnboarding(true);
             continue;
         }
@@ -1405,7 +1464,7 @@ async function chatLoop() {
         if (lowerInput === '/undo') {
             const history = toolContext.patchHistory;
             if (!history || history.length === 0) {
-                console.log(pc.yellow('⚠ No patches to undo.'));
+                console.log(pc.yellow('[WARN] No patches to undo.'));
             }
             else {
                 const last = history[history.length - 1];
@@ -1413,22 +1472,22 @@ async function chatLoop() {
                     const currentContent = fs.readFileSync(last.filePath, 'utf8');
                     if (currentContent === last.newContent) {
                         fs.writeFileSync(last.filePath, last.oldContent, 'utf8');
-                        console.log(pc.green(`✔ Undid patch to ${last.filePath} (${last.description})`));
+                        console.log(pc.green(`[OK] Undid patch to ${last.filePath} (${last.description})`));
                     }
                     else {
-                        console.log(pc.yellow(`⚠ File ${last.filePath} has been modified since last patch. Cannot auto-undo.`));
+                        console.log(pc.yellow(`[WARN] File ${last.filePath} has been modified since last patch. Cannot auto-undo.`));
                     }
                     history.pop();
                 }
                 catch (err) {
-                    console.log(pc.red(`⚠ Failed to undo: ${err.message}`));
+                    console.log(pc.red(`[WARN] Failed to undo: ${err.message}`));
                 }
             }
             continue;
         }
         // Command: /commit — stage and commit changes
         if (lowerInput === '/commit' || lowerInput.startsWith('/commit ')) {
-            const msg = trimmedInput.startsWith('/commit ') ? trimmedInput.substring(8).trim() : '';
+            const forcedMsg = trimmedInput.startsWith('/commit ') ? trimmedInput.substring(8).trim() : '';
             try {
                 const { execute: termExec } = await import('./tools/builtin/terminal.js');
                 const statusResult = await termExec({ command: 'git status --short', timeout: 10, workdir: process.cwd() }, toolContext);
@@ -1443,28 +1502,65 @@ async function chatLoop() {
                     console.log(pc.red(`Stage failed: ${addResult.error}`));
                     continue;
                 }
-                let commitMsg = msg;
+                let commitMsg = forcedMsg;
                 if (!commitMsg) {
                     const diffResult = await termExec({ command: 'git diff --cached --stat', timeout: 10, workdir: process.cwd() }, toolContext);
+                    const diffFull = await termExec({ command: 'git diff --cached', timeout: 10, workdir: process.cwd() }, toolContext);
+                    const diffContent = diffFull.content?.slice(0, 6000) || '';
                     if (diffResult.content)
                         console.log(pc.gray(diffResult.content));
-                    commitMsg = await askLine(pc.cyan('  Commit message: '));
+                    if (diffContent) {
+                        console.log(pc.dim('  Generating commit message...'));
+                        try {
+                            const aiResponse = await router.chat.completions.create({
+                                model: 'auto',
+                                messages: [
+                                    { role: 'system', content: 'You write concise git commit messages following the Conventional Commits spec (type(scope): description). Output only the commit message — no explanation, no quotes, no extra text.' },
+                                    { role: 'user', content: `Write a commit message for this diff:\n\n${diffContent}` }
+                                ],
+                                temperature: 0.2,
+                                max_tokens: 80,
+                            });
+                            const suggested = (aiResponse.choices[0]?.message?.content || '').trim().split('\n')[0].trim();
+                            if (suggested) {
+                                console.log(`\n  ${pc.dim('Suggested:')} ${pc.cyan(suggested)}`);
+                                const choice = await askLine(pc.dim('  [Enter] accept  [e] edit  [n] cancel: '));
+                                if (choice.trim().toLowerCase() === 'n') {
+                                    console.log(pc.yellow('Commit cancelled.'));
+                                    await termExec({ command: 'git restore --staged .', timeout: 10, workdir: process.cwd() }, toolContext);
+                                    continue;
+                                }
+                                else if (choice.trim().toLowerCase() === 'e') {
+                                    commitMsg = await askLine(pc.cyan('  Commit message: '));
+                                }
+                                else {
+                                    commitMsg = suggested;
+                                }
+                            }
+                        }
+                        catch {
+                            // Model unavailable — fall back to manual
+                        }
+                    }
+                    if (!commitMsg) {
+                        commitMsg = await askLine(pc.cyan('  Commit message: '));
+                    }
                     if (!commitMsg.trim()) {
                         console.log(pc.yellow('Commit cancelled — empty message.'));
-                        await termExec({ command: 'git reset', timeout: 10, workdir: process.cwd() }, toolContext);
+                        await termExec({ command: 'git restore --staged .', timeout: 10, workdir: process.cwd() }, toolContext);
                         continue;
                     }
                 }
                 const commitResult = await termExec({ command: `git commit -m ${JSON.stringify(commitMsg)}`, timeout: 10, workdir: process.cwd() }, toolContext);
                 if (commitResult.success) {
-                    console.log(pc.green(`\n✔ Commit: ${commitMsg.slice(0, 60)}`));
+                    console.log(pc.green(`\n[OK] Commit: ${commitMsg.slice(0, 60)}`));
                 }
                 else {
                     console.log(pc.red(`Commit failed: ${commitResult.error}`));
                 }
             }
             catch (err) {
-                console.log(pc.red(`⚠ Commit error: ${err.message}`));
+                console.log(pc.red(`[WARN] Commit error: ${err.message}`));
             }
             continue;
         }
@@ -1492,14 +1588,14 @@ async function chatLoop() {
                 value = parts.slice(1).join(' ');
             }
             if (!key || !value) {
-                console.log(pc.red('⚠ Usage: /project set <key> = <value>'));
+                console.log(pc.red('[WARN] Usage: /project set <key> = <value>'));
             }
             else {
                 const { loadProjectConfig, saveProjectConfig } = await import('./tools/builtin/project-config.js');
                 const cfg = loadProjectConfig(process.cwd());
                 cfg[key] = value;
                 saveProjectConfig(cfg);
-                console.log(pc.green(`✔ Set ${key} = ${value}`));
+                console.log(pc.green(`[OK] Set ${key} = ${value}`));
             }
             continue;
         }
@@ -1510,24 +1606,23 @@ async function chatLoop() {
             const { execute: termExec } = await import('./tools/builtin/terminal.js');
             const cfg = loadProjectConfig(process.cwd());
             const testCmd = cfg.testCommand || 'npm test';
-            console.log(pc.bold(`\n🧪 Test-Run-Fix Loop (max ${maxLoops} iterations)`));
+            console.log(pc.bold(`\nTest-Run-Fix Loop (max ${maxLoops} iterations)`));
             console.log(pc.gray(`Test command: ${testCmd}\n`));
             for (let i = 0; i < maxLoops; i++) {
-                console.log(pc.cyan(`\n─── Run ${i + 1}/${maxLoops} ───`));
+                console.log(pc.cyan(`\n--- Run ${i + 1}/${maxLoops} ---`));
                 const result = await termExec({ command: testCmd, timeout: 120, workdir: process.cwd() }, toolContext);
                 console.log(result.content?.slice(0, 2000) || pc.gray('(no output)'));
                 if (result.success) {
-                    console.log(pc.green('\n✔ All tests passed!'));
+                    console.log(pc.green('\n[OK] All tests passed!'));
                     break;
                 }
                 if (i === maxLoops - 1) {
-                    console.log(pc.yellow(`\n⚠ Max loops (${maxLoops}) reached. Tests still failing.`));
+                    console.log(pc.yellow(`\n[WARN] Max loops (${maxLoops}) reached. Tests still failing.`));
                     break;
                 }
-                const failureCtx = `Tests failed (run ${i + 1}/${maxLoops}). Here's the output:\n\n${result.content?.slice(0, 8000) || 'Unknown failure'}\n\nAnalyze the failures and fix the code.`;
-                const filesContext = buildFileContext();
-                const userContent = `${filesContext}User Prompt: ${failureCtx}`;
-                await callModelWithTools(userContent);
+                const failureCtx = `Tests failed (run ${i + 1}/${maxLoops}). Output:\n\n${result.content?.slice(0, 8000) || 'Unknown failure'}\n\nAnalyze the failures and fix the code. Do not re-read files you already have in context.`;
+                await callModelWithTools(`User Prompt: ${failureCtx}`);
+                sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
             }
             continue;
         }
@@ -1550,13 +1645,13 @@ async function chatLoop() {
         if (lowerInput.startsWith('/find ')) {
             const parts = trimmedInput.substring(6).trim().split(/\s+/);
             if (parts.length === 0) {
-                console.log(pc.red('⚠ Usage: /find <query> [limit]'));
+                console.log(pc.red('[WARN] Usage: /find <query> [limit]'));
             }
             else {
                 const query = parts[0];
                 const limit = parts[1] ? parseInt(parts[1], 10) : 30;
                 if (isNaN(limit)) {
-                    console.log(pc.red('⚠ Invalid limit'));
+                    console.log(pc.red('[WARN] Invalid limit'));
                 }
                 else {
                     await handleFindSymbol(query, limit);
@@ -1568,7 +1663,7 @@ async function chatLoop() {
         if (lowerInput.startsWith('/refs ')) {
             const symbol = trimmedInput.substring(6).trim();
             if (!symbol) {
-                console.log(pc.red('⚠ Usage: /refs <symbol>'));
+                console.log(pc.red('[WARN] Usage: /refs <symbol>'));
             }
             else {
                 await handleGetReferences(symbol);
@@ -1579,7 +1674,7 @@ async function chatLoop() {
         if (lowerInput.startsWith('/def ')) {
             const symbol = trimmedInput.substring(5).trim();
             if (!symbol) {
-                console.log(pc.red('⚠ Usage: /def <symbol>'));
+                console.log(pc.red('[WARN] Usage: /def <symbol>'));
             }
             else {
                 await handleGetDefinition(symbol);
@@ -1593,22 +1688,26 @@ async function chatLoop() {
             const userContent = `${indexCtx}${filesContext}User Prompt: ${trimmedInput}`;
             printUserTurn(trimmedInput);
             await callModelWithTools(userContent);
+            // Persist session incrementally after every turn
+            sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
             // Fact extraction — learns from tool results and reasoning
             await extractAndSave(router, sessionManager, messages);
         }
         catch (error) {
-            console.error(pc.red(`\n❌ Error: ${error.message}`));
+            console.error(pc.red(`\n[ERROR] Error: ${error.message}`));
             try {
                 const filesContext = buildFileContext();
                 const userContent = `${filesContext}User Prompt: ${trimmedInput}`;
-                console.log(pc.yellow('\n🔄 Trying fallback mode...'));
+                console.log(pc.yellow('\n[RETRY] Trying fallback mode...'));
                 const fallbackResult = await callModelWithFallback(userContent);
                 if (fallbackResult) {
+                    // Persist session after fallback too
+                    sessionManager.saveSessionState(messages, activeFiles, getSessionTodos(sessionId));
                     await extractAndSave(router, sessionManager, messages);
                 }
             }
             catch (fallbackErr) {
-                console.error(pc.red(`\n❌ Fallback also failed: ${fallbackErr.message}`));
+                console.error(pc.red(`\n[ERROR] Fallback also failed: ${fallbackErr.message}`));
                 console.error(pc.gray('Check that at least one local server is running.'));
             }
         }
@@ -1617,7 +1716,6 @@ async function chatLoop() {
 }
 // Start health checks and REPL
 async function main() {
-    // SIGINT handler — cancel generation if streaming, otherwise exit
     process.on('SIGINT', () => {
         if (currentAbortController) {
             currentAbortController.abort();
@@ -1638,10 +1736,10 @@ async function main() {
     printConfigInfo();
     try {
         await router.startHealthChecks();
-        console.log(pc.green('\n✔ Router started. Health checks running every 30s.'));
+        console.log(pc.green('\n[OK] Router started. Health checks running every 30s.'));
     }
     catch (err) {
-        console.error(pc.yellow(`\n⚠ Router health checks failed: ${err.message}`));
+        console.error(pc.yellow(`\n[WARN] Router health checks failed: ${err.message}`));
     }
     // Initialize MCP registry
     try {
@@ -1649,52 +1747,41 @@ async function main() {
         const servers = mcpRegistry.getConnectedServers();
         if (servers.length > 0) {
             const mcpToolCount = mcpRegistry.getToolDefinitions().length;
-            console.log(pc.green(`\n✔ MCP connected: ${servers.join(', ')}`));
+            console.log(pc.green(`\n[OK] MCP connected: ${servers.join(', ')}`));
             console.log(pc.dim(`  ${mcpToolCount} MCP tool(s) registered — I'll ask before using them on your behalf.`));
         }
     }
     catch (err) {
-        console.error(pc.yellow(`\n⚠ MCP initialization failed: ${err.message}`));
+        console.error(pc.yellow(`\n[WARN] MCP initialization failed: ${err.message}`));
     }
     // Check for updates — non-blocking
     if (config.updateCheck !== false) {
         setTimeout(() => checkForUpdates(), 2000);
     }
-    // Auto-index at startup — deferred so the REPL appears immediately
     if (config.indexing.enabled) {
         setTimeout(() => {
             (async () => {
                 try {
-                    const indexDbPath = path.join(os.homedir(), '.daedalus', 'sessions', projectHash, 'index.sqlite');
-                    if (!fs.existsSync(indexDbPath)) {
-                        console.log(pc.cyan('\n  ⚡ Auto-indexing codebase (background)...'));
-                        const { initIndexDb } = await import('./indexing/fts.js');
-                        const { indexCodebase } = await import('./indexing/indexer.js');
-                        const db = initIndexDb(indexDbPath);
-                        const result = await indexCodebase(db, process.cwd(), projectHash, {
-                            exclude: config.indexing.exclude,
-                        });
-                        console.log(pc.green(`  ✔ Indexed ${result.indexedFiles} files (${result.skippedFiles} unchanged)`));
-                        if (result.errors.length > 0) {
-                            console.log(pc.yellow(`  ⚠ ${result.errors.length} file(s) had errors`));
-                        }
-                        toolContext.indexDb = db;
+                    const indexDbPath = getIndexDbPath();
+                    if (!fs.existsSync(path.dirname(indexDbPath))) {
+                        fs.mkdirSync(path.dirname(indexDbPath), { recursive: true });
                     }
-                    else {
-                        const { initIndexDb } = await import('./indexing/fts.js');
-                        const { indexCodebase } = await import('./indexing/indexer.js');
-                        const db = initIndexDb(indexDbPath);
-                        const result = await indexCodebase(db, process.cwd(), projectHash, {
-                            exclude: config.indexing.exclude,
-                        });
-                        if (result.indexedFiles > 0) {
-                            console.log(pc.gray(`  📚 Re-indexed ${result.indexedFiles} changed file(s)`));
-                        }
-                        toolContext.indexDb = db;
+                    const { initIndexDb } = await import('./indexing/fts.js');
+                    const { indexCodebase } = await import('./indexing/indexer.js');
+                    const db = initIndexDb(indexDbPath);
+                    const result = await indexCodebase(db, process.cwd(), projectHash, {
+                        exclude: config.indexing.exclude,
+                    });
+                    if (result.indexedFiles > 0) {
+                        console.log(pc.cyan(`  [INDEX] Indexed ${result.indexedFiles} file(s) (${result.skippedFiles} unchanged)`));
+                    }
+                    if (result.errors.length > 0) {
+                        console.log(pc.yellow(`  [WARN] ${result.errors.length} file(s) had index errors`));
                     }
+                    toolContext.indexDb = db;
                 }
                 catch (err) {
-                    console.error(pc.yellow(`  ⚠ Auto-index failed: ${err.message}`));
+                    console.error(pc.yellow(`  [WARN] Auto-index failed: ${err.message}`));
                 }
             })();
         }, 100);