postgresai 0.14.0-dev.82 → 0.14.0-dev.83

package/bin/postgres-ai.ts

@@ -758,7 +758,7 @@ program
 
       const supabaseClient = new SupabaseClient(supabaseConfig);
 
-      // Fetch database URL for JSON output (non-blocking, best-effort)
+      // Fetch database URL for JSON output (best-effort, errors return null)
       let databaseUrl: string | null = null;
       if (jsonOutput) {
         databaseUrl = await fetchPoolerDatabaseUrl(supabaseConfig, opts.monitoringUser);
@@ -1648,12 +1648,13 @@ program
   .option("--check-id <id>", `specific check to run (see list below), or ALL`, "ALL")
   .option("--node-name <name>", "node name for reports", "node-01")
   .option("--output <path>", "output directory for JSON files")
-  .option("--[no-]upload", "upload JSON results to PostgresAI (default: enabled; requires API key)", undefined)
+  .option("--upload", "upload JSON results to PostgresAI (requires API key)")
+  .option("--no-upload", "disable upload to PostgresAI")
   .option(
     "--project <project>",
     "project name or ID for remote upload (used with --upload; defaults to config defaultProject; auto-generated on first run)"
   )
-  .option("--json", "output JSON to stdout (implies --no-upload)")
+  .option("--json", "output JSON to stdout")
   .addHelpText(
     "after",
     [
@@ -1678,7 +1679,9 @@ program
 
     const shouldPrintJson = !!opts.json;
     const uploadExplicitlyRequested = opts.upload === true;
-    const uploadExplicitlyDisabled = opts.upload === false || shouldPrintJson;
+    // Note: --json and --upload/--no-upload are independent flags.
+    // Use --no-upload to explicitly disable upload when using --json.
+    const uploadExplicitlyDisabled = opts.upload === false;
     let shouldUpload = !uploadExplicitlyDisabled;
 
     // Preflight: validate/create output directory BEFORE connecting / running checks.
@@ -1830,7 +1833,8 @@ async function resolveOrInitPaths(): Promise<PathResolution> {
  */
 function isDockerRunning(): boolean {
   try {
-    const result = spawnSync("docker", ["info"], { stdio: "pipe", timeout: 5000 });
+    // Note: timeout is supported by Bun but not in @types/bun
+    const result = spawnSync("docker", ["info"], { stdio: "pipe", timeout: 5000 } as Parameters<typeof spawnSync>[2]);
     return result.status === 0;
   } catch {
     return false;
@@ -1842,7 +1846,7 @@ function isDockerRunning(): boolean {
  */
 function getComposeCmd(): string[] | null {
   const tryCmd = (cmd: string, args: string[]): boolean =>
-    spawnSync(cmd, args, { stdio: "ignore", timeout: 5000 }).status === 0;
+    spawnSync(cmd, args, { stdio: "ignore", timeout: 5000 } as Parameters<typeof spawnSync>[2]).status === 0;
   if (tryCmd("docker-compose", ["version"])) return ["docker-compose"];
   if (tryCmd("docker", ["compose", "version"])) return ["docker", "compose"];
   return null;
@@ -1856,7 +1860,7 @@ function checkRunningContainers(): { running: boolean; containers: string[] } {
     const result = spawnSync(
       "docker",
       ["ps", "--filter", "name=grafana-with-datasources", "--filter", "name=pgwatch", "--format", "{{.Names}}"],
-      { stdio: "pipe", encoding: "utf8", timeout: 5000 }
+      { stdio: "pipe", encoding: "utf8", timeout: 5000 } as Parameters<typeof spawnSync>[2]
     );
 
     if (result.status === 0 && result.stdout) {

package/bun.lock

@@ -11,12 +11,12 @@
         "pg": "^8.16.3",
       },
       "devDependencies": {
-        "@types/bun": "^1.1.14",
+        "@types/bun": "^1.3.6",
         "@types/js-yaml": "^4.0.9",
         "@types/pg": "^8.15.6",
         "ajv": "^8.17.1",
         "ajv-formats": "^3.0.1",
-        "typescript": "^5.3.3",
+        "typescript": "^5.9.3",
       },
     },
   },
@@ -25,7 +25,7 @@
 
     "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.25.1", "", { "dependencies": { "@hono/node-server": "^1.19.7", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.0.1", "express-rate-limit": "^7.5.0", "jose": "^6.1.1", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.0" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1", "zod": "^3.25 || ^4.0" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-yO28oVFFC7EBoiKdAn+VqRm+plcfv4v0xp6osG/VsCB0NlPZWi87ajbCZZ8f/RvOFLEu7//rSRmuZZ7lMoe3gQ=="],
 
-    "@types/bun": ["@types/bun@1.3.5", "", { "dependencies": { "bun-types": "1.3.5" } }, "sha512-RnygCqNrd3srIPEWBd5LFeUYG7plCoH2Yw9WaZGyNmdTEei+gWaHqydbaIRkIkcbXwhBT94q78QljxN0Sk838w=="],
+    "@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
 
     "@types/js-yaml": ["@types/js-yaml@4.0.9", "", {}, "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg=="],
 
@@ -43,7 +43,7 @@
 
     "body-parser": ["body-parser@2.2.1", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.0", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw=="],
 
-    "bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="],
+    "bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
 
     "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],
 

package/dist/bin/postgres-ai.js

@@ -13064,7 +13064,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.14.0-dev.82",
+  version: "0.14.0-dev.83",
   description: "postgres_ai CLI",
   license: "Apache-2.0",
   private: false,
@@ -13109,12 +13109,12 @@ var package_default = {
     pg: "^8.16.3"
   },
   devDependencies: {
-    "@types/bun": "^1.1.14",
+    "@types/bun": "^1.3.6",
     "@types/js-yaml": "^4.0.9",
     "@types/pg": "^8.15.6",
     ajv: "^8.17.1",
     "ajv-formats": "^3.0.1",
-    typescript: "^5.3.3"
+    typescript: "^5.9.3"
   },
   publishConfig: {
     access: "public"
@@ -15889,7 +15889,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.82";
+var version = "0.14.0-dev.83";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -15937,12 +15937,12 @@ var package_default2 = {
     pg: "^8.16.3"
   },
   devDependencies: {
-    "@types/bun": "^1.1.14",
+    "@types/bun": "^1.3.6",
     "@types/js-yaml": "^4.0.9",
     "@types/pg": "^8.15.6",
     ajv: "^8.17.1",
     "ajv-formats": "^3.0.1",
-    typescript: "^5.3.3"
+    typescript: "^5.9.3"
   },
   publishConfig: {
     access: "public"
@@ -25378,6 +25378,9 @@ class SupabaseClient {
 }
 async function fetchPoolerDatabaseUrl(config2, username) {
   const url = `${SUPABASE_API_BASE}/v1/projects/${encodeURIComponent(config2.projectRef)}/config/database/pooler`;
+  const suffix = `.${config2.projectRef}`;
+  const effectiveUsername = username.endsWith(suffix) ? username : `${username}${suffix}`;
+  const encodedUsername = encodeURIComponent(effectiveUsername);
   try {
     const response = await fetch(url, {
       method: "GET",
@@ -25392,13 +25395,13 @@ async function fetchPoolerDatabaseUrl(config2, username) {
     if (Array.isArray(data) && data.length > 0) {
       const pooler = data[0];
       if (pooler.db_host && pooler.db_port && pooler.db_name) {
-        return `postgresql://${username}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
+        return `postgresql://${encodedUsername}@${pooler.db_host}:${pooler.db_port}/${pooler.db_name}`;
       }
       if (typeof pooler.connection_string === "string") {
         try {
           const connUrl = new URL(pooler.connection_string);
           const portPart = connUrl.port ? `:${connUrl.port}` : "";
-          return `postgresql://${username}@${connUrl.hostname}${portPart}${connUrl.pathname}`;
+          return `postgresql://${encodedUsername}@${connUrl.hostname}${portPart}${connUrl.pathname}`;
         } catch {
           return null;
         }
@@ -27789,218 +27792,6 @@ async function generateF001(client, nodeName) {
   };
   return report;
 }
-async function generateF004(client, nodeName) {
-  const report = createBaseReport("F004", "Autovacuum: heap bloat estimate", nodeName);
-  const postgresVersion = await getPostgresVersion(client);
-  let bloatData = [];
-  let bloatError = null;
-  try {
-    const result = await client.query(`
-      select
-        schemaname,
-        tblname,
-        (bs * tblpages)::bigint as real_size_bytes,
-        pg_size_pretty((bs * tblpages)::bigint) as real_size_pretty,
-        ((tblpages - est_tblpages) * bs)::bigint as extra_size_bytes,
-        pg_size_pretty(((tblpages - est_tblpages) * bs)::bigint) as extra_size_pretty,
-        case when tblpages > 0 and tblpages - est_tblpages > 0
-          then round(100.0 * (tblpages - est_tblpages) / tblpages, 2)
-          else 0
-        end as extra_pct,
-        fillfactor,
-        case when tblpages - est_tblpages_ff > 0
-          then ((tblpages - est_tblpages_ff) * bs)::bigint
-          else 0
-        end as bloat_size_bytes,
-        pg_size_pretty(case when tblpages - est_tblpages_ff > 0
-          then ((tblpages - est_tblpages_ff) * bs)::bigint
-          else 0
-        end) as bloat_size_pretty,
-        case when tblpages > 0 and tblpages - est_tblpages_ff > 0
-          then round(100.0 * (tblpages - est_tblpages_ff) / tblpages, 2)
-          else 0
-        end as bloat_pct,
-        is_na::text
-      from (
-        select
-          ceil(reltuples / ((bs - page_hdr) / tpl_size)) + ceil(toasttuples / 4) as est_tblpages,
-          ceil(reltuples / ((bs - page_hdr) * fillfactor / (tpl_size * 100))) + ceil(toasttuples / 4) as est_tblpages_ff,
-          tblpages, fillfactor, bs, schemaname, tblname, is_na
-        from (
-          select
-            (4 + tpl_hdr_size + tpl_data_size + (2 * ma)
-              - case when tpl_hdr_size % ma = 0 then ma else tpl_hdr_size % ma end
-              - case when ceil(tpl_data_size)::int % ma = 0 then ma else ceil(tpl_data_size)::int % ma end
-            ) as tpl_size,
-            (heappages + toastpages) as tblpages,
-            reltuples, toasttuples, bs, page_hdr, schemaname, tblname, fillfactor, is_na
-          from (
-            select
-              ns.nspname as schemaname,
-              tbl.relname as tblname,
-              tbl.reltuples,
-              tbl.relpages as heappages,
-              coalesce(toast.relpages, 0) as toastpages,
-              coalesce(toast.reltuples, 0) as toasttuples,
-              coalesce(substring(array_to_string(tbl.reloptions, ' ') from 'fillfactor=([0-9]+)')::smallint, 100) as fillfactor,
-              current_setting('block_size')::numeric as bs,
-              case when version() ~ 'mingw32' or version() ~ '64-bit|x86_64|ppc64|ia64|amd64' then 8 else 4 end as ma,
-              24 as page_hdr,
-              23 + case when max(coalesce(s.null_frac, 0)) > 0 then (7 + count(s.attname)) / 8 else 0::int end
-                + case when bool_or(att.attname = 'oid' and att.attnum < 0) then 4 else 0 end as tpl_hdr_size,
-              sum((1 - coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 0)) as tpl_data_size,
-              (bool_or(att.atttypid = 'pg_catalog.name'::regtype)
-                or sum(case when att.attnum > 0 then 1 else 0 end) <> count(s.attname))::int as is_na
-            from pg_attribute as att
-              join pg_class as tbl on att.attrelid = tbl.oid
-              join pg_namespace as ns on ns.oid = tbl.relnamespace
-              left join pg_stats as s on s.schemaname = ns.nspname
-                and s.tablename = tbl.relname and s.attname = att.attname
-              left join pg_class as toast on tbl.reltoastrelid = toast.oid
-            where not att.attisdropped
-              and tbl.relkind in ('r', 'm')
-              and ns.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
-            group by ns.nspname, tbl.relname, tbl.reltuples, tbl.relpages, toast.relpages, toast.reltuples, tbl.reloptions
-          ) as s
-        ) as s2
-      ) as s3
-      where tblpages > 0 and (bs * tblpages) >= 1024 * 1024  -- exclude tables < 1 MiB
-      order by bloat_size_bytes desc
-      limit 100
-    `);
-    bloatData = result.rows;
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    console.log(`[F004] Error estimating table bloat: ${errorMsg}`);
-    bloatError = errorMsg;
-  }
-  report.results[nodeName] = {
-    data: {
-      tables: bloatData,
-      ...bloatError && { error: bloatError }
-    },
-    postgres_version: postgresVersion
-  };
-  return report;
-}
-async function generateF005(client, nodeName) {
-  const report = createBaseReport("F005", "Autovacuum: index bloat estimate", nodeName);
-  const postgresVersion = await getPostgresVersion(client);
-  let bloatData = [];
-  let bloatError = null;
-  try {
-    const result = await client.query(`
-      select
-        nspname as schemaname,
-        tblname,
-        idxname,
-        (bs * relpages)::bigint as real_size_bytes,
-        pg_size_pretty((bs * relpages)::bigint) as real_size_pretty,
-        pg_relation_size(tbloid)::bigint as table_size_bytes,
-        pg_size_pretty(pg_relation_size(tbloid)) as table_size_pretty,
-        ((relpages - est_pages) * bs)::bigint as extra_size_bytes,
-        pg_size_pretty(((relpages - est_pages) * bs)::bigint) as extra_size_pretty,
-        round(100.0 * (relpages - est_pages) / relpages, 2) as extra_pct,
-        fillfactor,
-        case when relpages > est_pages_ff
-          then ((relpages - est_pages_ff) * bs)::bigint
-          else 0
-        end as bloat_size_bytes,
-        pg_size_pretty(case when relpages > est_pages_ff
-          then ((relpages - est_pages_ff) * bs)::bigint
-          else 0
-        end) as bloat_size_pretty,
-        case when relpages > est_pages_ff
-          then round(100.0 * (relpages - est_pages_ff) / relpages, 2)
-          else 0
-        end as bloat_pct,
-        is_na::text
-      from (
-        select
-          coalesce(1 + ceil(reltuples / floor((bs - pageopqdata - pagehdr) / (4 + nulldatahdrwidth)::float)), 0) as est_pages,
-          coalesce(1 + ceil(reltuples / floor((bs - pageopqdata - pagehdr) * fillfactor / (100 * (4 + nulldatahdrwidth)::float))), 0) as est_pages_ff,
-          bs, nspname, tblname, idxname, relpages, fillfactor, is_na, tbloid
-        from (
-          select
-            maxalign, bs, nspname, tblname, idxname, reltuples, relpages, idxoid, fillfactor, tbloid,
-            (index_tuple_hdr_bm + maxalign
-              - case when index_tuple_hdr_bm % maxalign = 0 then maxalign else index_tuple_hdr_bm % maxalign end
-              + nulldatawidth + maxalign
-              - case when nulldatawidth = 0 then 0
-                     when nulldatawidth::integer % maxalign = 0 then maxalign
-                     else nulldatawidth::integer % maxalign end
-            )::numeric as nulldatahdrwidth,
-            pagehdr, pageopqdata, is_na
-          from (
-            select
-              n.nspname, i.tblname, i.idxname, i.reltuples, i.relpages, i.tbloid, i.idxoid, i.fillfactor,
-              current_setting('block_size')::numeric as bs,
-              case when version() ~ 'mingw32' or version() ~ '64-bit|x86_64|ppc64|ia64|amd64' then 8 else 4 end as maxalign,
-              24 as pagehdr,
-              16 as pageopqdata,
-              case when max(coalesce(s.null_frac, 0)) = 0
-                then 8
-                else 8 + ((32 + 8 - 1) / 8)
-              end as index_tuple_hdr_bm,
-              sum((1 - coalesce(s.null_frac, 0)) * coalesce(s.avg_width, 1024)) as nulldatawidth,
-              (max(case when i.atttypid = 'pg_catalog.name'::regtype then 1 else 0 end) > 0)::int as is_na
-            from (
-              select
-                ct.relname as tblname, ct.relnamespace, ic.idxname, ic.attpos, ic.indkey,
-                ic.indkey[ic.attpos], ic.reltuples, ic.relpages, ic.tbloid, ic.idxoid, ic.fillfactor,
-                coalesce(a1.attnum, a2.attnum) as attnum,
-                coalesce(a1.attname, a2.attname) as attname,
-                coalesce(a1.atttypid, a2.atttypid) as atttypid,
-                case when a1.attnum is null then ic.idxname else ct.relname end as attrelname
-              from (
-                select
-                  idxname, reltuples, relpages, tbloid, idxoid, fillfactor,
-                  indkey, generate_subscripts(indkey, 1) as attpos
-                from (
-                  select
-                    ci.relname as idxname, ci.reltuples, ci.relpages, i.indrelid as tbloid,
-                    i.indexrelid as idxoid,
-                    coalesce(substring(array_to_string(ci.reloptions, ' ') from 'fillfactor=([0-9]+)')::smallint, 90) as fillfactor,
-                    i.indkey
-                  from pg_index as i
-                    join pg_class as ci on ci.oid = i.indexrelid
-                    join pg_namespace as ns on ns.oid = ci.relnamespace
-                    join pg_am as am on am.oid = ci.relam
-                  where am.amname = 'btree'
-                    and ci.relpages > 0
-                    and ns.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
-                ) as idx_data
-              ) as ic
-                join pg_class as ct on ct.oid = ic.tbloid
-                left join pg_attribute as a1 on a1.attrelid = ic.idxoid and a1.attnum = ic.indkey[ic.attpos]
-                left join pg_attribute as a2 on a2.attrelid = ic.tbloid and a2.attnum = ic.indkey[ic.attpos]
-            ) as i
-              join pg_namespace as n on n.oid = i.relnamespace
-              left join pg_stats as s on s.schemaname = n.nspname
-                and s.tablename = i.attrelname and s.attname = i.attname
-            group by n.nspname, i.tblname, i.idxname, i.reltuples, i.relpages, i.tbloid, i.idxoid, i.fillfactor
-          ) as rows_data_stats
-        ) as rows_hdr_pdg_stats
-      ) as relation_stats
-      where relpages > 0 and (bs * relpages) >= 1024 * 1024  -- exclude indexes < 1 MiB
-      order by bloat_size_bytes desc
-      limit 100
-    `);
-    bloatData = result.rows;
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    console.log(`[F005] Error estimating index bloat: ${errorMsg}`);
-    bloatError = errorMsg;
-  }
-  report.results[nodeName] = {
-    data: {
-      indexes: bloatData,
-      ...bloatError && { error: bloatError }
-    },
-    postgres_version: postgresVersion
-  };
-  return report;
-}
 async function generateG001(client, nodeName) {
   const report = createBaseReport("G001", "Memory-related settings", nodeName);
   const postgresVersion = await getPostgresVersion(client);
@@ -28151,8 +27942,6 @@ var REPORT_GENERATORS = {
   D001: generateD001,
   D004: generateD004,
   F001: generateF001,
-  F004: generateF004,
-  F005: generateF005,
   G001: generateG001,
   G003: generateG003,
   H001: generateH001,
@@ -29698,7 +29487,7 @@ program2.command("unprepare-db [conn]").description("remove monitoring setup: dr
     closeReadline();
   }
 });
-program2.command("checkup [conn]").description("generate health check reports directly from PostgreSQL (express mode)").option("--check-id <id>", `specific check to run (see list below), or ALL`, "ALL").option("--node-name <name>", "node name for reports", "node-01").option("--output <path>", "output directory for JSON files").option("--[no-]upload", "upload JSON results to PostgresAI (default: enabled; requires API key)", undefined).option("--project <project>", "project name or ID for remote upload (used with --upload; defaults to config defaultProject; auto-generated on first run)").option("--json", "output JSON to stdout (implies --no-upload)").addHelpText("after", [
+program2.command("checkup [conn]").description("generate health check reports directly from PostgreSQL (express mode)").option("--check-id <id>", `specific check to run (see list below), or ALL`, "ALL").option("--node-name <name>", "node name for reports", "node-01").option("--output <path>", "output directory for JSON files").option("--upload", "upload JSON results to PostgresAI (requires API key)").option("--no-upload", "disable upload to PostgresAI").option("--project <project>", "project name or ID for remote upload (used with --upload; defaults to config defaultProject; auto-generated on first run)").option("--json", "output JSON to stdout").addHelpText("after", [
   "",
   "Available checks:",
   ...Object.entries(CHECK_INFO).map(([id, title]) => `  ${id}: ${title}`),
@@ -29718,7 +29507,7 @@ program2.command("checkup [conn]").description("generate health check reports di
   }
   const shouldPrintJson = !!opts.json;
   const uploadExplicitlyRequested = opts.upload === true;
-  const uploadExplicitlyDisabled = opts.upload === false || shouldPrintJson;
+  const uploadExplicitlyDisabled = opts.upload === false;
   let shouldUpload = !uploadExplicitlyDisabled;
   const outputPath = prepareOutputDirectory(opts.output);
   if (outputPath === null) {