markov-cli 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markov-cli",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "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)) {
@@ -526,7 +528,7 @@ const HELP_TEXT =
   chalk.cyan('  /build') + chalk.dim('                      execute the stored plan\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: plan then build (no y/n). Tips: ') + chalk.cyan('@filename') + chalk.dim(' to attach a file · ctrl+q to cancel\n');
 
 export async function startInteractive() {
   printLogo();
@@ -635,7 +637,7 @@ export async function startInteractive() {
       continue;
     }
 
-    // Normal chat — file ops always available
+    // Normal chat — plan then build (two phases), apply file ops without y/n
     const { loaded, failed } = resolveFileRefs(trimmed);
 
     if (loaded.length > 0) {
@@ -645,19 +647,38 @@ 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) {
+      const planReply = await streamWithViewport(chatMessages, abortController.signal);
+      if (planReply === null) {
         chatMessages.pop();
-      } else {
-        chatMessages.push({ role: 'assistant', content: reply });
-        allFiles = await handleFileOps(reply, loaded);
+        continue;
+      }
+      chatMessages.push({ role: 'assistant', content: planReply });
+
+      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${planReply}`;
+
+      chatMessages.push({ role: 'user', content: buildPrompt });
+      const buildReply = await streamWithViewport(chatMessages, abortController.signal);
+      if (buildReply === null) {
+        chatMessages.pop(); // remove build prompt
+        continue;
       }
+      chatMessages.push({ role: 'assistant', content: buildReply });
+      allFiles = await handleFileOps(buildReply, loaded, { autoConfirm: true });
     } catch (err) {
       if (!abortController.signal.aborted) {
         console.log(chalk.red(`\n${err.message}\n`));