markov-cli 1.0.11 → 1.0.13

package/src/interactive.js

@@ -1,484 +1,42 @@
 import chalk from 'chalk';
 
 import gradient from 'gradient-string';
+import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { homedir } from 'os';
 import { resolve } from 'path';
-import { mkdirSync, writeFileSync } from 'fs';
 import { printLogo } from './ui/logo.js';
-import { chatWithTools, streamChat, MODEL, MODELS, setModel } from './ollama.js';
+import { chatWithTools, streamChat, streamChatWithTools, MODEL, MODEL_OPTIONS, setModelAndProvider, getModelDisplayName } from './ollama.js';
 import { resolveFileRefs } from './files.js';
-import { execCommand, AGENT_TOOLS, runTool } from './tools.js';
-import { parseEdits, renderDiff, applyEdit } from './editor.js';
+import { RUN_TERMINAL_COMMAND_TOOL, WEB_SEARCH_TOOL, runTool } from './tools.js';
 import { chatPrompt } from './input.js';
-import { getFiles, getFilesAndDirs } from './ui/picker.js';
-import { getToken, login, clearToken } from './auth.js';
+import { getFilesAndDirs } from './ui/picker.js';
+import { getToken, login, clearToken, getClaudeKey, setClaudeKey, getOpenAIKey, setOpenAIKey, getOllamaKey, setOllamaKey } from './auth.js';
 
-const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
-
-/** Arrow-key selector. Returns the chosen string or null if cancelled. */
-function selectFrom(options, label) {
-  return new Promise((resolve) => {
-    let idx = 0;
-
-    const draw = () => {
-      process.stdout.write('\r\x1b[0J');
-      process.stdout.write(chalk.dim(label) + '\n');
-      options.forEach((o, i) => {
-        process.stdout.write(
-          i === idx
-            ? '  ' + chalk.bgCyan.black(` ${o} `) + '\n'
-            : '  ' + chalk.dim(o) + '\n'
-        );
-      });
-      // Move cursor back up to keep it stable
-      process.stdout.write(`\x1b[${options.length + 1}A`);
-    };
-
-    const cleanup = () => {
-      process.stdin.removeListener('data', onKey);
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
-      // Clear the drawn lines
-      process.stdout.write('\r\x1b[0J');
-    };
-
-    const onKey = (data) => {
-      const key = data.toString();
-      if (key === '\x1b[A') { idx = (idx - 1 + options.length) % options.length; draw(); return; }
-      if (key === '\x1b[B') { idx = (idx + 1) % options.length; draw(); return; }
-      if (key === '\r' || key === '\n') { cleanup(); resolve(options[idx]); return; }
-      if (key === '\x03' || key === '\x11') { cleanup(); resolve(null); return; }
-    };
-
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', onKey);
-    draw();
-  });
-}
-
-/** Prompt y/n in raw mode, returns true for y/Y. */
-function confirm(question) {
-  return new Promise((resolve) => {
-    process.stdout.write(question);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding('utf8');
-    const onKey = (key) => {
-      process.stdin.removeListener('data', onKey);
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
-      const answer = key.toLowerCase() === 'y';
-      process.stdout.write(answer ? chalk.green('y\n') : chalk.dim('n\n'));
-      resolve(answer);
-    };
-    process.stdin.on('data', onKey);
-  });
-}
-
-/** Read a visible line of input. */
-function promptLine(label) {
-  return new Promise((resolve) => {
-    process.stdout.write(label);
-    let buf = '';
-    const onData = (data) => {
-      const key = data.toString();
-      if (key === '\r' || key === '\n') {
-        process.stdin.removeListener('data', onData);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
-        process.stdout.write('\n');
-        resolve(buf);
-      } else if (key === '\x7f' || key === '\b') {
-        if (buf.length > 0) { buf = buf.slice(0, -1); process.stdout.write('\b \b'); }
-      } else if (key >= ' ') {
-        buf += key;
-        process.stdout.write(key);
-      }
-    };
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', onData);
-  });
-}
+// Extracted UI modules
+import { selectFrom, confirm, promptLine, promptSecret } from './ui/prompts.js';
+import { formatResponseWithCodeBlocks, formatFileEditPreview, formatToolCallSummary, formatToolResultSummary, printTokenUsage } from './ui/formatting.js';
+import { createSpinner } from './ui/spinner.js';
 
-/** Read a line of input without echo (for passwords). */
-function promptSecret(label) {
-  return new Promise((resolve) => {
-    process.stdout.write(label);
-    let buf = '';
-    const onData = (data) => {
-      const key = data.toString();
-      if (key === '\r' || key === '\n') {
-        process.stdin.removeListener('data', onData);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
-        process.stdout.write('\n');
-        resolve(buf);
-      } else if (key === '\x7f' || key === '\b') {
-        if (buf.length > 0) buf = buf.slice(0, -1);
-      } else if (key >= ' ') {
-        buf += key;
-      }
-    };
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', onData);
-  });
-}
+// Extracted agent modules
+import { buildPlanSystemMessage, buildAgentSystemMessage, buildInitSystemMessage, getLsContext, getGrepContext } from './agent/context.js';
+import { runAgentLoop, maybePrintFullPayload, AGENT_LOOP_MAX_ITERATIONS } from './agent/agentLoop.js';
 
-const TERM_WIDTH = 80;
-const ANSI_RE = /\x1b\[[0-9;]*m/g;
-const visLen = (s) => s.replace(ANSI_RE, '').length;
+// Extracted editor modules
+import { applyCodeBlockEdits } from './editor/codeBlockEdits.js';
 
-/** Word-wrap plain text to a given column width, preserving existing newlines. */
-function wrapText(text, width) {
-  return text.split('\n').map(line => {
-    if (visLen(line) <= width) return line;
-    const words = line.split(' ');
-    const wrapped = [];
-    let current = '';
-    for (const word of words) {
-      const test = current ? current + ' ' + word : word;
-      if (visLen(test) <= width) {
-        current = test;
-      } else {
-        if (current) wrapped.push(current);
-        current = word;
-      }
-    }
-    if (current) wrapped.push(current);
-    return wrapped.join('\n');
-  }).join('\n');
-}
-
-/** 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;
-  const parts = [];
-  let lastIndex = 0;
-  let m;
-  while ((m = re.exec(text)) !== null) {
-    if (m.index > lastIndex) {
-      const textSegment = text.slice(lastIndex, m.index);
-      if (textSegment) parts.push({ type: 'text', content: textSegment });
-    }
-    parts.push({ type: 'code', lang: m[1], content: m[2].trim() });
-    lastIndex = re.lastIndex;
-  }
-  if (lastIndex < text.length) {
-    const textSegment = text.slice(lastIndex);
-    if (textSegment) parts.push({ type: 'text', content: textSegment });
-  }
-  if (parts.length === 0) return wrapText(text, width);
-  return parts.map((p) => {
-    if (p.type === 'text') return wrapText(p.content, width);
-    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');
-}
-
-/**
- * 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`;
-}
-
-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();
-  const fileList = files.length > 0 ? `\nFiles in working directory:\n${files.map(f => `  ${f}`).join('\n')}\n` : '';
-  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.',
-  };
-}
+// Extracted command modules
+import { runSetupSteps, NEXTJS_STEPS, TANSTACK_STEPS, LARAVEL_STEPS, LARAVEL_BLOG_PROMPT } from './commands/setup.js';
 
-/** System message for agent mode: tool-only instructions (no !!run / !!write). */
-function buildAgentSystemMessage() {
-  const toolInstructions =
-    `\nTOOL MODE — you have tools; use them. \n` +
-    `- run_terminal_command: run shell commands (npm install, npx create-next-app, etc.). One command per call.\n` +
-    `- create_folder: create directories.\n` +
-    `- read_file: read file contents before editing.\n` +
-    `- write_file: create or overwrite a file with full content.\n` +
-    `- 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), 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)';
-  if (name === 'search_replace') {
-    const oldStr = String(args?.old_string ?? '');
-    const newStr = String(args?.new_string ?? '');
-    const max = 120;
-    const oldPreview = oldStr.length > max ? oldStr.slice(0, max) + '…' : oldStr;
-    const newPreview = newStr.length > max ? newStr.slice(0, max) + '…' : newStr;
-    return (
-      chalk.cyan(path) + '\n' +
-      chalk.red('  - ' + (oldPreview || '(empty)').replace(/\n/g, '\n    ')) + '\n' +
-      chalk.green('  + ' + (newPreview || '(empty)').replace(/\n/g, '\n    '))
-    );
-  }
-  if (name === 'write_file') {
-    const content = String(args?.content ?? '');
-    const lines = content.split('\n');
-    const previewLines = lines.slice(0, 25);
-    const more = lines.length > 25 ? chalk.dim(`  ... ${lines.length - 25} more lines`) : '';
-    return chalk.cyan(path) + '\n' + previewLines.map(l => '  ' + l).join('\n') + (more ? '\n' + more : '');
-  }
-  return path;
-}
-
-/** One-line summary of tool args for display */
-function formatToolCallSummary(name, args) {
-  const a = args ?? {};
-  if (name === 'run_terminal_command') return (a.command ?? '').trim() || '(empty)';
-  if (name === 'write_file') return a.path ?? '(no path)';
-  if (name === 'search_replace') return (a.path ?? '') + (a.old_string ? ` "${String(a.old_string).slice(0, 30)}…"` : '');
-  if (name === 'read_file' || name === 'delete_file') return a.path ?? '(no path)';
-  if (name === 'create_folder') return a.path ?? '(no path)';
-  if (name === 'list_dir') return (a.path ?? '.') || '.';
-  return JSON.stringify(a).slice(0, 50);
-}
-
-/** One-line summary of tool result for display */
-function formatToolResultSummary(name, resultJson) {
-  let obj;
-  try {
-    obj = typeof resultJson === 'string' ? JSON.parse(resultJson) : resultJson;
-  } catch {
-    return resultJson?.slice(0, 60) ?? '—';
-  }
-  if (obj.error) return chalk.red('✗ ' + obj.error);
-  if (obj.declined) return chalk.yellow('✗ declined');
-  if (name === 'run_terminal_command') {
-    const code = obj.exitCode ?? obj.exit_code;
-    if (code === 0) return chalk.green('✓ exit 0') + (obj.stdout ? chalk.dim('  ' + String(obj.stdout).trim().slice(0, 80).replace(/\n/g, ' ')) : '');
-    return chalk.red(`✗ exit ${code}`) + (obj.stderr ? chalk.dim('  ' + String(obj.stderr).trim().slice(0, 80)) : '');
-  }
-  if (name === 'write_file' || name === 'search_replace' || name === 'delete_file' || name === 'create_folder') {
-    return obj.success !== false ? chalk.green('✓ ' + (obj.path ? obj.path : 'ok')) : chalk.red('✗ ' + (obj.error || 'failed'));
-  }
-  if (name === 'read_file') return obj.content != null ? chalk.green('✓ ' + (obj.path ?? '') + chalk.dim(` (${String(obj.content).length} chars)`)) : chalk.red('✗ ' + (obj.error || ''));
-  if (name === 'list_dir') return obj.entries ? chalk.green('✓ ' + (obj.entries.length ?? 0) + ' entries') : chalk.red('✗ ' + (obj.error || ''));
-  return chalk.dim(JSON.stringify(obj).slice(0, 60));
-}
-
-/**
- * Run the agent loop: call chatWithTools, run any tool_calls locally, append results, repeat until the model returns a final response.
- * For write_file and search_replace, confirmFileEdit is called first; if it returns false, the change is skipped and the model is told the user declined.
- * @param {Array<{ role: string; content?: string; tool_calls?: unknown[]; tool_name?: string }>} messages - Full message list (system + conversation)
- * @param {{ signal?: AbortSignal; cwd?: string; confirmFn?: (command: string) => Promise<boolean>; confirmFileEdit?: (name: string, args: object) => Promise<boolean>; onBeforeToolRun?: () => void; onToolCall?: (name: string, args: object) => void; onToolResult?: (name: string, result: string) => void }} opts
- * @returns {Promise<{ content: string; finalMessage: object } | null>} Final assistant content and message, or null if cancelled/error
- */
-async function runAgentLoop(messages, opts = {}) {
-  const cwd = opts.cwd ?? process.cwd();
-  const confirmFn = opts.confirmFn;
-  const confirmFileEdit = opts.confirmFileEdit;
-  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;
-    if (!message) {
-      return { content: '', finalMessage: { role: 'assistant', content: '' } };
-    }
-
-    const toolCalls = message.tool_calls;
-    if (!toolCalls || toolCalls.length === 0) {
-      return { content: message.content ?? '', finalMessage: message };
-    }
-
-    // Append assistant message with tool_calls
-    messages.push({
-      role: 'assistant',
-      content: message.content ?? '',
-      tool_calls: toolCalls,
-    });
-
-    onBeforeToolRun?.();
-    onIteration?.(iteration, AGENT_LOOP_MAX_ITERATIONS, toolCalls.length);
-
-    for (const tc of toolCalls) {
-      const name = tc?.function?.name;
-      const rawArgs = tc?.function?.arguments;
-      let args = rawArgs;
-      if (typeof rawArgs === 'string') {
-        try {
-          args = JSON.parse(rawArgs);
-        } catch {
-          messages.push({
-            role: 'tool',
-            tool_name: name ?? 'unknown',
-            content: JSON.stringify({ error: 'Invalid JSON in arguments' }),
-          });
-          if (onToolCall) onToolCall(name ?? 'unknown', {});
-          if (onToolResult) onToolResult(name ?? 'unknown', JSON.stringify({ error: 'Invalid JSON in arguments' }));
-          continue;
-        }
-      }
-
-      if (onToolCall) onToolCall(name ?? 'unknown', args ?? {});
+const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
 
-      const isFileEdit = name === 'write_file' || name === 'search_replace';
-      let result;
-      if (isFileEdit && confirmFileEdit) {
-        const ok = await confirmFileEdit(name, args ?? {});
-        if (!ok) {
-          result = JSON.stringify({ declined: true, message: 'User declined the change' });
-          if (onToolResult) onToolResult(name ?? 'unknown', result);
-          messages.push({
-            role: 'tool',
-            tool_name: name ?? 'unknown',
-            content: result,
-          });
-          continue;
-        }
-      }
+const PLAN_FILE = 'plan.md';
+const getPlanPath = () => resolve(process.cwd(), PLAN_FILE);
 
-      result = await runTool(name, args ?? {}, { cwd, confirmFn });
-      if (onToolResult) onToolResult(name ?? 'unknown', typeof result === 'string' ? result : JSON.stringify(result));
-      messages.push({
-        role: 'tool',
-        tool_name: name ?? 'unknown',
-        content: typeof result === 'string' ? result : JSON.stringify(result),
-      });
-    }
-  }
+const MARKOV_FILE = 'markov.md';
+const getMarkovPath = () => resolve(process.cwd(), MARKOV_FILE);
 
-  return {
-    content: '(agent loop reached max iterations)',
-    finalMessage: { role: 'assistant', content: '(max iterations)' },
-  };
-}
+/** Tools allowed during /plan and /yolo plan phase: web search + run command for research only (e.g. ls, cat). */
+const PLAN_YOLO_TOOLS = [WEB_SEARCH_TOOL, RUN_TERMINAL_COMMAND_TOOL];
 
 /** Short intro shown on first load; /intro re-displays this. */
 const INTRO_TEXT =
@@ -487,9 +45,10 @@ const INTRO_TEXT =
   chalk.cyan('  /help') + chalk.dim('                       show all commands\n') +
   chalk.cyan('  /login') + chalk.dim('                      authenticate with email & password\n') +
   chalk.cyan('  /cd [path]') + chalk.dim('                  change working directory\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.cyan('  /init') + chalk.dim(' [prompt]              create markov.md with project summary\n') +
+  chalk.cyan('  /plan') + chalk.dim(' [prompt]              stream a plan and save to plan.md\n') +
+  chalk.cyan('  /build') + chalk.dim('                      execute plan from plan.md\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');
 
 const HELP_TEXT =
@@ -498,66 +57,31 @@ const HELP_TEXT =
   chalk.cyan('  /intro') + chalk.dim('                      show quick start (same as on first load)\n') +
   chalk.cyan('  /help') + chalk.dim('                       show this help\n') +
   chalk.cyan('  /setup-nextjs') + chalk.dim('               scaffold a Next.js app\n') +
+  chalk.cyan('  /setup-tanstack') + chalk.dim('             scaffold a TanStack Start app\n') +
   chalk.cyan('  /setup-laravel') + chalk.dim('              scaffold a Laravel API\n') +
+  chalk.cyan('  /laravel') + chalk.dim('                   set up Laravel "my-blog" with blog route (agent)\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('  /clear') + chalk.dim('                      clear chat history and stored plan\n') +
+  chalk.cyan('  /env') + chalk.dim('                        show which .env vars are loaded (for debugging)\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('  /init') + chalk.dim(' [prompt]              create markov.md with project summary\n') +
+  chalk.cyan('  /plan') + chalk.dim(' [prompt]              stream a plan and save to plan.md\n') +
+  chalk.cyan('  /build') + chalk.dim('                      execute plan from plan.md\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');
 
-/**
- * Run a list of setup steps (mkdir / cd / run / write) in sequence.
- * Returns true if all steps succeeded, false if any failed.
- */
-async function runSetupSteps(steps) {
-  for (const step of steps) {
-    if (step.type === 'mkdir') {
-      process.stdout.write(chalk.dim(`  mkdir: ${step.path}\n`));
-      try {
-        mkdirSync(resolve(process.cwd(), step.path), { recursive: true });
-        console.log(chalk.green(`  ✓ created ${step.path}\n`));
-      } catch (err) {
-        console.log(chalk.red(`  ✗ ${err.message}\n`));
-        return false;
-      }
-    } else if (step.type === 'cd') {
-      try {
-        process.chdir(resolve(process.cwd(), step.path));
-        console.log(chalk.dim(`  📁 ${process.cwd()}\n`));
-      } catch (err) {
-        console.log(chalk.red(`  ✗ no such directory: ${step.path}\n`));
-        return false;
-      }
-    } else if (step.type === 'run') {
-      process.stdout.write(chalk.dim(`  running: ${step.cmd}\n`));
-      const { stdout, stderr, exitCode } = await execCommand(step.cmd);
-      const output = [stdout, stderr].filter(Boolean).join('\n').trim();
-      if (output) console.log(chalk.dim(output));
-      if (exitCode !== 0) {
-        console.log(chalk.red(`  ✗ command failed (exit ${exitCode})\n`));
-        return false;
-      }
-      console.log(chalk.green(`  ✓ done\n`));
-    } else if (step.type === 'write') {
-      process.stdout.write(chalk.dim(`  write: ${step.path}\n`));
-      try {
-        const abs = resolve(process.cwd(), step.path);
-        const dir = abs.split('/').slice(0, -1).join('/');
-        mkdirSync(dir, { recursive: true });
-        writeFileSync(abs, step.content);
-        console.log(chalk.green(`  ✓ wrote ${step.path}\n`));
-      } catch (err) {
-        console.log(chalk.red(`  ✗ ${err.message}\n`));
-        return false;
-      }
-    }
-  }
-  return true;
+/** If MARKOV_DEBUG is set, print the raw model output after completion. */
+function maybePrintRawModelOutput(rawText) {
+  if (!process.env.MARKOV_DEBUG || rawText == null) return;
+  const text = typeof rawText === 'string' ? rawText : String(rawText);
+  if (!text.trim()) return;
+  console.log(chalk.dim('\n--- MARKOV_DEBUG: raw model output ---'));
+  console.log(text);
+  console.log(chalk.dim('--- end raw output ---\n'));
 }
 
 export async function startInteractive() {
@@ -566,7 +90,7 @@ export async function startInteractive() {
   let allFiles = getFilesAndDirs();
   const chatMessages = [];
 
-  console.log(chalk.dim(`Chat with Markov (${MODEL}).`));
+  console.log(chalk.dim(`Chat with Markov (${getModelDisplayName()}).`));
   console.log(INTRO_TEXT);
 
   if (!getToken()) {
@@ -575,6 +99,7 @@ export async function startInteractive() {
 
   let pendingMessage = null;
   let lastPlan = null;
+  const inputHistory = [];
 
   while (true) {
     let raw;
@@ -583,7 +108,7 @@ export async function startInteractive() {
       pendingMessage = null;
       console.log(chalk.magenta('you> ') + raw + '\n');
     } else {
-      raw = await chatPrompt(chalk.magenta('you> '), allFiles);
+      raw = await chatPrompt(chalk.magenta('you> '), allFiles, inputHistory);
     }
     if (raw === null) continue;
     const trimmed = raw.trim();
@@ -610,6 +135,14 @@ export async function startInteractive() {
       continue;
     }
 
+    // /clear — clear chat history and stored plan
+    if (trimmed === '/clear') {
+      chatMessages.length = 0;
+      lastPlan = null;
+      console.log(chalk.green('✓ Chat and context cleared.\n'));
+      continue;
+    }
+
     // /intro — show quick start (same as on first load)
     if (trimmed === '/intro') {
       console.log(INTRO_TEXT);
@@ -634,6 +167,27 @@ export async function startInteractive() {
       continue;
     }
 
+    // /env — show which .env vars are loaded (for debugging)
+    if (trimmed === '/env') {
+      const mask = (v) => (v && v.length > 8 ? v.slice(0, 8) + '…' + v.slice(-4) : v ? '***' : null);
+      const vars = [
+        ['ANTHROPIC_API_KEY', process.env.ANTHROPIC_API_KEY],
+        ['ANTHROPIC_MODEL', process.env.ANTHROPIC_MODEL],
+        ['OPENAI_API_KEY', process.env.OPENAI_API_KEY],
+        ['OPENAI_MODEL', process.env.OPENAI_MODEL],
+        ['MARKOV_SEARCH_API_KEY', process.env.MARKOV_SEARCH_API_KEY],
+        ['MARKOV_DEBUG', process.env.MARKOV_DEBUG],
+      ];
+      console.log(chalk.dim('\nEnvironment (from .env or shell):\n'));
+      for (const [name, val] of vars) {
+        const status = val ? chalk.green('set') : chalk.red('not set');
+        const preview = val ? chalk.dim(' ' + mask(val)) : '';
+        console.log(chalk.dim('  ') + name + chalk.dim(': ') + status + preview);
+      }
+      console.log('');
+      continue;
+    }
+
     // /plan [prompt] — stream a plan (no tools), store as lastPlan
     if (trimmed === '/plan' || trimmed.startsWith('/plan ')) {
       const rawUserContent = trimmed.startsWith('/plan ')
@@ -643,6 +197,7 @@ export async function startInteractive() {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
       }
+      console.log(chalk.dim('You: ') + rawUserContent);
       const userContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
       chatMessages.push({ role: 'user', content: userContent });
       const planMessages = [buildPlanSystemMessage(), ...chatMessages];
@@ -666,31 +221,69 @@ export async function startInteractive() {
         }
       };
       try {
-        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));
+        let currentPlanMessages = planMessages;
+        let fullPlanText = '';
+        const planMaxIter = 10;
+        for (let planIter = 0; planIter < planMaxIter; planIter++) {
+          const { content, toolCalls, usage } = await streamChatWithTools(
+            currentPlanMessages,
+            PLAN_YOLO_TOOLS,
+            MODEL,
+            {
+              think: true, // plan mode only: request thinking from backend
+              onContent: (token) => {
+                if (firstContent) {
+                  clearPlanSpinner();
+                  firstContent = false;
+                }
+                process.stdout.write(token);
+              },
+              onThinking: (token) => {
+                if (!thinkingStarted) {
+                  clearPlanSpinner();
+                  process.stdout.write(chalk.dim('Thinking: '));
+                  thinkingStarted = true;
+                }
+                process.stdout.write(chalk.dim(token));
+              },
             },
+            planAbort.signal,
+            null
+          );
+          fullPlanText = content ?? '';
+          if (!toolCalls?.length) {
+            printTokenUsage(usage);
+            break;
+          }
+          currentPlanMessages = [...currentPlanMessages, { role: 'assistant', content: content ?? '', tool_calls: toolCalls }];
+          for (const tc of toolCalls) {
+            const name = tc?.function?.name ?? 'unknown';
+            let args = tc?.function?.arguments;
+            if (typeof args === 'string') {
+              try {
+                args = JSON.parse(args);
+              } catch {
+                currentPlanMessages.push({ role: 'tool', tool_name: name, content: JSON.stringify({ error: 'Invalid JSON in arguments' }) });
+                continue;
+              }
+            }
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
+            currentPlanMessages.push({
+              role: 'tool',
+              tool_name: name,
+              content: typeof result === 'string' ? result : JSON.stringify(result),
+            });
           }
-        );
+        }
         chatMessages.push({ role: 'assistant', content: fullPlanText });
-        lastPlan = fullPlanText;
-        console.log('\n' + chalk.dim('Plan saved. Use /build to execute.\n'));
+        // Store only plan (stream content), not thinking; write to plan.md for /build.
+        if ((fullPlanText ?? '').trim()) {
+          lastPlan = fullPlanText;
+          writeFileSync(getPlanPath(), fullPlanText.trim(), 'utf-8');
+        }
+        console.log('\n' + chalk.dim('Plan saved to plan.md. Use ') + chalk.green('/build') + chalk.dim(' to execute.\n'));
+        maybePrintRawModelOutput(fullPlanText);
       } catch (err) {
         if (planSpinner) {
           clearInterval(planSpinner);
@@ -711,6 +304,7 @@ export async function startInteractive() {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
       }
+      console.log(chalk.dim('You: ') + rawUserContent);
       const planUserContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
       chatMessages.push({ role: 'user', content: planUserContent });
       const planMessages = [buildPlanSystemMessage(), ...chatMessages];
@@ -719,31 +313,65 @@ export async function startInteractive() {
       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));
+        let currentPlanMessages = planMessages;
+        const yoloPlanMaxIter = 10;
+        for (let planIter = 0; planIter < yoloPlanMaxIter; planIter++) {
+          const { content: yoloPlanContent, toolCalls, usage } = await streamChatWithTools(
+            currentPlanMessages,
+            PLAN_YOLO_TOOLS,
+            MODEL,
+            {
+              think: true, // plan phase: request thinking from backend
+              onContent: (token) => process.stdout.write(token),
+              onThinking: (token) => {
+                if (!thinkingStarted) {
+                  process.stdout.write(chalk.dim('Thinking: '));
+                  thinkingStarted = true;
+                }
+                process.stdout.write(chalk.dim(token));
+              },
             },
+            yoloAbort.signal,
+            null
+          );
+          fullPlanText = yoloPlanContent ?? '';
+          if (!toolCalls?.length) {
+            printTokenUsage(usage);
+            break;
           }
-        );
+          currentPlanMessages = [...currentPlanMessages, { role: 'assistant', content: yoloPlanContent ?? '', tool_calls: toolCalls }];
+          for (const tc of toolCalls) {
+            const name = tc?.function?.name ?? 'unknown';
+            let args = tc?.function?.arguments;
+            if (typeof args === 'string') {
+              try {
+                args = JSON.parse(args);
+              } catch {
+                currentPlanMessages.push({ role: 'tool', tool_name: name, content: JSON.stringify({ error: 'Invalid JSON in arguments' }) });
+                continue;
+              }
+            }
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
+            currentPlanMessages.push({
+              role: 'tool',
+              tool_name: name,
+              content: typeof result === 'string' ? result : JSON.stringify(result),
+            });
+          }
+        }
         chatMessages.push({ role: 'assistant', content: fullPlanText });
-        lastPlan = fullPlanText;
+        // Store only plan (stream content), not thinking, so build phase uses exactly this.
+        if ((fullPlanText ?? '').trim()) lastPlan = fullPlanText;
+        maybePrintRawModelOutput(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.';
+        '\n\nPlan:\n' + lastPlan + '\n\nExecute this plan using your tools. Run commands and edit files as needed.';
       chatMessages.push({ role: 'user', content: buildContent });
-      const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+      const agentMessages = [buildAgentSystemMessage(), { role: 'user', content: buildContent }];
       maybePrintFullPayload(agentMessages);
       const abortController = new AbortController();
       const confirmFn = () => Promise.resolve(true);
@@ -782,7 +410,7 @@ export async function startInteractive() {
           },
           onToolCall: (name, args) => {
             const summary = formatToolCallSummary(name, args);
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
           },
           onToolResult: (name, resultStr) => {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
@@ -797,11 +425,7 @@ export async function startInteractive() {
           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;
-          }
+          maybePrintRawModelOutput(result.content);
         }
       } catch (err) {
         stopSpinner();
@@ -810,16 +434,119 @@ export async function startInteractive() {
       continue;
     }
 
-    // /build — execute last plan with tools
+    // /init [prompt] — create markov.md with project summary (agent writes file via tools)
+    if (trimmed === '/init' || trimmed.startsWith('/init ')) {
+      const rawUserContent = trimmed.startsWith('/init ')
+        ? trimmed.slice(6).trim()
+        : (await promptLine(chalk.bold('Describe the project to summarize (optional): '))).trim();
+      const userContent = (await getLsContext()) + (await getGrepContext()) +
+        (rawUserContent ? `Create markov.md with a project summary. Focus on: ${rawUserContent}` : 'Create markov.md with a concise project summary.');
+      const initMessages = [buildInitSystemMessage(), { role: 'user', content: userContent }];
+      const initAbort = new AbortController();
+      process.stdout.write(chalk.dim('\nInit › '));
+      const DOTS = ['.', '..', '...'];
+      let dotIdx = 0;
+      const initStartTime = Date.now();
+      let initSpinner = setInterval(() => {
+        const elapsed = ((Date.now() - initStartTime) / 1000).toFixed(1);
+        process.stdout.write('\r' + chalk.dim('Init › ') + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+        dotIdx++;
+      }, 400);
+      let thinkingStarted = false;
+      let firstContent = true;
+      const clearInitSpinner = () => {
+        if (initSpinner) {
+          clearInterval(initSpinner);
+          initSpinner = null;
+          process.stdout.write('\r\x1b[0J');
+        }
+      };
+      try {
+        let currentInitMessages = initMessages;
+        const initMaxIter = 10;
+        for (let initIter = 0; initIter < initMaxIter; initIter++) {
+          const { content, toolCalls, usage } = await streamChatWithTools(
+            currentInitMessages,
+            PLAN_YOLO_TOOLS,
+            MODEL,
+            {
+              think: true,
+              onContent: (token) => {
+                if (firstContent) {
+                  clearInitSpinner();
+                  firstContent = false;
+                }
+                process.stdout.write(token);
+              },
+              onThinking: (token) => {
+                if (!thinkingStarted) {
+                  clearInitSpinner();
+                  process.stdout.write(chalk.dim('Thinking: '));
+                  thinkingStarted = true;
+                }
+                process.stdout.write(chalk.dim(token));
+              },
+            },
+            initAbort.signal,
+            null
+          );
+          if (!toolCalls?.length) {
+            printTokenUsage(usage);
+            break;
+          }
+          currentInitMessages = [...currentInitMessages, { role: 'assistant', content: content ?? '', tool_calls: toolCalls }];
+          for (const tc of toolCalls) {
+            const name = tc?.function?.name ?? 'unknown';
+            let args = tc?.function?.arguments;
+            if (typeof args === 'string') {
+              try {
+                args = JSON.parse(args);
+              } catch {
+                currentInitMessages.push({ role: 'tool', tool_name: name, content: JSON.stringify({ error: 'Invalid JSON in arguments' }) });
+                continue;
+              }
+            }
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
+            currentInitMessages.push({
+              role: 'tool',
+              tool_name: name,
+              content: typeof result === 'string' ? result : JSON.stringify(result),
+            });
+          }
+        }
+        if (existsSync(getMarkovPath())) {
+          console.log('\n' + chalk.green('✓ markov.md created. It will be included in the system message from now on.\n'));
+        } else {
+          console.log('\n' + chalk.yellow('Init finished but markov.md was not created. The agent may need another run or a clearer prompt.\n'));
+        }
+      } catch (err) {
+        if (initSpinner) {
+          clearInterval(initSpinner);
+          initSpinner = null;
+          process.stdout.write('\r\x1b[0J');
+        }
+        if (!initAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      }
+      continue;
+    }
+
+    // /build — execute plan from plan.md only
     if (trimmed === '/build') {
-      if (!lastPlan || lastPlan.trim() === '') {
-        console.log(chalk.yellow('Run /plan first to create a plan.\n'));
+      const planPath = getPlanPath();
+      if (!existsSync(planPath)) {
+        console.log(chalk.yellow('plan.md not found. Run /plan first to create a plan.\n'));
+        continue;
+      }
+      const planToUse = readFileSync(planPath, 'utf-8').trim();
+      if (!planToUse) {
+        console.log(chalk.yellow('plan.md is empty. Run /plan first to create a plan.\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.';
+        '\n\nPlan:\n' + planToUse + '\n\nExecute this plan using your tools. Run commands and edit files as needed. ';
       chatMessages.push({ role: 'user', content: buildContent });
-      const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+      const agentMessages = [buildAgentSystemMessage(), { role: 'user', content: buildContent }];
       maybePrintFullPayload(agentMessages);
       const abortController = new AbortController();
       const confirmFn = (cmd) => confirm(chalk.bold(`Run: ${cmd}? [y/N] `));
@@ -863,7 +590,7 @@ export async function startInteractive() {
           },
           onToolCall: (name, args) => {
             const summary = formatToolCallSummary(name, args);
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
           },
           onToolResult: (name, resultStr) => {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
@@ -878,11 +605,7 @@ export async function startInteractive() {
           await applyCodeBlockEdits(result.content, []);
           allFiles = getFilesAndDirs();
           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:');
-            if (chosen) pendingMessage = chosen;
-          }
+          maybePrintRawModelOutput(result.content);
         }
       } catch (err) {
         stopSpinner();
@@ -891,12 +614,40 @@ export async function startInteractive() {
       continue;
     }
 
-    // /models — pick active model
+    // /models — pick active model (Claude or Ollama)
     if (trimmed === '/models') {
-      const chosen = await selectFrom(MODELS, 'Select model:');
+      const labels = MODEL_OPTIONS.map((o) => o.label);
+      const chosen = await selectFrom(labels, 'Select model:');
       if (chosen) {
-        setModel(chosen);
-        console.log(chalk.dim(`\n🤖 switched to ${chalk.cyan(chosen)}\n`));
+        const opt = MODEL_OPTIONS.find((o) => o.label === chosen);
+        if (opt) {
+          if (opt.provider === 'claude' && !getClaudeKey()) {
+            const enteredKey = (await promptSecret('Claude API key (paste then Enter): ')).trim();
+            if (!enteredKey) {
+              console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
+              continue;
+            }
+            setClaudeKey(enteredKey);
+          }
+          if (opt.provider === 'openai' && !getOpenAIKey()) {
+            const enteredKey = (await promptSecret('OpenAI API key (paste then Enter): ')).trim();
+            if (!enteredKey) {
+              console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
+              continue;
+            }
+            setOpenAIKey(enteredKey);
+          }
+          if (opt.provider === 'ollama' && opt.model.endsWith('-cloud') && !getOllamaKey()) {
+            const enteredKey = (await promptSecret('Ollama API key for cloud models (paste then Enter): ')).trim();
+            if (!enteredKey) {
+              console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
+              continue;
+            }
+            setOllamaKey(enteredKey);
+          }
+          setModelAndProvider(opt.provider, opt.model);
+          console.log(chalk.dim(`\n🤖 switched to ${chalk.cyan(getModelDisplayName())}\n`));
+        }
       }
       continue;
     }
@@ -942,33 +693,94 @@ export async function startInteractive() {
       continue;
     }
 
-    // /setup-nextjs — scaffold a Next.js app via script
+    // /setup-nextjs — scaffold a Next.js app
     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);
+      const ok = await runSetupSteps(NEXTJS_STEPS);
       allFiles = getFilesAndDirs();
-      if (ok) console.log(chalk.green(`✓ Next.js app created in ${name}.\n`));
+      if (ok) console.log(chalk.green('✓ Next.js app created.\n'));
       continue;
     }
 
-    // /setup-laravel — scaffold a Laravel API via script
+    // /setup-tanstack — scaffold a TanStack Start app
+    if (trimmed === '/setup-tanstack') {
+      const ok = await runSetupSteps(TANSTACK_STEPS);
+      allFiles = getFilesAndDirs();
+      if (ok) console.log(chalk.green('✓ TanStack Start app created.\n'));
+      continue;
+    }
+
+    // /setup-laravel — scaffold a Laravel API
     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);
+      const ok = await runSetupSteps(LARAVEL_STEPS);
       allFiles = getFilesAndDirs();
-      if (ok) console.log(chalk.green(`✓ Laravel API created in ${name}.\n`));
+      if (ok) console.log(chalk.green('✓ Laravel API created.\n'));
+      continue;
+    }
+
+    // /laravel — run agent with Laravel "my-blog" blog setup prompt (auto-confirm like /yolo)
+    if (trimmed === '/laravel') {
+      const userContent = (await getLsContext()) + (await getGrepContext()) + LARAVEL_BLOG_PROMPT;
+      chatMessages.push({ role: 'user', content: userContent });
+      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('\nLaravel › '));
+        spinner = setInterval(() => {
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          process.stdout.write('\r' + chalk.dim('Laravel › ') + 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('\n  ▶ ') + 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('✓ Laravel blog setup done.') + chalk.dim(` (${elapsed}s)\n`));
+          maybePrintRawModelOutput(result.content);
+        }
+      } catch (err) {
+        stopSpinner();
+        if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      }
       continue;
     }
 
@@ -981,6 +793,7 @@ export async function startInteractive() {
       console.log(chalk.yellow(`\n⚠  not found: ${failed.map(f => `@${f}`).join(', ')}`));
     }
     const rawUserContent = resolvedContent ?? trimmed;
+    console.log(chalk.dim('You: ') + rawUserContent);
     const userContent = (await getLsContext()) + (await getGrepContext()) + rawUserContent;
     chatMessages.push({ role: 'user', content: userContent });
 
@@ -1034,7 +847,7 @@ export async function startInteractive() {
         },
         onToolCall: (name, args) => {
           const summary = formatToolCallSummary(name, args);
-          console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+          console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
         },
         onToolResult: (name, resultStr) => {
           console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
@@ -1049,11 +862,7 @@ export async function startInteractive() {
         await applyCodeBlockEdits(result.content, loaded);
         allFiles = getFilesAndDirs();
         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;
-        }
+        maybePrintRawModelOutput(result.content);
       }
     } catch (err) {
       stopSpinner();