postgresai 0.15.0-dev.6 → 0.15.0-dev.7

package/bin/postgres-ai.ts

@@ -506,7 +506,7 @@ async function ensureDefaultMonitoringProject(): Promise<PathResolution> {
 
   // Ensure instances.yml exists as a FILE (avoid Docker creating a directory).
   // Docker bind-mounts create missing paths as directories; replace if so.
-  if (fs.existsSync(instancesFile) && fs.statSync(instancesFile).isDirectory()) {
+  if (fs.existsSync(instancesFile) && fs.lstatSync(instancesFile).isDirectory()) {
     fs.rmSync(instancesFile, { recursive: true, force: true });
   }
   if (!fs.existsSync(instancesFile)) {
@@ -2530,10 +2530,21 @@ mon
         }
       }
     } else {
-      // Demo mode: copy bundled instances.demo.yml → instances.yml so the demo target is active
+      // Demo mode: configure instances.yml from the bundled demo template.
+      //
+      // Side effects:
+      //   - Writes instancesPath (instances.yml next to docker-compose.yml)
+      //   - If Docker previously bind-mounted instances.yml as a directory, removes it first.
+      //
+      // Failure modes:
+      //   - Exits with code 1 if instances.demo.yml is not found in any candidate path.
+      //     This is fatal because starting without a target produces empty dashboards that
+      //     look like a bug rather than a misconfiguration.
+      //
+      // Template search order (import.meta.url is resolved at runtime, not baked in at build):
+      //   1. npm layout:  dist/bin/../../instances.demo.yml  →  package-root/instances.demo.yml
+      //   2. dev layout:  cli/bin/../../../instances.demo.yml →  repo-root/instances.demo.yml
       console.log("Step 2: Demo mode enabled - using included demo PostgreSQL database");
-      // Use import.meta.url instead of __dirname — bundlers bake in __dirname at build time.
-      // Check multiple candidate paths (npm package vs repo dev layout).
       const currentDir = path.dirname(fileURLToPath(import.meta.url));
       const demoCandidates = [
         path.resolve(currentDir, "..", "..", "instances.demo.yml"),        // npm: dist/bin -> package root
@@ -2541,14 +2552,15 @@ mon
       ];
       const demoSrc = demoCandidates.find(p => fs.existsSync(p));
       if (demoSrc) {
-        // Remove directory artifact left by Docker bind-mounts
-        if (fs.existsSync(instancesPath) && fs.statSync(instancesPath).isDirectory()) {
+        // Remove directory artifact left by Docker bind-mounts before copying
+        if (fs.existsSync(instancesPath) && fs.lstatSync(instancesPath).isDirectory()) {
           fs.rmSync(instancesPath, { recursive: true, force: true });
         }
         fs.copyFileSync(demoSrc, instancesPath);
         console.log("✓ Demo monitoring target configured\n");
       } else {
-        console.error(`⚠ instances.demo.yml not found — demo target not configured (searched: ${demoCandidates.join(", ")})\n`);
+        console.error(`Error: instances.demo.yml not found — cannot configure demo target.\nSearched: ${demoCandidates.join(", ")}\n`);
+        process.exit(1);
       }
     }
 
@@ -2904,7 +2916,7 @@ mon
     console.log(`Project Directory: ${projectDir}`);
     console.log(`Docker Compose File: ${composeFile}`);
     console.log(`Instances File: ${instancesFile}`);
-    if (fs.existsSync(instancesFile) && !fs.statSync(instancesFile).isDirectory()) {
+    if (fs.existsSync(instancesFile) && !fs.lstatSync(instancesFile).isDirectory()) {
       console.log("\nInstances configuration:\n");
       const text = fs.readFileSync(instancesFile, "utf8");
       process.stdout.write(text);
@@ -3120,7 +3132,7 @@ targets
   .description("list monitoring target databases")
   .action(async () => {
     const { instancesFile: instancesPath, projectDir } = await resolveOrInitPaths();
-    if (!fs.existsSync(instancesPath) || fs.statSync(instancesPath).isDirectory()) {
+    if (!fs.existsSync(instancesPath) || fs.lstatSync(instancesPath).isDirectory()) {
       console.error(`instances.yml not found in ${projectDir}`);
       process.exitCode = 1;
       return;
@@ -3186,7 +3198,7 @@ targets
 
     // Check if instance already exists
     try {
-      if (fs.existsSync(file) && !fs.statSync(file).isDirectory()) {
+      if (fs.existsSync(file) && !fs.lstatSync(file).isDirectory()) {
         const content = fs.readFileSync(file, "utf8");
         const instances = yaml.load(content) as Instance[] | null || [];
         if (Array.isArray(instances)) {
@@ -3200,7 +3212,7 @@ targets
       }
     } catch (err) {
       // If YAML parsing fails, fall back to simple check
-      const isFile = fs.existsSync(file) && !fs.statSync(file).isDirectory();
+      const isFile = fs.existsSync(file) && !fs.lstatSync(file).isDirectory();
       const content = isFile ? fs.readFileSync(file, "utf8") : "";
       if (new RegExp(`^- name: ${instanceName}$`, "m").test(content)) {
         console.error(`Monitoring target '${instanceName}' already exists`);
@@ -3210,7 +3222,7 @@ targets
     }
 
     // Add new instance — if instances.yml is a directory (Docker artifact), replace it with a file
-    if (fs.existsSync(file) && fs.statSync(file).isDirectory()) {
+    if (fs.existsSync(file) && fs.lstatSync(file).isDirectory()) {
       fs.rmSync(file, { recursive: true, force: true });
     }
     const body = `- name: ${instanceName}\n  conn_str: ${connStr}\n  preset_metrics: full\n  custom_metrics:\n  is_enabled: true\n  group: default\n  custom_tags:\n    env: production\n    cluster: default\n    node_name: ${instanceName}\n    sink_type: ~sink_type~\n`;
@@ -3223,7 +3235,7 @@ targets
   .description("remove monitoring target database")
   .action(async (name: string) => {
     const { instancesFile: file } = await resolveOrInitPaths();
-    if (!fs.existsSync(file) || fs.statSync(file).isDirectory()) {
+    if (!fs.existsSync(file) || fs.lstatSync(file).isDirectory()) {
       console.error("instances.yml not found");
       process.exitCode = 1;
       return;
@@ -3260,7 +3272,7 @@ targets
   .description("test monitoring target database connectivity")
   .action(async (name: string) => {
     const { instancesFile: instancesPath } = await resolveOrInitPaths();
-    if (!fs.existsSync(instancesPath) || fs.statSync(instancesPath).isDirectory()) {
+    if (!fs.existsSync(instancesPath) || fs.lstatSync(instancesPath).isDirectory()) {
       console.error("instances.yml not found");
       process.exitCode = 1;
       return;

package/dist/bin/postgres-ai.js

@@ -13151,7 +13151,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.15.0-dev.6",
+  version: "0.15.0-dev.7",
   description: "postgres_ai CLI",
   license: "Apache-2.0",
   private: false,
@@ -15982,7 +15982,7 @@ var Result = import_lib.default.Result;
 var TypeOverrides = import_lib.default.TypeOverrides;
 var defaults = import_lib.default.defaults;
 // package.json
-var version = "0.15.0-dev.6";
+var version = "0.15.0-dev.7";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -29891,7 +29891,7 @@ async function ensureDefaultMonitoringProject() {
       throw new Error(`Failed to bootstrap docker-compose.yml: ${msg}`);
     }
   }
-  if (fs6.existsSync(instancesFile) && fs6.statSync(instancesFile).isDirectory()) {
+  if (fs6.existsSync(instancesFile) && fs6.lstatSync(instancesFile).isDirectory()) {
     fs6.rmSync(instancesFile, { recursive: true, force: true });
   }
   if (!fs6.existsSync(instancesFile)) {
@@ -31549,15 +31549,17 @@ You can provide either:`);
     ];
     const demoSrc = demoCandidates.find((p) => fs6.existsSync(p));
     if (demoSrc) {
-      if (fs6.existsSync(instancesPath) && fs6.statSync(instancesPath).isDirectory()) {
+      if (fs6.existsSync(instancesPath) && fs6.lstatSync(instancesPath).isDirectory()) {
         fs6.rmSync(instancesPath, { recursive: true, force: true });
       }
       fs6.copyFileSync(demoSrc, instancesPath);
       console.log(`\u2713 Demo monitoring target configured
 `);
     } else {
-      console.error(`\u26A0 instances.demo.yml not found \u2014 demo target not configured (searched: ${demoCandidates.join(", ")})
+      console.error(`Error: instances.demo.yml not found \u2014 cannot configure demo target.
+Searched: ${demoCandidates.join(", ")}
 `);
+      process.exit(1);
     }
   }
   console.log(opts.demo ? "Step 3: Updating configuration..." : "Step 3: Updating configuration...");
@@ -31845,7 +31847,7 @@ mon.command("config").description("show monitoring services configuration").acti
   console.log(`Project Directory: ${projectDir}`);
   console.log(`Docker Compose File: ${composeFile}`);
   console.log(`Instances File: ${instancesFile}`);
-  if (fs6.existsSync(instancesFile) && !fs6.statSync(instancesFile).isDirectory()) {
+  if (fs6.existsSync(instancesFile) && !fs6.lstatSync(instancesFile).isDirectory()) {
     console.log(`
 Instances configuration:
 `);
@@ -32020,7 +32022,7 @@ mon.command("check").description("monitoring services system readiness check").a
 var targets = mon.command("targets").description("manage databases to monitor");
 targets.command("list").description("list monitoring target databases").action(async () => {
   const { instancesFile: instancesPath, projectDir } = await resolveOrInitPaths();
-  if (!fs6.existsSync(instancesPath) || fs6.statSync(instancesPath).isDirectory()) {
+  if (!fs6.existsSync(instancesPath) || fs6.lstatSync(instancesPath).isDirectory()) {
     console.error(`instances.yml not found in ${projectDir}`);
     process.exitCode = 1;
     return;
@@ -32075,7 +32077,7 @@ targets.command("add [connStr] [name]").description("add monitoring target datab
   const db = m[5];
   const instanceName = name && name.trim() ? name.trim() : `${host}-${db}`.replace(/[^a-zA-Z0-9-]/g, "-");
   try {
-    if (fs6.existsSync(file) && !fs6.statSync(file).isDirectory()) {
+    if (fs6.existsSync(file) && !fs6.lstatSync(file).isDirectory()) {
       const content2 = fs6.readFileSync(file, "utf8");
       const instances = load(content2) || [];
       if (Array.isArray(instances)) {
@@ -32088,7 +32090,7 @@ targets.command("add [connStr] [name]").description("add monitoring target datab
       }
     }
   } catch (err) {
-    const isFile = fs6.existsSync(file) && !fs6.statSync(file).isDirectory();
+    const isFile = fs6.existsSync(file) && !fs6.lstatSync(file).isDirectory();
     const content2 = isFile ? fs6.readFileSync(file, "utf8") : "";
     if (new RegExp(`^- name: ${instanceName}$`, "m").test(content2)) {
       console.error(`Monitoring target '${instanceName}' already exists`);
@@ -32096,7 +32098,7 @@ targets.command("add [connStr] [name]").description("add monitoring target datab
       return;
     }
   }
-  if (fs6.existsSync(file) && fs6.statSync(file).isDirectory()) {
+  if (fs6.existsSync(file) && fs6.lstatSync(file).isDirectory()) {
     fs6.rmSync(file, { recursive: true, force: true });
   }
   const body = `- name: ${instanceName}
@@ -32118,7 +32120,7 @@ targets.command("add [connStr] [name]").description("add monitoring target datab
 });
 targets.command("remove <name>").description("remove monitoring target database").action(async (name) => {
   const { instancesFile: file } = await resolveOrInitPaths();
-  if (!fs6.existsSync(file) || fs6.statSync(file).isDirectory()) {
+  if (!fs6.existsSync(file) || fs6.lstatSync(file).isDirectory()) {
     console.error("instances.yml not found");
     process.exitCode = 1;
     return;
@@ -32147,7 +32149,7 @@ targets.command("remove <name>").description("remove monitoring target database"
 });
 targets.command("test <name>").description("test monitoring target database connectivity").action(async (name) => {
   const { instancesFile: instancesPath } = await resolveOrInitPaths();
-  if (!fs6.existsSync(instancesPath) || fs6.statSync(instancesPath).isDirectory()) {
+  if (!fs6.existsSync(instancesPath) || fs6.lstatSync(instancesPath).isDirectory()) {
     console.error("instances.yml not found");
     process.exitCode = 1;
     return;

package/package.json

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

package/test/init.test.ts

@@ -1,5 +1,5 @@
 import { describe, test, expect, beforeAll, afterAll } from "bun:test";
-import { resolve } from "path";
+import path, { resolve } from "path";
 import * as fs from "fs";
 import * as os from "os";
 
@@ -1073,9 +1073,64 @@ describe("CLI commands", () => {
   test("cli: mon local-install --demo configures demo monitoring target", () => {
     // --demo should copy instances.demo.yml to instances.yml and print confirmation.
     // The command will fail later (no Docker), but we verify the demo target step succeeded.
-    const r = runCli(["mon", "local-install", "--demo"]);
-    expect(r.stdout).toMatch(/Demo mode enabled/);
-    expect(r.stdout).toMatch(/Demo monitoring target configured/);
+    // resolvePaths() walks cwd() up to find docker-compose.yml, so instances.yml
+    // is written next to docker-compose.yml in the repo root.
+    const repoRoot = resolve(import.meta.dir, "..", "..");
+    const instancesPath = path.join(repoRoot, "instances.yml");
+    // Remove instances.yml if it exists — use rmSync to handle both files and
+    // directories (the EISDIR test may have left a directory here if it failed).
+    if (fs.existsSync(instancesPath)) fs.rmSync(instancesPath, { recursive: true, force: true });
+    try {
+      const r = runCli(["mon", "local-install", "--demo"]);
+      expect(r.stdout).toMatch(/Demo mode enabled/);
+      expect(r.stdout).toMatch(/Demo monitoring target configured/);
+      // Verify instances.yml was actually written with the demo target
+      expect(fs.existsSync(instancesPath)).toBe(true);
+      const content = fs.readFileSync(instancesPath, "utf8");
+      expect(content).toContain("name: target_database");
+      expect(content).toContain("conn_str: postgresql://monitor:monitor_pass@target-db:5432/target_database");
+    } finally {
+      // Clean up — instances.yml is gitignored so safe to remove
+      if (fs.existsSync(instancesPath)) fs.rmSync(instancesPath, { recursive: true, force: true });
+    }
+  });
+
+  test("cli: mon local-install --demo exits with code 1 when instances.demo.yml is missing", () => {
+    // Regression: if instances.demo.yml cannot be found in any candidate path, the CLI
+    // must exit with a non-zero code and a descriptive error (not silently create empty dashboards).
+    const repoRoot = resolve(import.meta.dir, "..", "..");
+    const demoFile = path.join(repoRoot, "instances.demo.yml");
+    const tempBackup = path.join(os.tmpdir(), `instances.demo.yml.test-backup-${Date.now()}`);
+    // Temporarily move instances.demo.yml so neither candidate path resolves
+    fs.copyFileSync(demoFile, tempBackup);
+    fs.unlinkSync(demoFile);
+    try {
+      const r = runCli(["mon", "local-install", "--demo"]);
+      expect(r.status).not.toBe(0);
+      expect(r.stderr).toContain("instances.demo.yml not found");
+    } finally {
+      // Restore the file — critical to do before any assertion can throw
+      if (!fs.existsSync(demoFile)) fs.copyFileSync(tempBackup, demoFile);
+      fs.rmSync(tempBackup, { force: true });
+    }
+  });
+
+  test("cli: mon local-install --demo with EISDIR recovers instances.yml", () => {
+    // Docker bind-mounts create missing paths as directories; the CLI must handle this.
+    const repoRoot = resolve(import.meta.dir, "..", "..");
+    const instancesPath = path.join(repoRoot, "instances.yml");
+    // Create instances.yml as a directory (simulating Docker artifact)
+    if (fs.existsSync(instancesPath)) fs.rmSync(instancesPath, { recursive: true, force: true });
+    fs.mkdirSync(instancesPath);
+    try {
+      const r = runCli(["mon", "local-install", "--demo"]);
+      expect(r.stdout).toMatch(/Demo monitoring target configured/);
+      expect(fs.statSync(instancesPath).isFile()).toBe(true);
+      const content = fs.readFileSync(instancesPath, "utf8");
+      expect(content).toContain("name: target_database");
+    } finally {
+      if (fs.existsSync(instancesPath)) fs.rmSync(instancesPath, { recursive: true, force: true });
+    }
   });
 
   test("cli: mon local-install --demo with global --api-key shows error", () => {

package/test/monitoring.test.ts

@@ -286,13 +286,13 @@ describe("demo mode instances.demo.yml", () => {
     expect(content).toMatch(/^\s+conn_str:/m);
     expect(content).toMatch(/^\s+preset_metrics: full/m);
     expect(content).toMatch(/^\s+is_enabled: true/m);
-    // ~sink_type~ is a placeholder replaced per-sink by generate-pgwatch-sources.sh
+    // ~sink_type~ is a sed token substituted by generate-pgwatch-sources.sh; values: postgres, prometheus
     expect(content).toMatch(/^\s+sink_type: ~sink_type~/m);
   });
 
   test("instances.yml is gitignored (not tracked)", () => {
     const gitignore = fs.readFileSync(path.join(repoRoot, ".gitignore"), "utf8");
-    expect(gitignore).toContain("instances.yml");
+    expect(gitignore).toMatch(/^instances\.yml$/m);
   });
 
   test("demo config can be copied to instances.yml in temp dir", () => {