@atlashub/smartstack-cli 4.67.0 → 4.69.0

package/dist/index.js

@@ -112183,12 +112183,14 @@ var logger = {
       error: source_default.red
     };
     const color = colors12[type];
-    const maxLen = Math.max(...content.map((l) => l.length));
+    const stripAnsi3 = (s) => s.replace(/\x1B\[[0-9;]*m/g, "");
+    const maxLen = Math.max(...content.map((l) => stripAnsi3(l).length));
     const border = color("\u2500".repeat(maxLen + 4));
     console.log();
     console.log(border);
     content.forEach((line) => {
-      console.log(color("\u2502"), line.padEnd(maxLen), color("\u2502"));
+      const pad = maxLen - stripAnsi3(line).length;
+      console.log(color("\u2502"), line + " ".repeat(pad), color("\u2502"));
     });
     console.log(border);
     console.log();
@@ -127661,11 +127663,19 @@ var doctorCommand = new Command("doctor").description("Run diagnostics and check
     });
   } else if (containerEngine && !containerEngine.running) {
     const isPodman = containerEngine.name === "Podman";
+    const wslMissing = isPodman && process.platform === "win32" && (() => {
+      try {
+        return (0, import_child_process8.execSync)("wsl --status", { encoding: "utf-8", timeout: 5e3, stdio: "pipe" }) && false;
+      } catch {
+        return true;
+      }
+    })();
     diagnostics.push({
       name: "Container Engine",
       status: "warning",
-      message: `${containerEngine.name} installed but ${isPodman ? "machine" : "daemon"} not running`,
-      fix: isPodman ? "Run: podman machine init && podman machine start" : "Start Docker Desktop, or run: podman machine init && podman machine start"
+      message: wslMissing ? "Podman installed but WSL2 is missing" : `${containerEngine.name} installed but ${isPodman ? "machine" : "daemon"} not running`,
+      fix: wslMissing ? "Run as Admin: wsl --install, restart PC, then: podman machine init && podman machine start" : isPodman ? "Run: podman machine init && podman machine start" : "Start Docker Desktop, or run: podman machine init && podman machine start",
+      installCmd: wslMissing ? process.platform === "win32" ? "wsl --install" : void 0 : void 0
     });
   } else {
     diagnostics.push({
@@ -130196,11 +130206,29 @@ function detectEngine() {
     return podman;
   }
   if (podman.installed && !podman.running) {
-    logger.error("Podman is installed but the machine is not running.");
-    console.log();
-    console.log(`  Initialize and start the Podman machine:`);
-    console.log(`    ${source_default.cyan("podman machine init")}    (first time only)`);
-    console.log(`    ${source_default.cyan("podman machine start")}`);
+    const wslMissing = process.platform === "win32" && (() => {
+      try {
+        const r = (0, import_child_process12.spawnSync)("wsl", ["--status"], { encoding: "utf-8", shell: true, timeout: 5e3, stdio: "pipe" });
+        return r.status !== 0;
+      } catch {
+        return true;
+      }
+    })();
+    if (wslMissing) {
+      logger.error("WSL2 is required by Podman but is not installed.");
+      console.log();
+      console.log(`  Install WSL2 first (run as Administrator):`);
+      console.log(`    ${source_default.cyan("wsl --install")}`);
+      console.log(`  Restart your PC, then:`);
+      console.log(`    ${source_default.cyan("podman machine init")}`);
+      console.log(`    ${source_default.cyan("podman machine start")}`);
+    } else {
+      logger.error("Podman is installed but the machine is not running.");
+      console.log();
+      console.log(`  Initialize and start the Podman machine:`);
+      console.log(`    ${source_default.cyan("podman machine init")}    (first time only)`);
+      console.log(`    ${source_default.cyan("podman machine start")}`);
+    }
     if (docker.installed) {
       console.log();
       console.log(`  Or start Docker Desktop instead.`);
@@ -130247,15 +130275,64 @@ function requireComposeFile() {
   }
   return composePath;
 }
+function getPodmanEnv(engine) {
+  if (engine.name !== "podman") return {};
+  const dockerConfigPath = (0, import_path18.join)(process.env.USERPROFILE || process.env.HOME || "", ".docker", "config.json");
+  try {
+    if (import_fs_extra16.default.existsSync(dockerConfigPath)) {
+      const config = JSON.parse(import_fs_extra16.default.readFileSync(dockerConfigPath, "utf-8"));
+      if (config.credsStore === "desktop" || config.credsStore === "wincred") {
+        const cleanAuthPath = (0, import_path18.join)(process.env.TEMP || "/tmp", "podman-auth.json");
+        if (!import_fs_extra16.default.existsSync(cleanAuthPath)) {
+          import_fs_extra16.default.writeFileSync(cleanAuthPath, "{}", "utf-8");
+        }
+        return { REGISTRY_AUTH_FILE: cleanAuthPath };
+      }
+    }
+  } catch {
+  }
+  return {};
+}
 function runCompose(engine, composePath, args) {
+  const extraEnv = getPodmanEnv(engine);
+  if (Object.keys(extraEnv).length > 0) {
+    logger.info("Bypassing Docker Desktop credential store for Podman");
+  }
   const result = (0, import_child_process12.spawnSync)(engine.cmd, ["compose", "-f", composePath, ...args], {
     encoding: "utf-8",
     shell: true,
-    stdio: "inherit",
-    cwd: process.cwd()
+    stdio: "pipe",
+    cwd: process.cwd(),
+    env: { ...process.env, ...extraEnv }
   });
+  if (result.stdout) process.stdout.write(result.stdout);
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.status !== 0) {
+    const output = (result.stdout || "") + (result.stderr || "");
+    diagnoseError(engine, output);
+  }
   return result.status ?? 1;
 }
+function diagnoseError(engine, output) {
+  if (/no space left|disk full/i.test(output)) {
+    console.log();
+    logger.warning("Disk space error detected.");
+    console.log(`  Free up space with: ${source_default.cyan(`${engine.name} system prune -a`)}`);
+    console.log();
+  }
+  if (/could not resolve|network.*unreachable|timeout.*connect/i.test(output)) {
+    console.log();
+    logger.warning("Network error detected. Check your internet connection.");
+    console.log();
+  }
+  if (/unable to connect to Podman socket|podman machine init/i.test(output)) {
+    console.log();
+    logger.warning("Podman machine is not running.");
+    console.log(`    ${source_default.cyan("podman machine init")}    (first time only)`);
+    console.log(`    ${source_default.cyan("podman machine start")}`);
+    console.log();
+  }
+}
 var dockerCommand = new Command("docker").description("Build and run SmartStack Docker images (Docker or Podman)").addCommand(
   new Command("up").description("Build images and start containers").option("-d, --detach", "Run containers in the background").option("--no-build", "Skip image build, use existing images").action(async (options) => {
     const engine = requireEngine();