wattetheria 0.1.1 → 0.1.2

package/.env.release.example

@@ -1,9 +1,9 @@
 # Coordinated release image set
-WATTETHERIA_KERNEL_IMAGE=ghcr.io/wattetheria/wattetheria-kernel:0.1.0
-WATTETHERIA_OBSERVATORY_IMAGE=ghcr.io/wattetheria/wattetheria-observatory:0.1.0
-WATTSWARM_KERNEL_IMAGE=ghcr.io/wattetheria/wattswarm-kernel:0.1.0
-WATTSWARM_RUNTIME_IMAGE=ghcr.io/wattetheria/wattswarm-runtime:0.1.0
-WATTSWARM_WORKER_IMAGE=ghcr.io/wattetheria/wattswarm-worker:0.1.0
+WATTETHERIA_KERNEL_IMAGE=ghcr.io/wattetheria/wattetheria-kernel:1.0.0
+WATTETHERIA_OBSERVATORY_IMAGE=ghcr.io/wattetheria/wattetheria-observatory:1.0.0
+WATTSWARM_KERNEL_IMAGE=ghcr.io/wattetheria/wattswarm-kernel:1.0.0
+WATTSWARM_RUNTIME_IMAGE=ghcr.io/wattetheria/wattswarm-runtime:1.0.0
+WATTSWARM_WORKER_IMAGE=ghcr.io/wattetheria/wattswarm-worker:1.0.0
 
 # Host bindings
 WATTETHERIA_CONTROL_PLANE_BIND_HOST=127.0.0.1

package/lib/cli.js

@@ -7,6 +7,7 @@ const { createInterface } = require("node:readline/promises");
 
 const PACKAGE_ROOT = path.resolve(__dirname, "..");
 const PACKAGE_JSON = require(path.join(PACKAGE_ROOT, "package.json"));
+const RELEASE_ENV_TEMPLATE = path.join(PACKAGE_ROOT, ".env.release.example");
 const DEFAULT_DEPLOY_DIR = path.join(os.homedir(), ".wattetheria", "deploy");
 const DEFAULT_PROJECT_NAME = "wattetheria";
 const DEFAULT_COMMAND = "install";
@@ -22,6 +23,10 @@ const DOCKER_INSTALL_URLS = {
   win32: "https://www.docker.com/products/docker-desktop/",
   linux: "https://docs.docker.com/engine/install/"
 };
+const WINDOWS_DOCKER_CANDIDATES = [
+  "C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker.exe",
+  "C:\\Program Files\\Docker\\cli-plugins\\docker.exe"
+];
 
 function printHelp() {
   console.log(`Wattetheria CLI ${PACKAGE_JSON.version}
@@ -60,7 +65,7 @@ function parseArgs(argv) {
       options: {
         dir: DEFAULT_DEPLOY_DIR,
         projectName: DEFAULT_PROJECT_NAME,
-        tag: PACKAGE_JSON.version,
+        tag: null,
         force: false,
         healthChecks: true,
         volumes: false,
@@ -80,7 +85,7 @@ function parseArgs(argv) {
   const options = {
     dir: DEFAULT_DEPLOY_DIR,
     projectName: DEFAULT_PROJECT_NAME,
-    tag: PACKAGE_JSON.version,
+    tag: null,
     force: false,
     healthChecks: true,
     volumes: false,
@@ -131,6 +136,23 @@ function getDockerInstallUrl() {
   return DOCKER_INSTALL_URLS[process.platform] || DOCKER_INSTALL_URLS.linux;
 }
 
+function getDockerCandidates() {
+  if (process.platform === "win32") {
+    return ["docker", ...WINDOWS_DOCKER_CANDIDATES];
+  }
+  return ["docker"];
+}
+
+function resolveDockerCommand() {
+  for (const candidate of getDockerCandidates()) {
+    const result = spawnSync(candidate, ["--version"], { stdio: "ignore" });
+    if (!result.error && result.status === 0) {
+      return candidate;
+    }
+  }
+  return "";
+}
+
 function getGitRevision() {
   if (typeof PACKAGE_JSON.gitHead === "string" && PACKAGE_JSON.gitHead.trim()) {
     return PACKAGE_JSON.gitHead.trim();
@@ -147,12 +169,40 @@ function getGitRevision() {
   return (result.stdout || "").trim();
 }
 
+function extractImageTag(imageRef) {
+  if (!imageRef) {
+    return "";
+  }
+  const lastColon = imageRef.lastIndexOf(":");
+  const lastSlash = imageRef.lastIndexOf("/");
+  if (lastColon <= lastSlash) {
+    return "";
+  }
+  return imageRef.slice(lastColon + 1).trim();
+}
+
+function getDefaultReleaseVersion() {
+  try {
+    const envMap = readEnvFile(RELEASE_ENV_TEMPLATE);
+    const tags = IMAGE_KEYS
+      .map((key) => extractImageTag(envMap.get(key)))
+      .filter(Boolean);
+    if (tags.length === IMAGE_KEYS.length && new Set(tags).size === 1) {
+      return tags[0];
+    }
+  } catch (error) {
+    // fall through to package version
+  }
+  return PACKAGE_JSON.version;
+}
+
 function formatVersionString() {
   const revision = getGitRevision();
+  const releaseVersion = getDefaultReleaseVersion();
   if (revision) {
-    return `Wattetheria ${PACKAGE_JSON.version} (${revision})`;
+    return `Wattetheria ${releaseVersion} (${revision})`;
   }
-  return `Wattetheria ${PACKAGE_JSON.version}`;
+  return `Wattetheria ${releaseVersion}`;
 }
 
 function formatBanner() {
@@ -163,15 +213,27 @@ function formatDockerStatusMessage(status) {
   const installUrl = status.installUrl || getDockerInstallUrl();
   switch (status.code) {
     case "missing-docker":
+      if (process.platform === "linux") {
+        return [
+          "Docker runtime not found.",
+          "Install Docker Engine or another Docker-compatible runtime, then run the command again.",
+          `Install guide: ${installUrl}`
+        ].join("\n");
+      }
       return [
         "Docker runtime not found.",
         "Install Docker Desktop or another Docker-compatible runtime, then run the command again.",
+        process.platform === "win32"
+          ? "If you just installed Docker Desktop, open a new PowerShell window and retry."
+          : "",
         `Download: ${installUrl}`
-      ].join("\n");
+      ].filter(Boolean).join("\n");
     case "missing-compose":
       return [
         "Docker Compose v2 is required.",
-        "Install or upgrade Docker Desktop so `docker compose` is available.",
+        process.platform === "linux"
+          ? "Install or upgrade Docker Engine/Compose so `docker compose` is available."
+          : "Install or upgrade Docker Desktop so `docker compose` is available.",
         `Help: ${installUrl}`
       ].join("\n");
     case "daemon-unreachable":
@@ -186,8 +248,8 @@ function formatDockerStatusMessage(status) {
 
 function getDockerStatus() {
   const installUrl = getDockerInstallUrl();
-  const docker = spawnSync("docker", ["--version"], { stdio: "ignore" });
-  if (docker.error || docker.status !== 0) {
+  const dockerCommand = resolveDockerCommand();
+  if (!dockerCommand) {
     return {
       ready: false,
       code: "missing-docker",
@@ -195,28 +257,31 @@ function getDockerStatus() {
     };
   }
 
-  const compose = spawnSync("docker", ["compose", "version"], {
+  const compose = spawnSync(dockerCommand, ["compose", "version"], {
     stdio: "ignore"
   });
   if (compose.error || compose.status !== 0) {
     return {
       ready: false,
       code: "missing-compose",
-      installUrl
+      installUrl,
+      dockerCommand
     };
   }
 
-  const info = spawnSync("docker", ["info"], { stdio: "ignore" });
+  const info = spawnSync(dockerCommand, ["info"], { stdio: "ignore" });
   if (info.error || info.status !== 0) {
     return {
       ready: false,
       code: "daemon-unreachable",
-      installUrl
+      installUrl,
+      dockerCommand
     };
   }
 
   return {
-    ready: true
+    ready: true,
+    dockerCommand
   };
 }
 
@@ -255,7 +320,7 @@ async function promptForDockerSetup(status) {
       console.log("Wattetheria needs Docker before it can install the local stack.");
       console.log(formatDockerStatusMessage(status));
       console.log("");
-      console.log("1. Open Docker install page");
+      console.log("1. Open runtime install guide");
       console.log("2. Retry Docker check");
       console.log("3. Cancel");
 
@@ -283,7 +348,7 @@ async function ensureDockerAvailable(options = {}) {
   while (true) {
     const status = getDockerStatus();
     if (status.ready) {
-      return;
+      return status;
     }
     if (!interactive || !isInteractiveTerminal()) {
       throw new Error(formatDockerStatusMessage(status));
@@ -383,8 +448,9 @@ function randomPassword() {
 }
 
 function runCompose(options, args, capture = false) {
+  const dockerCommand = resolveDockerCommand() || "docker";
   const result = spawnSync(
-    "docker",
+    dockerCommand,
     [
       "compose",
       "--project-name",
@@ -404,6 +470,16 @@ function runCompose(options, args, capture = false) {
     throw result.error;
   }
   if (result.status !== 0) {
+    const stderr = capture ? (result.stderr || "").trim() : "";
+    if (stderr.includes("failed to resolve reference") && stderr.includes(": not found")) {
+      throw new Error(
+        [
+          "One or more release images were not found in the container registry.",
+          "This usually means the requested image tag has not been published yet.",
+          "Publish the matching GHCR images first, or run the command with --tag <published-tag>."
+        ].join("\n")
+      );
+    }
     if (capture && result.stderr) {
       throw new Error(result.stderr.trim() || `docker compose ${args.join(" ")} failed`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Wattetheria deployment CLI",
   "license": "Apache-2.0",
   "type": "commonjs",