@blogic-cz/agent-tools 0.14.41 → 0.14.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blogic-cz/agent-tools",
-  "version": "0.14.41",
+  "version": "0.14.42",
   "description": "CLI tools for AI coding agent workflows — GitHub, database, Kubernetes, Azure DevOps, logs, sessions, and audit",
   "keywords": [
     "agent",

package/src/gh-tool/index.ts

@@ -40,6 +40,7 @@ import {
   prReplyAndResolveCommand,
   prReviewTriageBatchCommand,
   prReviewTriageCommand,
+  prWaitMergeableCommand,
 } from "./pr/index";
 import { branchRenameCommand } from "./branch";
 import {
@@ -74,6 +75,7 @@ const prCommand = Command.make("pr", {}).pipe(
     prCloseCommand,
     prEditCommand,
     prMergeCommand,
+    prWaitMergeableCommand,
     prThreadsCommand,
     prCommentsCommand,
     prIssueCommentsCommand,

package/src/gh-tool/pr/commands.ts

@@ -1,10 +1,20 @@
 import { Command, Flag } from "effect/unstable/cli";
-import { Effect, Option } from "effect";
+import { Console, Effect, Option } from "effect";
 
 import type { CheckResult, PRStatusResult } from "#gh/types";
 
 import { formatOption, logFormatted } from "#shared";
 import { GitHubService } from "#gh/service";
+import { GitHubCommandError } from "#gh/errors";
+
+const emptyBatchError = (batch: string) =>
+  new GitHubCommandError({
+    message: `--prs received no valid PR numbers: ${JSON.stringify(batch)}`,
+    command: "gh pr --prs",
+    exitCode: 1,
+    stderr: "",
+    hint: "Pass comma-separated positive integers, e.g. --prs 1,2,3.",
+  });
 import {
   resolveDefaultTextInput,
   resolveOptionalTextInput,
@@ -29,6 +39,7 @@ import {
   mergePR,
   rerunChecks,
   viewPR,
+  waitForMergeable,
 } from "./core";
 import {
   fetchComments,
@@ -127,18 +138,34 @@ export const prViewCommand = Command.make(
       Flag.withDescription("PR number (default: current branch PR)"),
       Flag.optional,
     ),
+    prs: Flag.string("prs").pipe(
+      Flag.withDescription("Comma-separated PR numbers to view in one call (overrides --pr)"),
+      Flag.optional,
+    ),
     repo: repoOption,
   },
-  ({ format, pr, repo }) =>
+  ({ format, pr, prs, repo }) =>
     withRepo(
       repo,
       Effect.gen(function* () {
-        const prNumber = Option.getOrNull(pr);
-        const info = yield* viewPR(prNumber);
+        const batch = Option.getOrNull(prs);
+        if (batch !== null) {
+          const numbers = parsePrNumbers(batch);
+          if (numbers.length === 0) return yield* emptyBatchError(batch);
+          const results = yield* Effect.all(
+            numbers.map((n) => viewPR(n).pipe(Effect.map((info) => ({ pr: n, info })))),
+            { concurrency: 5 },
+          );
+          yield* logFormatted({ count: results.length, prs: results }, format);
+          return;
+        }
+        const info = yield* viewPR(Option.getOrNull(pr));
         yield* logFormatted(info, format);
       }),
     ),
-).pipe(Command.withDescription("View PR information"));
+).pipe(
+  Command.withDescription("View PR information (use --prs 1,2,3 to view several in one call)"),
+);
 
 export const prStatusCommand = Command.make(
   "status",
@@ -200,6 +227,36 @@ export const prListCommand = Command.make(
   ),
 );
 
+export const prWaitMergeableCommand = Command.make(
+  "wait-mergeable",
+  {
+    format: formatOption,
+    pr: Flag.integer("pr").pipe(
+      Flag.withDescription("PR number (default: current branch PR)"),
+      Flag.optional,
+    ),
+    timeout: Flag.integer("timeout").pipe(
+      Flag.withDescription(
+        "Max seconds to wait for a definitive mergeable verdict (capped at 180)",
+      ),
+      Flag.withDefault(60),
+    ),
+    repo: repoOption,
+  },
+  ({ format, pr, timeout, repo }) =>
+    withRepo(
+      repo,
+      Effect.gen(function* () {
+        const info = yield* waitForMergeable(Option.getOrNull(pr), timeout);
+        yield* logFormatted(info, format);
+      }),
+    ),
+).pipe(
+  Command.withDescription(
+    "Poll until GitHub reports a definitive mergeable verdict (MERGEABLE/CONFLICTING) or timeout",
+  ),
+);
+
 export const prCreateCommand = Command.make(
   "create",
   {
@@ -388,6 +445,10 @@ export const prChecksCommand = Command.make(
       Flag.withDescription("PR number (default: current branch PR)"),
       Flag.optional,
     ),
+    prs: Flag.string("prs").pipe(
+      Flag.withDescription("Comma-separated PR numbers for a one-shot batch snapshot (no --watch)"),
+      Flag.optional,
+    ),
     repo: repoOption,
     timeout: Flag.integer("timeout").pipe(
       Flag.withDefault(CI_CHECK_WATCH_TIMEOUT_MS / 1000),
@@ -398,16 +459,39 @@ export const prChecksCommand = Command.make(
       Flag.withDescription("Watch until checks complete or timeout"),
     ),
   },
-  ({ failFast, format, pr, repo, timeout, watch }) =>
+  ({ failFast, format, pr, prs, repo, timeout, watch }) =>
     withRepo(
       repo,
       Effect.gen(function* () {
-        const prNumber = Option.getOrNull(pr);
-        const checks = yield* fetchChecksForCommand(prNumber, watch, failFast, timeout);
+        const batch = Option.getOrNull(prs);
+        if (batch !== null) {
+          if (watch) {
+            yield* Console.warn(
+              "ℹ️  --watch is ignored with --prs; batch mode returns a one-shot snapshot per PR.",
+            );
+          }
+          const numbers = parsePrNumbers(batch);
+          if (numbers.length === 0) return yield* emptyBatchError(batch);
+          const results = yield* Effect.all(
+            numbers.map((n) =>
+              fetchChecks(n, false, failFast, timeout).pipe(
+                Effect.map((checks) => ({ pr: n, checks })),
+              ),
+            ),
+            { concurrency: 5 },
+          );
+          yield* logFormatted({ count: results.length, prs: results }, format);
+          return;
+        }
+        const checks = yield* fetchChecksForCommand(Option.getOrNull(pr), watch, failFast, timeout);
         yield* logFormatted(checks, format);
       }),
     ),
-).pipe(Command.withDescription("Fetch CI check status for a PR (optionally watch with timeout)"));
+).pipe(
+  Command.withDescription(
+    "Fetch CI check status for a PR (--watch to block; --prs 1,2,3 for a batch snapshot)",
+  ),
+);
 
 export const prChecksFailedCommand = Command.make(
   "checks-failed",

package/src/gh-tool/pr/core.ts

@@ -1,4 +1,4 @@
-import { Console, Effect, Option, Result } from "effect";
+import { Clock, Console, Duration, Effect, Option, Result } from "effect";
 
 import type {
   BranchPRDetail,
@@ -482,6 +482,41 @@ export const listPRs = Effect.fn("pr.listPRs")(function* (opts: {
   return yield* gh.runGhJson<PRInfo[]>(args);
 });
 
+// GitHub recomputes mergeability asynchronously after CI; poll until it settles out of "UNKNOWN".
+const MAX_MERGEABLE_WAIT_SECONDS = 180;
+const MERGEABLE_POLL_INTERVAL_MS = 3000;
+
+export const waitForMergeable = Effect.fn("pr.waitForMergeable")(function* (
+  pr: number | null,
+  timeoutSeconds: number,
+) {
+  const cappedSeconds = Math.min(timeoutSeconds, MAX_MERGEABLE_WAIT_SECONDS);
+  const start = yield* Clock.currentTimeMillis;
+  const deadlineMs = Number(start) + cappedSeconds * 1000;
+
+  // Effect.whileLoop (not recursion) so TestClock.adjust can advance Effect.sleep without real waits.
+  let latest = yield* viewPR(pr);
+  let timedOut = false;
+  yield* Effect.whileLoop({
+    while: () => latest.mergeable === "UNKNOWN" && !timedOut,
+    body: () =>
+      Effect.gen(function* () {
+        const now = yield* Clock.currentTimeMillis;
+        if (Number(now) >= deadlineMs) {
+          timedOut = true;
+          return;
+        }
+        // Cap the sleep to the remaining budget so the total wait doesn't overshoot the deadline.
+        const remaining = deadlineMs - Number(now);
+        yield* Effect.sleep(Duration.millis(Math.min(MERGEABLE_POLL_INTERVAL_MS, remaining)));
+        latest = yield* viewPR(pr);
+      }),
+    step: () => undefined,
+  });
+
+  return latest;
+});
+
 export const createPR = Effect.fn("pr.createPR")(function* (opts: {
   base: string | null;
   title: string;

package/src/gh-tool/pr/index.ts

@@ -18,6 +18,7 @@ export {
   prStatusCommand,
   prSubmitReviewCommand,
   prThreadsCommand,
+  prWaitMergeableCommand,
   prReviewTriageCommand,
   prReviewTriageBatchCommand,
   prViewCommand,