@trim21/personal-pi-extensions 0.0.125 → 0.0.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.125",
+  "version": "0.0.127",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/gh-readonly.ts

@@ -5,10 +5,10 @@
  *
  * Tools:
  *   - read-github-issue: Get issue details
- *   - list-github-issues: List issues
+ *   - list-github-issues: List or search issues
  *   - read-github-issue-comments: Get issue comments
  *   - read-github-pr: Get PR details
- *   - list-github-prs: List PRs
+ *   - list-github-prs: List or search PRs
  *   - read-github-pr-diff: Get PR diff
  *   - read-github-pr-status: Get PR status checks
  *   - read-github-pr-comments: Get PR comments
@@ -20,8 +20,6 @@
  *   - read-github-release: Get release details
  *   - wait-github-pr-checks: Watch PR CI checks
  *   - watch-github-run: Watch a workflow run
- *   - search-github-issues: Search GitHub issues
- *   - search-github-prs: Search GitHub pull requests
  *
  * Install:
  *   cp gh-readonly.ts ~/.pi/agent/extensions/
@@ -143,6 +141,60 @@ export class GhError extends Error {
   }
 }
 
+/** How long `read-github-pr-status` waits for pending checks to resolve. */
+const POLL_INTERVAL_MS = 30_000;
+const POLL_TIMEOUT_MS = 30 * 60_000;
+
+/** Sleep for `ms`, resolving early if `signal` is aborted. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve) => {
+    if (signal?.aborted) {
+      resolve();
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve();
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+
+/**
+ * Poll a `gh pr checks` query until it reaches a final state.
+ *
+ * `gh pr checks` exit codes: 0 = all passed, 1 = some failed, 8 = some pending.
+ * Pending (8) is polled every `intervalMs` until `timeoutMs` elapses, at which
+ * point the current result is returned as-is. Any other code is returned
+ * immediately; the caller decides whether it is an error.
+ */
+export async function pollChecksResult<R extends { code: number; stdout: string }>(
+  query: () => Promise<R>,
+  opts: { signal?: AbortSignal; intervalMs?: number; timeoutMs?: number } = {},
+): Promise<R> {
+  const { signal, intervalMs = POLL_INTERVAL_MS, timeoutMs = POLL_TIMEOUT_MS } = opts;
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    if (signal?.aborted) {
+      throw new Error("read-github-pr-status aborted");
+    }
+    const result = await query();
+    if (result.code !== 8) {
+      // 0 = all passed, 1 = some failed, anything else is a real error
+      return result;
+    }
+    // Still pending — keep waiting unless the overall timeout expired
+    if (Date.now() >= deadline) {
+      return result;
+    }
+    await sleep(intervalMs, signal);
+  }
+}
+
 /** Run `gh` and return stdout. On non-zero exit, throws a `GhError` carrying the toolcall input and raw command. */
 async function ghExec(
   args: string[],
@@ -214,6 +266,55 @@ function toToolResult(stdout: string): {
   return { content: [{ type: "text", text }], details: { truncated } };
 }
 
+interface ListFilters {
+  repo?: string;
+  keywords?: string;
+  state?: string;
+  label?: string;
+  author?: string;
+  assignee?: string;
+  milestone?: string;
+  limit?: number;
+}
+
+/**
+ * List or search issues/PRs with structured filters.
+ *
+ * `gh issue list` / `gh pr list` are used when a repo is available (repo param or
+ * current directory), with keywords passed via `--search`. When no repo is given
+ * and keywords are present, falls back to `gh search issues` / `gh search prs`
+ * with plain keywords — never embedding a `repo:` qualifier in the query string,
+ * because `gh` mis-parses `repo:` values followed by spaces.
+ */
+async function listGithub(
+  kind: "issue" | "pr",
+  params: ListFilters,
+  ctx: { cwd?: string; signal?: AbortSignal; input?: unknown },
+): Promise<string> {
+  const { repo, keywords, state, label, author, assignee, milestone, limit } = params;
+
+  if (!repo && keywords) {
+    const args = ["search", kind === "issue" ? "issues" : "prs", keywords];
+    if (state && state !== "all") args.push("--state", state);
+    if (label) args.push("--label", label);
+    if (author) args.push("--author", author);
+    if (assignee) args.push("--assignee", assignee);
+    if (milestone) args.push("--milestone", milestone);
+    if (limit) args.push("--limit", String(limit));
+    return ghExec(args, ctx);
+  }
+
+  const args = [kind, "list", ...repoArgs(repo)];
+  if (state) args.push("--state", state);
+  if (keywords) args.push("--search", keywords);
+  if (label) args.push("--label", label);
+  if (author) args.push("--author", author);
+  if (assignee) args.push("--assignee", assignee);
+  if (milestone) args.push("--milestone", milestone);
+  if (limit) args.push("--limit", String(limit));
+  return ghExec(args, ctx);
+}
+
 // ── CI helpers ───────────────────────────────────────────────────────────────
 
 export interface StepInfo {
@@ -444,19 +545,23 @@ export default function (pi: ExtensionAPI) {
   pi.registerTool({
     name: "list-github-issues",
     label: "GitHub Issues List",
-    description: "List GitHub issues with optional filters.",
-    promptSnippet: "List GitHub issues",
+    description:
+      "List GitHub issues with optional filters and keyword search. When repo is omitted, searches across GitHub using keywords.",
+    promptSnippet: "List or search GitHub issues",
     parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
+      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)" })),
+      label: Type.Optional(Type.String({ description: "Filter by label" })),
+      author: Type.Optional(Type.String({ description: "Filter by author" })),
+      assignee: Type.Optional(Type.String({ description: "Filter by assignee" })),
+      milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
       limit: Type.Optional(Type.Number({ description: "Max results (default 30)" })),
     }),
     async execute(_id, params, signal, _onUpdate, ctx) {
-      const { repo, state, limit } = params;
-      const args = ["issue", "list", ...repoArgs(repo)];
-      if (state) args.push("--state", state);
-      if (limit) args.push("--limit", String(limit));
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(
+        await listGithub("issue", params, { cwd: ctx.cwd, signal, input: params }),
+      );
     },
   });
 
@@ -492,21 +597,23 @@ export default function (pi: ExtensionAPI) {
   pi.registerTool({
     name: "list-github-prs",
     label: "GitHub PRs List",
-    description: "List GitHub pull requests with optional filters.",
-    promptSnippet: "List GitHub PRs",
+    description:
+      "List GitHub pull requests with optional filters and keyword search. When repo is omitted, searches across GitHub using keywords.",
+    promptSnippet: "List or search GitHub PRs",
     parameters: Type.Object({
-      repo: Type.Optional(Type.String({ description: "OWNER/REPO" })),
+      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)" }),
       ),
+      label: Type.Optional(Type.String({ description: "Filter by label" })),
+      author: Type.Optional(Type.String({ description: "Filter by author" })),
+      assignee: Type.Optional(Type.String({ description: "Filter by assignee" })),
+      milestone: Type.Optional(Type.String({ description: "Filter by milestone" })),
       limit: Type.Optional(Type.Number({ description: "Max results (default 30)" })),
     }),
     async execute(_id, params, signal, _onUpdate, ctx) {
-      const { repo, state, limit } = params;
-      const args = ["pr", "list", ...repoArgs(repo)];
-      if (state) args.push("--state", state);
-      if (limit) args.push("--limit", String(limit));
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
+      return toToolResult(await listGithub("pr", params, { cwd: ctx.cwd, signal, input: params }));
     },
   });
 
@@ -539,13 +646,18 @@ export default function (pi: ExtensionAPI) {
     }),
     async execute(_id, params, signal, _onUpdate, ctx) {
       const { number, repo } = params;
-      return toToolResult(
-        await ghExec(["pr", "checks", String(number), ...repoArgs(repo)], {
-          cwd: ctx.cwd,
-          signal,
-          input: params,
-        }),
-      );
+      const args = ["pr", "checks", String(number), ...repoArgs(repo)];
+
+      // Pending is not an error — poll until checks fail or all pass.
+      const final = await pollChecksResult(() => runGh(args, { cwd: ctx.cwd, signal }), {
+        signal,
+      });
+
+      if (final.code !== 0 && final.code !== 1 && final.code !== 8) {
+        // Anything else is a real error (cancelled, auth, network, ...)
+        throw new GhError(args, final, params);
+      }
+      return toToolResult(final.stdout);
     },
   });
 
@@ -1172,52 +1284,4 @@ export default function (pi: ExtensionAPI) {
       };
     },
   });
-
-  // ── search-github-issues ───────────────────────────────────────────────────
-  pi.registerTool({
-    name: "search-github-issues",
-    label: "GitHub Issue Search",
-    description: "Search GitHub issues using GitHub search syntax.",
-    promptSnippet: "Search GitHub issues",
-    parameters: Type.Object({
-      query: Type.String({
-        description:
-          "GitHub search syntax (e.g. 'repo:owner/name keyword', 'is:open label:bug'). Do NOT include 'type:issue' or 'type:pr' qualifiers.",
-      }),
-      include_prs: Type.Optional(
-        Type.Boolean({
-          description: "Whether to include pull requests in results (default: false)",
-        }),
-      ),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 20)" })),
-    }),
-    async execute(_id, params, signal, _onUpdate, ctx) {
-      const { query, include_prs, limit } = params;
-      const args = ["search", "issues", query];
-      if (include_prs) args.push("--include-prs");
-      if (limit) args.push("--limit", String(limit));
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
-    },
-  });
-
-  // ── search-github-prs ──────────────────────────────────────────────────────
-  pi.registerTool({
-    name: "search-github-prs",
-    label: "GitHub PR Search",
-    description: "Search GitHub pull requests using GitHub search syntax.",
-    promptSnippet: "Search GitHub PRs",
-    parameters: Type.Object({
-      query: Type.String({
-        description:
-          "GitHub search syntax (e.g. 'repo:owner/name keyword', 'is:open label:bug'). Do NOT include 'type:issue' or 'type:pr' qualifiers.",
-      }),
-      limit: Type.Optional(Type.Number({ description: "Max results (default 20)" })),
-    }),
-    async execute(_id, params, signal, _onUpdate, ctx) {
-      const { query, limit } = params;
-      const args = ["search", "prs", query];
-      if (limit) args.push("--limit", String(limit));
-      return toToolResult(await ghExec(args, { cwd: ctx.cwd, signal, input: params }));
-    },
-  });
 }