@arkhera30/cli 0.1.1 → 0.1.3

package/dist/index.js

@@ -8,7 +8,7 @@ import chalk10 from "chalk";
 import { Command } from "commander";
 import chalk from "chalk";
 import ora from "ora";
-import { input, confirm, number } from "@inquirer/prompts";
+import { input, confirm, number, select } from "@inquirer/prompts";
 
 // src/lib/config.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
@@ -212,7 +212,15 @@ function toResult(result) {
 }
 async function tryCommand(command, args) {
   try {
-    await execa(command, args, { reject: false });
+    const result = await execa(command, args, { reject: false });
+    return result.exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+async function commandExists(command) {
+  try {
+    await execa(command, ["--version"], { reject: false });
     return true;
   } catch {
     return false;
@@ -261,6 +269,9 @@ function createRuntime(name) {
     }
   };
 }
+async function checkRuntime(name) {
+  return tryCommand(name, ["compose", "version"]);
+}
 async function detectRuntime(preferred) {
   if (preferred) {
     const hasPreferred = await tryCommand(preferred, ["compose", "version"]);
@@ -276,6 +287,12 @@ async function detectRuntime(preferred) {
   if (hasPodman) {
     return createRuntime("podman");
   }
+  const podmanInstalled = await commandExists("podman");
+  if (podmanInstalled) {
+    throw new Error(
+      "Podman is installed but `podman compose` is not working.\n\nFix options:\n  1. Ensure your Podman machine is running:  podman machine start\n  2. Install podman-compose:                 pip3 install podman-compose\n  3. Upgrade Podman to v5+:                  brew upgrade podman\n"
+    );
+  }
   throw new Error(
     "No container runtime found.\n\nHorus requires Docker or Podman with the Compose plugin.\n\nInstall one of:\n  - Docker Desktop: https://www.docker.com/products/docker-desktop/\n  - Podman Desktop:  https://podman-desktop.io/\n"
   );
@@ -384,7 +401,7 @@ function installComposeFile() {
 }
 
 // src/commands/setup.ts
-var setupCommand = new Command("setup").description("Interactive first-run setup for Horus").option("-y, --yes", "Non-interactive mode (use defaults + env vars)").option("--data-dir <path>", "Data directory path").option("--repos-path <path>", "Host repos path for Forge scanning").action(async (opts) => {
+var setupCommand = new Command("setup").description("Interactive first-run setup for Horus").option("-y, --yes", "Non-interactive mode (use defaults + env vars)").option("--runtime <runtime>", "Container runtime to use: docker or podman (non-interactive only)").option("--data-dir <path>", "Data directory path").option("--repos-path <path>", "Host repos path for Forge scanning").action(async (opts) => {
   console.log("");
   console.log(chalk.bold("Horus Setup"));
   console.log(chalk.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
@@ -403,17 +420,46 @@ var setupCommand = new Command("setup").description("Interactive first-run setup
       }
     }
   }
-  const runtimeSpinner = ora("Detecting container runtime...").start();
-  let runtime;
-  try {
-    runtime = await detectRuntime();
-    runtimeSpinner.succeed(`Detected ${chalk.cyan(runtime.name)}`);
-  } catch (error) {
-    runtimeSpinner.fail("No container runtime found");
+  const checkSpinner = ora("Checking for container runtimes...").start();
+  const [hasDocker, hasPodman] = await Promise.all([
+    checkRuntime("docker"),
+    checkRuntime("podman")
+  ]);
+  checkSpinner.stop();
+  const available = [
+    ...hasDocker ? ["docker"] : [],
+    ...hasPodman ? ["podman"] : []
+  ];
+  if (available.length === 0) {
+    console.log(chalk.red("No container runtime found."));
     console.log("");
-    console.log(error.message);
+    console.log("Horus requires Docker or Podman with the Compose plugin.");
+    console.log("");
+    console.log("Install one of:");
+    console.log("  Docker Desktop: https://www.docker.com/products/docker-desktop/");
+    console.log("  Podman Desktop: https://podman-desktop.io/");
     process.exit(1);
   }
+  let selectedRuntime;
+  if (opts.yes) {
+    const requested = opts.runtime;
+    if (requested && !available.includes(requested)) {
+      console.log(chalk.red(`Requested runtime "${requested}" is not installed.`));
+      console.log(chalk.dim(`Available: ${available.join(", ")}`));
+      process.exit(1);
+    }
+    selectedRuntime = requested ?? available[0];
+    console.log(`Using ${chalk.cyan(selectedRuntime)}`);
+  } else {
+    selectedRuntime = await select({
+      message: "Which container runtime would you like to use?",
+      choices: available.map((r) => ({
+        value: r,
+        name: r === "docker" ? "Docker" : "Podman"
+      }))
+    });
+  }
+  const runtime = await detectRuntime(selectedRuntime);
   let config;
   if (opts.yes) {
     config = {
@@ -1013,7 +1059,7 @@ var connectCommand = new Command6("connect").description("Configure Claude/Curso
 import { Command as Command7 } from "commander";
 import chalk7 from "chalk";
 import ora6 from "ora";
-import { select, confirm as confirm3 } from "@inquirer/prompts";
+import { select as select2, confirm as confirm3 } from "@inquirer/prompts";
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync3, readdirSync, existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 import { createHash } from "crypto";
@@ -1110,7 +1156,7 @@ var updateCommand = new Command7("update").description("Update Horus to the late
         name: `${snapshot.timestamp}  (images: ${Object.keys(snapshot.images).length})`,
         value: i
       }));
-      const idx = await select({
+      const idx = await select2({
         message: "Select snapshot to restore:",
         choices
       });
@@ -1289,7 +1335,7 @@ function colorMessage(status, msg) {
       return chalk8.red(msg);
   }
 }
-async function checkRuntime() {
+async function checkRuntime2() {
   try {
     execSync("docker info", { stdio: "ignore" });
     return { status: "pass", label: "Runtime", message: "Docker is running" };
@@ -1477,7 +1523,7 @@ var doctorCommand = new Command8("doctor").description("Diagnose common Horus is
   console.log(chalk8.bold("Horus Doctor"));
   console.log(chalk8.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   const allResults = [];
-  allResults.push(await checkRuntime());
+  allResults.push(await checkRuntime2());
   allResults.push(await checkCompose());
   allResults.push(checkConfig());
   allResults.push(checkComposeFile());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkhera30/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "CLI for managing the Horus AI development stack",
   "type": "module",
   "bin": {
@@ -9,20 +9,22 @@
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts",
     "dev": "tsup src/index.ts --format esm --watch",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.0.0",
+    "chalk": "^5.0.0",
     "commander": "^12.0.0",
     "execa": "^8.0.0",
-    "chalk": "^5.0.0",
-    "yaml": "^2.0.0",
-    "ora": "^8.0.0"
+    "ora": "^8.0.0",
+    "yaml": "^2.0.0"
   },
   "devDependencies": {
-    "typescript": "^5.4.0",
+    "@types/node": "^20.0.0",
     "tsup": "^8.0.0",
-    "@types/node": "^20.0.0"
+    "typescript": "^5.4.0",
+    "vitest": "^4.0.18"
   },
   "engines": {
     "node": ">=18"