postgresai 0.14.0-dev.59 → 0.14.0-dev.61

package/bin/postgres-ai.ts

@@ -1104,7 +1104,7 @@ function checkRunningContainers(): { running: boolean; containers: string[] } {
 /**
  * Run docker compose command
  */
-async function runCompose(args: string[]): Promise<number> {
+async function runCompose(args: string[], grafanaPassword?: string): Promise<number> {
   let composeFile: string;
   let projectDir: string;
   try {
@@ -1130,21 +1130,28 @@ async function runCompose(args: string[]): Promise<number> {
     return 1;
   }
 
-  // Read Grafana password from .pgwatch-config and pass to Docker Compose
+  // Set Grafana password from parameter or .pgwatch-config
   const env = { ...process.env };
-  const cfgPath = path.resolve(projectDir, ".pgwatch-config");
-  if (fs.existsSync(cfgPath)) {
-    try {
-      const stats = fs.statSync(cfgPath);
-      if (!stats.isDirectory()) {
-        const content = fs.readFileSync(cfgPath, "utf8");
-        const match = content.match(/^grafana_password=([^\r\n]+)/m);
-        if (match) {
-          env.GF_SECURITY_ADMIN_PASSWORD = match[1].trim();
+  if (grafanaPassword) {
+    env.GF_SECURITY_ADMIN_PASSWORD = grafanaPassword;
+  } else {
+    const cfgPath = path.resolve(projectDir, ".pgwatch-config");
+    if (fs.existsSync(cfgPath)) {
+      try {
+        const stats = fs.statSync(cfgPath);
+        if (!stats.isDirectory()) {
+          const content = fs.readFileSync(cfgPath, "utf8");
+          const match = content.match(/^grafana_password=([^\r\n]+)/m);
+          if (match) {
+            env.GF_SECURITY_ADMIN_PASSWORD = match[1].trim();
+          }
+        }
+      } catch (err) {
+        // If we can't read the config, log warning and continue without setting the password
+        if (process.env.DEBUG) {
+          console.warn(`Warning: Could not read Grafana password from config: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
-    } catch (err) {
-      // If we can't read the config, continue without setting the password
     }
   }
 
@@ -1461,8 +1468,8 @@ mon
     }
 
     // Step 5: Start services
-    console.log(opts.demo ? "Step 5: Starting monitoring services..." : "Step 5: Starting monitoring services...");
-    const code2 = await runCompose(["up", "-d", "--force-recreate"]);
+    console.log("Step 5: Starting monitoring services...");
+    const code2 = await runCompose(["up", "-d", "--force-recreate"], grafanaPassword);
     if (code2 !== 0) {
       process.exitCode = code2;
       return;
@@ -1758,34 +1765,64 @@ mon
   });
 mon
   .command("clean")
-  .description("cleanup monitoring services artifacts")
-  .action(async () => {
-    console.log("Cleaning up Docker resources...\n");
+  .description("cleanup monitoring services artifacts (stops services and removes volumes)")
+  .option("--keep-volumes", "keep data volumes (only stop and remove containers)")
+  .action(async (options: { keepVolumes?: boolean }) => {
+    console.log("Cleaning up monitoring services...\n");
 
     try {
-      // Remove stopped containers
-      const { stdout: containers } = await execFilePromise("docker", ["ps", "-aq", "--filter", "status=exited"]);
-      if (containers.trim()) {
-        const containerIds = containers.trim().split('\n');
-        await execFilePromise("docker", ["rm", ...containerIds]);
-        console.log("✓ Removed stopped containers");
+      // First, use docker-compose down to properly stop and remove containers/volumes
+      const downArgs = options.keepVolumes ? ["down"] : ["down", "-v"];
+      console.log(options.keepVolumes
+        ? "Stopping and removing containers (keeping volumes)..."
+        : "Stopping and removing containers and volumes...");
+
+      const downCode = await runCompose(downArgs);
+      if (downCode === 0) {
+        console.log("✓ Monitoring services stopped and removed");
       } else {
-        console.log("✓ No stopped containers to remove");
+        console.log("⚠ Could not stop services (may not be running)");
+      }
+
+      // Remove orphaned volumes from previous installs with different project names
+      if (!options.keepVolumes) {
+        const volumePatterns = [
+          "monitoring_grafana_data",
+          "monitoring_postgres_ai_configs",
+          "monitoring_sink_postgres_data",
+          "monitoring_target_db_data",
+          "monitoring_victoria_metrics_data",
+          "postgres_ai_configs_grafana_data",
+          "postgres_ai_configs_sink_postgres_data",
+          "postgres_ai_configs_target_db_data",
+          "postgres_ai_configs_victoria_metrics_data",
+          "postgres_ai_configs_postgres_ai_configs",
+        ];
+
+        const { stdout: existingVolumes } = await execFilePromise("docker", ["volume", "ls", "-q"]);
+        const volumeList = existingVolumes.trim().split('\n').filter(Boolean);
+        const orphanedVolumes = volumeList.filter(v => volumePatterns.includes(v));
+
+        if (orphanedVolumes.length > 0) {
+          for (const vol of orphanedVolumes) {
+            try {
+              await execFilePromise("docker", ["volume", "rm", vol]);
+            } catch {
+              // Volume might be in use, skip
+            }
+          }
+          console.log(`✓ Removed ${orphanedVolumes.length} orphaned volume(s) from previous installs`);
+        }
       }
 
-      // Remove unused volumes
-      await execFilePromise("docker", ["volume", "prune", "-f"]);
-      console.log("✓ Removed unused volumes");
-
-      // Remove unused networks
+      // Remove any dangling resources
       await execFilePromise("docker", ["network", "prune", "-f"]);
       console.log("✓ Removed unused networks");
 
-      // Remove dangling images
       await execFilePromise("docker", ["image", "prune", "-f"]);
       console.log("✓ Removed dangling images");
 
-      console.log("\nCleanup completed");
+      console.log("\n✓ Cleanup completed - ready for fresh install");
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       console.error(`Error during cleanup: ${message}`);

package/dist/bin/postgres-ai.js

@@ -13064,7 +13064,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.14.0-dev.59",
+  version: "0.14.0-dev.61",
   description: "postgres_ai CLI",
   license: "Apache-2.0",
   private: false,
@@ -15887,7 +15887,7 @@ var Result = import_lib.default.Result;
 var TypeOverrides = import_lib.default.TypeOverrides;
 var defaults = import_lib.default.defaults;
 // package.json
-var version = "0.14.0-dev.59";
+var version = "0.14.0-dev.61";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -27138,7 +27138,7 @@ function checkRunningContainers() {
     return { running: false, containers: [] };
   }
 }
-async function runCompose(args) {
+async function runCompose(args, grafanaPassword) {
   let composeFile;
   let projectDir;
   try {
@@ -27161,18 +27161,26 @@ async function runCompose(args) {
     return 1;
   }
   const env = { ...process.env };
-  const cfgPath = path5.resolve(projectDir, ".pgwatch-config");
-  if (fs5.existsSync(cfgPath)) {
-    try {
-      const stats = fs5.statSync(cfgPath);
-      if (!stats.isDirectory()) {
-        const content = fs5.readFileSync(cfgPath, "utf8");
-        const match = content.match(/^grafana_password=([^\r\n]+)/m);
-        if (match) {
-          env.GF_SECURITY_ADMIN_PASSWORD = match[1].trim();
+  if (grafanaPassword) {
+    env.GF_SECURITY_ADMIN_PASSWORD = grafanaPassword;
+  } else {
+    const cfgPath = path5.resolve(projectDir, ".pgwatch-config");
+    if (fs5.existsSync(cfgPath)) {
+      try {
+        const stats = fs5.statSync(cfgPath);
+        if (!stats.isDirectory()) {
+          const content = fs5.readFileSync(cfgPath, "utf8");
+          const match = content.match(/^grafana_password=([^\r\n]+)/m);
+          if (match) {
+            env.GF_SECURITY_ADMIN_PASSWORD = match[1].trim();
+          }
+        }
+      } catch (err) {
+        if (process.env.DEBUG) {
+          console.warn(`Warning: Could not read Grafana password from config: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
-    } catch (err) {}
+    }
   }
   return new Promise((resolve6) => {
     const child = spawn2(cmd[0], [...cmd.slice(1), "-f", composeFile, ...args], {
@@ -27484,8 +27492,8 @@ You can provide either:`);
 `);
     grafanaPassword = "demo";
   }
-  console.log(opts.demo ? "Step 5: Starting monitoring services..." : "Step 5: Starting monitoring services...");
-  const code2 = await runCompose(["up", "-d", "--force-recreate"]);
+  console.log("Step 5: Starting monitoring services...");
+  const code2 = await runCompose(["up", "-d", "--force-recreate"], grafanaPassword);
   if (code2 !== 0) {
     process.exitCode = code2;
     return;
@@ -27740,27 +27748,50 @@ Stopping services and removing data...`);
     process.exitCode = 1;
   }
 });
-mon.command("clean").description("cleanup monitoring services artifacts").action(async () => {
-  console.log(`Cleaning up Docker resources...
+mon.command("clean").description("cleanup monitoring services artifacts (stops services and removes volumes)").option("--keep-volumes", "keep data volumes (only stop and remove containers)").action(async (options) => {
+  console.log(`Cleaning up monitoring services...
 `);
   try {
-    const { stdout: containers } = await execFilePromise("docker", ["ps", "-aq", "--filter", "status=exited"]);
-    if (containers.trim()) {
-      const containerIds = containers.trim().split(`
-`);
-      await execFilePromise("docker", ["rm", ...containerIds]);
-      console.log("\u2713 Removed stopped containers");
+    const downArgs = options.keepVolumes ? ["down"] : ["down", "-v"];
+    console.log(options.keepVolumes ? "Stopping and removing containers (keeping volumes)..." : "Stopping and removing containers and volumes...");
+    const downCode = await runCompose(downArgs);
+    if (downCode === 0) {
+      console.log("\u2713 Monitoring services stopped and removed");
     } else {
-      console.log("\u2713 No stopped containers to remove");
+      console.log("\u26A0 Could not stop services (may not be running)");
+    }
+    if (!options.keepVolumes) {
+      const volumePatterns = [
+        "monitoring_grafana_data",
+        "monitoring_postgres_ai_configs",
+        "monitoring_sink_postgres_data",
+        "monitoring_target_db_data",
+        "monitoring_victoria_metrics_data",
+        "postgres_ai_configs_grafana_data",
+        "postgres_ai_configs_sink_postgres_data",
+        "postgres_ai_configs_target_db_data",
+        "postgres_ai_configs_victoria_metrics_data",
+        "postgres_ai_configs_postgres_ai_configs"
+      ];
+      const { stdout: existingVolumes } = await execFilePromise("docker", ["volume", "ls", "-q"]);
+      const volumeList = existingVolumes.trim().split(`
+`).filter(Boolean);
+      const orphanedVolumes = volumeList.filter((v) => volumePatterns.includes(v));
+      if (orphanedVolumes.length > 0) {
+        for (const vol of orphanedVolumes) {
+          try {
+            await execFilePromise("docker", ["volume", "rm", vol]);
+          } catch {}
+        }
+        console.log(`\u2713 Removed ${orphanedVolumes.length} orphaned volume(s) from previous installs`);
+      }
     }
-    await execFilePromise("docker", ["volume", "prune", "-f"]);
-    console.log("\u2713 Removed unused volumes");
     await execFilePromise("docker", ["network", "prune", "-f"]);
     console.log("\u2713 Removed unused networks");
     await execFilePromise("docker", ["image", "prune", "-f"]);
     console.log("\u2713 Removed dangling images");
     console.log(`
-Cleanup completed`);
+\u2713 Cleanup completed - ready for fresh install`);
   } catch (error2) {
     const message = error2 instanceof Error ? error2.message : String(error2);
     console.error(`Error during cleanup: ${message}`);

package/lib/metrics-embedded.ts

@@ -1,6 +1,6 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
 // Generated from config/pgwatch-prometheus/metrics.yml by scripts/embed-metrics.ts
-// Generated at: 2025-12-29T23:02:20.864Z
+// Generated at: 2025-12-30T00:57:53.111Z
 
 /**
  * Metric definition from metrics.yml

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresai",
-  "version": "0.14.0-dev.59",
+  "version": "0.14.0-dev.61",
   "description": "postgres_ai CLI",
   "license": "Apache-2.0",
   "private": false,

package/test/checkup.integration.test.ts

@@ -112,11 +112,12 @@ async function createTempPostgres(): Promise<TempPostgres> {
   const cleanup = async () => {
     postgresProc.kill("SIGTERM");
     try {
+      // 30s timeout to handle slower CI environments gracefully
       await waitFor(
         async () => {
           if (postgresProc.exitCode === null) throw new Error("still running");
         },
-        { timeoutMs: 5000, intervalMs: 100 }
+        { timeoutMs: 30000, intervalMs: 100 }
       );
     } catch {
       postgresProc.kill("SIGKILL");

package/test/init.integration.test.ts

@@ -118,11 +118,12 @@ async function createTempPostgres(): Promise<TempPostgres> {
   const cleanup = async () => {
     postgresProc.kill("SIGTERM");
     try {
+      // 30s timeout to handle slower CI environments gracefully
       await waitFor(
         async () => {
           if (postgresProc.exitCode === null) throw new Error("still running");
         },
-        { timeoutMs: 5000, intervalMs: 100 }
+        { timeoutMs: 30000, intervalMs: 100 }
       );
     } catch {
       postgresProc.kill("SIGKILL");