markov-cli 1.0.9 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markov-cli",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Markov CLI",
   "type": "module",
   "bin": {

package/src/interactive.js

@@ -5,7 +5,7 @@ import { homedir } from 'os';
 import { resolve } from 'path';
 import { mkdirSync, writeFileSync } from 'fs';
 import { printLogo } from './ui/logo.js';
-import { chatWithTools, MODEL, MODELS, setModel } from './ollama.js';
+import { chatWithTools, streamChat, 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';
@@ -242,6 +242,38 @@ async function getLsContext(cwd = process.cwd()) {
   return `[Current directory: ${cwd}]\n(listing unavailable)\n\n`;
 }
 
+const GREP_DEFAULT_PATTERN = 'function |class |export |def ';
+const GREP_MAX_LINES_DEFAULT = 400;
+const GREP_INCLUDE = "--include='*.js' --include='*.ts' --include='*.jsx' --include='*.tsx' --include='*.py'";
+/** Portable: filter paths with grep -v (BSD grep may not support --exclude-dir). */
+const GREP_FILTER_PATHS = "| grep -v '/node_modules/' | grep -v '/.git/' | grep -v '/.next/' | grep -v '/dist/' | grep -v '/build/' | grep -v '/coverage/'";
+
+/** Safe chars for MARKOV_GREP_PATTERN (no shell metacharacters). */
+function isValidGrepPattern(p) {
+  if (typeof p !== 'string' || p.length > 200) return false;
+  return /^[a-zA-Z0-9 \|\.\-_\\\[\]\(\)\?\+\*]+$/.test(p);
+}
+
+/** Run grep for key definitions; return context block or empty string. Only runs when MARKOV_GREP_CONTEXT=1. */
+async function getGrepContext(cwd = process.cwd()) {
+  if (!process.env.MARKOV_GREP_CONTEXT) return '';
+
+  const rawPattern = process.env.MARKOV_GREP_PATTERN;
+  const pattern = (rawPattern && isValidGrepPattern(rawPattern.trim())) ? rawPattern.trim() : GREP_DEFAULT_PATTERN;
+  const maxLines = Math.min(2000, Math.max(1, parseInt(process.env.MARKOV_GREP_MAX_LINES, 10) || GREP_MAX_LINES_DEFAULT));
+  const escaped = pattern.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+  const cmd = `grep -rn -E "${escaped}" ${GREP_INCLUDE} . 2>/dev/null ${GREP_FILTER_PATHS} | head -n ${maxLines}`;
+
+  try {
+    const { stdout, exitCode } = await execCommand(cmd, cwd);
+    const out = (stdout || '').trim();
+    if (exitCode === 0 && out) {
+      return `[Grep: key definitions in repo]\n$ grep -rn -E '${pattern}' ...\n${out}\n\n`;
+    }
+  } catch (_) {}
+  return `[Grep: key definitions in repo]\n(grep context unavailable)\n\n`;
+}
+
 /** Shared system message base: Markov intro, cwd, file list. */
 function getSystemMessageBase() {
   const files = getFiles();
@@ -249,6 +281,15 @@ function getSystemMessageBase() {
   return `You are Markov, an AI coding assistant.\nWorking directory: ${process.cwd()}\n${fileList}`;
 }
 
+/** System message for /plan: output a step-by-step plan only (no tools). */
+function buildPlanSystemMessage() {
+  return {
+    role: 'system',
+    content: getSystemMessageBase() +
+      '\nOutput a clear, step-by-step plan only. Do not run any commands or edit files—just describe the steps. No tools.',
+  };
+}
+
 /** System message for agent mode: tool-only instructions (no !!run / !!write). */
 function buildAgentSystemMessage() {
   const toolInstructions =
@@ -260,14 +301,29 @@ function buildAgentSystemMessage() {
     `- search_replace: replace first occurrence of text in a file.\n` +
     `- delete_file: delete a file.\n` +
     `- list_dir: list directory contents (path optional, defaults to current dir).\n` +
-    `When the user asks to run commands, create/edit/delete files, scaffold projects, or to "plan" or "start" an app (e.g. npm run dev), call these tools — do not only list commands or describe steps in your reply. Execute with tool calls.\n` +
-    `When the user has ATTACHED FILES (FILE: path ... in the message), any edit, add, or fix they ask for in those files MUST be done with write_file or search_replace — never by pasting the modified file content in your reply.\n` +
-    `Use RELATIVE paths.\n`;
+    `When the user asks to run commands, create/edit/delete files, scaffold projects, or to "plan" or "start" an app (e.g. npm run dev), you MUST call the appropriate tool. Do not only describe steps in your reply.\n` +
+    `You MUST ALWAYS use write_file or search_replace for any file modification, creation, or fix. Never paste full file contents directly in your reply.\n` +
+    `All file operations must use RELATIVE paths.\n` +
+    `Do not output modified file contents in chat — apply changes through tool calls only.\n`;
   return { role: 'system', content: getSystemMessageBase() + toolInstructions };
 }
 
 const AGENT_LOOP_MAX_ITERATIONS = 20;
 
+/** If MARKOV_DEBUG is set, print the full message payload (system + conversation) before sending. */
+function maybePrintFullPayload(messages) {
+  if (!process.env.MARKOV_DEBUG) return;
+  const payload = messages.map((m) => ({
+    role: m.role,
+    ...(m.tool_calls && { tool_calls: m.tool_calls.length }),
+    ...(m.tool_name && { tool_name: m.tool_name }),
+    content: typeof m.content === 'string' ? m.content : '(binary/object)',
+  }));
+  console.log(chalk.dim('\n--- MARKOV_DEBUG: full payload sent to API ---'));
+  console.log(JSON.stringify(payload, null, 2));
+  console.log(chalk.dim('--- end payload ---\n'));
+}
+
 /** Preview of a file edit for confirmation (write_file / search_replace) */
 function formatFileEditPreview(name, args) {
   const path = args?.path ?? '(no path)';
@@ -428,13 +484,17 @@ const HELP_TEXT =
   '\n' +
   chalk.bold('Commands:\n') +
   chalk.cyan('  /help') + chalk.dim('                       show this help\n') +
-  chalk.cyan('  /agent') + chalk.dim(' [prompt]             run with tools (run commands, create folders)\n') +
   chalk.cyan('  /setup-nextjs') + chalk.dim('               scaffold a Next.js app\n') +
   chalk.cyan('  /setup-laravel') + chalk.dim('              scaffold a Laravel API\n') +
   chalk.cyan('  /models') + chalk.dim('                     switch the active AI model\n') +
   chalk.cyan('  /cd [path]') + chalk.dim('                  change working directory\n') +
+  chalk.cyan('  /cmd [command]') + chalk.dim('               run a shell command in the current folder\n') +
   chalk.cyan('  /login') + chalk.dim('                      authenticate with email & password\n') +
   chalk.cyan('  /logout') + chalk.dim('                     clear saved auth token\n') +
+  chalk.cyan('  /debug') + chalk.dim('                      toggle full payload dump (env MARKOV_DEBUG)\n') +
+  chalk.cyan('  /plan') + chalk.dim(' [prompt]              stream a plan (no tools)\n') +
+  chalk.cyan('  /build') + chalk.dim('                      execute last plan with tools\n') +
+  chalk.cyan('  /yolo') + chalk.dim(' [prompt]               plan in stream mode, then auto-run until done\n') +
   chalk.dim('\nType a message · ') + chalk.cyan('@filename') + chalk.dim(' to attach · ctrl+q to cancel\n');
 
 /**
@@ -501,6 +561,7 @@ export async function startInteractive() {
   }
 
   let pendingMessage = null;
+  let lastPlan = null;
 
   while (true) {
     let raw;
@@ -542,74 +603,205 @@ export async function startInteractive() {
       continue;
     }
 
-    // /models — pick active model
-    if (trimmed === '/models') {
-      const chosen = await selectFrom(MODELS, 'Select model:');
-      if (chosen) {
-        setModel(chosen);
-        console.log(chalk.dim(`\n🤖 switched to ${chalk.cyan(chosen)}\n`));
+    // /debug — toggle full payload dump before each request
+    if (trimmed === '/debug') {
+      if (process.env.MARKOV_DEBUG) {
+        delete process.env.MARKOV_DEBUG;
+        console.log(chalk.dim('Debug off — payload dump disabled.\n'));
+      } else {
+        process.env.MARKOV_DEBUG = '1';
+        console.log(chalk.dim('Debug on — full payload (system + messages) will be printed before each request.\n'));
       }
       continue;
     }
 
-    // /cd [path] — change working directory within this session
-    if (trimmed.startsWith('/cd')) {
-      const arg = trimmed.slice(3).trim();
-      const target = arg
-        ? resolve(process.cwd(), arg.replace(/^~/, homedir()))
-        : homedir();
+    // /plan [prompt] — stream a plan (no tools), store as lastPlan
+    if (trimmed === '/plan' || trimmed.startsWith('/plan ')) {
+      const rawUserContent = trimmed.startsWith('/plan ')
+        ? trimmed.slice(6).trim()
+        : (await promptLine(chalk.bold('What do you want to plan? '))).trim();
+      if (!rawUserContent) {
+        console.log(chalk.yellow('No prompt given.\n'));
+        continue;
+      }
+      const userContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
+      chatMessages.push({ role: 'user', content: userContent });
+      const planMessages = [buildPlanSystemMessage(), ...chatMessages];
+      const planAbort = new AbortController();
+      process.stdout.write(chalk.dim('\nPlan › '));
+      const DOTS = ['.', '..', '...'];
+      let dotIdx = 0;
+      const planStartTime = Date.now();
+      let planSpinner = setInterval(() => {
+        const elapsed = ((Date.now() - planStartTime) / 1000).toFixed(1);
+        process.stdout.write('\r' + chalk.dim('Plan › ') + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+        dotIdx++;
+      }, 400);
+      let thinkingStarted = false;
+      let firstContent = true;
+      const clearPlanSpinner = () => {
+        if (planSpinner) {
+          clearInterval(planSpinner);
+          planSpinner = null;
+          process.stdout.write('\r\x1b[0J');
+        }
+      };
       try {
-        process.chdir(target);
-        allFiles = getFilesAndDirs();
-        console.log(chalk.dim(`\n📁 ${process.cwd()}\n`));
-      } catch {
-        console.log(chalk.red(`\nno such directory: ${target}\n`));
+        const fullPlanText = await streamChat(
+          planMessages,
+          (token) => {
+            if (firstContent) {
+              clearPlanSpinner();
+              firstContent = false;
+            }
+            process.stdout.write(token);
+          },
+          MODEL,
+          planAbort.signal,
+          {
+            onThinkingToken: (token) => {
+              if (!thinkingStarted) {
+                clearPlanSpinner();
+                process.stdout.write(chalk.dim('Thinking: '));
+                thinkingStarted = true;
+              }
+              process.stdout.write(chalk.dim(token));
+            },
+          }
+        );
+        chatMessages.push({ role: 'assistant', content: fullPlanText });
+        lastPlan = fullPlanText;
+        console.log('\n' + chalk.dim('Plan saved. Use /build to execute.\n'));
+      } catch (err) {
+        if (planSpinner) {
+          clearInterval(planSpinner);
+          planSpinner = null;
+          process.stdout.write('\r\x1b[0J');
+        }
+        if (!planAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
       }
       continue;
     }
 
-    // /setup-nextjs — scaffold a Next.js app via script
-    if (trimmed === '/setup-nextjs') {
-      const name = (await promptLine(chalk.bold('App folder name: '))).trim() || 'next-app';
-      const steps = [
-        { type: 'mkdir', path: name },
-        { type: 'cd',    path: name },
-        { type: 'run',   cmd: 'npx create-next-app@latest . --yes' },
-        { type: 'run',   cmd: 'npm install sass' },
-      ];
-      const ok = await runSetupSteps(steps);
-      allFiles = getFilesAndDirs();
-      if (ok) console.log(chalk.green(`✓ Next.js app created in ${name}.\n`));
-      continue;
-    }
-
-    // /setup-laravel — scaffold a Laravel API via script
-    if (trimmed === '/setup-laravel') {
-      const name = (await promptLine(chalk.bold('App folder name: '))).trim() || 'laravel-api';
-      const steps = [
-        { type: 'mkdir', path: name },
-        { type: 'cd',    path: name },
-        { type: 'run',   cmd: 'composer create-project --prefer-dist laravel/laravel .' },
-        { type: 'run',   cmd: 'php artisan serve' },
-      ];
-      const ok = await runSetupSteps(steps);
-      allFiles = getFilesAndDirs();
-      if (ok) console.log(chalk.green(`✓ Laravel API created in ${name}.\n`));
+    // /yolo [prompt] — one plan in stream mode, then auto-accept and run agent until done
+    if (trimmed === '/yolo' || trimmed.startsWith('/yolo ')) {
+      const rawUserContent = trimmed.startsWith('/yolo ')
+        ? trimmed.slice(6).trim()
+        : (await promptLine(chalk.bold('What do you want to yolo? '))).trim();
+      if (!rawUserContent) {
+        console.log(chalk.yellow('No prompt given.\n'));
+        continue;
+      }
+      const planUserContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
+      chatMessages.push({ role: 'user', content: planUserContent });
+      const planMessages = [buildPlanSystemMessage(), ...chatMessages];
+      const yoloAbort = new AbortController();
+      process.stdout.write(chalk.dim('\nYolo › Plan › '));
+      let thinkingStarted = false;
+      let fullPlanText = '';
+      try {
+        fullPlanText = await streamChat(
+          planMessages,
+          (token) => process.stdout.write(token),
+          MODEL,
+          yoloAbort.signal,
+          {
+            onThinkingToken: (token) => {
+              if (!thinkingStarted) {
+                process.stdout.write(chalk.dim('Thinking: '));
+                thinkingStarted = true;
+              }
+              process.stdout.write(chalk.dim(token));
+            },
+          }
+        );
+        chatMessages.push({ role: 'assistant', content: fullPlanText });
+        lastPlan = fullPlanText;
+      } catch (err) {
+        if (!yoloAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+        continue;
+      }
+      const buildContent = (await getLsContext()) + (await getGrepContext()) +
+        'Execute the plan above using your tools. Run commands and edit files as needed. Do not only describe—use run_terminal_command, write_file, etc.';
+      chatMessages.push({ role: 'user', content: buildContent });
+      const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+      maybePrintFullPayload(agentMessages);
+      const abortController = new AbortController();
+      const confirmFn = () => Promise.resolve(true);
+      const confirmFileEdit = async () => true;
+      const startTime = Date.now();
+      const DOTS = ['.', '..', '...'];
+      let dotIdx = 0;
+      let spinner = null;
+      const startSpinner = () => {
+        if (spinner) { clearInterval(spinner); spinner = null; }
+        dotIdx = 0;
+        process.stdout.write(chalk.dim('\nYolo › Run › '));
+        spinner = setInterval(() => {
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          process.stdout.write('\r' + chalk.dim('Yolo › Run › ') + 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: () => { 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);
+            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+          },
+          onToolResult: (name, resultStr) => {
+            console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
+          },
+        });
+        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(`✓ Yolo 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) {
+        stopSpinner();
+        if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      }
       continue;
     }
 
-    // /agent [prompt] — run with tools (run_terminal_command, create_folder, file tools), loop until final response
-    if (trimmed === '/agent' || trimmed.startsWith('/agent ')) {
-      const rawUserContent = trimmed.startsWith('/agent ')
-        ? trimmed.slice(7).trim()
-        : (await promptLine(chalk.bold('Agent prompt: '))).trim();
-      if (!rawUserContent) {
-        console.log(chalk.yellow('No prompt given.\n'));
+    // /build — execute last plan with tools
+    if (trimmed === '/build') {
+      if (!lastPlan || lastPlan.trim() === '') {
+        console.log(chalk.yellow('Run /plan first to create a plan.\n'));
         continue;
       }
-      const userContent = (await getLsContext()) + rawUserContent;
-      chatMessages.push({ role: 'user', content: userContent });
+      const buildContent = (await getLsContext()) + (await getGrepContext()) +
+        'Execute the plan above using your tools. Run commands and edit files as needed. Do not only describe—use run_terminal_command, write_file, etc.';
+      chatMessages.push({ role: 'user', content: buildContent });
       const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+      maybePrintFullPayload(agentMessages);
       const abortController = new AbortController();
       const confirmFn = (cmd) => confirm(chalk.bold(`Run: ${cmd}? [y/N] `));
       const confirmFileEdit = async (name, args) => {
@@ -618,12 +810,10 @@ export async function startInteractive() {
         console.log('');
         return confirm(chalk.bold('Apply this change? [y/N] '));
       };
-
       const startTime = Date.now();
       const DOTS = ['.', '..', '...'];
       let dotIdx = 0;
       let spinner = null;
-
       const startSpinner = () => {
         if (spinner) { clearInterval(spinner); spinner = null; }
         dotIdx = 0;
@@ -638,19 +828,14 @@ export async function startInteractive() {
         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: () => {
-            stopSpinner();
-          },
+          onThinking: () => { startSpinner(); },
+          onBeforeToolRun: () => { stopSpinner(); },
           onIteration: (iter, max, toolCount) => {
             const w = process.stdout.columns || 80;
             const label = ` Step ${iter} `;
@@ -673,7 +858,7 @@ export async function startInteractive() {
           process.stdout.write(formatResponseWithCodeBlocks(result.content, width) + '\n\n');
           await applyCodeBlockEdits(result.content, []);
           allFiles = getFilesAndDirs();
-          console.log(chalk.green(`✓ Agent done.`) + chalk.dim(` (${elapsed}s)\n`));
+          console.log(chalk.green(`✓ Build done.`) + chalk.dim(` (${elapsed}s)\n`));
           const opts1 = extractNumberedOptions(result.content);
           if (opts1.length >= 2) {
             const chosen = await selectFrom(opts1, 'Select an option:');
@@ -687,6 +872,87 @@ export async function startInteractive() {
       continue;
     }
 
+    // /models — pick active model
+    if (trimmed === '/models') {
+      const chosen = await selectFrom(MODELS, 'Select model:');
+      if (chosen) {
+        setModel(chosen);
+        console.log(chalk.dim(`\n🤖 switched to ${chalk.cyan(chosen)}\n`));
+      }
+      continue;
+    }
+
+    // /cd [path] — change working directory within this session
+    if (trimmed.startsWith('/cd')) {
+      const arg = trimmed.slice(3).trim();
+      const target = arg
+        ? resolve(process.cwd(), arg.replace(/^~/, homedir()))
+        : homedir();
+      try {
+        process.chdir(target);
+        allFiles = getFilesAndDirs();
+        console.log(chalk.dim(`\n📁 ${process.cwd()}\n`));
+      } catch {
+        console.log(chalk.red(`\nno such directory: ${target}\n`));
+      }
+      continue;
+    }
+
+    // /cmd [command] — run a shell command in the current folder
+    if (trimmed === '/cmd' || trimmed.startsWith('/cmd ')) {
+      const command = trimmed.startsWith('/cmd ')
+        ? trimmed.slice(5).trim()
+        : (await promptLine(chalk.bold('Command: '))).trim();
+      if (!command) {
+        console.log(chalk.yellow('No command given. Use /cmd <command> e.g. /cmd ls -la\n'));
+        continue;
+      }
+      try {
+        const cwd = process.cwd();
+        const { stdout, stderr, exitCode } = await execCommand(command, cwd);
+        const out = [stdout, stderr].filter(Boolean).join(stderr ? '\n' : '').trim();
+        if (out) console.log(out);
+        if (exitCode !== 0) {
+          console.log(chalk.red(`\nExit code: ${exitCode}\n`));
+        } else {
+          console.log(chalk.dim('\n'));
+        }
+      } catch (err) {
+        console.log(chalk.red(`\n${err.message}\n`));
+      }
+      continue;
+    }
+
+    // /setup-nextjs — scaffold a Next.js app via script
+    if (trimmed === '/setup-nextjs') {
+      const name = (await promptLine(chalk.bold('App folder name: '))).trim() || 'next-app';
+      const steps = [
+        { type: 'mkdir', path: name },
+        { type: 'cd',    path: name },
+        { type: 'run',   cmd: 'npx create-next-app@latest . --yes' },
+        { type: 'run',   cmd: 'npm install sass' },
+      ];
+      const ok = await runSetupSteps(steps);
+      allFiles = getFilesAndDirs();
+      if (ok) console.log(chalk.green(`✓ Next.js app created in ${name}.\n`));
+      continue;
+    }
+
+    // /setup-laravel — scaffold a Laravel API via script
+    if (trimmed === '/setup-laravel') {
+      const name = (await promptLine(chalk.bold('App folder name: '))).trim() || 'laravel-api';
+      const steps = [
+        { type: 'mkdir', path: name },
+        { type: 'cd',    path: name },
+        { type: 'run',   cmd: 'composer create-project --prefer-dist laravel/laravel .' },
+        { type: 'run',   cmd: 'php artisan serve' },
+      ];
+      const ok = await runSetupSteps(steps);
+      allFiles = getFilesAndDirs();
+      if (ok) console.log(chalk.green(`✓ Laravel API created in ${name}.\n`));
+      continue;
+    }
+
     // Handle message with agent (tools)
     const { loaded, failed, content: resolvedContent } = await resolveFileRefs(trimmed);
     if (loaded.length > 0) {
@@ -696,10 +962,11 @@ export async function startInteractive() {
       console.log(chalk.yellow(`\n⚠  not found: ${failed.map(f => `@${f}`).join(', ')}`));
     }
     const rawUserContent = resolvedContent ?? trimmed;
-    const userContent = (await getLsContext()) + rawUserContent;
+    const userContent = (await getLsContext()) + (await getGrepContext()) + rawUserContent;
     chatMessages.push({ role: 'user', content: userContent });
 
     const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+    maybePrintFullPayload(agentMessages);
     const abortController = new AbortController();
     const confirmFn = (cmd) => confirm(chalk.bold(`Run: ${cmd}? [y/N] `));
     const confirmFileEdit = async (name, args) => {

package/src/ollama.js

@@ -4,22 +4,25 @@ const getHeaders = () => {
   const token = getToken();
   return { 'Content-Type': 'application/json', ...(token && { Authorization: `Bearer ${token}` }) };
 };
-export const MODELS = ['llama3:latest', 'gpt-oss:20b', 'qwen3:14b', 'qwen2.5:14b-instruct', 'qwen3.5:9b'];
+export const MODELS = ['llama3:latest', 'gpt-oss:20b', 'qwen3:14b', 'qwen2.5:14b-instruct', 'qwen3.5:4b', 'qwen3.5:9b'];
 export let MODEL    = 'qwen3.5:9b';
 export function setModel(m) { MODEL = m; }
 
 /**
  * Stream a chat response from Ollama.
- * Calls onToken(string) for each token, returns the full response string.
+ * Calls onToken(string) for each content token, returns the full response string.
+ * When the backend sends thinking tokens, calls opts.onThinkingToken(string) if provided.
  * Pass an AbortSignal to allow cancellation mid-stream.
+ * @param {object} [opts] - Optional. { onThinkingToken?: (token: string) => void }
  */
-export async function streamChat(messages, onToken, _model = MODEL, signal = null) {
+export async function streamChat(messages, onToken, _model = MODEL, signal = null, opts = {}) {
+  const onThinkingToken = opts.onThinkingToken;
   let response;
   try {
     response = await fetch(`${API_URL}/ai/chat/stream`, {
       method: 'POST',
       headers: getHeaders(),
-      body: JSON.stringify({ messages, temperature: 0.2 }),
+      body: JSON.stringify({ messages, temperature: 0.2, think: true }),
       signal,
     });
   } catch (err) {
@@ -54,6 +57,9 @@ export async function streamChat(messages, onToken, _model = MODEL, signal = nul
         if (data === '[DONE]') return fullText;
         try {
           const parsed = JSON.parse(data);
+          if (parsed.thinking != null && parsed.thinking !== '' && onThinkingToken) {
+            onThinkingToken(parsed.thinking);
+          }
           if (parsed.content) {
             onToken(parsed.content);
             fullText += parsed.content;