markov-cli 1.0.7 → 1.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "markov-cli",
-  "version": "1.0.7",
-  "description": "LivingCloud's CLI AI Agent",
+  "version": "1.0.9",
+  "description": "Markov CLI",
   "type": "module",
   "bin": {
     "markov": "./bin/markov.js"

package/src/interactive.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import boxen from 'boxen';
+
 import gradient from 'gradient-string';
 import { homedir } from 'os';
 import { resolve } from 'path';
@@ -8,6 +8,7 @@ import { printLogo } from './ui/logo.js';
 import { chatWithTools, MODEL, MODELS, setModel } from './ollama.js';
 import { resolveFileRefs } from './files.js';
 import { execCommand, AGENT_TOOLS, runTool } from './tools.js';
+import { parseEdits, renderDiff, applyEdit } from './editor.js';
 import { chatPrompt } from './input.js';
 import { getFiles, getFilesAndDirs } from './ui/picker.js';
 import { getToken, login, clearToken } from './auth.js';
@@ -154,7 +155,29 @@ function wrapText(text, width) {
   }).join('\n');
 }
 
-/** Parse fenced code blocks (```lang\n...\n```) and render them with boxen. Non-code segments are wrapped. */
+/** Extract numbered options (1. foo  2. bar  3. baz) from AI response text. Returns display strings or []. */
+function extractNumberedOptions(text) {
+  if (!text) return [];
+  const re = /^\s*(\d+)\.\s+(.+)$/gm;
+  const items = [];
+  let match;
+  while ((match = re.exec(text)) !== null) {
+    items.push({ num: parseInt(match[1], 10), label: match[2].trim() });
+  }
+  let best = [];
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].num !== 1) continue;
+    const run = [items[i]];
+    for (let j = i + 1; j < items.length; j++) {
+      if (items[j].num === run.length + 1) run.push(items[j]);
+      else break;
+    }
+    if (run.length > best.length) best = run;
+  }
+  return best.length >= 2 ? best.map(r => `${r.num}. ${r.label}`) : [];
+}
+
+/** Parse fenced code blocks (```lang\n...\n```) and render them with plain styling. Non-code segments are wrapped. */
 function formatResponseWithCodeBlocks(text, width) {
   if (!text || typeof text !== 'string') return '';
   const re = /```(\w*)\n([\s\S]*?)```/g;
@@ -176,17 +199,50 @@ function formatResponseWithCodeBlocks(text, width) {
   if (parts.length === 0) return wrapText(text, width);
   return parts.map((p) => {
     if (p.type === 'text') return wrapText(p.content, width);
-    const title = p.lang ? p.lang : 'code';
-    return boxen(p.content, {
-      borderColor: 'cyan',
-      borderStyle: 'round',
-      title,
-      padding: 1,
-    });
+    const label = p.lang ? p.lang : 'code';
+    const header = chalk.dim('─── ') + chalk.cyan(label) + chalk.dim(' ' + '─'.repeat(Math.max(0, width - label.length - 5)));
+    const code = p.content.split('\n').map(l => chalk.dim('  ') + l).join('\n');
+    return header + '\n' + code + '\n' + chalk.dim('─'.repeat(width));
   }).join('\n\n');
 }
 
-/** Shared system message base: Markov intro, cwd, file list (no !!run instructions). */
+/**
+ * Scan AI response text for fenced code blocks that reference files.
+ * Show a diff preview for each and apply on user confirmation.
+ * @param {string} responseText - The AI's response content
+ * @param {string[]} loadedFiles - Files attached via @ref
+ */
+async function applyCodeBlockEdits(responseText, loadedFiles = []) {
+  const edits = parseEdits(responseText, loadedFiles);
+  if (edits.length === 0) return;
+
+  console.log(chalk.dim(`\n📝 Detected ${edits.length} file edit(s) in response:\n`));
+
+  for (const edit of edits) {
+    renderDiff(edit.filepath, edit.content);
+    const ok = await confirm(chalk.bold(`Apply changes to ${chalk.cyan(edit.filepath)}? [y/N] `));
+    if (ok) {
+      applyEdit(edit.filepath, edit.content);
+      console.log(chalk.green(`  ✓ ${edit.filepath} updated\n`));
+    } else {
+      console.log(chalk.dim(`  ✗ skipped ${edit.filepath}\n`));
+    }
+  }
+}
+
+/** Run `ls -la` in cwd and return a context string to prepend to user messages. */
+async function getLsContext(cwd = process.cwd()) {
+  try {
+    const { stdout, stderr, exitCode } = await execCommand('ls -la', cwd);
+    const out = [stdout, stderr].filter(Boolean).join('\n').trim();
+    if (exitCode === 0 && out) {
+      return `[Current directory: ${cwd}]\n$ ls -la\n${out}\n\n`;
+    }
+  } catch (_) {}
+  return `[Current directory: ${cwd}]\n(listing unavailable)\n\n`;
+}
+
+/** Shared system message base: Markov intro, cwd, file list. */
 function getSystemMessageBase() {
   const files = getFiles();
   const fileList = files.length > 0 ? `\nFiles in working directory:\n${files.map(f => `  ${f}`).join('\n')}\n` : '';
@@ -286,10 +342,13 @@ async function runAgentLoop(messages, opts = {}) {
   const onBeforeToolRun = opts.onBeforeToolRun;
   const onToolCall = opts.onToolCall;
   const onToolResult = opts.onToolResult;
+  const onIteration = opts.onIteration;
+  const onThinking = opts.onThinking;
   let iteration = 0;
 
   while (iteration < AGENT_LOOP_MAX_ITERATIONS) {
     iteration += 1;
+    onThinking?.(iteration);
     const data = await chatWithTools(messages, AGENT_TOOLS, MODEL, opts.signal ?? null);
 
     const message = data?.message;
@@ -310,6 +369,7 @@ async function runAgentLoop(messages, opts = {}) {
     });
 
     onBeforeToolRun?.();
+    onIteration?.(iteration, AGENT_LOOP_MAX_ITERATIONS, toolCalls.length);
 
     for (const tc of toolCalls) {
       const name = tc?.function?.name;
@@ -440,8 +500,17 @@ export async function startInteractive() {
     console.log(chalk.yellow('⚠  Not logged in. Use /login to authenticate.\n'));
   }
 
+  let pendingMessage = null;
+
   while (true) {
-    const raw = await chatPrompt(chalk.magenta('you> '), allFiles);
+    let raw;
+    if (pendingMessage) {
+      raw = pendingMessage;
+      pendingMessage = null;
+      console.log(chalk.magenta('you> ') + raw + '\n');
+    } else {
+      raw = await chatPrompt(chalk.magenta('you> '), allFiles);
+    }
     if (raw === null) continue;
     const trimmed = raw.trim();
 
@@ -531,13 +600,14 @@ export async function startInteractive() {
 
     // /agent [prompt] — run with tools (run_terminal_command, create_folder, file tools), loop until final response
     if (trimmed === '/agent' || trimmed.startsWith('/agent ')) {
-      const userContent = trimmed.startsWith('/agent ')
+      const rawUserContent = trimmed.startsWith('/agent ')
         ? trimmed.slice(7).trim()
         : (await promptLine(chalk.bold('Agent prompt: '))).trim();
-      if (!userContent) {
+      if (!rawUserContent) {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
       }
+      const userContent = (await getLsContext()) + rawUserContent;
       chatMessages.push({ role: 'user', content: userContent });
       const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
       const abortController = new AbortController();
@@ -549,13 +619,25 @@ export async function startInteractive() {
         return confirm(chalk.bold('Apply this change? [y/N] '));
       };
 
+      const startTime = Date.now();
       const DOTS = ['.', '..', '...'];
       let dotIdx = 0;
-      process.stdout.write(chalk.dim('\nAgent › '));
-      const spinner = setInterval(() => {
-        process.stdout.write('\r' + chalk.dim('Agent › ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
-        dotIdx++;
-      }, 400);
+      let spinner = null;
+
+      const startSpinner = () => {
+        if (spinner) { clearInterval(spinner); spinner = null; }
+        dotIdx = 0;
+        process.stdout.write(chalk.dim('\nAgent › '));
+        spinner = setInterval(() => {
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          process.stdout.write('\r' + chalk.dim('Agent › ') + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+          dotIdx++;
+        }, 400);
+      };
+      const stopSpinner = () => {
+        if (spinner) { clearInterval(spinner); spinner = null; }
+        process.stdout.write('\r\x1b[0J');
+      };
 
       try {
         const result = await runAgentLoop(agentMessages, {
@@ -563,9 +645,17 @@ export async function startInteractive() {
           cwd: process.cwd(),
           confirmFn,
           confirmFileEdit,
+          onThinking: () => {
+            startSpinner();
+          },
           onBeforeToolRun: () => {
-            clearInterval(spinner);
-            process.stdout.write('\r\x1b[0J');
+            stopSpinner();
+          },
+          onIteration: (iter, max, toolCount) => {
+            const w = process.stdout.columns || 80;
+            const label = ` Step ${iter} `;
+            const line = chalk.dim('──') + chalk.bold.white(label) + chalk.dim('─'.repeat(Math.max(0, w - label.length - 2)));
+            console.log(line);
           },
           onToolCall: (name, args) => {
             const summary = formatToolCallSummary(name, args);
@@ -575,18 +665,23 @@ export async function startInteractive() {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
           },
         });
-        clearInterval(spinner);
-        process.stdout.write('\r\x1b[0J');
+        stopSpinner();
         if (result) {
           chatMessages.push(result.finalMessage);
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
           const width = Math.min(process.stdout.columns || 80, 80);
           process.stdout.write(formatResponseWithCodeBlocks(result.content, width) + '\n\n');
+          await applyCodeBlockEdits(result.content, []);
           allFiles = getFilesAndDirs();
-          console.log(chalk.green('✓ Agent done.\n'));
+          console.log(chalk.green(`✓ Agent done.`) + chalk.dim(` (${elapsed}s)\n`));
+          const opts1 = extractNumberedOptions(result.content);
+          if (opts1.length >= 2) {
+            const chosen = await selectFrom(opts1, 'Select an option:');
+            if (chosen) pendingMessage = chosen;
+          }
         }
       } catch (err) {
-        clearInterval(spinner);
-        process.stdout.write('\r\x1b[0J');
+        stopSpinner();
         if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
       }
       continue;
@@ -600,7 +695,8 @@ export async function startInteractive() {
     if (failed.length > 0) {
       console.log(chalk.yellow(`\n⚠  not found: ${failed.map(f => `@${f}`).join(', ')}`));
     }
-    const userContent = resolvedContent ?? trimmed;
+    const rawUserContent = resolvedContent ?? trimmed;
+    const userContent = (await getLsContext()) + rawUserContent;
     chatMessages.push({ role: 'user', content: userContent });
 
     const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
@@ -612,22 +708,43 @@ export async function startInteractive() {
       console.log('');
       return confirm(chalk.bold('Apply this change? [y/N] '));
     };
+    const startTime = Date.now();
     const DOTS = ['.', '..', '...'];
     let dotIdx = 0;
-    process.stdout.write(chalk.dim('\nAgent › '));
-    const spinner = setInterval(() => {
-      process.stdout.write('\r' + chalk.dim('Agent › ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
-      dotIdx++;
-    }, 400);
+    let spinner = null;
+
+    const startSpinner = () => {
+      if (spinner) { clearInterval(spinner); spinner = null; }
+      dotIdx = 0;
+      process.stdout.write(chalk.dim('\nAgent › '));
+      spinner = setInterval(() => {
+        const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+        process.stdout.write('\r' + chalk.dim('Agent › ') + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+        dotIdx++;
+      }, 400);
+    };
+    const stopSpinner = () => {
+      if (spinner) { clearInterval(spinner); spinner = null; }
+      process.stdout.write('\r\x1b[0J');
+    };
+
     try {
       const result = await runAgentLoop(agentMessages, {
         signal: abortController.signal,
         cwd: process.cwd(),
         confirmFn,
         confirmFileEdit,
+        onThinking: () => {
+          startSpinner();
+        },
         onBeforeToolRun: () => {
-          clearInterval(spinner);
-          process.stdout.write('\r\x1b[0J');
+          stopSpinner();
+        },
+        onIteration: (iter, max, toolCount) => {
+          const w = process.stdout.columns || 80;
+          const label = ` Step ${iter} `;
+          const line = chalk.dim('──') + chalk.bold.white(label) + chalk.dim('─'.repeat(Math.max(0, w - label.length - 2)));
+          console.log(line);
         },
         onToolCall: (name, args) => {
           const summary = formatToolCallSummary(name, args);
@@ -637,18 +754,23 @@ export async function startInteractive() {
           console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
         },
       });
-      clearInterval(spinner);
-      process.stdout.write('\r\x1b[0J');
+      stopSpinner();
       if (result) {
         chatMessages.push(result.finalMessage);
+        const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
         const width = Math.min(process.stdout.columns || 80, 80);
         process.stdout.write(formatResponseWithCodeBlocks(result.content, width) + '\n\n');
+        await applyCodeBlockEdits(result.content, loaded);
         allFiles = getFilesAndDirs();
-        console.log(chalk.green('✓ Agent done.\n'));
+        console.log(chalk.green(`✓ Agent done.`) + chalk.dim(` (${elapsed}s)\n`));
+        const opts2 = extractNumberedOptions(result.content);
+        if (opts2.length >= 2) {
+          const chosen = await selectFrom(opts2, 'Select an option:');
+          if (chosen) pendingMessage = chosen;
+        }
       }
     } catch (err) {
-      clearInterval(spinner);
-      process.stdout.write('\r\x1b[0J');
+      stopSpinner();
       if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
     }
   }

package/src/ollama.js

@@ -4,8 +4,8 @@ const getHeaders = () => {
   const token = getToken();
   return { 'Content-Type': 'application/json', ...(token && { Authorization: `Bearer ${token}` }) };
 };
-export const MODELS = ['gemma3:4b', 'qwen2.5-coder:0.5b', 'qwen2.5-coder:7b', 'qwen2.5:14b-instruct', 'qwen3:14b'];
-export let MODEL    = 'qwen3:14b';
+export const MODELS = ['llama3:latest', 'gpt-oss:20b', 'qwen3:14b', 'qwen2.5:14b-instruct', 'qwen3.5:9b'];
+export let MODEL    = 'qwen3.5:9b';
 export function setModel(m) { MODEL = m; }
 
 /**

package/src/ui/logo.js

@@ -1,16 +1,30 @@
 import gradient from 'gradient-string';
 
 const ASCII_ART = `                                    
-  ███╗   ███╗ █████╗ ██████╗ ██╗  ██╗ ██████╗ ██╗   ██╗  
-  ████╗ ████║██╔══██╗██╔══██╗██║ ██╔╝██╔═══██╗██║   ██║  
-  ██╔████╔██║███████║██████╔╝█████╔╝ ██    ██║██║   ██║ 
-  ██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝  
-  ██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝   
-  ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝        
+▗▖  ▗▖▗▞▀▜▌ ▄▄▄ █  ▄  ▄▄▄  ▄   ▄ 
+▐▛▚▞▜▌▝▚▄▟▌█    █▄▀  █   █ █   █ 
+▐▌  ▐▌     █    █ ▀▄ ▀▄▄▄▀  ▀▄▀  
+▐▌  ▐▌          █  █                                        
 `;
 
-const markovGradient = gradient(['#6366f1', '#a855f7', '#ec4899']);
+const ASCII_ART3 = `
+███╗   ███╗ █████╗ ██████╗ ██╗  ██╗ ██████╗ ██╗   ██╗
+████╗ ████║██╔══██╗██╔══██╗██║ ██╔╝██╔═══██╗██║   ██║
+██╔████╔██║███████║██████╔╝█████╔╝ ██║   ██║██║   ██║
+██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝
+██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝ 
+╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  
+`;
+
+const ASCII_ART2 = `                                              
+██▄  ▄██  ▄▄▄  ▄▄▄▄  ▄▄ ▄▄  ▄▄▄  ▄▄ ▄▄ 
+██ ▀▀ ██ ██▀██ ██▄█▄ ██▄█▀ ██▀██ ██▄██ 
+██    ██ ██▀██ ██ ██ ██ ██ ▀███▀  ▀█▀  
+`;
+
+
+const markovGradient = gradient(['#374151', '#4b5563', '#6b7280', '#4b5563', '#374151']);
 
 export function printLogo() {
-  console.log(markovGradient.multiline(ASCII_ART + '                                 LivingCloud\'s AI Agent'));
+  console.log(markovGradient.multiline(ASCII_ART3));
 }