markov-cli 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markov-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "LivingCloud's CLI AI Agent",
   "type": "module",
   "bin": {

package/src/interactive.js

@@ -106,15 +106,17 @@ function parseWriteCommands(text) {
 /**
  * Parse and apply all file operations from a model reply.
  * Shows diffs/confirmations for each op. Returns updated allFiles list.
+ * options.autoConfirm: if true, skip y/n prompts and apply all ops.
  */
-async function handleFileOps(reply, loadedFiles) {
+async function handleFileOps(reply, loadedFiles, options = {}) {
+  const autoConfirm = options.autoConfirm === true;
   let allFiles = getFilesAndDirs();
 
   // Create folders first (so !!run: cd <folder> can succeed later)
   for (const folderPath of parseMkdirCommands(reply)) {
     const path = toRelativePath(folderPath);
     process.stdout.write(chalk.dim(`  mkdir: ${path} — `));
-    const confirmed = await confirm(chalk.bold(`Create folder ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Create folder ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       try {
         mkdirSync(resolve(process.cwd(), path), { recursive: true });
@@ -131,7 +133,7 @@ async function handleFileOps(reply, loadedFiles) {
   // Create empty files
   for (const filePath of parseTouchCommands(reply)) {
     const path = toRelativePath(filePath);
-    const confirmed = await confirm(chalk.bold(`Create file ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Create file ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       try {
         const abs = resolve(process.cwd(), path);
@@ -152,7 +154,7 @@ async function handleFileOps(reply, loadedFiles) {
   for (const { filepath, content } of parseWriteCommands(reply)) {
     const path = toRelativePath(filepath);
     renderDiff(path, content);
-    const confirmed = await confirm(chalk.bold(`Write ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Write ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       try {
         applyEdit(path, content);
@@ -171,7 +173,7 @@ async function handleFileOps(reply, loadedFiles) {
   for (const { filepath, content } of edits) {
     const path = toRelativePath(filepath);
     renderDiff(path, content);
-    const confirmed = await confirm(chalk.bold(`Write ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Write ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       try {
         applyEdit(path, content);
@@ -187,7 +189,7 @@ async function handleFileOps(reply, loadedFiles) {
 
   // Run terminal commands (after folders/files exist, so cd works)
   for (const cmd of parseRunCommands(reply)) {
-    const ok = await confirm(chalk.bold(`Run: ${chalk.cyan(cmd)}? [y/N] `));
+    const ok = autoConfirm ? true : await confirm(chalk.bold(`Run: ${chalk.cyan(cmd)}? [y/N] `));
     if (ok) {
       // cd must be handled in-process — child processes can't change the parent's cwd
       const cdMatch = cmd.match(/^cd\s+(.+)$/);
@@ -215,7 +217,7 @@ async function handleFileOps(reply, loadedFiles) {
   // Remove directories
   for (const dirPath of parseRmdirCommands(reply)) {
     const path = toRelativePath(dirPath);
-    const confirmed = await confirm(chalk.bold(`Remove directory ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Remove directory ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       const abs = resolve(process.cwd(), path);
       if (existsSync(abs)) {
@@ -237,7 +239,7 @@ async function handleFileOps(reply, loadedFiles) {
   // Delete files
   for (const filePath of parseDeleteCommands(reply)) {
     const path = toRelativePath(filePath);
-    const confirmed = await confirm(chalk.bold(`Delete ${chalk.cyan(path)}? [y/N] `));
+    const confirmed = autoConfirm ? true : await confirm(chalk.bold(`Delete ${chalk.cyan(path)}? [y/N] `));
     if (confirmed) {
       const abs = resolve(process.cwd(), path);
       if (existsSync(abs)) {
@@ -429,11 +431,7 @@ function buildSystemMessage() {
     `\nSETUP NEXT.JS APP (or any new project in a subfolder):\n` +
     `1. Create the folder first: !!mkdir: next-app (or the requested name).\n` +
     `2. Change into it on its own line: !!run: cd next-app (nothing after the path).\n` +
-    `3. Run each following command on its own !!run: line: e.g. !!run: npx create-next-app@latest . --yes, then !!run: git init, !!run: git add ., !!run: git commit -m "Initial commit".\n` +
-    `\nSETUP LARAVEL API (output exactly this):\n` +
-    `!!mkdir: laravel-api then !!run: cd laravel-api then !!run: composer create-project --prefer-dist laravel/laravel . then !!run: php artisan serve. One per line; nothing after the dot in composer; no composer run dev or dev-server. No custom routes.\n` +
-    `\nSETUP ROUTES (API only — use when user asks to add routes, /health, /users, or API endpoints):\n` +
-    `Only after the Laravel app exists. Add in routes/api.php only (not web.php): GET /api/health returning response()->json(['status' => 'ok']), and /api/users as a resource (index, show, store, update, destroy) using User model and a controller. Register api in bootstrap/app.php if needed. Use !!write: for routes/api.php and the controller; prefix with laravel-api/ if cwd is parent. Do not use routes/web.php.\n`;
+    `3. Run each following command on its own !!run: line: e.g. !!run: npx create-next-app@latest . --yes, then !!run: git init, !!run: git add ., !!run: git commit -m "Initial commit".\n`;
   return { role: 'system', content: `You are Markov, an AI coding assistant.\nWorking directory: ${process.cwd()}\n${fileList}${fileOpsInstructions}` };
 }
 
@@ -522,11 +520,12 @@ const HELP_TEXT =
   '\n' +
   chalk.bold('Commands:\n') +
   chalk.cyan('  /help') + chalk.dim('                       show this help\n') +
-  chalk.cyan('  /plan <message>') + chalk.dim('             ask AI to create a plan (no files written)\n') +
   chalk.cyan('  /build') + chalk.dim('                      execute the stored plan\n') +
+  chalk.cyan('  /setup-nextjs') + chalk.dim('               scaffold a Next.js app\n') +
+  chalk.cyan('  /setup-laravel') + chalk.dim('              scaffold a Laravel API\n') +
   chalk.cyan('  /models') + chalk.dim('                     switch the active AI model\n') +
   chalk.cyan('  /cd [path]') + chalk.dim('                  change working directory\n') +
-  chalk.dim('\nTips: use ') + chalk.cyan('@filename') + chalk.dim(' to attach a file · ctrl+q to cancel a response\n');
+  chalk.dim('\nNormal chat: generates a plan · /build to execute · ') + chalk.cyan('@filename') + chalk.dim(' to attach a file · ctrl+q to cancel\n');
 
 export async function startInteractive() {
   printLogo();
@@ -577,28 +576,18 @@ export async function startInteractive() {
       continue;
     }
 
-    // /plan <message> — ask LLM to produce a plan as a normal chat message, store it
-    if (trimmed.startsWith('/plan ')) {
-      const planRequest = trimmed.slice(6).trim();
-      const planPrompt =
-        `Create a detailed, numbered plan for the following task:\n\n${planRequest}\n\n` +
-        `For each step, specify exactly what will happen and which syntax will be used:\n` +
-        `- Writing or editing a file → !!write: path/to/file then fenced code block\n` +
-        `- Creating an empty file   → !!touch: path/to/file\n` +
-        `- Creating a folder        → !!mkdir: path/to/folder\n` +
-        `- Removing a folder        → !!rmdir: path/to/folder\n` +
-        `- Deleting a file          → !!delete: path/to/file\n\n` +
-        `Do NOT output any actual file contents or commands yet — only the plan.`;
-      chatMessages.push({ role: 'user', content: planPrompt });
+    // /setup-nextjs — scaffold a Next.js app
+    if (trimmed === '/setup-nextjs') {
+      const msg = 'Set up a new Next.js app in a subfolder. Follow the SETUP NEXT.JS APP instructions exactly.';
+      chatMessages.push({ role: 'user', content: msg });
       const abortController = new AbortController();
       try {
         const reply = await streamWithViewport(chatMessages, abortController.signal);
-        if (reply === null) {
-          chatMessages.pop();
-        } else {
+        if (reply === null) { chatMessages.pop(); }
+        else {
           chatMessages.push({ role: 'assistant', content: reply });
-          currentPlan = { text: reply };
-          console.log(chalk.green('\n✓ Plan stored. Use /build to execute it.\n'));
+          allFiles = await handleFileOps(reply, [], { autoConfirm: true });
+          console.log(chalk.green('✓ Next.js app created.\n'));
         }
       } catch (err) {
         if (!abortController.signal.aborted) console.log(chalk.red(`\n${err.message}\n`));
@@ -606,13 +595,61 @@ export async function startInteractive() {
       continue;
     }
 
-    // /build — execute the stored plan with full file ops
+    // /setup-laravel — scaffold a Laravel API (hardcoded, no AI)
+    if (trimmed === '/setup-laravel') {
+      const steps = [
+        { type: 'mkdir', path: 'laravel-api' },
+        { type: 'cd', path: 'laravel-api' },
+        { type: 'run', cmd: 'composer create-project --prefer-dist laravel/laravel .' },
+        { type: 'run', cmd: 'php artisan serve' },
+      ];
+      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 });
+            allFiles = getFilesAndDirs();
+            console.log(chalk.green(`  ✓ created ${step.path}\n`));
+          } catch (err) {
+            console.log(chalk.red(`  ✗ ${err.message}\n`));
+            break;
+          }
+        } else if (step.type === 'cd') {
+          try {
+            process.chdir(resolve(process.cwd(), step.path));
+            allFiles = getFilesAndDirs();
+            console.log(chalk.dim(`  📁 ${process.cwd()}\n`));
+          } catch (err) {
+            console.log(chalk.red(`  ✗ no such directory: ${step.path}\n`));
+            break;
+          }
+        } 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`));
+            break;
+          }
+          console.log(chalk.green(`  ✓ done\n`));
+          allFiles = getFilesAndDirs();
+        }
+      }
+      console.log(chalk.green('✓ Laravel API created.\n'));
+      continue;
+    }
+
+
+    // /build — execute the stored plan with file ops
     if (trimmed === '/build') {
       if (!currentPlan) {
-        console.log(chalk.yellow('\n⚠  No plan stored. Use /plan <message> first.\n'));
+        console.log(chalk.yellow('\n⚠  No plan stored. Describe what you want first.\n'));
         continue;
       }
 
+      const autoConfirm = await confirm(chalk.bold('Auto-confirm all operations? [y/N] '));
+
       const buildPrompt =
         `Execute the following plan. Use !!write: path then a fenced code block for file writes, !!mkdir: for folders, !!delete: for deletions.\n\n` +
         `Plan:\n${currentPlan.text}`;
@@ -625,7 +662,7 @@ export async function startInteractive() {
           chatMessages.pop();
         } else {
           chatMessages.push({ role: 'assistant', content: reply });
-          allFiles = await handleFileOps(reply, []);
+          allFiles = await handleFileOps(reply, [], { autoConfirm });
           currentPlan = null;
           console.log(chalk.green('✓ Plan executed.\n'));
         }
@@ -635,7 +672,7 @@ export async function startInteractive() {
       continue;
     }
 
-    // Normal chat — file ops always available
+    // Normal chat — generate a plan, store it, require /build to execute
     const { loaded, failed } = resolveFileRefs(trimmed);
 
     if (loaded.length > 0) {
@@ -645,18 +682,26 @@ export async function startInteractive() {
       console.log(chalk.yellow(`\n⚠  not found: ${failed.map(f => `@${f}`).join(', ')}`));
     }
 
-    // Store raw message — @refs are re-resolved fresh on every API call
-    chatMessages.push({ role: 'user', content: trimmed });
-
+    const planPrompt =
+      `Create a detailed, numbered plan for the following task:\n\n${trimmed}\n\n` +
+      `For each step, specify exactly what will happen and which syntax will be used:\n` +
+      `- Writing or editing a file → !!write: path/to/file then fenced code block\n` +
+      `- Creating an empty file   → !!touch: path/to/file\n` +
+      `- Creating a folder        → !!mkdir: path/to/folder\n` +
+      `- Removing a folder        → !!rmdir: path/to/folder\n` +
+      `- Deleting a file          → !!delete: path/to/file\n\n` +
+      `Do NOT output any actual file contents or commands yet — only the plan.`;
+
+    chatMessages.push({ role: 'user', content: planPrompt });
     const abortController = new AbortController();
     try {
       const reply = await streamWithViewport(chatMessages, abortController.signal);
-
       if (reply === null) {
         chatMessages.pop();
       } else {
         chatMessages.push({ role: 'assistant', content: reply });
-        allFiles = await handleFileOps(reply, loaded);
+        currentPlan = { text: reply };
+        console.log(chalk.green('\n✓ Plan stored. Use /build to execute it.\n'));
       }
     } catch (err) {
       if (!abortController.signal.aborted) {