postgresai 0.15.0-dev.2 → 0.15.0-dev.4

package/bin/postgres-ai.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import pkg from "../package.json";
 import * as config from "../lib/config";
 import * as yaml from "js-yaml";
@@ -13,6 +13,7 @@ import { startMcpServer } from "../lib/mcp-server";
 import { fetchIssues, fetchIssueComments, createIssueComment, fetchIssue, createIssue, updateIssue, updateIssueComment, fetchActionItem, fetchActionItems, createActionItem, updateActionItem, type ConfigChange } from "../lib/issues";
 import { fetchReports, fetchAllReports, fetchReportFiles, fetchReportFileData, renderMarkdownForTerminal, parseFlexibleDate } from "../lib/reports";
 import { resolveBaseUrls } from "../lib/util";
+import { uploadFile, downloadFile, buildMarkdownLink } from "../lib/storage";
 import { applyInitPlan, applyUninitPlan, buildInitPlan, buildUninitPlan, connectWithSslFallback, DEFAULT_MONITORING_USER, KNOWN_PROVIDERS, redactPasswordsInSql, resolveAdminConnection, resolveMonitoringPassword, validateProvider, verifyInitSetup } from "../lib/init";
 import { SupabaseClient, resolveSupabaseConfig, extractProjectRefFromUrl, applyInitPlanViaSupabase, verifyInitSetupViaSupabase, fetchPoolerDatabaseUrl, type PgCompatibleError } from "../lib/supabase";
 import * as pkce from "../lib/pkce";
@@ -343,7 +344,8 @@ function writeReportFiles(reports: Record<string, any>, outputPath: string): voi
   for (const [checkId, report] of Object.entries(reports)) {
     const filePath = path.join(outputPath, `${checkId}.json`);
     fs.writeFileSync(filePath, JSON.stringify(report, null, 2), "utf8");
-    console.log(`✓ ${checkId}: ${filePath}`);
+    const title = report.checkTitle || checkId;
+    console.log(`✓ ${checkId} ${title}: ${filePath}`);
   }
 }
 
@@ -411,6 +413,7 @@ interface CliOptions {
   apiKey?: string;
   apiBaseUrl?: string;
   uiBaseUrl?: string;
+  storageBaseUrl?: string;
 }
 
 /**
@@ -579,6 +582,10 @@ program
   .option(
     "--ui-base-url <url>",
     "UI base URL for browser routes (overrides PGAI_UI_BASE_URL)"
+  )
+  .option(
+    "--storage-base-url <url>",
+    "Storage base URL for file uploads (overrides PGAI_STORAGE_BASE_URL)"
   );
 
 program
@@ -595,6 +602,27 @@ program
     console.log(`Default project saved: ${value}`);
   });
 
+program
+  .command("set-storage-url <url>")
+  .description("store storage base URL for file uploads")
+  .action(async (url: string) => {
+    const value = (url || "").trim();
+    if (!value) {
+      console.error("Error: url is required");
+      process.exitCode = 1;
+      return;
+    }
+    try {
+      const { normalizeBaseUrl } = await import("../lib/util");
+      const normalized = normalizeBaseUrl(value);
+      config.writeConfig({ storageBaseUrl: normalized });
+      console.log(`Storage URL saved: ${normalized}`);
+    } catch {
+      console.error(`Error: invalid URL: ${value}`);
+      process.exitCode = 1;
+    }
+  });
+
 program
   .command("prepare-db [conn]")
   .description("prepare database for monitoring: create monitoring user, required view(s), and grant permissions (idempotent)")
@@ -840,8 +868,8 @@ program
             } else {
               console.log("✓ prepare-db verify: OK");
               if (v.missingOptional.length > 0) {
-                console.log("⚠ Optional items missing:");
-                for (const m of v.missingOptional) console.log(`- ${m}`);
+                console.error("⚠ Optional items missing:");
+                for (const m of v.missingOptional) console.error(`- ${m}`);
               }
             }
             return;
@@ -972,8 +1000,8 @@ program
         } else {
           console.log(opts.resetPassword ? "✓ prepare-db password reset completed" : "✓ prepare-db completed");
           if (skippedOptional.length > 0) {
-            console.log("⚠ Some optional steps were skipped (not supported or insufficient privileges):");
-            for (const s of skippedOptional) console.log(`- ${s}`);
+            console.error("⚠ Some optional steps were skipped (not supported or insufficient privileges):");
+            for (const s of skippedOptional) console.error(`- ${s}`);
           }
           if (process.stdout.isTTY) {
             console.log(`Applied ${applied.length} steps`);
@@ -1154,8 +1182,8 @@ program
           } else {
             console.log(`✓ prepare-db verify: OK${opts.provider ? ` (provider: ${opts.provider})` : ""}`);
             if (v.missingOptional.length > 0) {
-              console.log("⚠ Optional items missing:");
-              for (const m of v.missingOptional) console.log(`- ${m}`);
+              console.error("⚠ Optional items missing:");
+              for (const m of v.missingOptional) console.error(`- ${m}`);
             }
           }
           return;
@@ -1282,8 +1310,8 @@ program
       } else {
         console.log(opts.resetPassword ? "✓ prepare-db password reset completed" : "✓ prepare-db completed");
         if (skippedOptional.length > 0) {
-          console.log("⚠ Some optional steps were skipped (not supported or insufficient privileges):");
-          for (const s of skippedOptional) console.log(`- ${s}`);
+          console.error("⚠ Some optional steps were skipped (not supported or insufficient privileges):");
+          for (const s of skippedOptional) console.error(`- ${s}`);
         }
         // Keep output compact but still useful
         if (process.stdout.isTTY) {
@@ -1599,11 +1627,11 @@ program
           console.log("✓ unprepare-db completed");
           console.log(`Applied ${applied.length} steps`);
         } else {
-          console.log("⚠ unprepare-db completed with errors");
+          console.error("⚠ unprepare-db completed with errors");
           console.log(`Applied ${applied.length} steps`);
-          console.log("Errors:");
+          console.error("Errors:");
           for (const err of errors) {
-            console.log(`  - ${err}`);
+            console.error(`  - ${err}`);
           }
           process.exitCode = 1;
         }
@@ -1925,8 +1953,8 @@ program
         }
       }
 
-      // Output JSON to stdout
-      if (shouldPrintJson) {
+      // Output JSON to stdout (unless --output is specified, in which case files are written instead)
+      if (shouldPrintJson && !outputPath) {
         console.log(JSON.stringify(reports, null, 2));
       }
 
@@ -2088,9 +2116,9 @@ function registerMonitoringInstance(
   const debug = opts?.debug;
 
   if (debug) {
-    console.log(`\nDebug: Registering monitoring instance...`);
-    console.log(`Debug: POST ${url}`);
-    console.log(`Debug: project_name=${projectName}`);
+    console.error(`\nDebug: Registering monitoring instance...`);
+    console.error(`Debug: POST ${url}`);
+    console.error(`Debug: project_name=${projectName}`);
   }
 
   // Fire and forget - don't block the main flow
@@ -2108,18 +2136,18 @@ function registerMonitoringInstance(
       const body = await res.text().catch(() => "");
       if (!res.ok) {
         if (debug) {
-          console.log(`Debug: Monitoring registration failed: HTTP ${res.status}`);
-          console.log(`Debug: Response: ${body}`);
+          console.error(`Debug: Monitoring registration failed: HTTP ${res.status}`);
+          console.error(`Debug: Response: ${body}`);
         }
         return;
       }
       if (debug) {
-        console.log(`Debug: Monitoring registration response: ${body}`);
+        console.error(`Debug: Monitoring registration response: ${body}`);
       }
     })
     .catch((err) => {
       if (debug) {
-        console.log(`Debug: Monitoring registration error: ${err.message}`);
+        console.error(`Debug: Monitoring registration error: ${err.message}`);
       }
     });
 }
@@ -2299,8 +2327,8 @@ mon
 
     // Validate conflicting options
     if (opts.demo && opts.dbUrl) {
-      console.log("⚠ Both --demo and --db-url provided. Demo mode includes its own database.");
-      console.log("⚠ The --db-url will be ignored in demo mode.\n");
+      console.error("⚠ Both --demo and --db-url provided. Demo mode includes its own database.");
+      console.error("⚠ The --db-url will be ignored in demo mode.\n");
       opts.dbUrl = undefined;
     }
 
@@ -2316,7 +2344,7 @@ mon
     // Check if containers are already running
     const { running, containers } = checkRunningContainers();
     if (running) {
-      console.log(`⚠ Monitoring services are already running: ${containers.join(", ")}`);
+      console.error(`⚠ Monitoring services are already running: ${containers.join(", ")}`);
       console.log("Use 'postgres-ai mon restart' to restart them\n");
       return;
     }
@@ -2335,7 +2363,7 @@ mon
       } else if (opts.yes) {
         // Auto-yes mode without API key - skip API key setup
         console.log("Auto-yes mode: no API key provided, skipping API key setup");
-        console.log("⚠ Reports will be generated locally only");
+        console.error("⚠ Reports will be generated locally only");
         console.log("You can add an API key later with: postgres-ai add-key <api_key>\n");
       } else {
         const answer = await question("Do you have a Postgres AI API key? (Y/n): ");
@@ -2355,16 +2383,16 @@ mon
               break;
             }
 
-            console.log("⚠ API key cannot be empty");
+            console.error("⚠ API key cannot be empty");
             const retry = await question("Try again or skip API key setup, retry? (Y/n): ");
             if (retry.toLowerCase() === "n") {
-              console.log("⚠ Skipping API key setup - reports will be generated locally only");
+              console.error("⚠ Skipping API key setup - reports will be generated locally only");
               console.log("You can add an API key later with: postgres-ai add-key <api_key>\n");
               break;
             }
           }
         } else {
-          console.log("⚠ Skipping API key setup - reports will be generated locally only");
+          console.error("⚠ Skipping API key setup - reports will be generated locally only");
           console.log("You can add an API key later with: postgres-ai add-key <api_key>\n");
         }
       }
@@ -2424,7 +2452,7 @@ mon
       } else if (opts.yes) {
         // Auto-yes mode without database URL - skip database setup
         console.log("Auto-yes mode: no database URL provided, skipping database setup");
-        console.log("⚠ No PostgreSQL instance added");
+        console.error("⚠ No PostgreSQL instance added");
         console.log("You can add one later with: postgres-ai mon targets add\n");
       } else {
         console.log("You need to add at least one PostgreSQL instance to monitor");
@@ -2442,7 +2470,7 @@ mon
             const m = connStr.match(/^postgresql:\/\/([^:]+):([^@]+)@([^:\/]+)(?::(\d+))?\/(.+)$/);
             if (!m) {
               console.error("✗ Invalid connection string format");
-              console.log("⚠ Continuing without adding instance\n");
+              console.error("⚠ Continuing without adding instance\n");
             } else {
               const host = m[3];
               const db = m[5];
@@ -2467,10 +2495,10 @@ mon
               }
             }
           } else {
-            console.log("⚠ No PostgreSQL instance added - you can add one later with: postgres-ai mon targets add\n");
+            console.error("⚠ No PostgreSQL instance added - you can add one later with: postgres-ai mon targets add\n");
           }
         } else {
-          console.log("⚠ No PostgreSQL instance added - you can add one later with: postgres-ai mon targets add\n");
+          console.error("⚠ No PostgreSQL instance added - you can add one later with: postgres-ai mon targets add\n");
         }
       }
     } else {
@@ -2523,7 +2551,7 @@ mon
 
       console.log("✓ Grafana password configured\n");
     } catch (error) {
-      console.log("⚠ Could not generate Grafana password automatically");
+      console.error("⚠ Could not generate Grafana password automatically");
       console.log("Using default password: demo\n");
       grafanaPassword = "demo";
     }
@@ -2915,7 +2943,7 @@ mon
       if (downCode === 0) {
         console.log("✓ Monitoring services stopped and removed");
       } else {
-        console.log("⚠ Could not stop services (may not be running)");
+        console.error("⚠ Could not stop services (may not be running)");
       }
 
       // Remove any orphaned containers that docker compose down missed
@@ -3228,8 +3256,8 @@ auth
     const { apiBaseUrl, uiBaseUrl } = resolveBaseUrls(rootOpts, cfg);
 
     if (opts.debug) {
-      console.log(`Debug: Resolved API base URL: ${apiBaseUrl}`);
-      console.log(`Debug: Resolved UI base URL: ${uiBaseUrl}`);
+      console.error(`Debug: Resolved API base URL: ${apiBaseUrl}`);
+      console.error(`Debug: Resolved UI base URL: ${uiBaseUrl}`);
     }
 
     try {
@@ -3259,8 +3287,8 @@ auth
       const initUrl = new URL(`${apiBaseUrl}/rpc/oauth_init`);
 
       if (opts.debug) {
-        console.log(`Debug: Trying to POST to: ${initUrl.toString()}`);
-        console.log(`Debug: Request data: ${initData}`);
+        console.error(`Debug: Trying to POST to: ${initUrl.toString()}`);
+        console.error(`Debug: Request data: ${initData}`);
       }
 
       // Step 2: Initialize OAuth session on backend using fetch
@@ -3306,7 +3334,7 @@ auth
       const authUrl = `${uiBaseUrl}/cli/auth?state=${encodeURIComponent(params.state)}&code_challenge=${encodeURIComponent(params.codeChallenge)}&code_challenge_method=S256&redirect_uri=${encodeURIComponent(redirectUri)}&api_url=${encodeURIComponent(apiBaseUrl)}`;
 
       if (opts.debug) {
-        console.log(`Debug: Auth URL: ${authUrl}`);
+        console.error(`Debug: Auth URL: ${authUrl}`);
       }
 
       console.log(`\nOpening browser for authentication...`);
@@ -3730,12 +3758,12 @@ issues
     // Interpret escape sequences in content (e.g., \n -> newline)
     if (opts.debug) {
       // eslint-disable-next-line no-console
-      console.log(`Debug: Original content: ${JSON.stringify(content)}`);
+      console.error(`Debug: Original content: ${JSON.stringify(content)}`);
     }
     content = interpretEscapes(content);
     if (opts.debug) {
       // eslint-disable-next-line no-console
-      console.log(`Debug: Interpreted content: ${JSON.stringify(content)}`);
+      console.error(`Debug: Interpreted content: ${JSON.stringify(content)}`);
     }
 
     const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Posting comment...");
@@ -3929,12 +3957,12 @@ issues
   .action(async (commentId: string, content: string, opts: { debug?: boolean; json?: boolean }) => {
     if (opts.debug) {
       // eslint-disable-next-line no-console
-      console.log(`Debug: Original content: ${JSON.stringify(content)}`);
+      console.error(`Debug: Original content: ${JSON.stringify(content)}`);
     }
     content = interpretEscapes(content);
     if (opts.debug) {
       // eslint-disable-next-line no-console
-      console.log(`Debug: Interpreted content: ${JSON.stringify(content)}`);
+      console.error(`Debug: Interpreted content: ${JSON.stringify(content)}`);
     }
 
     const rootOpts = program.opts<CliOptions>();
@@ -3967,6 +3995,93 @@ issues
     }
   });
 
+// File upload/download (subcommands of issues)
+const issueFiles = issues.command("files").description("upload and download files for issues");
+
+issueFiles
+  .command("upload <path>")
+  .description("upload a file to storage and get a markdown link")
+  .option("--debug", "enable debug output")
+  .option("--json", "output raw JSON")
+  .action(async (filePath: string, opts: { debug?: boolean; json?: boolean }) => {
+    const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Uploading file...");
+    try {
+      const rootOpts = program.opts<CliOptions>();
+      const cfg = config.readConfig();
+      const { apiKey } = getConfig(rootOpts);
+      if (!apiKey) {
+        spinner.stop();
+        console.error("API key is required. Run 'pgai auth' first or set --api-key.");
+        process.exitCode = 1;
+        return;
+      }
+
+      const { storageBaseUrl } = resolveBaseUrls(rootOpts, cfg);
+
+      const result = await uploadFile({
+        apiKey,
+        storageBaseUrl,
+        filePath,
+        debug: !!opts.debug,
+      });
+      spinner.stop();
+
+      if (opts.json) {
+        printResult(result, true);
+      } else {
+        const md = buildMarkdownLink(result.url, storageBaseUrl, result.metadata.originalName);
+        const displayUrl = result.url.startsWith("/") ? `${storageBaseUrl}${result.url}` : `${storageBaseUrl}/${result.url}`;
+        console.log(`URL: ${displayUrl}`);
+        console.log(`File: ${result.metadata.originalName}`);
+        console.log(`Size: ${result.metadata.size} bytes`);
+        console.log(`Type: ${result.metadata.mimeType}`);
+        console.log(`Markdown: ${md}`);
+      }
+    } catch (err) {
+      spinner.stop();
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(message);
+      process.exitCode = 1;
+    }
+  });
+
+issueFiles
+  .command("download <url>")
+  .description("download a file from storage")
+  .option("-o, --output <path>", "output file path (default: derive from URL)")
+  .option("--debug", "enable debug output")
+  .action(async (fileUrl: string, opts: { output?: string; debug?: boolean }) => {
+    const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Downloading file...");
+    try {
+      const rootOpts = program.opts<CliOptions>();
+      const cfg = config.readConfig();
+      const { apiKey } = getConfig(rootOpts);
+      if (!apiKey) {
+        spinner.stop();
+        console.error("API key is required. Run 'pgai auth' first or set --api-key.");
+        process.exitCode = 1;
+        return;
+      }
+
+      const { storageBaseUrl } = resolveBaseUrls(rootOpts, cfg);
+
+      const result = await downloadFile({
+        apiKey,
+        storageBaseUrl,
+        fileUrl,
+        outputPath: opts.output,
+        debug: !!opts.debug,
+      });
+      spinner.stop();
+      console.log(`Saved: ${result.savedTo}`);
+    } catch (err) {
+      spinner.stop();
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(message);
+      process.exitCode = 1;
+    }
+  });
+
 // Action Items management (subcommands of issues)
 issues
   .command("action-items <issueId>")
@@ -4198,11 +4313,11 @@ reports
   .command("list")
   .description("list checkup reports")
   .option("--project-id <id>", "filter by project id", (v: string) => parseInt(v, 10))
-  .option("--status <status>", "filter by status (e.g., completed)")
-  .option("--limit <n>", "max number of reports to return (default: 20)", (v: string) => parseInt(v, 10))
+  .addOption(new Option("--status <status>", "filter by status (e.g., completed)").hideHelp())
+  .option("--limit <n>", "max number of reports to return (default: 20, max: 100)", (v: string) => { const n = parseInt(v, 10); return Number.isNaN(n) ? 20 : Math.max(1, Math.min(n, 100)); })
   .option("--before <date>", "show reports created before this date (YYYY-MM-DD, DD.MM.YYYY, etc.)")
   .option("--all", "fetch all reports (paginated automatically)")
-  .option("--debug", "enable debug output")
+  .addOption(new Option("--debug", "enable debug output").hideHelp())
   .option("--json", "output raw JSON")
   .action(async (opts: { projectId?: number; status?: string; limit?: number; before?: string; all?: boolean; debug?: boolean; json?: boolean }) => {
     const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Fetching reports...");
@@ -4260,7 +4375,7 @@ reports
   .description("list files of a checkup report (metadata only, no content)")
   .option("--type <type>", "filter by file type: json, md")
   .option("--check-id <id>", "filter by check ID (e.g., H002)")
-  .option("--debug", "enable debug output")
+  .addOption(new Option("--debug", "enable debug output").hideHelp())
   .option("--json", "output raw JSON")
   .action(async (reportId: string | undefined, opts: { type?: "json" | "md"; checkId?: string; debug?: boolean; json?: boolean }) => {
     const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Fetching report files...");
@@ -4317,7 +4432,7 @@ reports
   .option("--check-id <id>", "filter by check ID (e.g., H002)")
   .option("--formatted", "render markdown with ANSI styling (experimental)")
   .option("-o, --output <dir>", "save files to directory (uses original filenames)")
-  .option("--debug", "enable debug output")
+  .addOption(new Option("--debug", "enable debug output").hideHelp())
   .option("--json", "output raw JSON")
   .action(async (reportId: string | undefined, opts: { type?: "json" | "md"; checkId?: string; formatted?: boolean; output?: string; debug?: boolean; json?: boolean }) => {
     const spinner = createTtySpinner(process.stdout.isTTY ?? false, "Fetching report data...");