Simplify issues cli and mcp

Author: Sarumyan

cli/README.md

@@ -117,14 +117,14 @@ Cursor configuration example (Settings → MCP):
 
 Tools exposed:
 - list_issues: returns the same JSON as `pgai issues list`.
-- list_issue_comments: list comments for an issue (args: { issue_id, debug? })
+- view_issue: view a single issue with its comments (args: { issue_id, debug? })
 - post_issue_comment: post a comment (args: { issue_id, content, parent_comment_id?, debug? })
 
 ### Issues management (`issues` group)
 
 ```bash
-pgai issues list                                  # List issues
-pgai issues comments <issueId>                    # List comments for an issue
+pgai issues list                                  # List issues (shows: id, title, status, created_at)
+pgai issues view <issueId>                        # View issue details and comments
 pgai issues post_comment <issueId> <content>      # Post a comment to an issue
 # Options:
 #   --parent <uuid>  Parent comment ID (for replies)
@@ -145,7 +145,7 @@ pgai issues list --json | jq '.[] | {id, title}'
 - Rely on auto-detection: when stdout is not a TTY (e.g., piped or redirected), output is JSON automatically:
 
 ```bash
-pgai issues comments <issueId> > comments.json
+pgai issues view <issueId> > issue.json
 ```
 
 #### Grafana management

cli/bin/postgres-ai.ts

@@ -13,7 +13,7 @@ import * as readline from "readline";
 import * as http from "https";
 import { URL } from "url";
 import { startMcpServer } from "../lib/mcp-server";
-import { fetchIssues, fetchIssueComments, createIssueComment } from "../lib/issues";
+import { fetchIssues, fetchIssueComments, createIssueComment, fetchIssue } from "../lib/issues";
 import { resolveBaseUrls } from "../lib/util";
 
 const execPromise = promisify(exec);
@@ -1225,7 +1225,15 @@ issues
       const { apiBaseUrl } = resolveBaseUrls(rootOpts, cfg);
 
       const result = await fetchIssues({ apiKey, apiBaseUrl, debug: !!opts.debug });
-      printResult(result, opts.json);
+      const trimmed = Array.isArray(result)
+        ? (result as any[]).map((r) => ({
+            id: (r as any).id,
+            title: (r as any).title,
+            status: (r as any).status,
+            created_at: (r as any).created_at,
+          }))
+        : result;
+      printResult(trimmed, opts.json);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(message);
@@ -1234,8 +1242,8 @@ issues
   });
 
 issues
-  .command("comments <issueId>")
-  .description("list comments for an issue")
+  .command("view <issueId>")
+  .description("view issue details and comments")
   .option("--debug", "enable debug output")
   .option("--json", "output raw JSON")
   .action(async (issueId: string, opts: { debug?: boolean; json?: boolean }) => {
@@ -1251,8 +1259,16 @@ issues
 
       const { apiBaseUrl } = resolveBaseUrls(rootOpts, cfg);
 
-      const result = await fetchIssueComments({ apiKey, apiBaseUrl, issueId, debug: !!opts.debug });
-      printResult(result, opts.json);
+      const issue = await fetchIssue({ apiKey, apiBaseUrl, issueId, debug: !!opts.debug });
+      if (!issue) {
+        console.error("Issue not found");
+        process.exitCode = 1;
+        return;
+      }
+
+      const comments = await fetchIssueComments({ apiKey, apiBaseUrl, issueId, debug: !!opts.debug });
+      const combined = { issue, comments };
+      printResult(combined, opts.json);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(message);

cli/lib/issues.ts

@@ -163,6 +163,94 @@ export async function fetchIssueComments(params: FetchIssueCommentsParams): Prom
   });
 }
 
+export interface FetchIssueParams {
+  apiKey: string;
+  apiBaseUrl: string;
+  issueId: string;
+  debug?: boolean;
+}
+
+export async function fetchIssue(params: FetchIssueParams): Promise<unknown> {
+  const { apiKey, apiBaseUrl, issueId, debug } = params;
+  if (!apiKey) {
+    throw new Error("API key is required");
+  }
+  if (!issueId) {
+    throw new Error("issueId is required");
+  }
+
+  const base = normalizeBaseUrl(apiBaseUrl);
+  const url = new URL(`${base}/issues`);
+  url.searchParams.set("id", `eq.${issueId}`);
+  url.searchParams.set("limit", "1");
+
+  const headers: Record<string, string> = {
+    "access-token": apiKey,
+    "Prefer": "return=representation",
+    "Content-Type": "application/json",
+  };
+
+  if (debug) {
+    const debugHeaders: Record<string, string> = { ...headers, "access-token": maskSecret(apiKey) };
+    // eslint-disable-next-line no-console
+    console.log(`Debug: Resolved API base URL: ${base}`);
+    // eslint-disable-next-line no-console
+    console.log(`Debug: GET URL: ${url.toString()}`);
+    // eslint-disable-next-line no-console
+    console.log(`Debug: Auth scheme: access-token`);
+    // eslint-disable-next-line no-console
+    console.log(`Debug: Request headers: ${JSON.stringify(debugHeaders)}`);
+  }
+
+  return new Promise((resolve, reject) => {
+    const req = https.request(
+      url,
+      {
+        method: "GET",
+        headers,
+      },
+      (res) => {
+        let data = "";
+        res.on("data", (chunk) => (data += chunk));
+        res.on("end", () => {
+          if (debug) {
+            // eslint-disable-next-line no-console
+            console.log(`Debug: Response status: ${res.statusCode}`);
+            // eslint-disable-next-line no-console
+            console.log(`Debug: Response headers: ${JSON.stringify(res.headers)}`);
+          }
+          if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+            try {
+              const parsed = JSON.parse(data);
+              if (Array.isArray(parsed)) {
+                resolve(parsed[0] ?? null);
+              } else {
+                resolve(parsed);
+              }
+            } catch {
+              resolve(data);
+            }
+          } else {
+            let errMsg = `Failed to fetch issue: HTTP ${res.statusCode}`;
+            if (data) {
+              try {
+                const errObj = JSON.parse(data);
+                errMsg += `\n${JSON.stringify(errObj, null, 2)}`;
+              } catch {
+                errMsg += `\n${data}`;
+              }
+            }
+            reject(new Error(errMsg));
+          }
+        });
+      }
+    );
+
+    req.on("error", (err: Error) => reject(err));
+    req.end();
+  });
+}
+
 export interface CreateIssueCommentParams {
   apiKey: string;
   apiBaseUrl: string;

cli/lib/mcp-server.ts

@@ -1,6 +1,6 @@
 import * as pkg from "../package.json";
 import * as config from "./config";
-import { fetchIssues, fetchIssueComments, createIssueComment } from "./issues";
+import { fetchIssues, fetchIssueComments, createIssueComment, fetchIssue } from "./issues";
 import { resolveBaseUrls } from "./util";
 
 // MCP SDK imports
@@ -54,8 +54,8 @@ export async function startMcpServer(rootOpts?: RootOptsLike, extra?: { debug?:
           },
         },
         {
-          name: "list_issue_comments",
-          description: "List comments for a specific issue (issue_id UUID)",
+          name: "view_issue",
+          description: "View a specific issue with its comments",
           inputSchema: {
             type: "object",
             properties: {
@@ -110,16 +110,29 @@ export async function startMcpServer(rootOpts?: RootOptsLike, extra?: { debug?:
     try {
       if (toolName === "list_issues") {
         const result = await fetchIssues({ apiKey, apiBaseUrl, debug });
-        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+        const trimmed = Array.isArray(result)
+          ? (result as any[]).map((r) => ({
+              id: (r as any).id,
+              title: (r as any).title,
+              status: (r as any).status,
+              created_at: (r as any).created_at,
+            }))
+          : result;
+        return { content: [{ type: "text", text: JSON.stringify(trimmed, null, 2) }] };
       }
 
-      if (toolName === "list_issue_comments") {
+      if (toolName === "view_issue") {
         const issueId = String(args.issue_id || "").trim();
         if (!issueId) {
           return { content: [{ type: "text", text: "issue_id is required" }], isError: true };
         }
-        const result = await fetchIssueComments({ apiKey, apiBaseUrl, issueId, debug });
-        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+        const issue = await fetchIssue({ apiKey, apiBaseUrl, issueId, debug });
+        if (!issue) {
+          return { content: [{ type: "text", text: "Issue not found" }], isError: true };
+        }
+        const comments = await fetchIssueComments({ apiKey, apiBaseUrl, issueId, debug });
+        const combined = { issue, comments };
+        return { content: [{ type: "text", text: JSON.stringify(combined, null, 2) }] };
       }
 
       if (toolName === "post_issue_comment") {