markov-cli 1.0.12 → 1.0.14

package/package.json

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

package/src/auth.js

@@ -6,6 +6,7 @@ const CONFIG_DIR = join(homedir(), '.markov');
 const TOKEN_PATH = join(CONFIG_DIR, 'token');
 const ANTHROPIC_KEY_PATH = join(CONFIG_DIR, 'anthropic_api_key');
 const OPENAI_KEY_PATH = join(CONFIG_DIR, 'openai_api_key');
+const OLLAMA_KEY_PATH = join(CONFIG_DIR, 'ollama_api_key');
 
 export const API_URL = 'https://api.livingcloud.app/api';
 
@@ -31,6 +32,28 @@ export function clearOpenAIKey() {
   delete process.env.OPENAI_API_KEY;
 }
 
+export function getOllamaKey() {
+  const env = process.env.OLLAMA_API_KEY?.trim();
+  if (env) return env;
+  if (!existsSync(OLLAMA_KEY_PATH)) return null;
+  return readFileSync(OLLAMA_KEY_PATH, 'utf-8').trim() || null;
+}
+
+export function setOllamaKey(key) {
+  const trimmed = (key && String(key).trim()) || '';
+  if (!trimmed) return;
+  mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(OLLAMA_KEY_PATH, trimmed, 'utf-8');
+  process.env.OLLAMA_API_KEY = trimmed;
+}
+
+export function clearOllamaKey() {
+  if (existsSync(OLLAMA_KEY_PATH)) {
+    writeFileSync(OLLAMA_KEY_PATH, '', 'utf-8');
+  }
+  delete process.env.OLLAMA_API_KEY;
+}
+
 export function getClaudeKey() {
   const env = process.env.ANTHROPIC_API_KEY?.trim();
   if (env) return env;

package/src/commands/setup.js

@@ -68,5 +68,18 @@ export const TANSTACK_STEPS = [
 
 /** Laravel setup steps. */
 export const LARAVEL_STEPS = [
+  { type: 'run', cmd: 'mkdir laravel-be' },
+  { type: 'cd', path: 'laravel-be' },
   { type: 'run', cmd: 'composer create-project laravel/laravel .' },
+  { type: 'run', cmd: 'npm install && npm run build' },
 ];
+
+/** Prompt for /laravel: steps as run_terminal_command + file edits only. */
+export const LARAVEL_BLOG_PROMPT = `Set up a new Laravel project "laravel-be" with the following steps:
+
+1. run_terminal_command: composer --version
+2. run_terminal_command: php --version
+3. run_terminal_command: composer create-project laravel/laravel laravel-be
+4. run_terminal_command: cd laravel-be
+
+If a step fails, stop and report the error.`;

package/src/interactive.js

@@ -7,10 +7,10 @@ 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 } from './tools.js';
+import { RUN_TERMINAL_COMMAND_TOOL, WEB_SEARCH_TOOL, runTool, execCommand } from './tools.js';
 import { chatPrompt } from './input.js';
 import { getFilesAndDirs } from './ui/picker.js';
-import { getToken, login, clearToken, getClaudeKey, setClaudeKey, getOpenAIKey, setOpenAIKey } from './auth.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';
@@ -25,7 +25,7 @@ import { runAgentLoop, maybePrintFullPayload, AGENT_LOOP_MAX_ITERATIONS } from '
 import { applyCodeBlockEdits } from './editor/codeBlockEdits.js';
 
 // Extracted command modules
-import { runSetupSteps, NEXTJS_STEPS, TANSTACK_STEPS, LARAVEL_STEPS } from './commands/setup.js';
+import { runSetupSteps, NEXTJS_STEPS, TANSTACK_STEPS, LARAVEL_STEPS, LARAVEL_BLOG_PROMPT } from './commands/setup.js';
 
 const agentGradient = gradient(['#22c55e', '#16a34a', '#4ade80']);
 
@@ -48,7 +48,7 @@ const INTRO_TEXT =
   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.cyan('  /yolo') + chalk.dim(' [prompt]              plan in stream mode, then auto-run until done\n') +
   chalk.dim('\nType a message · ') + chalk.cyan('@filename') + chalk.dim(' to attach · ctrl+q to cancel\n');
 
 const HELP_TEXT =
@@ -59,9 +59,10 @@ const HELP_TEXT =
   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('  /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') +
@@ -70,7 +71,7 @@ const HELP_TEXT =
   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.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');
 
 /** If MARKOV_DEBUG is set, print the raw model output after completion. */
@@ -196,6 +197,7 @@ export async function startInteractive() {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
       }
+      console.log(chalk.dim('You: ') + rawUserContent);
       const userContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
       chatMessages.push({ role: 'user', content: userContent });
       const planMessages = [buildPlanSystemMessage(), ...chatMessages];
@@ -265,7 +267,7 @@ export async function startInteractive() {
                 continue;
               }
             }
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
             const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
             currentPlanMessages.push({
               role: 'tool',
@@ -302,6 +304,7 @@ export async function startInteractive() {
         console.log(chalk.yellow('No prompt given.\n'));
         continue;
       }
+      console.log(chalk.dim('You: ') + rawUserContent);
       const planUserContent = (await getLsContext()) + (await getGrepContext()) + 'Create a step-by-step plan for: ' + rawUserContent;
       chatMessages.push({ role: 'user', content: planUserContent });
       const planMessages = [buildPlanSystemMessage(), ...chatMessages];
@@ -348,7 +351,7 @@ export async function startInteractive() {
                 continue;
               }
             }
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
             const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
             currentPlanMessages.push({
               role: 'tool',
@@ -407,7 +410,7 @@ export async function startInteractive() {
           },
           onToolCall: (name, args) => {
             const summary = formatToolCallSummary(name, args);
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
           },
           onToolResult: (name, resultStr) => {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
@@ -503,7 +506,7 @@ export async function startInteractive() {
                 continue;
               }
             }
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + (name === 'web_search' ? (args?.query ?? '') : (args?.command ?? '')));
             const result = await runTool(name, args ?? {}, { cwd: process.cwd(), confirmFn: () => Promise.resolve(true) });
             currentInitMessages.push({
               role: 'tool',
@@ -587,7 +590,7 @@ export async function startInteractive() {
           },
           onToolCall: (name, args) => {
             const summary = formatToolCallSummary(name, args);
-            console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
           },
           onToolResult: (name, resultStr) => {
             console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
@@ -634,6 +637,14 @@ 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();
+            if (!enteredKey) {
+              console.log(chalk.yellow('\nNo key entered. Model not switched.\n'));
+              continue;
+            }
+            setOllamaKey(enteredKey);
+          }
           setModelAndProvider(opt.provider, opt.model);
           console.log(chalk.dim(`\n🤖 switched to ${chalk.cyan(getModelDisplayName())}\n`));
         }
@@ -706,6 +717,73 @@ export async function startInteractive() {
       continue;
     }
 
+    // /laravel — run agent with Laravel "my-blog" blog setup prompt (auto-confirm like /yolo)
+    if (trimmed === '/laravel') {
+      const userContent = (await getLsContext()) + (await getGrepContext()) + LARAVEL_BLOG_PROMPT;
+      chatMessages.push({ role: 'user', content: userContent });
+      const agentMessages = [buildAgentSystemMessage(), ...chatMessages];
+      maybePrintFullPayload(agentMessages);
+      const abortController = new AbortController();
+      const confirmFn = () => Promise.resolve(true);
+      const confirmFileEdit = async () => true;
+      const startTime = Date.now();
+      const DOTS = ['.', '..', '...'];
+      let dotIdx = 0;
+      let spinner = null;
+      const startSpinner = () => {
+        if (spinner) { clearInterval(spinner); spinner = null; }
+        dotIdx = 0;
+        process.stdout.write(chalk.dim('\nLaravel › '));
+        spinner = setInterval(() => {
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          process.stdout.write('\r' + chalk.dim('Laravel › ') + chalk.dim(elapsed + 's ') + agentGradient(DOTS[dotIdx % DOTS.length]) + '   ');
+          dotIdx++;
+        }, 400);
+      };
+      const stopSpinner = () => {
+        if (spinner) { clearInterval(spinner); spinner = null; }
+        process.stdout.write('\r\x1b[0J');
+      };
+      try {
+        const result = await runAgentLoop(agentMessages, {
+          signal: abortController.signal,
+          cwd: process.cwd(),
+          confirmFn,
+          confirmFileEdit,
+          onThinking: () => { startSpinner(); },
+          onBeforeToolRun: () => { stopSpinner(); },
+          onIteration: (iter, max, toolCount) => {
+            const w = process.stdout.columns || 80;
+            const label = ` Step ${iter} `;
+            const line = chalk.dim('──') + chalk.bold.white(label) + chalk.dim('─'.repeat(Math.max(0, w - label.length - 2)));
+            console.log(line);
+          },
+          onToolCall: (name, args) => {
+            const summary = formatToolCallSummary(name, args);
+            console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+          },
+          onToolResult: (name, resultStr) => {
+            console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));
+          },
+        });
+        stopSpinner();
+        if (result) {
+          chatMessages.push(result.finalMessage);
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          const width = Math.min(process.stdout.columns || 80, 80);
+          process.stdout.write(formatResponseWithCodeBlocks(result.content, width) + '\n\n');
+          await applyCodeBlockEdits(result.content, []);
+          allFiles = getFilesAndDirs();
+          console.log(chalk.green('✓ Laravel blog setup done.') + chalk.dim(` (${elapsed}s)\n`));
+          maybePrintRawModelOutput(result.content);
+        }
+      } catch (err) {
+        stopSpinner();
+        if (!abortController.signal?.aborted) console.log(chalk.red(`\n${err.message}\n`));
+      }
+      continue;
+    }
+
     // Handle message with agent (tools)
     const { loaded, failed, content: resolvedContent } = await resolveFileRefs(trimmed);
     if (loaded.length > 0) {
@@ -715,6 +793,7 @@ export async function startInteractive() {
       console.log(chalk.yellow(`\n⚠  not found: ${failed.map(f => `@${f}`).join(', ')}`));
     }
     const rawUserContent = resolvedContent ?? trimmed;
+    console.log(chalk.dim('You: ') + rawUserContent);
     const userContent = (await getLsContext()) + (await getGrepContext()) + rawUserContent;
     chatMessages.push({ role: 'user', content: userContent });
 
@@ -768,7 +847,7 @@ export async function startInteractive() {
         },
         onToolCall: (name, args) => {
           const summary = formatToolCallSummary(name, args);
-          console.log(chalk.cyan('  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
+          console.log(chalk.cyan('\n  ▶ ') + chalk.bold(name) + chalk.dim('  ') + chalk.white(summary));
         },
         onToolResult: (name, resultStr) => {
           console.log(chalk.dim('    ') + formatToolResultSummary(name, resultStr));

package/src/ollama.js

@@ -1,4 +1,4 @@
-import { API_URL, getToken, getClaudeKey, getOpenAIKey } from './auth.js';
+import { API_URL, getToken, getClaudeKey, getOpenAIKey, getOllamaKey } from './auth.js';
 import * as openai from './openai.js';
 import * as claude from './claude.js';
 
@@ -33,7 +33,12 @@ function stripToolCallArtifacts(s) {
 
 const getHeaders = () => {
   const token = getToken();
-  return { 'Content-Type': 'application/json', ...(token && { Authorization: `Bearer ${token}` }) };
+  const ollamaKey = getOllamaKey();
+  return { 
+    'Content-Type': 'application/json', 
+    ...(token && { Authorization: `Bearer ${token}` }),
+    ...(ollamaKey && { 'X-Ollama-Api-Key': ollamaKey })
+  };
 };
 
 /** Claude models: { label, model } */
@@ -51,7 +56,7 @@ export const OPENAI_MODELS = [
 ];
 
 /** Ollama models (backend) */
-export const MODELS = ['qwen3.5:0.8b', 'qwen3.5:2b', 'qwen3.5:4b', 'qwen3.5:9b'];
+export const MODELS = ['qwen3.5:0.8b', 'qwen3.5:2b', 'qwen3.5:4b', 'qwen3.5:9b', 'qwen3.5:397b-cloud'];
 
 /** Combined options for /models picker: { label, provider, model } */
 export const MODEL_OPTIONS = [

package/src/tools.js

@@ -412,7 +412,9 @@ const TOOLS_MAP = {
  * @returns {Promise<{ stdout: string, stderr: string, exitCode: number }>}
  */
 export async function execCommand(command, cwd = process.cwd()) {
-  if (!command.trim()) return { stdout: '', stderr: 'Error: empty command', exitCode: 1 };
+  if (command == null || typeof command !== 'string' || !command.trim()) {
+    return { stdout: '', stderr: 'Error: empty or invalid command', exitCode: 1 };
+  }
   const timeout = 30_000;
   const maxBuffer = 1024 * 1024;
   try {

package/src/ui/logo.js

@@ -1,10 +1,28 @@
 import gradient from 'gradient-string';
 
 const ASCII_ART = `                                    
-▗▖  ▗▖▗▞▀▜▌ ▄▄▄ █  ▄  ▄▄▄  ▄   ▄ 
-▐▛▚▞▜▌▝▚▄▟▌█    █▄▀  █   █ █   █ 
-▐▌  ▐▌     █    █ ▀▄ ▀▄▄▄▀  ▀▄▀  
-▐▌  ▐▌          █  █                                        
+███╗   ███╗ █████╗ ██████╗ ██╗  ██╗ ██████╗ ██╗   ██╗    
+████╗ ████║██╔══██╗██╔══██╗██║ ██╔╝██╔═══██╗██║   ██║    
+██╔████╔██║███████║██████╔╝█████╔╝ ██║   ██║██║   ██║    
+██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝    
+██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝     
+╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝      
+                                                         
+ ██████╗ ██████╗ ██████╗ ███████╗                        
+██╔════╝██╔═══██╗██╔══██╗██╔════╝                        
+██║     ██║   ██║██║  ██║█████╗                          
+██║     ██║   ██║██║  ██║██╔══╝                          
+╚██████╗╚██████╔╝██████╔╝███████╗                        
+ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝                                  
+`;
+
+const ASCII_ART4 = `                                                   
+ ██████╗██╗     ███╗   ███╗ █████╗ ██████╗ ██╗  ██╗ ██████╗ ██╗   ██╗
+██╔════╝██║     ████╗ ████║██╔══██╗██╔══██╗██║ ██╔╝██╔═══██╗██║   ██║
+██║     ██║     ██╔████╔██║███████║██████╔╝█████╔╝ ██║   ██║██║   ██║
+██║     ██║     ██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝
+╚██████╗███████╗██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝ 
+ ╚═════╝╚══════╝╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  
 `;
 
 const ASCII_ART3 = `
@@ -14,17 +32,26 @@ const ASCII_ART3 = `
 ██║╚██╔╝██║██╔══██║██╔══██╗██╔═██╗ ██║   ██║╚██╗ ██╔╝
 ██║ ╚═╝ ██║██║  ██║██║  ██║██║  ██╗╚██████╔╝ ╚████╔╝ 
 ╚═╝     ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  
+                                                    
+ ██████╗ ██████╗ ██████╗ ███████╗                    
+██╔════╝██╔═══██╗██╔══██╗██╔════╝                    
+██║     ██║   ██║██║  ██║█████╗                      
+██║     ██║   ██║██║  ██║██╔══╝                      
+╚██████╗╚██████╔╝██████╔╝███████╗                    
+ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝ 
 `;
 
 const ASCII_ART2 = `                                              
-██▄  ▄██  ▄▄▄  ▄▄▄▄  ▄▄ ▄▄  ▄▄▄  ▄▄ ▄▄ 
-██ ▀▀ ██ ██▀██ ██▄█▄ ██▄█▀ ██▀██ ██▄██ 
-██    ██ ██▀██ ██ ██ ██ ██ ▀███▀  ▀█▀  
+  e88'Y88 888         e   e                    888                        
+ d888  'Y 888        d8b d8b     ,"Y88b 888,8, 888 ee  e88 88e  Y8b Y888P 
+C8888     888       e Y8b Y8b   "8" 888 888 "  888 P  d888 888b  Y8b Y8P  
+ Y888  ,d 888  ,d  d8b Y8b Y8b  ,ee 888 888    888 b  Y888 888P   Y8b "   
+  "88,d88 888,d88 d888b Y8b Y8b "88 888 888    888 8b  "88 88"     Y8P                                                                           
 `;
 
 
-const markovGradient = gradient(['#374151', '#4b5563', '#6b7280', '#4b5563', '#374151']);
+const markovGradient = gradient(['#4ade80', '#6ee7b7', '#38bdf8']);
 
 export function printLogo() {
-  console.log(markovGradient.multiline(ASCII_ART3));
+  console.log(markovGradient.multiline(ASCII_ART4));
 }