postgresai 0.14.0-dev.72 → 0.14.0-dev.74

package/bin/postgres-ai.ts

@@ -760,7 +760,7 @@ program
       // Fetch database URL for JSON output (non-blocking, best-effort)
       let databaseUrl: string | null = null;
       if (jsonOutput) {
-        databaseUrl = await fetchPoolerDatabaseUrl(supabaseConfig);
+        databaseUrl = await fetchPoolerDatabaseUrl(supabaseConfig, opts.monitoringUser);
       }
 
       try {

package/dist/bin/postgres-ai.js

@@ -13064,7 +13064,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.14.0-dev.72",
+  version: "0.14.0-dev.74",
   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.72";
+var version = "0.14.0-dev.74";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -25312,8 +25312,12 @@ class SupabaseClient {
     return err;
   }
 }
-async function fetchPoolerDatabaseUrl(config2) {
+async function fetchPoolerDatabaseUrl(config2, username) {
   const url = `${SUPABASE_API_BASE}/v1/projects/${encodeURIComponent(config2.projectRef)}/config/database/pooler`;
+  const effectiveUsername = (() => {
+    const suffix = `.${config2.projectRef}`;
+    return username.endsWith(suffix) ? username : `${username}${suffix}`;
+  })();
   try {
     const response = await fetch(url, {
       method: "GET",
@@ -25327,13 +25331,14 @@ async function fetchPoolerDatabaseUrl(config2) {
     const data = await response.json();
     if (Array.isArray(data) && data.length > 0) {
       const pooler = data[0];
-      if (pooler.db_host && pooler.db_port && pooler.db_name && pooler.db_user) {
-        return `postgresql://${pooler.db_user}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
+      if (pooler.db_host && pooler.db_port && pooler.db_name) {
+        return `postgresql://${effectiveUsername}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
       }
       if (typeof pooler.connection_string === "string") {
         try {
           const connUrl = new URL(pooler.connection_string);
-          return `postgresql://${connUrl.username}@${connUrl.hostname}:${connUrl.port}${connUrl.pathname}`;
+          const portPart = connUrl.port ? `:${connUrl.port}` : "";
+          return `postgresql://${effectiveUsername}@${connUrl.hostname}${portPart}${connUrl.pathname}`;
         } catch {
           return null;
         }
@@ -28004,7 +28009,7 @@ program2.command("prepare-db [conn]").description("prepare database for monitori
     const supabaseClient = new SupabaseClient(supabaseConfig);
     let databaseUrl = null;
     if (jsonOutput) {
-      databaseUrl = await fetchPoolerDatabaseUrl(supabaseConfig);
+      databaseUrl = await fetchPoolerDatabaseUrl(supabaseConfig, opts.monitoringUser);
     }
     try {
       const database = await supabaseClient.getCurrentDatabase();

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: 2026-01-09T15:26:19.729Z
+// Generated at: 2026-01-09T18:10:39.847Z
 
 /**
  * Metric definition from metrics.yml

package/lib/supabase.ts

@@ -335,16 +335,26 @@ export class SupabaseClient {
 
 /**
  * Fetch the database pooler connection string from Supabase Management API.
- * Returns a postgresql:// URL with username but no password.
+ * Returns a postgresql:// URL with the specified username but no password.
  *
  * @param config Supabase configuration with projectRef and accessToken
- * @returns Database URL without password (e.g., "postgresql://postgres.ref@host:port/postgres")
+ * @param username Username to include in the URL (e.g., monitoring user)
+ * @returns Database URL without password (e.g., "postgresql://user@host:port/postgres")
  */
 export async function fetchPoolerDatabaseUrl(
-  config: SupabaseConfig
+  config: SupabaseConfig,
+  username: string
 ): Promise<string | null> {
   const url = `${SUPABASE_API_BASE}/v1/projects/${encodeURIComponent(config.projectRef)}/config/database/pooler`;
 
+  // For Supabase pooler connections, the username must include the project ref:
+  //   <user>.<project_ref>
+  // Example:
+  //   postgresql://postgres_ai_mon.xhaqmsvczjkkvkgdyast@aws-1-eu-west-1.pooler.supabase.com:6543/postgres
+  const effectiveUsername = (() => {
+    const suffix = `.${config.projectRef}`;
+    return username.endsWith(suffix) ? username : `${username}${suffix}`;
+  })();
   try {
     const response = await fetch(url, {
       method: "GET",
@@ -364,15 +374,16 @@ export async function fetchPoolerDatabaseUrl(
     if (Array.isArray(data) && data.length > 0) {
       const pooler = data[0];
       // Build URL from components if available
-      if (pooler.db_host && pooler.db_port && pooler.db_name && pooler.db_user) {
-        return `postgresql://${pooler.db_user}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
+      if (pooler.db_host && pooler.db_port && pooler.db_name) {
+        return `postgresql://${effectiveUsername}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
       }
       // Fallback: try to extract from connection_string if present
       if (typeof pooler.connection_string === "string") {
         try {
           const connUrl = new URL(pooler.connection_string);
-          // Remove password from URL
-          return `postgresql://${connUrl.username}@${connUrl.hostname}:${connUrl.port}${connUrl.pathname}`;
+          // Use provided username; handle empty port for default ports (e.g., 5432)
+          const portPart = connUrl.port ? `:${connUrl.port}` : "";
+          return `postgresql://${effectiveUsername}@${connUrl.hostname}${portPart}${connUrl.pathname}`;
         } catch {
           return null;
         }

package/package.json

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

package/test/supabase.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, test, beforeEach, afterEach, mock } from "bun:test";
 import {
   resolveSupabaseConfig,
   extractProjectRefFromUrl,
+  fetchPoolerDatabaseUrl,
   SupabaseClient,
   applyInitPlanViaSupabase,
   verifyInitSetupViaSupabase,
@@ -137,6 +138,64 @@ describe("Supabase module", () => {
     });
   });
 
+  describe("fetchPoolerDatabaseUrl", () => {
+    const originalFetch = globalThis.fetch;
+
+    afterEach(() => {
+      globalThis.fetch = originalFetch;
+    });
+
+    test("returns pooler db url with username including project ref (db_host/db_port/db_name response)", async () => {
+      globalThis.fetch = mock(() =>
+        Promise.resolve(
+          new Response(
+            JSON.stringify([
+              {
+                db_host: "aws-1-eu-west-1.pooler.supabase.com",
+                db_port: 6543,
+                db_name: "postgres",
+              },
+            ]),
+            { status: 200 }
+          )
+        )
+      ) as unknown as typeof fetch;
+
+      const url = await fetchPoolerDatabaseUrl(
+        { projectRef: "xhaqmsvczjkkvkgdyast", accessToken: "token" },
+        "postgres_ai_mon"
+      );
+      expect(url).toBe(
+        "postgresql://postgres_ai_mon.xhaqmsvczjkkvkgdyast@aws-1-eu-west-1.pooler.supabase.com:6543/postgres"
+      );
+    });
+
+    test("does not double-append project ref if username already has it", async () => {
+      globalThis.fetch = mock(() =>
+        Promise.resolve(
+          new Response(
+            JSON.stringify([
+              {
+                db_host: "aws-1-eu-west-1.pooler.supabase.com",
+                db_port: 6543,
+                db_name: "postgres",
+              },
+            ]),
+            { status: 200 }
+          )
+        )
+      ) as unknown as typeof fetch;
+
+      const url = await fetchPoolerDatabaseUrl(
+        { projectRef: "xhaqmsvczjkkvkgdyast", accessToken: "token" },
+        "postgres_ai_mon.xhaqmsvczjkkvkgdyast"
+      );
+      expect(url).toBe(
+        "postgresql://postgres_ai_mon.xhaqmsvczjkkvkgdyast@aws-1-eu-west-1.pooler.supabase.com:6543/postgres"
+      );
+    });
+  });
+
   describe("SupabaseClient", () => {
     test("throws error when project ref is empty", () => {
       expect(() => new SupabaseClient({ projectRef: "", accessToken: "token" })).toThrow(