devfix-cli 1.0.6 → 1.0.7

package/package.json

@@ -18,5 +18,5 @@
     "marked-terminal": "^7.3.0",
     "ora": "^9.3.0"
   },
-  "version": "1.0.6"
+  "version": "1.0.7"
 }

package/src/utils/run.js

@@ -1,13 +1,9 @@
-
 import chalk from "chalk";
 import boxen from "boxen";
 import inquirer from "inquirer";
 import ora from "ora";
 import { spawn } from "child_process";
 
-import { marked } from "marked";
-import TerminalRenderer from "marked-terminal";
-
 import { readConfig } from "../utils/config.js";
 import { isSessionValid } from "../utils/session.js";
 import { decrypt } from "../utils/cryptoStore.js";
@@ -17,10 +13,28 @@ import { detectStack } from "../utils/detectStack.js";
 import { buildPrompt } from "../utils/prompt.js";
 import { askAI } from "../utils/ai.js";
 
-// Markdown renderer
-marked.setOptions({
-  renderer: new TerminalRenderer(),
-});
+function headerBox({ fullCmd, contextOn }) {
+  return boxen(
+    `${chalk.bold.cyan("DevFix Run")}\n` +
+      `${chalk.gray("────────────────────────")}\n` +
+      `${chalk.white("Command:")} ${chalk.yellow(fullCmd)}\n` +
+      `${chalk.white("Context:")} ${contextOn ? chalk.green("ON") : chalk.red("OFF")}`,
+    { padding: 1, borderStyle: "round" }
+  );
+}
+
+function extractFirstCodeBlock(md) {
+  const match = md.match(/```(?:bash|sh)?\n([\s\S]*?)```/);
+  if (!match) return null;
+  return match[1].trim();
+}
+
+function cleanAIText(text) {
+  return (text || "")
+    .replace(/\n {4,}/g, "\n")
+    .replace(/\n\n{3,}/g, "\n\n")
+    .trim();
+}
 
 export async function runCommand(cmdArgs, options) {
   const config = readConfig();
@@ -45,24 +59,16 @@ export async function runCommand(cmdArgs, options) {
   const args = cmdArgs.slice(1);
   const fullCmd = `${command} ${args.join(" ")}`.trim();
 
-  // ✅ Prevent duplicate prompts + duplicate AI calls
   let handled = false;
 
-  console.log(
-    boxen(
-      `${chalk.bold.cyan("▶ DevFix Run")}\n\n${chalk.white("Command:")} ${chalk.yellow(fullCmd)}\n${
-        options.context ? chalk.green("Context: ON") : chalk.red("Context: OFF")
-      }`,
-      { padding: 1, borderStyle: "round" }
-    )
-  );
+  console.log("\n" + headerBox({ fullCmd, contextOn: !!options.context }) + "\n");
 
-  // ✅ No shell=true (removes security warning)
   const child = spawn(command, args, { stdio: ["inherit", "pipe", "pipe"] });
 
   let stdout = "";
   let stderr = "";
 
+  // ✅ Still show live output (like normal terminal)
   child.stdout.on("data", (d) => {
     const text = d.toString();
     stdout += text;
@@ -75,76 +81,91 @@ export async function runCommand(cmdArgs, options) {
     process.stderr.write(text);
   });
 
-  // ✅ Handle "command not found"
+  // ✅ Command not found
   child.on("error", async (err) => {
     if (handled) return;
     handled = true;
 
-    if (err.code === "ENOENT") {
-      console.log(chalk.red(`\n❌ Command not found: ${command}\n`));
-      console.log(chalk.gray("Tip: Did you mean `kubectl`?\n"));
-
-      const { confirm } = await inquirer.prompt([
-        {
-          name: "confirm",
-          type: "confirm",
-          message: "Send this error to DevFix AI for a fix?",
-          default: true,
-        },
-      ]);
-
-      if (!confirm) {
-        console.log(chalk.yellow("\n❌ Not sent to AI.\n"));
-        process.exit(1);
-      }
+    const msg =
+      err.code === "ENOENT"
+        ? `Command not found: ${command}`
+        : `Failed to run: ${fullCmd}\n${err.message}`;
 
-      const errorText = `Command not found: ${command}\nTried to run: ${fullCmd}`;
-      const context = options.context ? collectContext() : {};
-      const stack = options.stack || detectStack(errorText);
-      const usedModel = options.model || "openai/gpt-4o-mini";
+    console.log(chalk.red(`\n❌ ${msg}\n`));
 
-      const spinner = ora("DevFix AI is analyzing...").start();
+    const { confirm } = await inquirer.prompt([
+      {
+        name: "confirm",
+        type: "confirm",
+        message: "Send to DevFix AI?",
+        default: true,
+      },
+    ]);
 
-      try {
-        const prompt = buildPrompt({
-          stack,
-          input: errorText,
-          context,
-        });
+    if (!confirm) {
+      console.log(chalk.yellow("\n❌ Not sent.\n"));
+      process.exit(1);
+    }
+
+    const errorBundle = `
+Command: ${fullCmd}
+
+Error:
+${msg}
+`.trim();
 
-        const answer = await askAI({
-          apiKey,
-          model: usedModel,
-          prompt,
-        });
+    const context = options.context ? collectContext() : {};
+    const stack = options.stack || detectStack(errorBundle);
+    const usedModel = options.model || "openai/gpt-4o-mini";
 
-        spinner.succeed("Analysis complete");
+    const spinner = ora("DevFix AI is analyzing...").start();
 
+    try {
+      const prompt = buildPrompt({
+        stack,
+        input: errorBundle,
+        context,
+      });
+
+      const answerRaw = await askAI({
+        apiKey,
+        model: usedModel,
+        prompt,
+      });
+
+      spinner.succeed("Done");
+
+      const answer = cleanAIText(answerRaw);
+      const mainCmd = extractFirstCodeBlock(answer);
+
+      if (mainCmd) {
         console.log(
-          boxen(chalk.bold.green("✅ DevFix Suggested Fix"), {
-            padding: 1,
-            borderStyle: "round",
-          })
+          "\n" +
+            boxen(`${chalk.bold.green("Main Fix (copy-paste)")}\n\n${chalk.cyan(mainCmd)}`, {
+              padding: 1,
+              borderStyle: "round",
+            }) +
+            "\n"
         );
-
-        console.log(marked(answer));
-        console.log();
-      } catch (e) {
-        spinner.fail("AI request failed");
-        console.log(chalk.red("\n❌ Error:\n"));
-        console.log(e?.response?.data || e.message);
-        console.log();
       }
 
-      process.exit(1);
+      console.log(
+        boxen(`${chalk.bold.white("Explanation")}\n\n${answer}`, {
+          padding: 1,
+          borderStyle: "round",
+        }) + "\n"
+      );
+    } catch (e) {
+      spinner.fail("AI request failed");
+      console.log(chalk.red("\n❌ Error:\n"));
+      console.log(e?.response?.data || e.message);
+      console.log();
     }
 
-    console.log(chalk.red("\n❌ Failed to run command:\n"));
-    console.log(err.message);
     process.exit(1);
   });
 
-  // ✅ Handle normal command exit
+  // ✅ Normal close
   child.on("close", async (code) => {
     if (handled) return;
     handled = true;
@@ -154,36 +175,22 @@ export async function runCommand(cmdArgs, options) {
       return;
     }
 
+    // ⚠️ We do NOT print captured error again (already shown above)
     const errorText = (stderr || stdout || "").trim();
 
     console.log(chalk.red(`\n❌ Command failed (exit code: ${code}).\n`));
 
-    if (!errorText) {
-      console.log(chalk.red("No error output captured.\n"));
-      return;
-    }
-
-    console.log(
-      boxen(chalk.bold.red("⚠️ Captured Error"), {
-        padding: 1,
-        borderStyle: "round",
-      })
-    );
-
-    console.log(chalk.red(errorText.slice(0, 1200)));
-    if (errorText.length > 1200) console.log(chalk.gray("\n...trimmed...\n"));
-
     const { confirm } = await inquirer.prompt([
       {
         name: "confirm",
         type: "confirm",
-        message: "Send this error to DevFix AI for a fix?",
+        message: "Send this error to DevFix AI?",
         default: true,
       },
     ]);
 
     if (!confirm) {
-      console.log(chalk.yellow("\n❌ Not sent to AI.\n"));
+      console.log(chalk.yellow("\n❌ Not sent.\n"));
       return;
     }
 
@@ -192,25 +199,13 @@ export async function runCommand(cmdArgs, options) {
     const usedModel = options.model || "openai/gpt-4o-mini";
 
     const errorBundle = `
-Command:
-${fullCmd}
-
-Exit Code:
-${code}
+Command: ${fullCmd}
+Exit Code: ${code}
 
 Error Output:
 ${errorText}
 `.trim();
 
-    console.log(
-      boxen(
-        `${chalk.bold.white("Stack:")} ${chalk.cyan(stack)}\n${chalk.bold.white("Model:")} ${chalk.magenta(
-          usedModel
-        )}`,
-        { padding: 1, borderStyle: "round" }
-      )
-    );
-
     const spinner = ora("DevFix AI is analyzing...").start();
 
     try {
@@ -220,28 +215,38 @@ ${errorText}
         context,
       });
 
-      const answer = await askAI({
+      const answerRaw = await askAI({
         apiKey,
         model: usedModel,
         prompt,
       });
 
-      spinner.succeed("Analysis complete");
+      spinner.succeed("Done");
+
+      const answer = cleanAIText(answerRaw);
+      const mainCmd = extractFirstCodeBlock(answer);
+
+      if (mainCmd) {
+        console.log(
+          "\n" +
+            boxen(`${chalk.bold.green("Main Fix (copy-paste)")}\n\n${chalk.cyan(mainCmd)}`, {
+              padding: 1,
+              borderStyle: "round",
+            }) +
+            "\n"
+        );
+      }
 
       console.log(
-        boxen(chalk.bold.green("✅ DevFix Suggested Fix"), {
+        boxen(`${chalk.bold.white("Explanation")}\n\n${answer}`, {
           padding: 1,
           borderStyle: "round",
-        })
+        }) + "\n"
       );
-
-      console.log(marked(answer));
-      console.log();
-    } catch (err) {
+    } catch (e) {
       spinner.fail("AI request failed");
-
       console.log(chalk.red("\n❌ Error:\n"));
-      console.log(err?.response?.data || err.message);
+      console.log(e?.response?.data || e.message);
       console.log();
     }
   });