@trim21/personal-pi-extensions 0.1.684 → 0.1.687

package/src/gh/tools/list-issues.ts

@@ -1,64 +1,83 @@
+/**
+ * `list-github-issues`：两条取数分支（关键词搜索走 octokit，浏览走 `gh issue list --json`）
+ * 归一成同一套 `SearchHit`，因此文本渲染与结构化载荷只有一份实现。
+ */
+
 import { Type } from "typebox";
 
-import type { ToolBus } from "../../lib/tool-bus.js";
+import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
+  browseList,
   type GhClient,
   type ListFilters,
-  listGithub,
-  searchList,
+  renderHitList,
+  type StructuredResultOf,
   subtitlePendant,
   type ToolCall,
-  type ToolResult,
   toToolResult,
+  withStructuredResult,
 } from "../base.js";
+import { ghHitListPayloadSchema } from "../schemas.js";
 
-async function listIssues(gh: GhClient, call: ToolCall<ListFilters>): Promise<ToolResult> {
+async function listIssues(
+  gh: GhClient,
+  call: ToolCall<ListFilters>,
+): Promise<StructuredResultOf<typeof ghHitListPayloadSchema>> {
   const { params, ctx, signal } = call;
-  const result = toToolResult(
-    params.keywords
-      ? await searchList("issue", params, gh.search)
-      : await listGithub("issue", params, { cwd: ctx.cwd, signal, input: params }),
-    params,
-  );
+  const { repo, hits } = params.keywords
+    ? { repo: params.repo, hits: await gh.search.search("issue", params) }
+    : await browseList(gh, "issue", params, { cwd: ctx.cwd, signal, input: params });
+  const text = renderHitList("issue", hits, { repo, fields: params.fields });
+  const result = toToolResult(text, params);
   result.details.pendant = subtitlePendant(params);
-  return result;
+  // 文本可能被行数/字节预算截断，载荷给全部命中
+  return withStructuredResult(result, { text, items: hits });
 }
 
 export function addListIssuesTool(gh: GhClient, bus: ToolBus) {
-  bus.register({
-    name: "list-github-issues",
-    label: "GitHub Issues List",
-    description:
-      'List GitHub issues with optional filters and keyword search. When repo is omitted, keyword search runs across GitHub. Keyword search defaults to open issues — pass state="all" to include closed ones. Set fields to choose the columns of each result row.',
-    promptSnippet: "List or search GitHub issues",
-    parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO (defaults to current repo)" })),
-      keywords: Type.Optional(Type.String({ description: "Search keywords (free text)" })),
-      state: Type.Optional(
-        Type.String({
-          description:
-            "open, closed, all (default: open; all applies to keyword search and covers closed too)",
-        }),
-      ),
-      label: Type.Optional(Type.String({ description: "Filter by label" })),
-      // `@me` 由 GitHub 的搜索 / 过滤 API 解析：不带 keywords 时 gh 自行展开（GraphQL 过滤分支）
-      // 或按字面量转发（搜索分支），带 keywords 时我们直接把 `assignee:@me` 交给搜索 API。
-      // 两条传输都支持，因此本仓库不要再实现一次展开。
-      author: Type.Optional(Type.String({ description: "Filter by author ('@me' for yourself)" })),
-      assignee: Type.Optional(
-        Type.String({ description: "Filter by assignee ('@me' for yourself)" }),
-      ),
-      milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 30, max 100)" })),
-      fields: Type.Optional(
-        Type.String({
-          description:
-            "Comma-separated columns for keyword-search rows (default: number,state,title,labels,updatedAt; adds repo when no repo given). Valid: number,state,title,url,author,labels,milestone,assignees,comments,repo,createdAt,updatedAt,closedAt",
-        }),
-      ),
+  bus.register(
+    defineStructuredTool({
+      name: "list-github-issues",
+      label: "GitHub Issues List",
+      description:
+        'List GitHub issues with optional filters and keyword search. When repo is omitted, keyword search runs across GitHub. Keyword search defaults to open issues — pass state="all" to include closed ones. Set fields to choose the columns of each result row.',
+      promptSnippet: "List or search GitHub issues",
+      parameters: Type.Object({
+        repo: Type.Optional(Type.String({ description: "OWNER/REPO (defaults to current repo)" })),
+        keywords: Type.Optional(Type.String({ description: "Search keywords (free text)" })),
+        state: Type.Optional(
+          Type.String({
+            description:
+              "open, closed, all (default: open; all applies to keyword search and covers closed too)",
+          }),
+        ),
+        label: Type.Optional(Type.String({ description: "Filter by label" })),
+        // `@me` 只在关键词搜索分支可用：搜索 API 自己把它解析成当前登录用户。浏览分支走
+        // REST 列表端点，`@me` 按字面量转发，不会匹配到当前用户（本仓库不做展开）。
+        author: Type.Optional(
+          Type.String({
+            description: "Filter by author ('@me' works with keywords; browse takes it literally)",
+          }),
+        ),
+        assignee: Type.Optional(
+          Type.String({
+            description:
+              "Filter by assignee ('@me' works with keywords; browse takes it literally)",
+          }),
+        ),
+        milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
+        limit: Type.Optional(Type.Number({ description: "Max results (default 30, max 100)" })),
+        fields: Type.Optional(
+          Type.String({
+            description:
+              "Comma-separated columns for the rows (default: number,state,title,labels,updatedAt; adds repo when no repo given). Valid: number,state,title,url,author,labels,milestone,assignees,comments,repo,createdAt,updatedAt,closedAt",
+          }),
+        ),
+      }),
+      structuredSchema: ghHitListPayloadSchema,
+      async execute(_id, params, signal, onUpdate, ctx) {
+        return listIssues(gh, { params, ctx, signal, onUpdate });
+      },
     }),
-    async execute(_id, params, signal, onUpdate, ctx) {
-      return listIssues(gh, { params, ctx, signal, onUpdate });
-    },
-  });
+  );
 }

package/src/gh/tools/list-prs.ts

@@ -1,64 +1,83 @@
+/**
+ * `list-github-prs`：与 `list-github-issues` 同一套两条分支（关键词搜索走 octokit，
+ * 浏览走 `gh pr list --json`），归一成同一套 `SearchHit`。
+ */
+
 import { Type } from "typebox";
 
-import type { ToolBus } from "../../lib/tool-bus.js";
+import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
+  browseList,
   type GhClient,
   type ListFilters,
-  listGithub,
-  searchList,
+  renderHitList,
+  type StructuredResultOf,
   subtitlePendant,
   type ToolCall,
-  type ToolResult,
   toToolResult,
+  withStructuredResult,
 } from "../base.js";
+import { ghHitListPayloadSchema } from "../schemas.js";
 
-async function listPrs(gh: GhClient, call: ToolCall<ListFilters>): Promise<ToolResult> {
+async function listPrs(
+  gh: GhClient,
+  call: ToolCall<ListFilters>,
+): Promise<StructuredResultOf<typeof ghHitListPayloadSchema>> {
   const { params, ctx, signal } = call;
-  const result = toToolResult(
-    params.keywords
-      ? await searchList("pr", params, gh.search)
-      : await listGithub("pr", params, { cwd: ctx.cwd, signal, input: params }),
-    params,
-  );
+  const { repo, hits } = params.keywords
+    ? { repo: params.repo, hits: await gh.search.search("pr", params) }
+    : await browseList(gh, "pr", params, { cwd: ctx.cwd, signal, input: params });
+  const text = renderHitList("pr", hits, { repo, fields: params.fields });
+  const result = toToolResult(text, params);
   result.details.pendant = subtitlePendant(params);
-  return result;
+  // 文本可能被行数/字节预算截断，载荷给全部命中
+  return withStructuredResult(result, { text, items: hits });
 }
 
 export function addListPrsTool(gh: GhClient, bus: ToolBus) {
-  bus.register({
-    name: "list-github-prs",
-    label: "GitHub PRs List",
-    description:
-      'List GitHub pull requests with optional filters and keyword search. When repo is omitted, keyword search runs across GitHub. Keyword search defaults to open PRs — pass state="merged", state="closed" (merged excluded) or state="all" to broaden. Set fields to choose the columns of each result row.',
-    promptSnippet: "List or search GitHub PRs",
-    parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO (defaults to current repo)" })),
-      keywords: Type.Optional(Type.String({ description: "Search keywords (free text)" })),
-      state: Type.Optional(
-        Type.String({
-          description:
-            "open, closed, merged, all (default: open; all applies to keyword search and covers open + closed + merged)",
-        }),
-      ),
-      label: Type.Optional(Type.String({ description: "Filter by label" })),
-      // `@me` 由 GitHub 的搜索 / 过滤 API 解析：不带 keywords 时 gh 自行展开（GraphQL 过滤分支）
-      // 或按字面量转发（搜索分支），带 keywords 时我们直接把 `assignee:@me` 交给搜索 API。
-      // 两条传输都支持，因此本仓库不要再实现一次展开。
-      author: Type.Optional(Type.String({ description: "Filter by author ('@me' for yourself)" })),
-      assignee: Type.Optional(
-        Type.String({ description: "Filter by assignee ('@me' for yourself)" }),
-      ),
-      milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 30, max 100)" })),
-      fields: Type.Optional(
-        Type.String({
-          description:
-            "Comma-separated columns for keyword-search rows (default: number,state,title,labels,updatedAt; adds repo when no repo given). Valid: number,state,title,url,author,labels,milestone,assignees,comments,repo,createdAt,updatedAt,closedAt,mergedAt",
-        }),
-      ),
+  bus.register(
+    defineStructuredTool({
+      name: "list-github-prs",
+      label: "GitHub PRs List",
+      description:
+        'List GitHub pull requests with optional filters and keyword search. When repo is omitted, keyword search runs across GitHub. Keyword search defaults to open PRs — pass state="merged", state="closed" (merged excluded) or state="all" to broaden. Set fields to choose the columns of each result row.',
+      promptSnippet: "List or search GitHub PRs",
+      parameters: Type.Object({
+        repo: Type.Optional(Type.String({ description: "OWNER/REPO (defaults to current repo)" })),
+        keywords: Type.Optional(Type.String({ description: "Search keywords (free text)" })),
+        state: Type.Optional(
+          Type.String({
+            description:
+              "open, closed, merged, all (default: open; all applies to keyword search and covers open + closed + merged)",
+          }),
+        ),
+        label: Type.Optional(Type.String({ description: "Filter by label" })),
+        // `@me` 只在关键词搜索分支可用：搜索 API 自己把它解析成当前登录用户。浏览分支走
+        // REST 列表端点，`@me` 按字面量转发，不会匹配到当前用户（本仓库不做展开）。
+        author: Type.Optional(
+          Type.String({
+            description: "Filter by author ('@me' works with keywords; browse takes it literally)",
+          }),
+        ),
+        assignee: Type.Optional(
+          Type.String({
+            description:
+              "Filter by assignee ('@me' works with keywords; browse takes it literally)",
+          }),
+        ),
+        milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
+        limit: Type.Optional(Type.Number({ description: "Max results (default 30, max 100)" })),
+        fields: Type.Optional(
+          Type.String({
+            description:
+              "Comma-separated columns for the rows (default: number,state,title,labels,updatedAt; adds repo when no repo given). Valid: number,state,title,url,author,labels,milestone,assignees,comments,repo,createdAt,updatedAt,closedAt,mergedAt",
+          }),
+        ),
+      }),
+      structuredSchema: ghHitListPayloadSchema,
+      async execute(_id, params, signal, onUpdate, ctx) {
+        return listPrs(gh, { params, ctx, signal, onUpdate });
+      },
     }),
-    async execute(_id, params, signal, onUpdate, ctx) {
-      return listPrs(gh, { params, ctx, signal, onUpdate });
-    },
-  });
+  );
 }

package/src/gh/tools/list-releases.ts

@@ -1,30 +1,48 @@
 import { Type } from "typebox";
 
-import type { ToolBus } from "../../lib/tool-bus.js";
-import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
+import { parseWithSchema } from "../../lib/parse-with-schema.js";
+import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
+import {
+  type GhClient,
+  resolveRepo,
+  splitRepo,
+  subtitlePendant,
+  toToolResult,
+  withStructuredResult,
+} from "../base.js";
+import { renderReleaseList } from "../render.js";
+import { ghReleaseListPayloadSchema, ghReleaseSummarySchema } from "../schemas.js";
 
-export function addListReleasesTool(_gh: GhClient, bus: ToolBus) {
-  bus.register({
-    name: "list-github-releases",
-    label: "GitHub Releases List",
-    description: "List GitHub releases.",
-    promptSnippet: "List GitHub releases",
-    parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 10)" })),
+export function addListReleasesTool(gh: GhClient, bus: ToolBus) {
+  bus.register(
+    defineStructuredTool({
+      name: "list-github-releases",
+      label: "GitHub Releases List",
+      description:
+        "List GitHub releases. Each row is: tag, flags (latest/prerelease/draft), published date, name.",
+      promptSnippet: "List GitHub releases",
+      parameters: Type.Object({
+        repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
+        limit: Type.Optional(Type.Number({ description: "Max results (default 10)" })),
+      }),
+      structuredSchema: ghReleaseListPayloadSchema,
+      async execute(_id, params, signal, _onUpdate, ctx) {
+        const { repo, limit } = params;
+        const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const { owner, repo: repoName } = splitRepo(effectiveRepo);
+        const items = await gh.reads.listReleases(owner, repoName, limit, signal);
+        const releases = parseWithSchema(Type.Array(ghReleaseSummarySchema), items);
+        // REST 没有 isLatest：按列表顺序取第一个非 draft / prerelease 的条目
+        const latestIndex = releases.findIndex(
+          (release) => release.draft !== true && release.prerelease !== true,
+        );
+        const text = renderReleaseList(
+          releases.map((release, index) => ({ ...release, latest: index === latestIndex })),
+        );
+        const result = toToolResult(text, params);
+        result.details.pendant = subtitlePendant(params);
+        return withStructuredResult(result, { text, releases });
+      },
     }),
-    async execute(_id, params, signal, _onUpdate, ctx) {
-      const { repo, limit } = params;
-      const args = ["release", "list", ...repoArgs(repo)];
-      if (limit) {
-        args.push("--limit", String(limit));
-      }
-      const result = toToolResult(
-        await ghExec(args, { cwd: ctx.cwd, signal, input: params }),
-        params,
-      );
-      result.details.pendant = subtitlePendant(params);
-      return result;
-    },
-  });
+  );
 }

package/src/gh/tools/list-workflow-runs.ts

@@ -1,40 +1,46 @@
 import { Type } from "typebox";
 
-import type { ToolBus } from "../../lib/tool-bus.js";
-import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
+import { parseWithSchema } from "../../lib/parse-with-schema.js";
+import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
+import {
+  type GhClient,
+  resolveRepo,
+  splitRepo,
+  subtitlePendant,
+  toToolResult,
+  withStructuredResult,
+} from "../base.js";
+import { renderRunList } from "../render.js";
+import { ghRunListPayloadSchema, ghRunSummarySchema } from "../schemas.js";
 
-export function addListWorkflowRunsTool(_gh: GhClient, bus: ToolBus) {
-  bus.register({
-    name: "list-github-workflow-runs",
-    label: "GitHub Workflow Runs",
-    description: "List GitHub Actions workflow runs.",
-    promptSnippet: "List GitHub workflow runs",
-    parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 20)" })),
-      status: Type.Optional(
-        Type.String({ description: "Filter by status: success, failure, cancelled, etc." }),
-      ),
-      workflow: Type.Optional(Type.String({ description: "Filter by workflow name or file" })),
+export function addListWorkflowRunsTool(gh: GhClient, bus: ToolBus) {
+  bus.register(
+    defineStructuredTool({
+      name: "list-github-workflow-runs",
+      label: "GitHub Workflow Runs",
+      description:
+        "List GitHub Actions workflow runs. Each row is: id, status, conclusion, workflow, branch, event, created date, url.",
+      promptSnippet: "List GitHub workflow runs",
+      parameters: Type.Object({
+        repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
+        limit: Type.Optional(Type.Number({ description: "Max results (default 20)" })),
+        status: Type.Optional(
+          Type.String({ description: "Filter by status: success, failure, cancelled, etc." }),
+        ),
+        workflow: Type.Optional(Type.String({ description: "Filter by workflow name or file" })),
+      }),
+      structuredSchema: ghRunListPayloadSchema,
+      async execute(_id, params, signal, _onUpdate, ctx) {
+        const { repo, limit, status, workflow } = params;
+        const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const { owner, repo: repoName } = splitRepo(effectiveRepo);
+        const items = await gh.reads.listRuns(owner, repoName, { workflow, status, limit }, signal);
+        const runs = parseWithSchema(Type.Array(ghRunSummarySchema), items);
+        const text = renderRunList(runs);
+        const result = toToolResult(text, params);
+        result.details.pendant = subtitlePendant(params);
+        return withStructuredResult(result, { text, runs });
+      },
     }),
-    async execute(_id, params, signal, _onUpdate, ctx) {
-      const { repo, limit, status, workflow } = params;
-      const args = ["run", "list", ...repoArgs(repo)];
-      if (limit) {
-        args.push("--limit", String(limit));
-      }
-      if (status) {
-        args.push("--status", status);
-      }
-      if (workflow) {
-        args.push("--workflow", workflow);
-      }
-      const result = toToolResult(
-        await ghExec(args, { cwd: ctx.cwd, signal, input: params }),
-        params,
-      );
-      result.details.pendant = subtitlePendant(params);
-      return result;
-    },
-  });
+  );
 }

package/src/gh/tools/read-ci-logs.ts

@@ -14,7 +14,6 @@ import { createSeqState } from "../../lib/seq-state.js";
 import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
-  ghExec,
   resolveRepo,
   splitRepo,
   structuredFailure,
@@ -55,10 +54,9 @@ export function jobLogPath(repo: string, runId: string, jobId: number): string {
 }
 
 async function getJobLog(
+  gh: GhClient,
   job: RunJob,
   signal: AbortSignal | undefined,
-  cwd: string | undefined,
-  input?: unknown,
 ): Promise<string> {
   // The log download only accepts a job id, and the cache is keyed on the
   // canonical repo/run from the job itself, not on the caller's `repo` string.
@@ -76,21 +74,10 @@ async function getJobLog(
       // Not cached, fetch from GitHub
     }
 
-    // `gh api` refuses to print responses that contain terminal escape
-    // sequences unless `--allow-escape-sequences` is passed. Job logs carry
-    // ANSI color codes, so without this flag the download always fails with
-    // "the response contains terminal escape sequences; pass
-    // --allow-escape-sequences to output it anyway". The raw bytes are kept
-    // as-is (the file is the log exactly as GitHub delivers it); the tool never
-    // echoes them, and the TUI strips ANSI when rendering tool results.
-    const log = await ghExec(
-      ["api", "--allow-escape-sequences", `/repos/${repo}/actions/jobs/${job.id}/logs`],
-      {
-        cwd,
-        signal,
-        input,
-      },
-    );
+    // 日志原样落盘（GitHub 返回什么就是什么，含 ANSI 转义与 runner 时间戳）；工具从不回显
+    // 它，模型自己读文件，TUI 渲染工具结果时会自己剥 ANSI。
+    const { owner, repo: name } = splitRepo(repo);
+    const log = await gh.reads.jobLogs(owner, name, job.id, signal);
 
     // Write to cache
     await mkdir(cacheDir, { recursive: true });
@@ -420,7 +407,7 @@ async function ciLogs(gh: GhClient, call: ToolCall<JobIdParams>): Promise<CiLogs
     details: {},
   });
 
-  const rawLog = await getJobLog(target, signal, ctx.cwd, params);
+  const rawLog = await getJobLog(gh, target, signal);
   const index = jobLogIndex(target, rawLog);
 
   return withStructuredResult(

package/src/gh/tools/read-issue-comments.ts

@@ -3,14 +3,14 @@ import { Type } from "typebox";
 import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
-  ghExec,
-  repoArgs,
+  resolveRepo,
+  splitRepo,
   subtitlePendant,
   toStructuredJsonResult,
 } from "../base.js";
 import { issueCommentsSchema } from "../schemas.js";
 
-export function addReadIssueCommentsTool(_gh: GhClient, bus: ToolBus) {
+export function addReadIssueCommentsTool(gh: GhClient, bus: ToolBus) {
   bus.register(
     defineStructuredTool({
       name: "read-github-issue-comments",
@@ -24,11 +24,14 @@ export function addReadIssueCommentsTool(_gh: GhClient, bus: ToolBus) {
       structuredSchema: issueCommentsSchema,
       async execute(_id, params, signal, _onUpdate, ctx) {
         const { number, repo } = params;
-        const out = await ghExec(
-          ["issue", "view", String(number), ...repoArgs(repo), "--json", "comments"],
-          { cwd: ctx.cwd, signal, input: params },
+        const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const { owner, repo: repoName } = splitRepo(effectiveRepo);
+        const comments = await gh.reads.issueComments(owner, repoName, Number(number), signal);
+        const result = toStructuredJsonResult(
+          JSON.stringify({ comments }, null, 2),
+          params,
+          issueCommentsSchema,
         );
-        const result = toStructuredJsonResult(out, params, issueCommentsSchema);
         result.details.pendant = subtitlePendant(params, "number");
         return result;
       },

package/src/gh/tools/read-issue.ts

@@ -3,14 +3,14 @@ import { Type } from "typebox";
 import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
-  ghExec,
-  repoArgs,
+  resolveRepo,
+  splitRepo,
   subtitlePendant,
   toStructuredJsonResult,
 } from "../base.js";
 import { issueViewSchema } from "../schemas.js";
 
-export function addReadIssueTool(_gh: GhClient, bus: ToolBus) {
+export function addReadIssueTool(gh: GhClient, bus: ToolBus) {
   bus.register(
     defineStructuredTool({
       name: "read-github-issue",
@@ -24,18 +24,14 @@ export function addReadIssueTool(_gh: GhClient, bus: ToolBus) {
       structuredSchema: issueViewSchema,
       async execute(_id, params, signal, _onUpdate, ctx) {
         const { number, repo } = params;
-        const out = await ghExec(
-          [
-            "issue",
-            "view",
-            String(number),
-            ...repoArgs(repo),
-            "--json",
-            "title,state,body,author,createdAt,updatedAt,closedAt,url,labels,assignees,comments,milestone,number",
-          ],
-          { cwd: ctx.cwd, signal, input: params },
+        const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const { owner, repo: repoName } = splitRepo(effectiveRepo);
+        const data = await gh.reads.issue(owner, repoName, Number(number), signal);
+        const result = toStructuredJsonResult(
+          JSON.stringify(data, null, 2),
+          params,
+          issueViewSchema,
         );
-        const result = toStructuredJsonResult(out, params, issueViewSchema);
         result.details.pendant = subtitlePendant(params, "number");
         return result;
       },

package/src/gh/tools/read-pr-comments.ts

@@ -2,17 +2,15 @@ import { Type } from "typebox";
 
 import { defineStructuredTool, type ToolBus } from "../../lib/tool-bus.js";
 import {
-  ghApiList,
   type GhClient,
-  ghExec,
-  repoArgs,
   resolveRepo,
+  splitRepo,
   subtitlePendant,
   toStructuredJsonResult,
 } from "../base.js";
 import { prCommentsSchema } from "../schemas.js";
 
-export function addReadPrCommentsTool(_gh: GhClient, bus: ToolBus) {
+export function addReadPrCommentsTool(gh: GhClient, bus: ToolBus) {
   bus.register(
     defineStructuredTool({
       name: "read-github-pr-comments",
@@ -33,42 +31,25 @@ export function addReadPrCommentsTool(_gh: GhClient, bus: ToolBus) {
       structuredSchema: prCommentsSchema,
       async execute(_id, params, signal, _onUpdate, ctx) {
         const { number, repo, reviews } = params;
-        let out: string;
-        if (reviews) {
-          const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
+        const { owner, repo: repoName } = splitRepo(effectiveRepo);
+        const pullNumber = Number(number);
 
-          const [reviewComments, reviewSummaries] = await Promise.all([
-            ghApiList(`/repos/${effectiveRepo}/pulls/${String(number)}/comments`, {
-              cwd: ctx.cwd,
-              signal,
-              input: params,
-            }),
-            ghApiList(`/repos/${effectiveRepo}/pulls/${String(number)}/reviews`, {
-              cwd: ctx.cwd,
-              signal,
-              input: params,
-            }),
-          ]);
+        // reviews=true 给行内评审评论 + 评审摘要；缺省给 PR 上的普通（issue）评论
+        const payload = reviews
+          ? {
+              reviews: await gh.reads.pullReviews(owner, repoName, pullNumber, signal),
+              comments: await gh.reads.pullReviewComments(owner, repoName, pullNumber, signal),
+            }
+          : {
+              comments: await gh.reads.issueComments(owner, repoName, pullNumber, signal),
+            };
 
-          out = JSON.stringify(
-            {
-              reviews: reviewSummaries,
-              comments: reviewComments,
-            },
-            null,
-            2,
-          );
-        } else {
-          out = await ghExec(
-            ["pr", "view", String(number), ...repoArgs(repo), "--json", "comments"],
-            {
-              cwd: ctx.cwd,
-              signal,
-              input: params,
-            },
-          );
-        }
-        const result = toStructuredJsonResult(out, params, prCommentsSchema);
+        const result = toStructuredJsonResult(
+          JSON.stringify(payload, null, 2),
+          params,
+          prCommentsSchema,
+        );
         result.details.pendant = subtitlePendant(params, "number");
         return result;
       },