markov-cli 1.0.15 → 1.0.17

package/src/ollama.js

@@ -43,9 +43,9 @@ const getHeaders = () => {
 
 /** Claude models: { label, model } */
 export const CLAUDE_MODELS = [
+  { label: 'Claude Opus 4.6', model: 'claude-opus-4-6' },
+  { label: 'Claude Sonnet 4.6', model: 'claude-sonnet-4-6' },
   { label: 'Claude Haiku 4.5', model: 'claude-haiku-4-5-20251001' },
-  { label: 'Claude Sonnet 4', model: 'claude-sonnet-4-20250514' },
-  { label: 'Claude Opus 4', model: 'claude-opus-4-20250514' },
 ];
 
 /** OpenAI models: { label, model } */
@@ -58,13 +58,49 @@ export const OPENAI_MODELS = [
 /** Ollama models (backend) */
 export const MODELS = ['qwen3.5:0.8b', 'qwen3.5:2b', 'qwen3.5:4b', 'qwen3.5:9b', 'qwen3.5:397b-cloud'];
 
+let cachedClaudeModels = [...CLAUDE_MODELS];
+
+const mapOptions = (provider, models, labelPrefix = '') =>
+  models.map((entry) => ({
+    label: labelPrefix ? `${labelPrefix}${entry}` : entry.label,
+    provider,
+    model: labelPrefix ? entry : entry.model,
+  }));
+
 /** Combined options for /models picker: { label, provider, model } */
 export const MODEL_OPTIONS = [
-  ...CLAUDE_MODELS.map((o) => ({ label: o.label, provider: 'claude', model: o.model })),
-  ...OPENAI_MODELS.map((o) => ({ label: o.label, provider: 'openai', model: o.model })),
-  ...MODELS.map((m) => ({ label: `Ollama ${m}`, provider: 'ollama', model: m })),
+  ...mapOptions('claude', CLAUDE_MODELS),
+  ...mapOptions('openai', OPENAI_MODELS),
+  ...mapOptions('ollama', MODELS, 'Ollama '),
 ];
 
+export async function getModelOptions(signal = null) {
+  let claudeModels = cachedClaudeModels;
+  let warning = null;
+
+  if (hasClaudeKey()) {
+    try {
+      const liveClaudeModels = await claude.listAvailableModels(signal);
+      if (liveClaudeModels.length > 0) {
+        cachedClaudeModels = liveClaudeModels;
+        claudeModels = liveClaudeModels;
+      }
+    } catch (err) {
+      claudeModels = cachedClaudeModels;
+      warning = `Could not load latest Claude models; using fallback list. ${err.message}`;
+    }
+  }
+
+  return {
+    options: [
+      ...mapOptions('claude', claudeModels),
+      ...mapOptions('openai', OPENAI_MODELS),
+      ...mapOptions('ollama', MODELS, 'Ollama '),
+    ],
+    warning,
+  };
+}
+
 export let PROVIDER = 'ollama';
 export let MODEL = 'qwen3.5:4b';
 
@@ -79,7 +115,7 @@ export function setModelAndProvider(provider, model) {
 
 export function getModelDisplayName() {
   if (PROVIDER === 'claude') {
-    const found = CLAUDE_MODELS.find((o) => o.model === MODEL);
+    const found = [...cachedClaudeModels, ...CLAUDE_MODELS].find((o) => o.model === MODEL);
     return found ? found.label : `Claude ${MODEL}`;
   }
   if (PROVIDER === 'openai') {

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,
+  };
+}