wattetheria 0.4.2 → 0.4.3

package/lib/cli.js

@@ -8,8 +8,10 @@ const readline = require("node:readline");
 
 const PACKAGE_ROOT = path.resolve(__dirname, "..");
 const PACKAGE_JSON = require(path.join(PACKAGE_ROOT, "package.json"));
+const WATTETHERIA_HOME_DIR = path.join(os.homedir(), ".wattetheria");
 const DEFAULT_DEPLOY_DIR = path.join(os.homedir(), ".wattetheria", "deploy");
 const DEFAULT_PROJECT_NAME = "wattetheria";
+const POSTGRES_VOLUME_SERVICE_NAME = "wattswarm_pg_data";
 const DEFAULT_COMMAND = "help";
 const RELEASE_ENV_TEMPLATE_PATH = path.join(PACKAGE_ROOT, ".env.release");
 const IMAGE_KEYS = [
@@ -85,7 +87,7 @@ Options:
   --force                Refresh deployment defaults and compose assets
   --no-health-checks     Skip HTTP health checks
   --volumes              With uninstall, remove named docker volumes
-  --purge                With uninstall, remove the deployment directory
+  --purge                With uninstall, remove ~/.wattetheria and PostgreSQL data
   --data-dir <path>      With mcp-proxy or doctor, override Wattetheria host state directory
   --control-plane <url>  With mcp-proxy or doctor, override local control-plane endpoint
 
@@ -955,6 +957,74 @@ function runCompose(options, args, capture = false) {
   return result;
 }
 
+function runDocker(args, capture = false) {
+  const dockerCommand = resolveDockerCommand() || "docker";
+  const result = spawnSync(dockerCommand, args, {
+    stdio: capture ? "pipe" : "inherit",
+    encoding: capture ? "utf8" : undefined
+  });
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    const stderr = capture ? (result.stderr || "").trim() : "";
+    throw new Error(stderr || `docker ${args.join(" ")} failed`);
+  }
+  return result;
+}
+
+function postgresVolumeName(options) {
+  return `${options.projectName}_${POSTGRES_VOLUME_SERVICE_NAME}`;
+}
+
+function dockerVolumeExists(volumeName) {
+  const dockerCommand = resolveDockerCommand() || "docker";
+  const result = spawnSync(dockerCommand, ["volume", "inspect", volumeName], {
+    stdio: "ignore"
+  });
+  return !result.error && result.status === 0;
+}
+
+function removeDockerVolumeIfExists(volumeName) {
+  if (!dockerVolumeExists(volumeName)) {
+    console.log(`PostgreSQL volume not found: ${volumeName}`);
+    return;
+  }
+  runDocker(["volume", "rm", volumeName]);
+  if (dockerVolumeExists(volumeName)) {
+    throw new Error(`PostgreSQL volume still exists after removal: ${volumeName}`);
+  }
+  console.log(`Removed PostgreSQL volume: ${volumeName}`);
+}
+
+function comparablePath(filePath) {
+  const resolved = path.resolve(filePath);
+  return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+}
+
+function pathIsInsideOrEqual(childPath, parentPath) {
+  const child = comparablePath(childPath);
+  const parent = comparablePath(parentPath);
+  const relative = path.relative(parent, child);
+  return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
+}
+
+function removeWattetheriaHomeDir() {
+  const homeDir = WATTETHERIA_HOME_DIR;
+  if (!fs.existsSync(homeDir)) {
+    console.log(`Wattetheria home directory not found: ${homeDir}`);
+    return;
+  }
+  if (pathIsInsideOrEqual(process.cwd(), homeDir)) {
+    process.chdir(os.homedir());
+  }
+  fs.rmSync(homeDir, { recursive: true, force: true });
+  if (fs.existsSync(homeDir)) {
+    throw new Error(`Wattetheria home directory still exists after removal: ${homeDir}`);
+  }
+  console.log(`Removed Wattetheria home directory: ${homeDir}`);
+}
+
 const RELEASE_SERVICES = [
   "kernel",
   "wattswarm-postgres",
@@ -1268,14 +1338,21 @@ async function stop(options) {
 
 async function uninstall(options) {
   await ensureDockerAvailable();
-  const args = ["down"];
-  if (options.volumes) {
-    args.push("-v");
-  }
-  runCompose(options, args);
-  if (options.purge && fs.existsSync(options.dir)) {
-    fs.rmSync(options.dir, { recursive: true, force: true });
-    console.log(`Removed deployment directory: ${options.dir}`);
+  const hasDeploymentFiles = fs.existsSync(composeFilePath(options)) && fs.existsSync(envFilePath(options));
+  if (hasDeploymentFiles) {
+    const args = ["down"];
+    if (options.purge) {
+      args.push("--remove-orphans");
+    } else if (options.volumes) {
+      args.push("-v");
+    }
+    runCompose(options, args);
+  } else {
+    console.log(`Deployment compose/env files not found in: ${options.dir}`);
+  }
+  if (options.purge) {
+    removeDockerVolumeIfExists(postgresVolumeName(options));
+    removeWattetheriaHomeDir();
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Wattetheria deployment CLI",
   "license": "AGPL-3.0-only",
   "type": "commonjs",