postgresai 0.14.0-dev.83 → 0.14.0-dev.85

package/bin/postgres-ai.ts

@@ -1643,9 +1643,9 @@ program
   });
 
 program
-  .command("checkup [conn]")
+  .command("checkup [checkIdOrConn] [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("--check-id <id>", `specific check to run (see list below), or 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)")
@@ -1664,13 +1664,43 @@ program
       "",
       "Examples:",
       "  postgresai checkup postgresql://user:pass@host:5432/db",
-      "  postgresai checkup postgresql://user:pass@host:5432/db --check-id D001",
+      "  postgresai checkup H002 postgresql://user:pass@host:5432/db",
+      "  postgresai checkup postgresql://user:pass@host:5432/db --check-id H002",
       "  postgresai checkup postgresql://user:pass@host:5432/db --output ./reports",
-      "  postgresai checkup postgresql://user:pass@host:5432/db --project my_project",
       "  postgresai checkup postgresql://user:pass@host:5432/db --no-upload --json",
     ].join("\n")
   )
-  .action(async (conn: string | undefined, opts: CheckupOptions, cmd: Command) => {
+  .action(async (checkIdOrConn: string | undefined, connArg: string | undefined, opts: CheckupOptions, cmd: Command) => {
+    // Support both syntaxes:
+    //   pgai checkup postgresql://...              -> run ALL checks
+    //   pgai checkup H002 postgresql://...         -> run specific check (positional)
+    //   pgai checkup --check-id H002 postgresql:// -> run specific check (option)
+    const checkIdPattern = /^[A-Z]\d{3}$/i;
+    let conn: string | undefined;
+    let checkId: string;
+
+    if (!checkIdOrConn) {
+      cmd.outputHelp();
+      process.exitCode = 1;
+      return;
+    }
+
+    if (checkIdPattern.test(checkIdOrConn)) {
+      // First arg is a check ID
+      checkId = checkIdOrConn.toUpperCase();
+      conn = connArg;
+      if (!conn) {
+        console.error(`Error: Connection string required when specifying check ID "${checkId}"`);
+        console.error(`\nUsage: postgresai checkup ${checkId} postgresql://user@host:5432/dbname\n`);
+        process.exitCode = 1;
+        return;
+      }
+    } else {
+      // First arg is the connection string
+      conn = checkIdOrConn;
+      checkId = opts.checkId?.toUpperCase() || "ALL";
+    }
+
     if (!conn) {
       cmd.outputHelp();
       process.exitCode = 1;
@@ -1718,12 +1748,11 @@ program
 
       // Generate reports
       let reports: Record<string, any>;
-      if (opts.checkId === "ALL") {
+      if (checkId === "ALL") {
         reports = await generateAllReports(client, opts.nodeName, (p) => {
           spinner.update(`Running ${p.checkId}: ${p.checkTitle} (${p.index}/${p.total})`);
         });
       } else {
-        const checkId = opts.checkId.toUpperCase();
         const generator = REPORT_GENERATORS[checkId];
         if (!generator) {
           spinner.stop();
@@ -1733,7 +1762,7 @@ program
             console.error(`Check ${checkId} (${dictEntry.title}) is not yet available in express mode.`);
             console.error(`Express-mode checks: ${Object.keys(CHECK_INFO).join(", ")}`);
           } else {
-            console.error(`Unknown check ID: ${opts.checkId}`);
+            console.error(`Unknown check ID: ${checkId}`);
             console.error(`See 'postgresai checkup --help' for available checks.`);
           }
           process.exitCode = 1;

package/dist/bin/postgres-ai.js

@@ -13064,7 +13064,7 @@ var {
 // package.json
 var package_default = {
   name: "postgresai",
-  version: "0.14.0-dev.83",
+  version: "0.14.0-dev.85",
   description: "postgres_ai CLI",
   license: "Apache-2.0",
   private: false,
@@ -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.83";
+var version = "0.14.0-dev.85";
 var package_default2 = {
   name: "postgresai",
   version,
@@ -27116,7 +27116,7 @@ function buildCheckInfoMap() {
 }
 
 // lib/checkup.ts
-var __dirname = "/builds/postgres-ai/postgres_ai/cli/lib";
+var __dirname = "/builds/postgres-ai/postgresai/cli/lib";
 var SECONDS_PER_DAY = 86400;
 var SECONDS_PER_HOUR = 3600;
 var SECONDS_PER_MINUTE = 60;
@@ -29487,19 +29487,42 @@ 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("--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", [
+program2.command("checkup [checkIdOrConn] [conn]").description("generate health check reports directly from PostgreSQL (express mode)").option("--check-id <id>", `specific check to run (see list below), or 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}`),
   "",
   "Examples:",
   "  postgresai checkup postgresql://user:pass@host:5432/db",
-  "  postgresai checkup postgresql://user:pass@host:5432/db --check-id D001",
+  "  postgresai checkup H002 postgresql://user:pass@host:5432/db",
+  "  postgresai checkup postgresql://user:pass@host:5432/db --check-id H002",
   "  postgresai checkup postgresql://user:pass@host:5432/db --output ./reports",
-  "  postgresai checkup postgresql://user:pass@host:5432/db --project my_project",
   "  postgresai checkup postgresql://user:pass@host:5432/db --no-upload --json"
 ].join(`
-`)).action(async (conn, opts, cmd) => {
+`)).action(async (checkIdOrConn, connArg, opts, cmd) => {
+  const checkIdPattern = /^[A-Z]\d{3}$/i;
+  let conn;
+  let checkId;
+  if (!checkIdOrConn) {
+    cmd.outputHelp();
+    process.exitCode = 1;
+    return;
+  }
+  if (checkIdPattern.test(checkIdOrConn)) {
+    checkId = checkIdOrConn.toUpperCase();
+    conn = connArg;
+    if (!conn) {
+      console.error(`Error: Connection string required when specifying check ID "${checkId}"`);
+      console.error(`
+Usage: postgresai checkup ${checkId} postgresql://user@host:5432/dbname
+`);
+      process.exitCode = 1;
+      return;
+    }
+  } else {
+    conn = checkIdOrConn;
+    checkId = opts.checkId?.toUpperCase() || "ALL";
+  }
   if (!conn) {
     cmd.outputHelp();
     process.exitCode = 1;
@@ -29535,12 +29558,11 @@ program2.command("checkup [conn]").description("generate health check reports di
     const connResult = await connectWithSslFallback(Client, adminConn);
     client = connResult.client;
     let reports;
-    if (opts.checkId === "ALL") {
+    if (checkId === "ALL") {
       reports = await generateAllReports(client, opts.nodeName, (p) => {
         spinner.update(`Running ${p.checkId}: ${p.checkTitle} (${p.index}/${p.total})`);
       });
     } else {
-      const checkId = opts.checkId.toUpperCase();
       const generator = REPORT_GENERATORS[checkId];
       if (!generator) {
         spinner.stop();
@@ -29549,7 +29571,7 @@ program2.command("checkup [conn]").description("generate health check reports di
           console.error(`Check ${checkId} (${dictEntry.title}) is not yet available in express mode.`);
           console.error(`Express-mode checks: ${Object.keys(CHECK_INFO).join(", ")}`);
         } else {
-          console.error(`Unknown check ID: ${opts.checkId}`);
+          console.error(`Unknown check ID: ${checkId}`);
           console.error(`See 'postgresai checkup --help' for available checks.`);
         }
         process.exitCode = 1;

package/package.json

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

package/test/checkup.test.ts

@@ -1008,6 +1008,47 @@ describe("CLI tests", () => {
     const r = runCli(["checkup", "postgresql://test:test@localhost:5432/test", "--no-upload"], env);
     expect(r.stderr).not.toMatch(/API key is required/i);
   });
+
+  // Argument parsing tests for check ID / connection string recognition
+  test("checkup with check ID but no connection shows specific error", () => {
+    const r = runCli(["checkup", "H002"]);
+    expect(r.status).not.toBe(0);
+    expect(r.stderr).toMatch(/connection string required/i);
+    expect(r.stderr).toMatch(/H002/);
+  });
+
+  test("checkup recognizes valid check ID patterns", () => {
+    // Valid check IDs: A002, H002, F004, etc.
+    for (const checkId of ["A002", "H002", "F004", "K003", "a002", "h002"]) {
+      const r = runCli(["checkup", checkId]);
+      expect(r.status).not.toBe(0);
+      expect(r.stderr).toMatch(/connection string required/i);
+    }
+  });
+
+  test("checkup does not treat connection string as check ID", () => {
+    // Connection strings should not be parsed as check IDs
+    const r = runCli(["checkup", "postgresql://test:test@localhost:5432/test", "--no-upload"]);
+    // Should not show "connection string required" error
+    expect(r.stderr).not.toMatch(/connection string required/i);
+  });
+
+  test("checkup with check ID and connection string works", () => {
+    // pgai checkup H002 postgresql://...
+    const r = runCli(["checkup", "H002", "postgresql://test:test@localhost:5432/test", "--no-upload"]);
+    // Should not show "connection string required" error
+    expect(r.stderr).not.toMatch(/connection string required/i);
+    // Connection will fail but argument parsing should succeed
+    expect(r.stderr).not.toMatch(/unknown option/i);
+  });
+
+  test("checkup with --check-id option works", () => {
+    // pgai checkup --check-id H002 postgresql://...
+    const r = runCli(["checkup", "--check-id", "H002", "postgresql://test:test@localhost:5432/test", "--no-upload"]);
+    // Should not show "connection string required" error
+    expect(r.stderr).not.toMatch(/connection string required/i);
+    expect(r.stderr).not.toMatch(/unknown option/i);
+  });
 });
 
 // Tests for checkup-api module