markov-cli 1.0.10 → 1.0.12

package/src/commands/setup.js

@@ -0,0 +1,72 @@
+import chalk from 'chalk';
+import { mkdirSync, writeFileSync } from 'fs';
+import { resolve } from 'path';
+import { execCommand } from '../tools.js';
+
+/**
+ * Run a list of setup steps (mkdir / cd / run / write) in sequence.
+ * Returns true if all steps succeeded, false if any failed.
+ */
+export async function runSetupSteps(steps) {
+  for (const step of steps) {
+    if (step.type === 'mkdir') {
+      process.stdout.write(chalk.dim(`  mkdir: ${step.path}\n`));
+      try {
+        mkdirSync(resolve(process.cwd(), step.path), { recursive: true });
+        console.log(chalk.green(`  ✓ created ${step.path}\n`));
+      } catch (err) {
+        console.log(chalk.red(`  ✗ ${err.message}\n`));
+        return false;
+      }
+    } else if (step.type === 'cd') {
+      try {
+        process.chdir(resolve(process.cwd(), step.path));
+        console.log(chalk.dim(`  📁 ${process.cwd()}\n`));
+      } catch (err) {
+        console.log(chalk.red(`  ✗ no such directory: ${step.path}\n`));
+        return false;
+      }
+    } else if (step.type === 'run') {
+      process.stdout.write(chalk.dim(`  running: ${step.cmd}\n`));
+      const { stdout, stderr, exitCode } = await execCommand(step.cmd);
+      const output = [stdout, stderr].filter(Boolean).join('\n').trim();
+      if (output) console.log(chalk.dim(output));
+      if (exitCode !== 0) {
+        console.log(chalk.red(`  ✗ command failed (exit ${exitCode})\n`));
+        return false;
+      }
+      console.log(chalk.green(`  ✓ done\n`));
+    } else if (step.type === 'write') {
+      process.stdout.write(chalk.dim(`  write: ${step.path}\n`));
+      try {
+        const abs = resolve(process.cwd(), step.path);
+        const dir = abs.split('/').slice(0, -1).join('/');
+        mkdirSync(dir, { recursive: true });
+        writeFileSync(abs, step.content);
+        console.log(chalk.green(`  ✓ wrote ${step.path}\n`));
+      } catch (err) {
+        console.log(chalk.red(`  ✗ ${err.message}\n`));
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+/** Next.js setup steps. */
+export const NEXTJS_STEPS = [
+  { type: 'run', cmd: 'npx create-next-app@latest . --typescript --tailwind --eslint --no-git' },
+];
+
+/** TanStack Start setup steps (Vite + TanStack Router, type-safe full-stack). Uses @tanstack/cli (create-start is deprecated). */
+export const TANSTACK_STEPS = [
+  {
+    type: 'run',
+    cmd: 'npx @tanstack/cli create . --package-manager npm --toolchain eslint',
+  },
+];
+
+/** Laravel setup steps. */
+export const LARAVEL_STEPS = [
+  { type: 'run', cmd: 'composer create-project laravel/laravel .' },
+];

package/src/editor/codeBlockEdits.js

@@ -0,0 +1,27 @@
+import chalk from 'chalk';
+import { parseEdits, renderDiff, applyEdit } from '../editor.js';
+import { confirm } from '../ui/prompts.js';
+
+/**
+ * Scan AI response text for fenced code blocks that reference files.
+ * Show a diff preview for each and apply on user confirmation.
+ * @param {string} responseText - The AI's response content
+ * @param {string[]} loadedFiles - Files attached via @ref
+ */
+export async function applyCodeBlockEdits(responseText, loadedFiles = []) {
+  const edits = parseEdits(responseText, loadedFiles);
+  if (edits.length === 0) return;
+
+  console.log(chalk.dim(`\n📝 Detected ${edits.length} file edit(s) in response:\n`));
+
+  for (const edit of edits) {
+    renderDiff(edit.filepath, edit.content);
+    const ok = await confirm(chalk.bold(`Apply changes to ${chalk.cyan(edit.filepath)}? [y/N] `));
+    if (ok) {
+      applyEdit(edit.filepath, edit.content);
+      console.log(chalk.green(`  ✓ ${edit.filepath} updated\n`));
+    } else {
+      console.log(chalk.dim(`  ✗ skipped ${edit.filepath}\n`));
+    }
+  }
+}

package/src/files.js

@@ -76,7 +76,7 @@ export function resolveFileRefs(input, cwd = process.cwd()) {
 
   const contextBlock = blocks.length > 0
     ? `The user referenced the following file(s) as context:\n\n${blocks.join('\n\n')}\n\n` +
-      `ATTACHED FILES RULE: The user attached the file(s) above. If they ask you to edit, add, fix, or create anything in these files, you MUST use the write_file or search_replace tool — do not output the new or modified file content in your reply (no code blocks with file content). Use the exact paths shown above (e.g. ${loaded[0] ?? 'path'}).\n\n`
+      `ATTACHED FILES RULE: The user attached the file(s) above. If they ask you to edit, add, fix, or create anything in these files, you MUST use run_terminal_command (e.g. echo, cat, tee, heredocs) or search_replace for small edits — do not output the new or modified file content in your reply (no code blocks with file content). Use the exact paths shown above (e.g. ${loaded[0] ?? 'path'}).\n\n`
     : '';
 
   return { content: contextBlock + input, loaded, failed };

package/src/input.js

@@ -21,18 +21,25 @@ function statusBar() {
   return STATUS_LEFT + ' '.repeat(gap) + right;
 }
 
+const INPUT_HISTORY_MAX = 100;
+
 /**
- * Show an interactive raw-mode prompt that supports @file autocomplete.
+ * 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).
+ * @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) {
+export function chatPrompt(_promptStr, allFiles, inputHistory = []) {
   return new Promise((resolve) => {
     const stdin  = process.stdin;
     const stdout = process.stdout;
 
     let buffer      = '';
+    let cursorPos   = 0;   // 0..buffer.length; position of cursor in buffer
     let pickerFiles = [];
     let pickerIndex = 0;
+    let historyIndex = -1; // -1 = not navigating history
     let cursorLineOffset = 0; // lines from top of drawn block to where cursor sits
 
     const getAtPos = () => {
@@ -96,9 +103,12 @@ export function chatPrompt(_promptStr, allFiles) {
       const inputVisualLines = Math.max(1, Math.ceil(inputVisualLen / w));
       cursorLineOffset = inputVisualLines;
 
-      // Position cursor at the correct column on the last visual line of the input.
-      const totalInputLen = visibleLen(chalk.cyan(PREFIX)) + visibleLen(buffer);
-      const col = (totalInputLen % w) + 1;
+      // Position cursor: beforeCursorLen is the character offset where the cursor sits.
+      const prefixLen = visibleLen(chalk.cyan(PREFIX));
+      const beforeCursorLen = prefixLen + visibleLen(buffer.slice(0, cursorPos));
+      const lineIdx = Math.floor(beforeCursorLen / w);
+      const col = (beforeCursorLen % w) + 1;
+      if (lineIdx > 0) stdout.write(`\x1b[${lineIdx}B`);
       stdout.write(`\x1b[${col}G`);
     };
 
@@ -147,12 +157,17 @@ export function chatPrompt(_promptStr, allFiles) {
           const atPos = getAtPos();
           if (atPos !== -1) {
             buffer = buffer.slice(0, atPos) + '@' + pickerFiles[pickerIndex] + ' ';
+            cursorPos = buffer.length;
           }
           pickerFiles = [];
           pickerIndex = 0;
           redraw();
           return;
         }
+        if (buffer.trim() && buffer !== inputHistory[inputHistory.length - 1]) {
+          inputHistory.push(buffer);
+          if (inputHistory.length > INPUT_HISTORY_MAX) inputHistory.shift();
+        }
         clearPanel();
         cleanup();
         stdout.write('\n');
@@ -167,28 +182,67 @@ export function chatPrompt(_promptStr, allFiles) {
         return;
       }
 
-      // Arrow keys
+      // Arrow keys: Up/Down navigate picker when open, else input history (Up = older, Down = newer)
       if (key === '\x1b[A') {
-        if (pickerFiles.length > 0) { pickerIndex = (pickerIndex - 1 + pickerFiles.length) % pickerFiles.length; redraw(); }
+        if (pickerFiles.length > 0) {
+          pickerIndex = (pickerIndex - 1 + pickerFiles.length) % pickerFiles.length;
+          redraw();
+        } else if (inputHistory.length > 0) {
+          historyIndex = historyIndex === -1 ? inputHistory.length - 1 : Math.max(0, historyIndex - 1);
+          buffer = inputHistory[historyIndex];
+          cursorPos = buffer.length;
+          updatePicker();
+          redraw();
+        }
         return;
       }
       if (key === '\x1b[B') {
-        if (pickerFiles.length > 0) { pickerIndex = (pickerIndex + 1) % pickerFiles.length; redraw(); }
+        if (pickerFiles.length > 0) {
+          pickerIndex = (pickerIndex + 1) % pickerFiles.length;
+          redraw();
+        } else if (historyIndex >= 0) {
+          historyIndex++;
+          if (historyIndex >= inputHistory.length) {
+            historyIndex = -1;
+            buffer = '';
+          } else {
+            buffer = inputHistory[historyIndex];
+          }
+          cursorPos = buffer.length;
+          updatePicker();
+          redraw();
+        }
+        return;
+      }
+      // Left/Right: move cursor within the line
+      if (key === '\x1b[D') {
+        if (cursorPos > 0) { cursorPos--; redraw(); }
+        return;
+      }
+      if (key === '\x1b[C') {
+        if (cursorPos < buffer.length) { cursorPos++; redraw(); }
         return;
       }
-      if (key === '\x1b[C' || key === '\x1b[D') return; // left/right — ignore
 
-      // Backspace
+      // Backspace: delete character before cursor
       if (key === '\x7f' || key === '\b') {
-        if (buffer.length > 0) { buffer = buffer.slice(0, -1); updatePicker(); redraw(); }
+        historyIndex = -1;
+        if (cursorPos > 0) {
+          buffer = buffer.slice(0, cursorPos - 1) + buffer.slice(cursorPos);
+          cursorPos--;
+          updatePicker();
+          redraw();
+        }
         return;
       }
 
       // Ignore other control chars
       if (key < ' ') return;
 
-      // Printable
-      buffer += key;
+      // Printable: insert at cursor
+      historyIndex = -1;
+      buffer = buffer.slice(0, cursorPos) + key + buffer.slice(cursorPos);
+      cursorPos += key.length;
       updatePicker();
       redraw();
     };