@blogic-cz/agent-tools 0.18.0 → 0.18.1

package/dist/gh-tool/errors.d.ts

@@ -30,7 +30,7 @@ export declare class GitHubAuthError extends GitHubAuthError_base {
 }
 declare const GitHubMergeError_base: Schema.Class<GitHubMergeError, Schema.TaggedStruct<"GitHubMergeError", {
     readonly message: Schema.String;
-    readonly reason: Schema.Literals<readonly ["conflicts", "checks_failing", "branch_protected", "unknown"]>;
+    readonly reason: Schema.Literals<readonly ["conflicts", "checks_failing", "branch_protected", "merge_queue", "unknown"]>;
     readonly hint: Schema.optionalKey<Schema.String>;
     readonly nextCommand: Schema.optionalKey<Schema.String>;
     readonly retryable: Schema.optionalKey<Schema.Boolean>;

package/dist/gh-tool/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/gh-tool/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;;;;;AAEhC,qBAAa,kBAAmB,SAAQ,uBAWvC;CAAG;;;;;;;;;AAEJ,qBAAa,mBAAoB,SAAQ,wBAUxC;CAAG;;;;;;;AAEJ,qBAAa,eAAgB,SAAQ,oBAKnC;CAAG;;;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAMpC;CAAG;;;;;;;;AAEL,qBAAa,kBAAmB,SAAQ,uBASvC;CAAG;AAEJ,MAAM,MAAM,kBAAkB,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,eAAe,GACf,gBAAgB,GAChB,kBAAkB,CAAC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/gh-tool/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;;;;;AAEhC,qBAAa,kBAAmB,SAAQ,uBAWvC;CAAG;;;;;;;;;AAEJ,qBAAa,mBAAoB,SAAQ,wBAUxC;CAAG;;;;;;;AAEJ,qBAAa,eAAgB,SAAQ,oBAKnC;CAAG;;;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAYpC;CAAG;;;;;;;;AAEL,qBAAa,kBAAmB,SAAQ,uBASvC;CAAG;AAEJ,MAAM,MAAM,kBAAkB,GAC1B,kBAAkB,GAClB,mBAAmB,GACnB,eAAe,GACf,gBAAgB,GAChB,kBAAkB,CAAC"}

package/dist/gh-tool/pr/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/gh-tool/pr/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/gh-tool/pr/core.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/gh-tool/errors.ts

@@ -34,7 +34,13 @@ export class GitHubAuthError extends Schema.TaggedError<GitHubAuthError>()("GitH
 
 export class GitHubMergeError extends Schema.TaggedError<GitHubMergeError>()("GitHubMergeError", {
   message: Schema.String,
-  reason: Schema.Literals(["conflicts", "checks_failing", "branch_protected", "unknown"]),
+  reason: Schema.Literals([
+    "conflicts",
+    "checks_failing",
+    "branch_protected",
+    "merge_queue",
+    "unknown",
+  ]),
   hint: Schema.optionalKey(Schema.String),
   nextCommand: Schema.optionalKey(Schema.String),
   retryable: Schema.optionalKey(Schema.Boolean),

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

@@ -702,6 +702,99 @@ export const createPR = Effect.fn("pr.createPR")(function* (opts: {
   );
 });
 
+// GitHub rejects GraphQL `mergePullRequest` for a PR that belongs to a native stack and points at
+// the asynchronous REST merge instead. `gh pr merge` only speaks GraphQL.
+const ASYNC_MERGE_REQUIRED_RE = /asynchronous merge/i;
+const ASYNC_MERGE_POLL_INTERVAL_MS = 2000;
+const MAX_ASYNC_MERGE_WAIT_SECONDS = 120;
+
+type AsyncMergeResult = {
+  status: "pending" | "merged" | "enqueued" | "failed";
+  details?: { message?: string; uuid?: string; sha?: string };
+};
+
+const asyncMergeFailure = (
+  pr: number,
+  message: string,
+  hint: string,
+  reason: "merge_queue" | "unknown" = "unknown",
+) =>
+  new GitHubMergeError({
+    message: `Failed to merge PR #${pr} asynchronously: ${message}`,
+    reason,
+    hint,
+    nextCommand: `agent-tools-gh pr view --pr ${pr}`,
+  });
+
+const mergeViaAsyncApi = Effect.fn("pr.mergeViaAsyncApi")(function* (opts: {
+  pr: number;
+  strategy: MergeStrategy;
+}) {
+  const gh = yield* GitHubService;
+  const repo = yield* gh.getRepoInfo();
+  const asyncPath = `repos/${repo.owner}/${repo.name}/pulls/${opts.pr}/merge-async`;
+
+  let latest = yield* gh.runGhJson<AsyncMergeResult>([
+    "api",
+    "--method",
+    "PUT",
+    asyncPath,
+    "-f",
+    `merge_method=${opts.strategy}`,
+  ]);
+
+  const uuid = latest.details?.uuid;
+  if (latest.status === "pending" && uuid !== undefined) {
+    const start = yield* Clock.currentTimeMillis;
+    const deadlineMs = Number(start) + MAX_ASYNC_MERGE_WAIT_SECONDS * 1000;
+    let timedOut = false;
+
+    // Effect.whileLoop (not recursion) so TestClock.adjust can advance Effect.sleep without real waits.
+    yield* Effect.whileLoop({
+      while: () => latest.status === "pending" && !timedOut,
+      body: () =>
+        Effect.gen(function* () {
+          const now = yield* Clock.currentTimeMillis;
+          if (Number(now) >= deadlineMs) {
+            timedOut = true;
+            return;
+          }
+          const remaining = deadlineMs - Number(now);
+          yield* Effect.sleep(Duration.millis(Math.min(ASYNC_MERGE_POLL_INTERVAL_MS, remaining)));
+          latest = yield* gh.runGhJson<AsyncMergeResult>(["api", `${asyncPath}/${uuid}`]);
+        }),
+      step: () => undefined,
+    });
+  }
+
+  if (latest.status === "merged") {
+    return latest.details?.sha ?? null;
+  }
+
+  if (latest.status === "enqueued") {
+    return yield* asyncMergeFailure(
+      opts.pr,
+      latest.details?.message ?? "the pull request entered a merge queue",
+      "The merge queue owns the merge from here; it is not merged yet. Watch the PR until the queue drains.",
+      "merge_queue",
+    );
+  }
+
+  if (latest.status === "pending") {
+    return yield* asyncMergeFailure(
+      opts.pr,
+      `still pending after ${MAX_ASYNC_MERGE_WAIT_SECONDS}s`,
+      "The asynchronous merge is still running. Re-check the PR state before retrying so the merge is not requested twice.",
+    );
+  }
+
+  return yield* asyncMergeFailure(
+    opts.pr,
+    latest.details?.message ?? "the merge request failed",
+    "Inspect the PR state and branch protections, then retry.",
+  );
+});
+
 export const mergePR = Effect.fn("pr.mergePR")(function* (opts: {
   pr: number;
   strategy: MergeStrategy;
@@ -847,77 +940,92 @@ export const mergePR = Effect.fn("pr.mergePR")(function* (opts: {
 
   const mergeArgs = ["pr", "merge", String(opts.pr), `--${opts.strategy}`];
 
-  const mergeResult = yield* gh.runGh(mergeArgs).pipe(
-    Effect.catch((error) =>
-      rollbackRetargets.pipe(
-        Effect.andThen(
-          (
-            rollbackFailed,
-          ): Effect.Effect<never, GitHubNotFoundError | GitHubAuthError | GitHubMergeError> => {
-            const rollbackNote =
-              rollbackFailed.length > 0
-                ? ` ROLLBACK INCOMPLETE: dependent PR(s) ${rollbackFailed
-                    .map((child) => `#${child}`)
-                    .join(", ")} are still retargeted to \`${info.baseRefName}\`; ` +
-                  `manually restore their base to \`${info.headRefName}\`.`
-                : "";
-
-            if (error._tag !== "GitHubCommandError") {
-              return rollbackNote === ""
-                ? Effect.fail(error)
-                : Console.error(rollbackNote.trim()).pipe(Effect.andThen(Effect.fail(error)));
-            }
-
-            const stderr = error.stderr.toLowerCase();
-
-            if (stderr.includes("merge conflict") || stderr.includes("conflicts")) {
-              return Effect.fail(
-                new GitHubMergeError({
-                  message: `PR #${opts.pr} has merge conflicts`,
-                  reason: "conflicts",
-                  hint: `Resolve merge conflicts locally, push the fix, then retry the merge.${rollbackNote}`,
-                  nextCommand: `gh pr diff ${opts.pr}`,
-                }),
-              );
-            }
-
-            if (stderr.includes("required status check") || stderr.includes("checks")) {
-              return Effect.fail(
-                new GitHubMergeError({
-                  message: `PR #${opts.pr} has failing required checks`,
-                  reason: "checks_failing",
-                  hint: `Wait for CI checks to pass or investigate failures before merging.${rollbackNote}`,
-                  nextCommand: `agent-tools-gh pr checks --pr ${opts.pr}`,
-                  retryable: true,
-                }),
-              );
-            }
-
-            if (stderr.includes("protected branch")) {
-              return Effect.fail(
-                new GitHubMergeError({
-                  message: `PR #${opts.pr} targets a protected branch`,
-                  reason: "branch_protected",
-                  hint: `This branch has protection rules. Ensure required reviews and checks are satisfied, or ask a repo admin.${rollbackNote}`,
-                }),
-              );
-            }
-
-            return Effect.fail(
-              new GitHubMergeError({
-                message: `Failed to merge PR #${opts.pr}: ${error.stderr}`,
-                reason: "unknown",
-                hint: `Check the PR state and branch protections. The PR may already be merged or closed.${rollbackNote}`,
-                nextCommand: `agent-tools-gh pr view --pr ${opts.pr}`,
-              }),
-            );
-          },
-        ),
+  const mergedSha = yield* gh
+    .runGh(mergeArgs)
+    .pipe(
+      Effect.map((result) => result.stdout.match(/([0-9a-f]{7,40})/)?.[1] ?? null),
+      Effect.catchTag("GitHubCommandError", (error) =>
+        ASYNC_MERGE_REQUIRED_RE.test(error.stderr)
+          ? mergeViaAsyncApi({ pr: opts.pr, strategy: opts.strategy })
+          : Effect.fail(error),
       ),
-    ),
-  );
-
-  const shaMatch = mergeResult.stdout.match(/([0-9a-f]{7,40})/);
+    )
+    .pipe(
+      Effect.catch((error) =>
+        // A queued merge still lands, and its head branch disappears with it. Rolling the
+        // dependents back onto that branch would close them (cli/cli#1168), so keep the retargets.
+        error._tag === "GitHubMergeError" && error.reason === "merge_queue"
+          ? Effect.fail(error)
+          : rollbackRetargets.pipe(
+              Effect.andThen(
+                (
+                  rollbackFailed,
+                ): Effect.Effect<
+                  never,
+                  GitHubNotFoundError | GitHubAuthError | GitHubMergeError
+                > => {
+                  const rollbackNote =
+                    rollbackFailed.length > 0
+                      ? ` ROLLBACK INCOMPLETE: dependent PR(s) ${rollbackFailed
+                          .map((child) => `#${child}`)
+                          .join(", ")} are still retargeted to \`${info.baseRefName}\`; ` +
+                        `manually restore their base to \`${info.headRefName}\`.`
+                      : "";
+
+                  if (error._tag !== "GitHubCommandError") {
+                    return rollbackNote === ""
+                      ? Effect.fail(error)
+                      : Console.error(rollbackNote.trim()).pipe(Effect.andThen(Effect.fail(error)));
+                  }
+
+                  const stderr = error.stderr.toLowerCase();
+
+                  if (stderr.includes("merge conflict") || stderr.includes("conflicts")) {
+                    return Effect.fail(
+                      new GitHubMergeError({
+                        message: `PR #${opts.pr} has merge conflicts`,
+                        reason: "conflicts",
+                        hint: `Resolve merge conflicts locally, push the fix, then retry the merge.${rollbackNote}`,
+                        nextCommand: `gh pr diff ${opts.pr}`,
+                      }),
+                    );
+                  }
+
+                  if (stderr.includes("required status check") || stderr.includes("checks")) {
+                    return Effect.fail(
+                      new GitHubMergeError({
+                        message: `PR #${opts.pr} has failing required checks`,
+                        reason: "checks_failing",
+                        hint: `Wait for CI checks to pass or investigate failures before merging.${rollbackNote}`,
+                        nextCommand: `agent-tools-gh pr checks --pr ${opts.pr}`,
+                        retryable: true,
+                      }),
+                    );
+                  }
+
+                  if (stderr.includes("protected branch")) {
+                    return Effect.fail(
+                      new GitHubMergeError({
+                        message: `PR #${opts.pr} targets a protected branch`,
+                        reason: "branch_protected",
+                        hint: `This branch has protection rules. Ensure required reviews and checks are satisfied, or ask a repo admin.${rollbackNote}`,
+                      }),
+                    );
+                  }
+
+                  return Effect.fail(
+                    new GitHubMergeError({
+                      message: `Failed to merge PR #${opts.pr}: ${error.stderr}`,
+                      reason: "unknown",
+                      hint: `Check the PR state and branch protections. The PR may already be merged or closed.${rollbackNote}`,
+                      nextCommand: `agent-tools-gh pr view --pr ${opts.pr}`,
+                    }),
+                  );
+                },
+              ),
+            ),
+      ),
+    );
 
   // `gh pr merge --delete-branch` aborts its remote delete when the head branch is checked out in a
   // worktree; deleting the remote ref explicitly is worktree-independent. Local cleanup is separate.
@@ -944,7 +1052,7 @@ export const mergePR = Effect.fn("pr.mergePR")(function* (opts: {
     merged: true,
     strategy: opts.strategy,
     branchDeleted: willDeleteBranch,
-    sha: shaMatch?.[1] ?? null,
+    sha: mergedSha,
     retargetedChildren: retargetedChildren.length > 0 ? retargetedChildren : undefined,
     branchDeleteSkipped: branchDeleteSkipped ? true : undefined,
   };