postgresai 0.11.0-alpha.11 → 0.11.0-alpha.13

package/README.md

@@ -88,6 +88,31 @@ postgres-ai mon check                          # System readiness check
 postgres-ai mon shell <service>                # Open shell to monitoring service
 ```
 
+### MCP server (`mcp` group)
+
+```bash
+pgai mcp start                 # Start MCP stdio server exposing list_issues tool
+```
+
+Cursor configuration example (Settings → MCP):
+
+```json
+{
+  "mcpServers": {
+    "PostgresAI": {
+      "command": "pgai",
+      "args": ["mcp", "start"],
+      "env": {
+        "PGAI_API_BASE_URL": "https://postgres.ai/api/general/"
+      }
+    }
+  }
+}
+```
+
+Tools exposed:
+- list_issues: returns the same JSON as `pgai issues list`.
+
 #### Grafana management
 ```bash
 postgres-ai mon generate-grafana-password      # Generate new Grafana password
@@ -117,6 +142,20 @@ API key resolution order:
 3. User config file (`~/.config/postgresai/config.json`)
 4. Legacy project config (`.pgwatch-config`)
 
+Base URL resolution order:
+- API base URL (`apiBaseUrl`):
+  1. Command line option (`--api-base-url`)
+  2. Environment variable (`PGAI_API_BASE_URL`)
+  3. User config file `baseUrl` (`~/.config/postgresai/config.json`)
+  4. Default: `https://postgres.ai/api/general/`
+- UI base URL (`uiBaseUrl`):
+  1. Command line option (`--ui-base-url`)
+  2. Environment variable (`PGAI_UI_BASE_URL`)
+  3. Default: `https://console.postgres.ai`
+
+Normalization:
+- A single trailing `/` is removed to ensure consistent path joining.
+
 ### Environment variables
 
 - `PGAI_API_KEY` - API key for PostgresAI services

package/bin/postgres-ai.ts

@@ -12,6 +12,9 @@ import { promisify } from "util";
 import * as readline from "readline";
 import * as http from "https";
 import { URL } from "url";
+import { startMcpServer } from "../lib/mcp-server";
+import { fetchIssues } from "../lib/issues";
+import { resolveBaseUrls } from "../lib/util";
 
 const execPromise = promisify(exec);
 const execFilePromise = promisify(execFile);
@@ -672,9 +675,8 @@ program
     const params = pkce.generatePKCEParams();
 
     const rootOpts = program.opts<CliOptions>();
-
-    const apiBaseUrl = (rootOpts.apiBaseUrl || process.env.PGAI_API_BASE_URL || "https://postgres.ai/api/general/").replace(/\/$/, "");
-    const uiBaseUrl = (rootOpts.uiBaseUrl || process.env.PGAI_UI_BASE_URL || "https://console.postgres.ai").replace(/\/$/, "");
+    const cfg = config.readConfig();
+    const { apiBaseUrl, uiBaseUrl } = resolveBaseUrls(rootOpts, cfg);
     
     if (opts.debug) {
       console.log(`Debug: Resolved API base URL: ${apiBaseUrl}`);
@@ -685,7 +687,7 @@ program
       // Step 1: Start local callback server FIRST to get actual port
       console.log("Starting local callback server...");
       const requestedPort = opts.port || 0; // 0 = OS assigns available port
-      const callbackServer = authServer.createCallbackServer(requestedPort, params.state, 300000);
+      const callbackServer = authServer.createCallbackServer(requestedPort, params.state, 120000); // 2 minute timeout
       
       // Wait a bit for server to start and get port
       await new Promise(resolve => setTimeout(resolve, 100));
@@ -727,10 +729,20 @@ program
           res.on("end", async () => {
             if (res.statusCode !== 200) {
               console.error(`Failed to initialize auth session: ${res.statusCode}`);
-              console.error(data);
+              
+              // Check if response is HTML (common for 404 pages)
+              if (data.trim().startsWith("<!") || data.trim().startsWith("<html")) {
+                console.error("Error: Received HTML response instead of JSON. This usually means:");
+                console.error("  1. The API endpoint URL is incorrect");
+                console.error("  2. The endpoint does not exist (404)");
+                console.error(`\nAPI URL attempted: ${initUrl.toString()}`);
+                console.error("\nPlease verify the --api-base-url parameter.");
+              } else {
+                console.error(data);
+              }
+              
               callbackServer.server.close();
-              process.exitCode = 1;
-              return;
+              process.exit(1);
             }
             
             // Step 3: Open browser
@@ -751,9 +763,22 @@ program
             
             // Step 4: Wait for callback
             console.log("Waiting for authorization...");
+            console.log("(Press Ctrl+C to cancel)\n");
+            
+            // Handle Ctrl+C gracefully
+            const cancelHandler = () => {
+              console.log("\n\nAuthentication cancelled by user.");
+              callbackServer.server.close();
+              process.exit(130); // Standard exit code for SIGINT
+            };
+            process.on("SIGINT", cancelHandler);
+            
             try {
               const { code } = await callbackServer.promise;
               
+              // Remove the cancel handler after successful auth
+              process.off("SIGINT", cancelHandler);
+              
               // Step 5: Exchange code for token
               console.log("\nExchanging authorization code for API token...");
               const exchangeData = JSON.stringify({
@@ -761,7 +786,6 @@ program
                 code_verifier: params.codeVerifier,
                 state: params.state,
               });
-              
               const exchangeUrl = new URL(`${apiBaseUrl}/rpc/oauth_token_exchange`);
               const exchangeReq = http.request(
                 exchangeUrl,
@@ -773,20 +797,31 @@ program
                   },
                 },
                 (exchangeRes) => {
-                  let exchangeData = "";
-                  exchangeRes.on("data", (chunk) => (exchangeData += chunk));
+                  let exchangeBody = "";
+                  exchangeRes.on("data", (chunk) => (exchangeBody += chunk));
                   exchangeRes.on("end", () => {
                     if (exchangeRes.statusCode !== 200) {
                       console.error(`Failed to exchange code for token: ${exchangeRes.statusCode}`);
-                      console.error(exchangeData);
-                      process.exitCode = 1;
+                      
+                      // Check if response is HTML (common for 404 pages)
+                      if (exchangeBody.trim().startsWith("<!") || exchangeBody.trim().startsWith("<html")) {
+                        console.error("Error: Received HTML response instead of JSON. This usually means:");
+                        console.error("  1. The API endpoint URL is incorrect");
+                        console.error("  2. The endpoint does not exist (404)");
+                        console.error(`\nAPI URL attempted: ${exchangeUrl.toString()}`);
+                        console.error("\nPlease verify the --api-base-url parameter.");
+                      } else {
+                        console.error(exchangeBody);
+                      }
+                      
+                      process.exit(1);
                       return;
                     }
                     
                     try {
-                      const result = JSON.parse(exchangeData);
-                      const apiToken = result.api_token;
-                      const orgId = result.org_id;
+                      const result = JSON.parse(exchangeBody);
+                      const apiToken = result.api_token || result?.[0]?.result?.api_token; // There is a bug with PostgREST Caching that may return an array, not single object, it's a workaround to support both cases.
+                      const orgId = result.org_id || result?.[0]?.result?.org_id; // There is a bug with PostgREST Caching that may return an array, not single object, it's a workaround to support both cases.
                       
                       // Step 6: Save token to config
                       config.writeConfig({
@@ -799,10 +834,11 @@ program
                       console.log(`API key saved to: ${config.getConfigPath()}`);
                       console.log(`Organization ID: ${orgId}`);
                       console.log(`\nYou can now use the CLI without specifying an API key.`);
+                      process.exit(0);
                     } catch (err) {
                       const message = err instanceof Error ? err.message : String(err);
                       console.error(`Failed to parse response: ${message}`);
-                      process.exitCode = 1;
+                      process.exit(1);
                     }
                   });
                 }
@@ -810,16 +846,28 @@ program
               
               exchangeReq.on("error", (err: Error) => {
                 console.error(`Exchange request failed: ${err.message}`);
-                process.exitCode = 1;
+                process.exit(1);
               });
               
               exchangeReq.write(exchangeData);
               exchangeReq.end();
               
             } catch (err) {
+              // Remove the cancel handler in error case too
+              process.off("SIGINT", cancelHandler);
+              
               const message = err instanceof Error ? err.message : String(err);
-              console.error(`\nAuthentication failed: ${message}`);
-              process.exitCode = 1;
+              
+              // Provide more helpful error messages
+              if (message.includes("timeout")) {
+                console.error(`\nAuthentication timed out.`);
+                console.error(`This usually means you closed the browser window without completing authentication.`);
+                console.error(`Please try again and complete the authentication flow.`);
+              } else {
+                console.error(`\nAuthentication failed: ${message}`);
+              }
+              
+              process.exit(1);
             }
           });
         }
@@ -828,7 +876,7 @@ program
       initReq.on("error", (err: Error) => {
         console.error(`Failed to connect to API: ${err.message}`);
         callbackServer.server.close();
-        process.exitCode = 1;
+        process.exit(1);
       });
       
       initReq.write(initData);
@@ -837,7 +885,7 @@ program
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(`Authentication error: ${message}`);
-      process.exitCode = 1;
+      process.exit(1);
     }
   });
 
@@ -859,13 +907,8 @@ program
       console.log(`\nTo authenticate, run: pgai auth`);
       return;
     }
-    const mask = (k: string): string => {
-      if (k.length <= 8) return "****";
-      if (k.length <= 16) return `${k.slice(0, 4)}${"*".repeat(k.length - 8)}${k.slice(-4)}`;
-      // For longer keys, show more of the beginning to help identify them
-      return `${k.slice(0, Math.min(12, k.length - 8))}${"*".repeat(Math.max(4, k.length - 16))}${k.slice(-4)}`;
-    };
-    console.log(`Current API key: ${mask(cfg.apiKey)}`);
+    const { maskSecret } = require("../lib/util");
+    console.log(`Current API key: ${maskSecret(cfg.apiKey)}`);
     if (cfg.orgId) {
       console.log(`Organization ID: ${cfg.orgId}`);
     }
@@ -953,8 +996,8 @@ mon
       console.log("  URL:      http://localhost:3000");
       console.log("  Username: monitor");
       console.log(`  Password: ${newPassword}`);
-      console.log("\nRestart Grafana to apply:");
-      console.log("  postgres-ai mon restart grafana");
+      console.log("\nReset Grafana to apply new password:");
+      console.log("  postgres-ai mon reset grafana");
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       console.error(`Failed to generate password: ${message}`);
@@ -1002,5 +1045,51 @@ mon
     console.log("");
   });
 
+// Issues management
+const issues = program.command("issues").description("issues management");
+
+issues
+  .command("list")
+  .description("list issues")
+  .option("--debug", "enable debug output")
+  .action(async (opts: { debug?: boolean }) => {
+    try {
+      const rootOpts = program.opts<CliOptions>();
+      const cfg = config.readConfig();
+      const { apiKey } = getConfig(rootOpts);
+      if (!apiKey) {
+        console.error("API key is required. Run 'pgai auth' first or set --api-key.");
+        process.exitCode = 1;
+        return;
+      }
+
+      const { apiBaseUrl } = resolveBaseUrls(rootOpts, cfg);
+
+      const result = await fetchIssues({ apiKey, apiBaseUrl, debug: !!opts.debug });
+      if (typeof result === "string") {
+        process.stdout.write(result);
+        if (!/\n$/.test(result)) console.log();
+      } else {
+        console.log(JSON.stringify(result, null, 2));
+      }
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(message);
+      process.exitCode = 1;
+    }
+  });
+
+// MCP server
+const mcp = program.command("mcp").description("MCP server integration");
+
+mcp
+  .command("start")
+  .description("start MCP stdio server")
+  .option("--debug", "enable debug output")
+  .action(async (opts: { debug?: boolean }) => {
+    const rootOpts = program.opts<CliOptions>();
+    await startMcpServer(rootOpts, { debug: !!opts.debug });
+  });
+
 program.parseAsync(process.argv);
 

package/dist/bin/postgres-ai.js

@@ -45,6 +45,9 @@ const util_1 = require("util");
 const readline = __importStar(require("readline"));
 const http = __importStar(require("https"));
 const url_1 = require("url");
+const mcp_server_1 = require("../lib/mcp-server");
+const issues_1 = require("../lib/issues");
+const util_2 = require("../lib/util");
 const execPromise = (0, util_1.promisify)(child_process_1.exec);
 const execFilePromise = (0, util_1.promisify)(child_process_1.execFile);
 /**
@@ -602,8 +605,8 @@ program
     // Generate PKCE parameters
     const params = pkce.generatePKCEParams();
     const rootOpts = program.opts();
-    const apiBaseUrl = (rootOpts.apiBaseUrl || process.env.PGAI_API_BASE_URL || "https://postgres.ai/api/general/").replace(/\/$/, "");
-    const uiBaseUrl = (rootOpts.uiBaseUrl || process.env.PGAI_UI_BASE_URL || "https://console.postgres.ai").replace(/\/$/, "");
+    const cfg = config.readConfig();
+    const { apiBaseUrl, uiBaseUrl } = (0, util_2.resolveBaseUrls)(rootOpts, cfg);
     if (opts.debug) {
         console.log(`Debug: Resolved API base URL: ${apiBaseUrl}`);
         console.log(`Debug: Resolved UI base URL: ${uiBaseUrl}`);
@@ -612,7 +615,7 @@ program
         // Step 1: Start local callback server FIRST to get actual port
         console.log("Starting local callback server...");
         const requestedPort = opts.port || 0; // 0 = OS assigns available port
-        const callbackServer = authServer.createCallbackServer(requestedPort, params.state, 300000);
+        const callbackServer = authServer.createCallbackServer(requestedPort, params.state, 120000); // 2 minute timeout
         // Wait a bit for server to start and get port
         await new Promise(resolve => setTimeout(resolve, 100));
         const actualPort = callbackServer.getPort();
@@ -645,10 +648,19 @@ program
             res.on("end", async () => {
                 if (res.statusCode !== 200) {
                     console.error(`Failed to initialize auth session: ${res.statusCode}`);
-                    console.error(data);
+                    // Check if response is HTML (common for 404 pages)
+                    if (data.trim().startsWith("<!") || data.trim().startsWith("<html")) {
+                        console.error("Error: Received HTML response instead of JSON. This usually means:");
+                        console.error("  1. The API endpoint URL is incorrect");
+                        console.error("  2. The endpoint does not exist (404)");
+                        console.error(`\nAPI URL attempted: ${initUrl.toString()}`);
+                        console.error("\nPlease verify the --api-base-url parameter.");
+                    }
+                    else {
+                        console.error(data);
+                    }
                     callbackServer.server.close();
-                    process.exitCode = 1;
-                    return;
+                    process.exit(1);
                 }
                 // Step 3: Open browser
                 const authUrl = `${uiBaseUrl}/cli/auth?state=${encodeURIComponent(params.state)}&code_challenge=${encodeURIComponent(params.codeChallenge)}&code_challenge_method=S256&redirect_uri=${encodeURIComponent(redirectUri)}`;
@@ -664,8 +676,18 @@ program
                 (0, child_process_1.spawn)(openCommand, [authUrl], { detached: true, stdio: "ignore" }).unref();
                 // Step 4: Wait for callback
                 console.log("Waiting for authorization...");
+                console.log("(Press Ctrl+C to cancel)\n");
+                // Handle Ctrl+C gracefully
+                const cancelHandler = () => {
+                    console.log("\n\nAuthentication cancelled by user.");
+                    callbackServer.server.close();
+                    process.exit(130); // Standard exit code for SIGINT
+                };
+                process.on("SIGINT", cancelHandler);
                 try {
                     const { code } = await callbackServer.promise;
+                    // Remove the cancel handler after successful auth
+                    process.off("SIGINT", cancelHandler);
                     // Step 5: Exchange code for token
                     console.log("\nExchanging authorization code for API token...");
                     const exchangeData = JSON.stringify({
@@ -681,19 +703,29 @@ program
                             "Content-Length": Buffer.byteLength(exchangeData),
                         },
                     }, (exchangeRes) => {
-                        let exchangeData = "";
-                        exchangeRes.on("data", (chunk) => (exchangeData += chunk));
+                        let exchangeBody = "";
+                        exchangeRes.on("data", (chunk) => (exchangeBody += chunk));
                         exchangeRes.on("end", () => {
                             if (exchangeRes.statusCode !== 200) {
                                 console.error(`Failed to exchange code for token: ${exchangeRes.statusCode}`);
-                                console.error(exchangeData);
-                                process.exitCode = 1;
+                                // Check if response is HTML (common for 404 pages)
+                                if (exchangeBody.trim().startsWith("<!") || exchangeBody.trim().startsWith("<html")) {
+                                    console.error("Error: Received HTML response instead of JSON. This usually means:");
+                                    console.error("  1. The API endpoint URL is incorrect");
+                                    console.error("  2. The endpoint does not exist (404)");
+                                    console.error(`\nAPI URL attempted: ${exchangeUrl.toString()}`);
+                                    console.error("\nPlease verify the --api-base-url parameter.");
+                                }
+                                else {
+                                    console.error(exchangeBody);
+                                }
+                                process.exit(1);
                                 return;
                             }
                             try {
-                                const result = JSON.parse(exchangeData);
-                                const apiToken = result.api_token;
-                                const orgId = result.org_id;
+                                const result = JSON.parse(exchangeBody);
+                                const apiToken = result.api_token || result?.[0]?.result?.api_token; // There is a bug with PostgREST Caching that may return an array, not single object, it's a workaround to support both cases.
+                                const orgId = result.org_id || result?.[0]?.result?.org_id; // There is a bug with PostgREST Caching that may return an array, not single object, it's a workaround to support both cases.
                                 // Step 6: Save token to config
                                 config.writeConfig({
                                     apiKey: apiToken,
@@ -704,32 +736,43 @@ program
                                 console.log(`API key saved to: ${config.getConfigPath()}`);
                                 console.log(`Organization ID: ${orgId}`);
                                 console.log(`\nYou can now use the CLI without specifying an API key.`);
+                                process.exit(0);
                             }
                             catch (err) {
                                 const message = err instanceof Error ? err.message : String(err);
                                 console.error(`Failed to parse response: ${message}`);
-                                process.exitCode = 1;
+                                process.exit(1);
                             }
                         });
                     });
                     exchangeReq.on("error", (err) => {
                         console.error(`Exchange request failed: ${err.message}`);
-                        process.exitCode = 1;
+                        process.exit(1);
                     });
                     exchangeReq.write(exchangeData);
                     exchangeReq.end();
                 }
                 catch (err) {
+                    // Remove the cancel handler in error case too
+                    process.off("SIGINT", cancelHandler);
                     const message = err instanceof Error ? err.message : String(err);
-                    console.error(`\nAuthentication failed: ${message}`);
-                    process.exitCode = 1;
+                    // Provide more helpful error messages
+                    if (message.includes("timeout")) {
+                        console.error(`\nAuthentication timed out.`);
+                        console.error(`This usually means you closed the browser window without completing authentication.`);
+                        console.error(`Please try again and complete the authentication flow.`);
+                    }
+                    else {
+                        console.error(`\nAuthentication failed: ${message}`);
+                    }
+                    process.exit(1);
                 }
             });
         });
         initReq.on("error", (err) => {
             console.error(`Failed to connect to API: ${err.message}`);
             callbackServer.server.close();
-            process.exitCode = 1;
+            process.exit(1);
         });
         initReq.write(initData);
         initReq.end();
@@ -737,7 +780,7 @@ program
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         console.error(`Authentication error: ${message}`);
-        process.exitCode = 1;
+        process.exit(1);
     }
 });
 program
@@ -757,15 +800,8 @@ program
         console.log(`\nTo authenticate, run: pgai auth`);
         return;
     }
-    const mask = (k) => {
-        if (k.length <= 8)
-            return "****";
-        if (k.length <= 16)
-            return `${k.slice(0, 4)}${"*".repeat(k.length - 8)}${k.slice(-4)}`;
-        // For longer keys, show more of the beginning to help identify them
-        return `${k.slice(0, Math.min(12, k.length - 8))}${"*".repeat(Math.max(4, k.length - 16))}${k.slice(-4)}`;
-    };
-    console.log(`Current API key: ${mask(cfg.apiKey)}`);
+    const { maskSecret } = require("../lib/util");
+    console.log(`Current API key: ${maskSecret(cfg.apiKey)}`);
     if (cfg.orgId) {
         console.log(`Organization ID: ${cfg.orgId}`);
     }
@@ -842,8 +878,8 @@ mon
         console.log("  URL:      http://localhost:3000");
         console.log("  Username: monitor");
         console.log(`  Password: ${newPassword}`);
-        console.log("\nRestart Grafana to apply:");
-        console.log("  postgres-ai mon restart grafana");
+        console.log("\nReset Grafana to apply new password:");
+        console.log("  postgres-ai mon reset grafana");
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -889,5 +925,48 @@ mon
     console.log(`  Password: ${password}`);
     console.log("");
 });
+// Issues management
+const issues = program.command("issues").description("issues management");
+issues
+    .command("list")
+    .description("list issues")
+    .option("--debug", "enable debug output")
+    .action(async (opts) => {
+    try {
+        const rootOpts = program.opts();
+        const cfg = config.readConfig();
+        const { apiKey } = getConfig(rootOpts);
+        if (!apiKey) {
+            console.error("API key is required. Run 'pgai auth' first or set --api-key.");
+            process.exitCode = 1;
+            return;
+        }
+        const { apiBaseUrl } = (0, util_2.resolveBaseUrls)(rootOpts, cfg);
+        const result = await (0, issues_1.fetchIssues)({ apiKey, apiBaseUrl, debug: !!opts.debug });
+        if (typeof result === "string") {
+            process.stdout.write(result);
+            if (!/\n$/.test(result))
+                console.log();
+        }
+        else {
+            console.log(JSON.stringify(result, null, 2));
+        }
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(message);
+        process.exitCode = 1;
+    }
+});
+// MCP server
+const mcp = program.command("mcp").description("MCP server integration");
+mcp
+    .command("start")
+    .description("start MCP stdio server")
+    .option("--debug", "enable debug output")
+    .action(async (opts) => {
+    const rootOpts = program.opts();
+    await (0, mcp_server_1.startMcpServer)(rootOpts, { debug: !!opts.debug });
+});
 program.parseAsync(process.argv);
 //# sourceMappingURL=postgres-ai.js.map