markov-cli 1.0.15 → 1.0.16

package/.env.example

@@ -10,3 +10,5 @@
 # Optional: use OpenAI (ChatGPT) instead of the backend. Used when ANTHROPIC_API_KEY is not set.
 # OPENAI_API_KEY=sk-your_openai_api_key
 # OPENAI_MODEL=gpt-4o-mini
+
+# OLLAMA_API_KEY=

package/package.json

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

package/src/editor/codeBlockEdits.js

@@ -17,7 +17,7 @@ export async function applyCodeBlockEdits(responseText, loadedFiles = []) {
   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) {
+    if (ok === true) {
       applyEdit(edit.filepath, edit.content);
       console.log(chalk.green(`  ✓ ${edit.filepath} updated\n`));
     } else {

package/src/input.js

@@ -7,7 +7,7 @@ const visibleLen = (s) => s.replace(/\x1b\[[0-9;]*m/g, '').length;
 
 const PREFIX      = '❯  ';
 const HINT        = chalk.dim(' Ask Markov anything...');
-const STATUS_LEFT = chalk.dim('/help');
+const STATUS_LEFT = chalk.dim('ctrl tab to switch mode');
 const PICKER_MAX  = 6;
 
 function border() {
@@ -25,12 +25,13 @@ const INPUT_HISTORY_MAX = 100;
 
 /**
  * Show an interactive raw-mode prompt that supports @file autocomplete and Up/Down input history.
- * Returns a Promise<string|null> — null means the prompt was cancelled (Ctrl+Q).
+ * Returns a Promise<string|object|null> — null means the prompt was cancelled (Ctrl+Q),
+ * and { type: 'interrupt' } means the prompt was interrupted with Ctrl+C.
  * @param {string} _promptStr
  * @param {string[]} allFiles
  * @param {string[]} inputHistory - Mutable array of previous inputs; newest last. Up/Down navigate this; Enter pushes current input.
  */
-export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
+export function chatPrompt(_promptStr, allFiles, inputHistory = [], modes = [], initialMode = null) {
   return new Promise((resolve) => {
     const stdin  = process.stdin;
     const stdout = process.stdout;
@@ -41,6 +42,7 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
     let pickerIndex = 0;
     let historyIndex = -1; // -1 = not navigating history
     let cursorLineOffset = 0; // lines from top of drawn block to where cursor sits
+    let currentMode = initialMode;
 
     const getAtPos = () => {
       for (let i = buffer.length - 1; i >= 0; i--) {
@@ -58,7 +60,18 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
     };
 
     const redraw = () => {
-      const inputLine = chalk.cyan(PREFIX) + (buffer || HINT);
+      let modePrefix = '';
+      if (currentMode) {
+        switch (currentMode) {
+          case '/cmd': modePrefix = chalk.yellow(`[${currentMode}] `); break;
+          case '/agent': modePrefix = chalk.green(`[${currentMode}] `); break;
+          case '/plan': modePrefix = chalk.blue(`[${currentMode}] `); break;
+          case '/build': modePrefix = chalk.cyan(`[${currentMode}] `); break;
+          case '/yolo': modePrefix = chalk.red(`[${currentMode}] `); break;
+          default: modePrefix = chalk.magenta(`[${currentMode}] `); break;
+        }
+      }
+      const inputLine = modePrefix + chalk.cyan(PREFIX) + (buffer || HINT);
 
       // Build scrollable picker window of PICKER_MAX items.
       const total = pickerFiles.length;
@@ -99,12 +112,12 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
       // it takes multiple visual lines and we must move up by that many to reach
       // the top border on the next redraw.
       const w = process.stdout.columns || 80;
-      const inputVisualLen = visibleLen(chalk.cyan(PREFIX)) + visibleLen(buffer || HINT);
+      const inputVisualLen = visibleLen(modePrefix) + visibleLen(chalk.cyan(PREFIX)) + visibleLen(buffer || HINT);
       const inputVisualLines = Math.max(1, Math.ceil(inputVisualLen / w));
       cursorLineOffset = inputVisualLines;
 
       // Position cursor: beforeCursorLen is the character offset where the cursor sits.
-      const prefixLen = visibleLen(chalk.cyan(PREFIX));
+      const prefixLen = visibleLen(modePrefix) + visibleLen(chalk.cyan(PREFIX));
       const beforeCursorLen = prefixLen + visibleLen(buffer.slice(0, cursorPos));
       const lineIdx = Math.floor(beforeCursorLen / w);
       const col = (beforeCursorLen % w) + 1;
@@ -119,16 +132,22 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
       cursorLineOffset = 0;
     };
 
-    const onSigint = () => {
+    const onExit = () => {
       clearPanel();
       cleanup();
       stdout.write('\n');
       process.exit(0);
     };
 
+    const onInterrupt = () => {
+      clearPanel();
+      cleanup();
+      stdout.write(chalk.dim('(interrupted)\n'));
+      resolve({ type: 'interrupt' });
+    };
+
     const cleanup = () => {
       stdin.removeListener('data', onData);
-      process.removeListener('SIGINT', onSigint);
       stdin.setRawMode(false);
       stdin.pause();
     };
@@ -136,8 +155,8 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
     const onData = (data) => {
       const key = data.toString();
 
-      // Ctrl+C → exit
-      if (key === '\x03') { onSigint(); return; }
+      // Ctrl+C → interrupt prompt
+      if (key === '\x03') { onInterrupt(); return; }
 
       // Ctrl+Q → cancel prompt
       if (key === '\x11') {
@@ -149,7 +168,7 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
       }
 
       // Ctrl+D → exit
-      if (key === '\x04') { onSigint(); return; }
+      if (key === '\x04') { onExit(); return; }
 
       // Enter
       if (key === '\r' || key === '\n') {
@@ -171,7 +190,15 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
         clearPanel();
         cleanup();
         stdout.write('\n');
-        resolve(buffer);
+        resolve(modes.length > 0 ? { text: buffer, mode: currentMode } : buffer);
+        return;
+      }
+
+      // Shift+Tab → toggle mode
+      if (key === '\x1b[Z' && modes.length > 0) {
+        const idx = modes.indexOf(currentMode);
+        currentMode = modes[(idx + 1) % modes.length];
+        redraw();
         return;
       }
 
@@ -251,7 +278,6 @@ export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
     stdin.resume();
     stdin.setEncoding('utf8');
     stdin.on('data', onData);
-    process.on('SIGINT', onSigint);
     redraw();
   });
 }

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 { 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);
 
@@ -100,6 +97,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 +176,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 +279,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 +296,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 +313,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 +345,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 +356,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 +365,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 +392,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 +407,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 +440,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 +451,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 +471,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 +495,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 +507,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 +545,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 +576,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 +586,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 +619,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 +651,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,8 +663,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 {
+        clearBuildInterruptHandler();
       }
       continue;
     }
@@ -617,12 +674,14 @@ export async function startInteractive() {
     // /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 chosen = await askSelect(labels, 'Select model:');
       if (chosen) {
         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();
+            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 +689,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 +699,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 +733,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 +811,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 +835,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 +847,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 +871,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 +889,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 +908,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 +920,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();
     }
   }
 }

package/src/tools.js

@@ -1,4 +1,4 @@
-import { exec } from 'child_process';
+import { exec, spawn } from 'child_process';
 import { promisify } from 'util';
 import { mkdirSync, readFileSync, writeFileSync, existsSync, unlinkSync, readdirSync, statSync } from 'fs';
 import { resolve, dirname } from 'path';
@@ -425,6 +425,35 @@ export async function execCommand(command, cwd = process.cwd()) {
   }
 }
 
+/**
+ * Execute a shell command and stream its output.
+ * @param {string} command
+ * @param {string} [cwd]
+ * @returns {Promise<number>} exit code
+ */
+export function spawnCommand(command, cwd = process.cwd()) {
+  return new Promise((resolve) => {
+    if (command == null || typeof command !== 'string' || !command.trim()) {
+      return resolve(1);
+    }
+    
+    const child = spawn(command, {
+      cwd,
+      shell: true,
+      stdio: 'inherit' // This pipes stdout and stderr directly to the terminal
+    });
+
+    child.on('error', (err) => {
+      console.error(`\nFailed to start command: ${err.message}`);
+      resolve(1);
+    });
+
+    child.on('close', (code) => {
+      resolve(code ?? 1);
+    });
+  });
+}
+
 /**
  * Run a tool by name with the given arguments.
  * @param {string} name - Tool name (e.g. 'run_terminal_command')

package/src/ui/logo.js

@@ -6,14 +6,9 @@ const ASCII_ART = `
 ██╔████╔██║███████║██████╔╝█████╔╝ ██║   ██║██║   ██║    
 ██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝    
 ██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝     
-╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝      
-                                                         
- ██████╗ ██████╗ ██████╗ ███████╗                        
-██╔════╝██╔═══██╗██╔══██╗██╔════╝                        
-██║     ██║   ██║██║  ██║█████╗                          
-██║     ██║   ██║██║  ██║██╔══╝                          
-╚██████╗╚██████╔╝██████╔╝███████╗                        
- ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝                                  
+╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝                          
+                          ▜▘█▌▛▘▛▛▌▌▛▌▀▌▐   ▜▘▛▌▛▌▐ 
+                          ▐▖▙▖▌ ▌▌▌▌▌▌█▌▐▖  ▐▖▙▌▙▌▐▖                           
 `;
 
 const ASCII_ART4 = `                                                   
@@ -32,13 +27,8 @@ const ASCII_ART3 = `
 ██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝
 ██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝ 
 ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  
-                                                    
- ██████╗ ██████╗ ██████╗ ███████╗                    
-██╔════╝██╔═══██╗██╔══██╗██╔════╝                    
-██║     ██║   ██║██║  ██║█████╗                      
-██║     ██║   ██║██║  ██║██╔══╝                      
-╚██████╗╚██████╔╝██████╔╝███████╗                    
- ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝ 
+                                  ▜▘█▌▛▘▛▛▌▌▛▌▀▌▐ 
+                                  ▐▖▙▖▌ ▌▌▌▌▌▌█▌▐▖
 `;
 
 const ASCII_ART2 = `                                              
@@ -50,8 +40,10 @@ C8888     888       e Y8b Y8b   "8" 888 888 "  888 P  d888 888b  Y8b Y8P
 `;
 
 
-const markovGradient = gradient(['#4ade80', '#6ee7b7', '#38bdf8']);
+const markovGradient = gradient(['#6ee7b7','#6ee7b7']);
+// const markovGradient = gradient(['#4ade80', '#6ee7b7', '#38bdf8']);
+
 
 export function printLogo() {
-  console.log(markovGradient.multiline(ASCII_ART4));
+  console.log(markovGradient.multiline(ASCII_ART));
 }

package/src/ui/prompts.js

@@ -1,5 +1,9 @@
 import chalk from 'chalk';
 
+export const PROMPT_INTERRUPT = { type: 'interrupt' };
+const CTRL_C = '\x03';
+const CTRL_Q = '\x11';
+
 /** Arrow-key selector. Returns the chosen string or null if cancelled. */
 export function selectFrom(options, label) {
   return new Promise((resolve) => {
@@ -32,7 +36,8 @@ export function selectFrom(options, label) {
       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; }
+      if (key === CTRL_C) { cleanup(); resolve(PROMPT_INTERRUPT); return; }
+      if (key === CTRL_Q) { cleanup(); resolve(null); return; }
     };
 
     process.stdin.setRawMode(true);
@@ -43,17 +48,30 @@ export function selectFrom(options, label) {
   });
 }
 
-/** Prompt y/n in raw mode, returns true for y/Y. */
+/** Prompt y/n in raw mode, returns true for y/Y, false for no/cancel, or PROMPT_INTERRUPT on Ctrl+C. */
 export 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) => {
+    const cleanup = () => {
       process.stdin.removeListener('data', onKey);
       process.stdin.setRawMode(false);
       process.stdin.pause();
+    };
+    const onKey = (key) => {
+      cleanup();
+      if (key === CTRL_C) {
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(PROMPT_INTERRUPT);
+        return;
+      }
+      if (key === CTRL_Q) {
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(false);
+        return;
+      }
       const answer = key.toLowerCase() === 'y';
       process.stdout.write(answer ? chalk.green('y\n') : chalk.dim('n\n'));
       resolve(answer);
@@ -67,12 +85,27 @@ export function promptLine(label) {
   return new Promise((resolve) => {
     process.stdout.write(label);
     let buf = '';
+    const cleanup = () => {
+      process.stdin.removeListener('data', onData);
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+    };
     const onData = (data) => {
       const key = data.toString();
+      if (key === CTRL_C) {
+        cleanup();
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(PROMPT_INTERRUPT);
+        return;
+      }
+      if (key === CTRL_Q) {
+        cleanup();
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(null);
+        return;
+      }
       if (key === '\r' || key === '\n') {
-        process.stdin.removeListener('data', onData);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
+        cleanup();
         process.stdout.write('\n');
         resolve(buf);
       } else if (key === '\x7f' || key === '\b') {
@@ -94,12 +127,27 @@ export function promptSecret(label) {
   return new Promise((resolve) => {
     process.stdout.write(label);
     let buf = '';
+    const cleanup = () => {
+      process.stdin.removeListener('data', onData);
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+    };
     const onData = (data) => {
       const key = data.toString();
+      if (key === CTRL_C) {
+        cleanup();
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(PROMPT_INTERRUPT);
+        return;
+      }
+      if (key === CTRL_Q) {
+        cleanup();
+        process.stdout.write(chalk.dim('(cancelled)\n'));
+        resolve(null);
+        return;
+      }
       if (key === '\r' || key === '\n') {
-        process.stdin.removeListener('data', onData);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
+        cleanup();
         process.stdout.write('\n');
         resolve(buf);
       } else if (key === '\x7f' || key === '\b') {

package/src/ui/spinner.js

@@ -2,6 +2,33 @@ import chalk from 'chalk';
 import gradient from 'gradient-string';
 
 const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
+export const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const SPINNER_INTERVAL_MS = 200;
+const IDLE_SPINNER_DELAY_MS = 250;
+const SPINNER_LABELS = [
+  'Squirming',
+  'Shadoodeling',
+  'Braincrunching',
+  'Brewing',
+  'Hacking',
+  'Debugging',
+  'Refactoring',
+  'Tinkering',
+  'Sweating',
+  'Brainstorming',
+  'Spellcasting',
+];
+
+function pickSpinnerLabel() {
+  const randomLabel = SPINNER_LABELS[Math.floor(Math.random() * SPINNER_LABELS.length)];
+  return `${randomLabel} `;
+}
+
+function renderFrame(label, startTime, frameIdx, opts = {}) {
+  const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+  const labelText = opts.gradientLabel ? agentGradient(label) : chalk.dim(label);
+  process.stdout.write('\r' + agentGradient(SPINNER_FRAMES[frameIdx % SPINNER_FRAMES.length]) + ' ' + labelText + chalk.dim(elapsed + 's ') + '   ');
+}
 
 /**
  * Create a spinner with a given label.
@@ -10,20 +37,22 @@ const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
  * @returns {{ stop: () => void }} A spinner handle with a stop() method
  */
 export function createSpinner(label) {
-  const DOTS = ['.', '..', '...'];
+  const resolvedLabel = pickSpinnerLabel();
   let dotIdx = 0;
   let interval = null;
   const startTime = Date.now();
+  const renderOpts = { gradientLabel: true };
 
   const start = () => {
     if (interval) clearInterval(interval);
     dotIdx = 0;
-    process.stdout.write(chalk.dim(`\n${label}`));
+    process.stdout.write('\n\n');
+    renderFrame(resolvedLabel, startTime, dotIdx, renderOpts);
+    dotIdx++;
     interval = setInterval(() => {
-      const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-      process.stdout.write('\r' + chalk.dim(label) + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+      renderFrame(resolvedLabel, startTime, dotIdx, renderOpts);
       dotIdx++;
-    }, 400);
+    }, SPINNER_INTERVAL_MS);
   };
 
   const stop = () => {
@@ -38,3 +67,60 @@ export function createSpinner(label) {
 
   return { stop };
 }
+
+/**
+ * Create a spinner that only appears after a quiet period.
+ * Call bump() whenever output is streamed to hide/snooze it.
+ * @param {string} label - The label to display before the spinner
+ * @param {{ startTime?: number, delayMs?: number }} [opts]
+ * @returns {{ bump: () => void, pause: () => void, stop: () => void }}
+ */
+export function createIdleSpinner(label, opts = {}) {
+  const resolvedLabel = pickSpinnerLabel();
+  const startTime = opts.startTime ?? Date.now();
+  const delayMs = opts.delayMs ?? IDLE_SPINNER_DELAY_MS;
+  let dotIdx = 0;
+  let interval = null;
+  let timeout = null;
+  const renderOpts = { gradientLabel: opts.gradientLabel ?? true };
+
+  const clearTimeoutIfNeeded = () => {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = null;
+    }
+  };
+
+  const hide = () => {
+    clearTimeoutIfNeeded();
+    if (interval) {
+      clearInterval(interval);
+      interval = null;
+      process.stdout.write('\r\x1b[0J');
+    }
+  };
+
+  const start = () => {
+    clearTimeoutIfNeeded();
+    if (interval) return;
+    dotIdx = 0;
+    process.stdout.write('\n\n');
+    renderFrame(resolvedLabel, startTime, dotIdx, renderOpts);
+    dotIdx++;
+    interval = setInterval(() => {
+      renderFrame(resolvedLabel, startTime, dotIdx, renderOpts);
+      dotIdx++;
+    }, SPINNER_INTERVAL_MS);
+  };
+
+  const bump = () => {
+    hide();
+    timeout = setTimeout(start, delayMs);
+  };
+
+  return {
+    bump,
+    pause: hide,
+    stop: hide,
+  };
+}