markov-cli 1.0.15 → 1.0.17

package/src/interactive.js

@@ -1,21 +1,20 @@
 import chalk from 'chalk';
 
-import gradient from 'gradient-string';
 import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { homedir } from 'os';
 import { resolve } from 'path';
 import { printLogo } from './ui/logo.js';
-import { chatWithTools, streamChat, streamChatWithTools, MODEL, MODEL_OPTIONS, setModelAndProvider, getModelDisplayName } from './ollama.js';
+import { chatWithTools, streamChat, streamChatWithTools, MODEL, getModelOptions, setModelAndProvider, getModelDisplayName } from './ollama.js';
 import { resolveFileRefs } from './files.js';
-import { RUN_TERMINAL_COMMAND_TOOL, WEB_SEARCH_TOOL, runTool, execCommand } from './tools.js';
+import { RUN_TERMINAL_COMMAND_TOOL, WEB_SEARCH_TOOL, runTool, execCommand, spawnCommand } from './tools.js';
 import { chatPrompt } from './input.js';
 import { getFilesAndDirs } from './ui/picker.js';
 import { getToken, login, clearToken, getClaudeKey, setClaudeKey, getOpenAIKey, setOpenAIKey, getOllamaKey, setOllamaKey } from './auth.js';
 
 // Extracted UI modules
-import { selectFrom, confirm, promptLine, promptSecret } from './ui/prompts.js';
+import { selectFrom, confirm, promptLine, promptSecret, PROMPT_INTERRUPT } from './ui/prompts.js';
 import { formatResponseWithCodeBlocks, formatFileEditPreview, formatToolCallSummary, formatToolResultSummary, printTokenUsage } from './ui/formatting.js';
-import { createSpinner } from './ui/spinner.js';
+import { createIdleSpinner } from './ui/spinner.js';
 
 // Extracted agent modules
 import { buildPlanSystemMessage, buildAgentSystemMessage, buildInitSystemMessage, getLsContext, getGrepContext } from './agent/context.js';
@@ -27,8 +26,6 @@ import { applyCodeBlockEdits } from './editor/codeBlockEdits.js';
 // Extracted command modules
 import { runSetupSteps, NEXTJS_STEPS, TANSTACK_STEPS, LARAVEL_STEPS, LARAVEL_BLOG_PROMPT } from './commands/setup.js';
 
-const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
-
 const PLAN_FILE = 'plan.md';
 const getPlanPath = () => resolve(process.cwd(), PLAN_FILE);
 
@@ -44,35 +41,30 @@ const INTRO_TEXT =
   chalk.bold('Quick start:\n') +
   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('  /cmd') + chalk.dim('  [command]             run a shell command in the current folder (default)\n') +
+  chalk.cyan('  /agent') + chalk.dim('[prompt]              run an agent with the current folder context\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');
+  chalk.cyan('  /yolo') + chalk.dim(' [prompt]              plan in stream mode, then auto-run until done\n\n') +
+  chalk.dim('  Tips: Use ') + chalk.cyan('@filename') + chalk.dim(' to add file to context\n') +
+  chalk.dim('        Press ') + chalk.cyan('CTRL + TAB') + chalk.dim(' to switch mode\n');
 
 const HELP_TEXT =
+  INTRO_TEXT +
   '\n' +
-  chalk.bold('Commands:\n') +
+  chalk.bold('More commands:\n') +
   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('  /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');
+  chalk.cyan('  /debug') + chalk.dim('                      toggle full payload dump (env MARKOV_DEBUG)\n');
 
 /** If MARKOV_DEBUG is set, print the raw model output after completion. */
 function maybePrintRawModelOutput(rawText) {
@@ -89,8 +81,6 @@ export async function startInteractive() {
 
   let allFiles = getFilesAndDirs();
   const chatMessages = [];
-
-  console.log(chalk.dim(`Chat with Markov (${getModelDisplayName()}).`));
   console.log(INTRO_TEXT);
 
   if (!getToken()) {
@@ -100,6 +90,77 @@ export async function startInteractive() {
   let pendingMessage = null;
   let lastPlan = null;
   const inputHistory = [];
+  const availableModes = ['/cmd', '/agent', '/plan', '/build', '/yolo'];
+  let currentMode = '/cmd';
+  let interruptArmed = false;
+  let activeInterruptHandler = null;
+
+  const isInterrupted = (value) => value === PROMPT_INTERRUPT || (typeof value === 'object' && value !== null && value.type === 'interrupt');
+  const resetInterruptState = () => {
+    interruptArmed = false;
+  };
+  const exitInteractive = () => {
+    process.stdout.write('\n');
+    process.exit(0);
+  };
+  const registerInterruptHandler = (handler) => {
+    activeInterruptHandler = handler;
+    return () => {
+      if (activeInterruptHandler === handler) activeInterruptHandler = null;
+    };
+  };
+  const handleInterrupt = ({ alreadyPrinted = false } = {}) => {
+    if (activeInterruptHandler) {
+      const handler = activeInterruptHandler;
+      activeInterruptHandler = null;
+      handler();
+      return;
+    }
+    if (interruptArmed) exitInteractive();
+    interruptArmed = true;
+    if (!alreadyPrinted) console.log(chalk.dim('\n(interrupted)\n'));
+  };
+  const registerAbortController = (abortController, onAbort) => registerInterruptHandler(() => {
+    onAbort?.();
+    if (!abortController.signal.aborted) abortController.abort();
+    console.log(chalk.dim('\n(interrupted)\n'));
+  });
+  const askLine = async (label) => {
+    const value = await promptLine(label);
+    if (isInterrupted(value)) {
+      handleInterrupt({ alreadyPrinted: true });
+      return null;
+    }
+    return value;
+  };
+  const askSecret = async (label) => {
+    const value = await promptSecret(label);
+    if (isInterrupted(value)) {
+      handleInterrupt({ alreadyPrinted: true });
+      return null;
+    }
+    return value;
+  };
+  const askSelect = async (options, label) => {
+    const value = await selectFrom(options, label);
+    if (isInterrupted(value)) {
+      handleInterrupt();
+      return null;
+    }
+    return value;
+  };
+  const askConfirm = async (question) => {
+    const value = await confirm(question);
+    if (isInterrupted(value)) {
+      handleInterrupt({ alreadyPrinted: true });
+      return false;
+    }
+    return value;
+  };
+
+  process.on('SIGINT', () => {
+    handleInterrupt();
+  });
 
   while (true) {
     let raw;
@@ -108,17 +169,38 @@ export async function startInteractive() {
       pendingMessage = null;
       console.log(chalk.magenta('you> ') + raw + '\n');
     } else {
-      raw = await chatPrompt(chalk.magenta('you> '), allFiles, inputHistory);
+      const result = await chatPrompt(chalk.magenta('you> '), allFiles, inputHistory, availableModes, currentMode);
+      if (isInterrupted(result)) {
+        handleInterrupt({ alreadyPrinted: true });
+        continue;
+      }
+      if (result === null) continue;
+      resetInterruptState();
+      if (typeof result === 'object' && result !== null) {
+        raw = result.text;
+        currentMode = result.mode;
+      } else {
+        raw = result;
+      }
     }
     if (raw === null) continue;
-    const trimmed = raw.trim();
+    let trimmed = raw.trim();
+
+    if (!trimmed) {
+      if (currentMode === '/build') trimmed = '/build';
+      else continue;
+    } else if (!trimmed.startsWith('/') && currentMode !== '/agent') {
+      trimmed = `${currentMode} ${trimmed}`;
+    }
 
     if (!trimmed) continue;
 
     // /login — authenticate and save token
     if (trimmed === '/login') {
-      const email    = await promptLine('Email: ');
-      const password = await promptSecret('Password: ');
+      const email = await askLine('Email: ');
+      if (email === null) continue;
+      const password = await askSecret('Password: ');
+      if (password === null) continue;
       try {
         await login(email, password);
         console.log(chalk.green('✓ logged in\n'));
@@ -190,9 +272,14 @@ export async function startInteractive() {
 
     // /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();
+      let rawUserContent;
+      if (trimmed.startsWith('/plan ')) {
+        rawUserContent = trimmed.slice(6).trim();
+      } else {
+        const prompted = await askLine(chalk.bold('What do you want to plan? '));
+        if (prompted === null) continue;
+        rawUserContent = prompted.trim();
+      }
       if (!rawUserContent) {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
@@ -202,24 +289,11 @@ export async function startInteractive() {
       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);
+      const planSpinner = createIdleSpinner('Squirming ', { startTime: planStartTime });
+      const clearInterruptHandler = registerAbortController(planAbort, () => planSpinner.stop());
+      planSpinner.bump();
       let thinkingStarted = false;
-      let firstContent = true;
-      const clearPlanSpinner = () => {
-        if (planSpinner) {
-          clearInterval(planSpinner);
-          planSpinner = null;
-          process.stdout.write('\r\x1b[0J');
-        }
-      };
       try {
         let currentPlanMessages = planMessages;
         let fullPlanText = '';
@@ -232,15 +306,12 @@ export async function startInteractive() {
             {
               think: true, // plan mode only: request thinking from backend
               onContent: (token) => {
-                if (firstContent) {
-                  clearPlanSpinner();
-                  firstContent = false;
-                }
+                planSpinner.bump();
                 process.stdout.write(token);
               },
               onThinking: (token) => {
+                planSpinner.bump();
                 if (!thinkingStarted) {
-                  clearPlanSpinner();
                   process.stdout.write(chalk.dim('Thinking: '));
                   thinkingStarted = true;
                 }
@@ -267,6 +338,7 @@ export async function startInteractive() {
                 continue;
               }
             }
+            planSpinner.pause();
             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({
@@ -277,6 +349,7 @@ export async function startInteractive() {
           }
         }
         chatMessages.push({ role: 'assistant', content: fullPlanText });
+        planSpinner.stop();
         // Store only plan (stream content), not thinking; write to plan.md for /build.
         if ((fullPlanText ?? '').trim()) {
           lastPlan = fullPlanText;
@@ -285,21 +358,24 @@ export async function startInteractive() {
         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);
-          planSpinner = null;
-          process.stdout.write('\r\x1b[0J');
-        }
+        planSpinner.stop();
         if (!planAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      } finally {
+        clearInterruptHandler();
       }
       continue;
     }
 
     // /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();
+      let rawUserContent;
+      if (trimmed.startsWith('/yolo ')) {
+        rawUserContent = trimmed.slice(6).trim();
+      } else {
+        const prompted = await askLine(chalk.bold('What do you want to yolo? '));
+        if (prompted === null) continue;
+        rawUserContent = prompted.trim();
+      }
       if (!rawUserContent) {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
@@ -309,9 +385,11 @@ export async function startInteractive() {
       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 = '';
+      const yoloPlanSpinner = createIdleSpinner('Squirming ');
+      const clearYoloPlanInterruptHandler = registerAbortController(yoloAbort, () => yoloPlanSpinner.stop());
+      yoloPlanSpinner.bump();
       try {
         let currentPlanMessages = planMessages;
         const yoloPlanMaxIter = 10;
@@ -322,8 +400,12 @@ export async function startInteractive() {
             MODEL,
             {
               think: true, // plan phase: request thinking from backend
-              onContent: (token) => process.stdout.write(token),
+              onContent: (token) => {
+                yoloPlanSpinner.bump();
+                process.stdout.write(token);
+              },
               onThinking: (token) => {
+                yoloPlanSpinner.bump();
                 if (!thinkingStarted) {
                   process.stdout.write(chalk.dim('Thinking: '));
                   thinkingStarted = true;
@@ -351,6 +433,7 @@ export async function startInteractive() {
                 continue;
               }
             }
+            yoloPlanSpinner.pause();
             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({
@@ -361,12 +444,16 @@ export async function startInteractive() {
           }
         }
         chatMessages.push({ role: 'assistant', content: fullPlanText });
+        yoloPlanSpinner.stop();
         // Store only plan (stream content), not thinking, so build phase uses exactly this.
         if ((fullPlanText ?? '').trim()) lastPlan = fullPlanText;
         maybePrintRawModelOutput(fullPlanText);
       } catch (err) {
+        yoloPlanSpinner.stop();
         if (!yoloAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
         continue;
+      } finally {
+        clearYoloPlanInterruptHandler();
       }
       const buildContent = (await getLsContext()) + (await getGrepContext()) +
         '\n\nPlan:\n' + lastPlan + '\n\nExecute this plan using your tools. Run commands and edit files as needed.';
@@ -377,31 +464,16 @@ export async function startInteractive() {
       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');
-      };
+      const idleSpinner = createIdleSpinner('Squirming ', { startTime });
+      const clearYoloBuildInterruptHandler = registerAbortController(abortController, () => idleSpinner.stop());
       try {
         const result = await runAgentLoop(agentMessages, {
           signal: abortController.signal,
           cwd: process.cwd(),
           confirmFn,
           confirmFileEdit,
-          onThinking: () => { startSpinner(); },
-          onBeforeToolRun: () => { stopSpinner(); },
+          onThinking: () => { idleSpinner.bump(); },
+          onBeforeToolRun: () => { idleSpinner.pause(); },
           onIteration: (iter, max, toolCount) => {
             const w = process.stdout.columns || 80;
             const label = ` Step ${iter} `;
@@ -416,7 +488,7 @@ export async function startInteractive() {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
           },
         });
-        stopSpinner();
+        idleSpinner.stop();
         if (result) {
           chatMessages.push(result.finalMessage);
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -428,39 +500,33 @@ export async function startInteractive() {
           maybePrintRawModelOutput(result.content);
         }
       } catch (err) {
-        stopSpinner();
+        idleSpinner.stop();
         if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      } finally {
+        clearYoloBuildInterruptHandler();
       }
       continue;
     }
 
     // /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();
+      let rawUserContent;
+      if (trimmed.startsWith('/init ')) {
+        rawUserContent = trimmed.slice(6).trim();
+      } else {
+        const prompted = await askLine(chalk.bold('Describe the project to summarize (optional): '));
+        if (prompted === null) continue;
+        rawUserContent = prompted.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);
+      const initSpinner = createIdleSpinner('Squirming ', { startTime: initStartTime });
+      const clearInitInterruptHandler = registerAbortController(initAbort, () => initSpinner.stop());
+      initSpinner.bump();
       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;
@@ -472,15 +538,12 @@ export async function startInteractive() {
             {
               think: true,
               onContent: (token) => {
-                if (firstContent) {
-                  clearInitSpinner();
-                  firstContent = false;
-                }
+                initSpinner.bump();
                 process.stdout.write(token);
               },
               onThinking: (token) => {
+                initSpinner.bump();
                 if (!thinkingStarted) {
-                  clearInitSpinner();
                   process.stdout.write(chalk.dim('Thinking: '));
                   thinkingStarted = true;
                 }
@@ -506,6 +569,7 @@ export async function startInteractive() {
                 continue;
               }
             }
+            initSpinner.pause();
             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({
@@ -515,18 +579,17 @@ export async function startInteractive() {
             });
           }
         }
+        initSpinner.stop();
         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');
-        }
+        initSpinner.stop();
         if (!initAbort.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      } finally {
+        clearInitInterruptHandler();
       }
       continue;
     }
@@ -549,39 +612,24 @@ export async function startInteractive() {
       const agentMessages = [buildAgentSystemMessage(), { role: 'user', content: buildContent }];
       maybePrintFullPayload(agentMessages);
       const abortController = new AbortController();
-      const confirmFn = (cmd) => confirm(chalk.bold(`Run: ${cmd}? [y/N] `));
+      const confirmFn = async (cmd) => (await askConfirm(chalk.bold(`Run: ${cmd}? [y/N] `))) === true;
       const confirmFileEdit = async (name, args) => {
         console.log(chalk.dim('\n  Proposed change:\n'));
         console.log(formatFileEditPreview(name, args));
         console.log('');
-        return confirm(chalk.bold('Apply this change? [y/N] '));
+        return (await askConfirm(chalk.bold('Apply this change? [y/N] '))) === 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('\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');
-      };
+      const idleSpinner = createIdleSpinner('Squirming ', { startTime });
+      const clearBuildInterruptHandler = registerAbortController(abortController, () => idleSpinner.stop());
       try {
         const result = await runAgentLoop(agentMessages, {
           signal: abortController.signal,
           cwd: process.cwd(),
           confirmFn,
           confirmFileEdit,
-          onThinking: () => { startSpinner(); },
-          onBeforeToolRun: () => { stopSpinner(); },
+          onThinking: () => { idleSpinner.bump(); },
+          onBeforeToolRun: () => { idleSpinner.pause(); },
           onIteration: (iter, max, toolCount) => {
             const w = process.stdout.columns || 80;
             const label = ` Step ${iter} `;
@@ -596,7 +644,7 @@ export async function startInteractive() {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
           },
         });
-        stopSpinner();
+        idleSpinner.stop();
         if (result) {
           chatMessages.push(result.finalMessage);
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -608,21 +656,27 @@ export async function startInteractive() {
           maybePrintRawModelOutput(result.content);
         }
       } catch (err) {
-        stopSpinner();
+        idleSpinner.stop();
         if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      } finally {
+        clearBuildInterruptHandler();
       }
       continue;
     }
 
     // /models — pick active model (Claude or Ollama)
     if (trimmed === '/models') {
-      const labels = MODEL_OPTIONS.map((o) => o.label);
-      const chosen = await selectFrom(labels, 'Select model:');
+      const { options, warning } = await getModelOptions();
+      if (warning) console.log(chalk.yellow(`\n${warning}\n`));
+      const labels = options.map((o) => o.label);
+      const chosen = await askSelect(labels, 'Select model:');
       if (chosen) {
-        const opt = MODEL_OPTIONS.find((o) => o.label === chosen);
+        const opt = options.find((o) => o.label === chosen);
         if (opt) {
           if (opt.provider === 'claude' && !getClaudeKey()) {
-            const enteredKey = (await promptSecret('Claude API key (paste then Enter): ')).trim();
+            const prompted = await askSecret('Claude API key (paste then Enter): ');
+            if (prompted === null) continue;
+            const enteredKey = prompted.trim();
             if (!enteredKey) {
               console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
               continue;
@@ -630,7 +684,9 @@ export async function startInteractive() {
             setClaudeKey(enteredKey);
           }
           if (opt.provider === 'openai' && !getOpenAIKey()) {
-            const enteredKey = (await promptSecret('OpenAI API key (paste then Enter): ')).trim();
+            const prompted = await askSecret('OpenAI API key (paste then Enter): ');
+            if (prompted === null) continue;
+            const enteredKey = prompted.trim();
             if (!enteredKey) {
               console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
               continue;
@@ -638,7 +694,9 @@ export async function startInteractive() {
             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();
+            const prompted = await askSecret('Ollama API key for cloud models (paste then Enter): ');
+            if (prompted === null) continue;
+            const enteredKey = prompted.trim();
             if (!enteredKey) {
               console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
               continue;
@@ -670,18 +728,39 @@ export async function startInteractive() {
 
     // /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();
+      let command;
+      if (trimmed.startsWith('/cmd ')) {
+        command = trimmed.slice(5).trim();
+      } else {
+        const prompted = await askLine(chalk.bold('Command: '));
+        if (prompted === null) continue;
+        command = prompted.trim();
+      }
       if (!command) {
         console.log(chalk.yellow('No command given. Use /cmd <command> e.g. /cmd ls -la\n'));
         continue;
       }
+      
+      // Intercept 'cd' to act like native /cd
+      if (command === 'cd' || command.startsWith('cd ')) {
+        const arg = command.startsWith('cd ') ? command.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;
+      }
+
       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);
+        console.log(''); // Add a newline before output
+        const exitCode = await spawnCommand(command, cwd);
         if (exitCode !== 0) {
           console.log(chalk.red(`\nExit code: ${exitCode}\n`));
         } else {
@@ -727,31 +806,16 @@ export async function startInteractive() {
       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');
-      };
+      const idleSpinner = createIdleSpinner('Squirming ', { startTime });
+      const clearLaravelInterruptHandler = registerAbortController(abortController, () => idleSpinner.stop());
       try {
         const result = await runAgentLoop(agentMessages, {
           signal: abortController.signal,
           cwd: process.cwd(),
           confirmFn,
           confirmFileEdit,
-          onThinking: () => { startSpinner(); },
-          onBeforeToolRun: () => { stopSpinner(); },
+          onThinking: () => { idleSpinner.bump(); },
+          onBeforeToolRun: () => { idleSpinner.pause(); },
           onIteration: (iter, max, toolCount) => {
             const w = process.stdout.columns || 80;
             const label = ` Step ${iter} `;
@@ -766,7 +830,7 @@ export async function startInteractive() {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
           },
         });
-        stopSpinner();
+        idleSpinner.stop();
         if (result) {
           chatMessages.push(result.finalMessage);
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -778,8 +842,10 @@ export async function startInteractive() {
           maybePrintRawModelOutput(result.content);
         }
       } catch (err) {
-        stopSpinner();
+        idleSpinner.stop();
         if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      } finally {
+        clearLaravelInterruptHandler();
       }
       continue;
     }
@@ -800,32 +866,16 @@ export async function startInteractive() {
     const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
     maybePrintFullPayload(agentMessages);
     const abortController = new AbortController();
-    const confirmFn = (cmd) => confirm(chalk.bold(`Run: ${cmd}? [y/N] `));
+    const confirmFn = async (cmd) => (await askConfirm(chalk.bold(`Run: ${cmd}? [y/N] `))) === true;
     const confirmFileEdit = async (name, args) => {
       console.log(chalk.dim('\n  Proposed change:\n'));
       console.log(formatFileEditPreview(name, args));
       console.log('');
-      return confirm(chalk.bold('Apply this change? [y/N] '));
+      return (await askConfirm(chalk.bold('Apply this change? [y/N] '))) === 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('\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');
-    };
+    const idleSpinner = createIdleSpinner('Agent › ', { startTime });
+    const clearAgentInterruptHandler = registerAbortController(abortController, () => idleSpinner.stop());
 
     try {
       const result = await runAgentLoop(agentMessages, {
@@ -834,10 +884,10 @@ export async function startInteractive() {
         confirmFn,
         confirmFileEdit,
         onThinking: () => {
-          startSpinner();
+          idleSpinner.bump();
         },
         onBeforeToolRun: () => {
-          stopSpinner();
+          idleSpinner.pause();
         },
         onIteration: (iter, max, toolCount) => {
           const w = process.stdout.columns || 80;
@@ -853,7 +903,7 @@ export async function startInteractive() {
           console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
         },
       });
-      stopSpinner();
+      idleSpinner.stop();
       if (result) {
         chatMessages.push(result.finalMessage);
         const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -865,8 +915,10 @@ export async function startInteractive() {
         maybePrintRawModelOutput(result.content);
       }
     } catch (err) {
-      stopSpinner();
+      idleSpinner.stop();
       if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+    } finally {
+      clearAgentInterruptHandler();
     }
   }
 }