komodo-cli 2.2.0 → 2.3.0

package/dist/index.js

@@ -9,7 +9,10 @@ import {
   analyzeRepoStructure,
   buildDependencyTree,
   detectConflicts,
+  detectRealConflicts,
+  diagnoseEnvironment,
   diffPackages,
+  executeRepair,
   explainPackage,
   formatDiff,
   formatDoctorReport,
@@ -24,10 +27,11 @@ import {
   getTemplateById,
   loadState,
   parseGitHubUrl,
+  resolveConflicts,
   runDoctor,
   searchTemplates,
   visualizeTree
-} from "./chunk-AR6QW5FH.js";
+} from "./chunk-G2KKBIAH.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -173,7 +177,7 @@ async function startInteractiveMode(projectPath) {
   const hardware = komodo.getHardware();
   console.log(chalk.hex("#b4ffb4").dim(`  ${formatOs(hardware.os)} \xB7 ${formatGpu(hardware)} \xB7 ${hardware.totalMemoryGb}GB memory`));
   console.log();
-  console.log(chalk.hex("#96ff96").dim("  Commands: ") + chalk.hex("#d2ffd2")("doctor") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("optimize") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("tree") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("templates") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("explain"));
+  console.log(chalk.hex("#96ff96").dim("  Commands: ") + chalk.hex("#d2ffd2")("fix") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("conflicts") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("doctor") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("optimize") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("tree"));
   console.log(chalk.hex("#96ff96").dim("            ") + chalk.hex("#d2ffd2")("undo") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("list") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("check") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("ask") + chalk.dim(" \xB7 ") + chalk.hex("#d2ffd2")("exit"));
   console.log(chalk.dim("  Or just ask anything in natural language!"));
   console.log();
@@ -239,6 +243,17 @@ async function startInteractiveMode(projectPath) {
         prompt();
         return;
       }
+      if (trimmed === "fix" || trimmed === "repair" || trimmed.includes("broken") || trimmed.includes("nothing works") || trimmed.includes("everything is broken") || trimmed.includes("help me fix")) {
+        await handleFix(projectPath);
+        await updateChatContext(projectPath);
+        prompt();
+        return;
+      }
+      if (trimmed === "conflicts" || trimmed.includes("check conflicts") || trimmed.includes("find conflicts")) {
+        await handleConflicts(projectPath);
+        prompt();
+        return;
+      }
       if (trimmed === "list" || trimmed === "ls") {
         await handleList(projectPath);
         prompt();
@@ -502,6 +517,135 @@ async function handleCheck(projectPath) {
   }
   console.log();
 }
+async function handleFix(projectPath) {
+  const spinner = ora(chalk.hex("#b4ffb4")("Scanning your project...")).start();
+  const state = await loadState(projectPath);
+  let runtime;
+  if (state.activeEnvironmentId) {
+    const env = state.environments.find((e) => e.id === state.activeEnvironmentId);
+    runtime = env?.runtime;
+  }
+  const diagnosis = await diagnoseEnvironment(projectPath, runtime);
+  spinner.stop();
+  console.log();
+  if (diagnosis.status === "healthy") {
+    console.log(chalk.hex("#5aff5a")("  \u2713 Everything looks good!"));
+    console.log(chalk.dim("    No issues found with your environment."));
+    console.log();
+    return;
+  }
+  console.log(chalk.hex("#ffb347")(`  Found ${diagnosis.problems.length} issue${diagnosis.problems.length > 1 ? "s" : ""}:`));
+  console.log();
+  diagnosis.problems.slice(0, 3).forEach((problem) => {
+    const icon = problem.severity === "critical" ? chalk.red("\u2717") : problem.severity === "warning" ? chalk.yellow("\u26A0") : chalk.blue("\u2139");
+    console.log(`    ${icon} ${problem.friendlyTitle}`);
+    console.log(chalk.dim(`      ${problem.description}`));
+  });
+  if (diagnosis.problems.length > 3) {
+    console.log(chalk.dim(`    ...and ${diagnosis.problems.length - 3} more`));
+  }
+  console.log();
+  if (diagnosis.repairPlan.length === 0) {
+    console.log(chalk.dim("  No automatic fixes available. Try creating a new environment."));
+    console.log();
+    return;
+  }
+  console.log(chalk.hex("#b4ffb4")(`  Fixing ${diagnosis.repairPlan.length} issue${diagnosis.repairPlan.length > 1 ? "s" : ""}...`));
+  console.log();
+  const repairSpinner = ora().start();
+  const result = await executeRepair(projectPath, diagnosis, {
+    autoBackup: true,
+    dryRun: false,
+    onProgress: (step, status) => {
+      if (status === "starting") {
+        repairSpinner.text = chalk.hex("#b4ffb4")(step.friendlyDescription);
+      } else if (status === "complete") {
+        repairSpinner.succeed(chalk.hex("#5aff5a")(step.friendlyDescription));
+        repairSpinner.start();
+      } else if (status === "failed") {
+        repairSpinner.fail(chalk.red(step.friendlyDescription));
+        repairSpinner.start();
+      }
+    }
+  });
+  if (repairSpinner.isSpinning) {
+    repairSpinner.stop();
+  }
+  console.log();
+  if (result.success) {
+    console.log(chalk.hex("#5aff5a")(`  \u2713 All fixed! Resolved ${result.problemsFixed.length} issue${result.problemsFixed.length > 1 ? "s" : ""}.`));
+  } else {
+    console.log(chalk.yellow(`  \u26A0 Partially fixed. Resolved ${result.stepsCompleted}/${result.stepsTotal} issues.`));
+  }
+  console.log();
+}
+async function handleConflicts(projectPath) {
+  const spinner = ora(chalk.hex("#b4ffb4")("Checking for conflicts...")).start();
+  const state = await loadState(projectPath);
+  let runtime;
+  if (state.activeEnvironmentId) {
+    const env = state.environments.find((e) => e.id === state.activeEnvironmentId);
+    runtime = env?.runtime;
+  }
+  if (!runtime) {
+    spinner.fail("No environment found");
+    console.log();
+    return;
+  }
+  const conflicts = await detectRealConflicts(projectPath, runtime);
+  spinner.stop();
+  console.log();
+  if (conflicts.length === 0) {
+    console.log(chalk.hex("#5aff5a")("  \u2713 No conflicts found!"));
+    console.log(chalk.dim("    All packages are compatible."));
+    console.log();
+    return;
+  }
+  console.log(chalk.yellow(`  Found ${conflicts.length} conflict${conflicts.length > 1 ? "s" : ""}:`));
+  console.log();
+  conflicts.slice(0, 3).forEach((conflict) => {
+    const icon = conflict.severity === "error" ? chalk.red("\u2717") : chalk.yellow("\u26A0");
+    console.log(`    ${icon} ${conflict.package1} \u2194 ${conflict.package2}`);
+    console.log(chalk.dim(`      ${conflict.reason}`));
+    if (conflict.suggestion) {
+      console.log(chalk.hex("#87cefa")(`      \u{1F4A1} ${conflict.suggestion}`));
+    }
+  });
+  if (conflicts.length > 3) {
+    console.log(chalk.dim(`    ...and ${conflicts.length - 3} more`));
+  }
+  console.log();
+  console.log(chalk.hex("#b4ffb4")("  Attempting to resolve..."));
+  console.log();
+  const resolveSpinner = ora().start();
+  const result = await resolveConflicts(
+    projectPath,
+    runtime,
+    conflicts,
+    (message) => {
+      resolveSpinner.text = chalk.hex("#b4ffb4")(message);
+    }
+  );
+  if (resolveSpinner.isSpinning) {
+    resolveSpinner.stop();
+  }
+  console.log();
+  if (result.success) {
+    console.log(chalk.hex("#5aff5a")("  \u2713 All conflicts resolved!"));
+    result.resolved.forEach((r) => console.log(chalk.dim(`    \u2022 ${r}`)));
+  } else {
+    if (result.resolved.length > 0) {
+      console.log(chalk.hex("#5aff5a")("  Resolved:"));
+      result.resolved.forEach((r) => console.log(chalk.dim(`    \u2022 ${r}`)));
+      console.log();
+    }
+    console.log(chalk.yellow("  Cannot auto-resolve:"));
+    result.remaining.slice(0, 3).forEach(
+      (c) => console.log(chalk.dim(`    \u2022 ${c.package1} \u2194 ${c.package2}`))
+    );
+  }
+  console.log();
+}
 async function handleHistory(projectPath) {
   const snapshots = await komodo.listSnapshots(projectPath);
   console.log();
@@ -725,7 +869,7 @@ async function handleUI(projectPath) {
   console.log();
   console.log(chalk.hex("#b4ffb4").dim("  Starting dashboard..."));
   try {
-    const { startServer } = await import("./server-LCQG53IY.js");
+    const { startServer } = await import("./server-YR5YMDJ7.js");
     await startServer(projectPath, port);
     console.log(chalk.hex("#5aff5a")(`  \u2713 Dashboard ready at ${chalk.bold(url)}`));
     console.log();
@@ -864,6 +1008,188 @@ program.command("undo").description("Undo your last change").option("-p, --path
     process.exit(1);
   }
 });
+program.command("fix").alias("repair").description("Fix a broken environment").option("-p, --path <path>", "Project folder", process.cwd()).option("--dry-run", "Show what would be fixed without making changes").action(async (options) => {
+  console.log();
+  console.log(chalk.bold("\u{1F98E} Komodo Fix"));
+  console.log();
+  const spinner = ora("Scanning your project...").start();
+  const state = await loadState(options.path);
+  let runtime;
+  if (state.activeEnvironmentId) {
+    const env = state.environments.find((e) => e.id === state.activeEnvironmentId);
+    runtime = env?.runtime;
+  }
+  const diagnosis = await diagnoseEnvironment(options.path, runtime);
+  spinner.stop();
+  if (diagnosis.status === "healthy") {
+    console.log(chalk.green("  \u2713 Everything looks good!"));
+    console.log();
+    console.log(chalk.dim("  No issues found with your environment."));
+    console.log();
+    return;
+  }
+  console.log(chalk.bold(`  Found ${diagnosis.problems.length} issue${diagnosis.problems.length > 1 ? "s" : ""}:`));
+  console.log();
+  diagnosis.problems.forEach((problem) => {
+    const icon = problem.severity === "critical" ? "\u2717" : problem.severity === "warning" ? "\u26A0" : "\u2139";
+    const color = problem.severity === "critical" ? chalk.red : problem.severity === "warning" ? chalk.yellow : chalk.blue;
+    console.log(color(`    ${icon}  ${problem.friendlyTitle}`));
+    console.log(chalk.dim(`       ${problem.description}`));
+    console.log();
+  });
+  if (diagnosis.repairPlan.length === 0) {
+    console.log(chalk.yellow("  No automatic fixes available."));
+    console.log();
+    console.log(chalk.dim("  Try:"));
+    console.log(chalk.dim("    \u2022 Check the technical details above"));
+    console.log(chalk.dim("    \u2022 Create a new environment: komodo <your-intent>"));
+    console.log();
+    return;
+  }
+  if (options.dryRun) {
+    console.log(chalk.cyan("  Would fix:"));
+    console.log();
+    diagnosis.repairPlan.forEach((step, i) => {
+      console.log(chalk.dim(`    ${i + 1}. ${step.friendlyDescription}`));
+    });
+    console.log();
+    console.log(chalk.dim(`  Estimated time: ${diagnosis.estimatedTime}`));
+    console.log();
+    console.log(chalk.cyan("  Run without --dry-run to apply these fixes."));
+    console.log();
+    return;
+  }
+  console.log(chalk.bold(`  Fix all ${diagnosis.problems.length} issue${diagnosis.problems.length > 1 ? "s" : ""}?`));
+  console.log(chalk.dim(`  Estimated time: ${diagnosis.estimatedTime}`));
+  console.log();
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const answer = await new Promise((resolve) => {
+    rl.question(chalk.dim("  Continue? (Y/n) "), resolve);
+  });
+  rl.close();
+  if (answer.toLowerCase() === "n" || answer.toLowerCase() === "no") {
+    console.log();
+    console.log(chalk.dim("  Cancelled."));
+    console.log();
+    return;
+  }
+  console.log();
+  const repairSpinner = ora().start();
+  const result = await executeRepair(options.path, diagnosis, {
+    autoBackup: true,
+    dryRun: false,
+    onProgress: (step, status) => {
+      if (status === "starting") {
+        repairSpinner.text = step.friendlyDescription;
+      } else if (status === "complete") {
+        repairSpinner.succeed(step.friendlyDescription);
+        repairSpinner.start();
+      } else if (status === "failed") {
+        repairSpinner.fail(step.friendlyDescription);
+        repairSpinner.start();
+      }
+    }
+  });
+  if (repairSpinner.isSpinning) {
+    repairSpinner.stop();
+  }
+  console.log();
+  if (result.success) {
+    console.log(
+      boxen(
+        chalk.green("All fixed!") + "\n\n" + chalk.dim(`Fixed ${result.problemsFixed.length} issue${result.problemsFixed.length > 1 ? "s" : ""}.`) + "\n\n" + chalk.dim("Changed your mind? Run: ") + chalk.white("komodo undo"),
+        { padding: 1, borderStyle: "round", borderColor: "green" }
+      )
+    );
+  } else {
+    console.log(
+      boxen(
+        chalk.yellow("Partially fixed") + "\n\n" + chalk.dim(`Fixed ${result.stepsCompleted}/${result.stepsTotal} issues.`) + (result.problemsRemaining.length > 0 ? "\n\n" + chalk.dim("Remaining issues:") + "\n" + result.problemsRemaining.map((p) => chalk.dim(`  \u2022 ${p}`)).join("\n") : ""),
+        { padding: 1, borderStyle: "round", borderColor: "yellow" }
+      )
+    );
+  }
+  console.log();
+});
+program.command("conflicts").description("Find and fix package conflicts").option("-p, --path <path>", "Project folder", process.cwd()).option("--fix", "Automatically fix conflicts").action(async (options) => {
+  console.log();
+  console.log(chalk.bold("\u{1F98E} Conflict Check"));
+  console.log();
+  const spinner = ora("Checking for conflicts...").start();
+  const state = await loadState(options.path);
+  let runtime;
+  if (state.activeEnvironmentId) {
+    const env = state.environments.find((e) => e.id === state.activeEnvironmentId);
+    runtime = env?.runtime;
+  }
+  if (!runtime) {
+    spinner.fail("No environment found");
+    console.log();
+    console.log(chalk.dim("  No active environment detected."));
+    console.log();
+    return;
+  }
+  const conflicts = await detectRealConflicts(options.path, runtime);
+  spinner.stop();
+  if (conflicts.length === 0) {
+    console.log(chalk.green("  \u2713 No conflicts found!"));
+    console.log();
+    console.log(chalk.dim("  All packages are compatible."));
+    console.log();
+    return;
+  }
+  console.log(chalk.bold(`  Found ${conflicts.length} conflict${conflicts.length > 1 ? "s" : ""}:`));
+  console.log();
+  conflicts.forEach((conflict) => {
+    const icon = conflict.severity === "error" ? "\u2717" : "\u26A0";
+    const color = conflict.severity === "error" ? chalk.red : chalk.yellow;
+    console.log(color(`    ${icon}  ${conflict.package1} \u2194 ${conflict.package2}`));
+    console.log(chalk.dim(`       ${conflict.reason}`));
+    if (conflict.suggestion) {
+      console.log(chalk.dim(`       \u{1F4A1} ${conflict.suggestion}`));
+    }
+    console.log();
+  });
+  if (!options.fix) {
+    console.log(chalk.dim("  Run with --fix to automatically resolve conflicts."));
+    console.log();
+    return;
+  }
+  console.log(chalk.bold("  Attempting to resolve..."));
+  console.log();
+  const resolveSpinner = ora().start();
+  const result = await resolveConflicts(
+    options.path,
+    runtime,
+    conflicts,
+    (message) => {
+      resolveSpinner.text = message;
+    }
+  );
+  if (resolveSpinner.isSpinning) {
+    resolveSpinner.stop();
+  }
+  console.log();
+  if (result.success) {
+    console.log(
+      boxen(
+        chalk.green("All conflicts resolved!") + "\n\n" + result.resolved.map((r) => chalk.dim(`  \u2713 ${r}`)).join("\n"),
+        { padding: 1, borderStyle: "round", borderColor: "green" }
+      )
+    );
+  } else {
+    console.log(
+      boxen(
+        chalk.yellow("Some conflicts resolved") + "\n\n" + (result.resolved.length > 0 ? chalk.dim("Resolved:") + "\n" + result.resolved.map((r) => chalk.dim(`  \u2713 ${r}`)).join("\n") + "\n\n" : "") + chalk.dim("Cannot auto-resolve:") + "\n" + result.remaining.map((c) => chalk.dim(`  \u2022 ${c.package1} \u2194 ${c.package2}`)).join("\n") + "\n\n" + chalk.dim("These require manual intervention or separate environments."),
+        { padding: 1, borderStyle: "round", borderColor: "yellow" }
+      )
+    );
+  }
+  console.log();
+});
 program.command("ui").description("Open the visual dashboard").option("-p, --path <path>", "Project folder", process.cwd()).option("--port <port>", "Port number", "3333").action(async (options) => {
   console.log();
   console.log(chalk.bold("\u{1F98E} Komodo"));
@@ -872,7 +1198,7 @@ program.command("ui").description("Open the visual dashboard").option("-p, --pat
   const url = `http://localhost:${port}`;
   console.log(chalk.dim("  Starting dashboard..."));
   try {
-    const { startServer } = await import("./server-LCQG53IY.js");
+    const { startServer } = await import("./server-YR5YMDJ7.js");
     await startServer(options.path, port);
     console.log();
     console.log(chalk.green(`  \u2713 Dashboard ready at ${chalk.bold(url)}`));

package/dist/{server-LCQG53IY.js → server-YR5YMDJ7.js}

@@ -7,7 +7,7 @@ import {
   detectConflicts,
   getInstalledPackages,
   loadState
-} from "./chunk-AR6QW5FH.js";
+} from "./chunk-G2KKBIAH.js";
 
 // ../../node_modules/.pnpm/reusify@1.1.0/node_modules/reusify/reusify.js
 var require_reusify = __commonJS({

package/package.json

@@ -1,12 +1,19 @@
 {
   "name": "komodo-cli",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "The simple way to set up your project. Just say what you want to build.",
   "type": "module",
   "bin": {
     "komodo": "./dist/index.js"
   },
   "main": "./dist/index.js",
+  "scripts": {
+    "build": "tsup && chmod +x dist/index.js",
+    "dev": "tsup src/index.ts --format esm --watch",
+    "typecheck": "tsc --noEmit",
+    "clean": "rm -rf dist",
+    "prepublishOnly": "pnpm build"
+  },
   "files": [
     "dist"
   ],
@@ -35,13 +42,7 @@
     "cross-spawn": "^7.0.6"
   },
   "devDependencies": {
-    "@komodo/core": "0.1.0",
-    "@komodo/ui": "0.1.0"
-  },
-  "scripts": {
-    "build": "tsup && chmod +x dist/index.js",
-    "dev": "tsup src/index.ts --format esm --watch",
-    "typecheck": "tsc --noEmit",
-    "clean": "rm -rf dist"
+    "@komodo/core": "workspace:*",
+    "@komodo/ui": "workspace:*"
   }
-}
+}