merge-steward 0.32.0 → 0.32.2

package/dist/github/pr-client.js

@@ -132,19 +132,15 @@ export class GitHubPRClient {
     }
     async listLabels(prNumber) {
         const result = await exec("gh", [
-            "pr", "view", String(prNumber),
-            "--repo", this.repoFullName,
-            "--json", "labels",
+            "api",
+            `repos/${this.repoFullName}/issues/${prNumber}/labels`,
+            "--paginate",
+            "--jq", ".[].name",
         ], { allowNonZero: true, githubRepoFullName: this.repoFullName });
-        if (result.exitCode !== 0)
-            return [];
-        try {
-            const data = JSON.parse(result.stdout);
-            return data.labels.map((l) => l.name);
-        }
-        catch {
-            return [];
+        if (result.exitCode !== 0) {
+            throw new Error(`Failed to list labels for PR #${prNumber}: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
         }
+        return result.stdout.split(/\r?\n/).map((label) => label.trim()).filter(Boolean);
     }
     async setLabels(prNumber, opts) {
         const args = ["pr", "edit", String(prNumber), "--repo", this.repoFullName];
@@ -155,7 +151,10 @@ export class GitHubPRClient {
         // Nothing to change beyond the base args — skip the call.
         if (args.length === 5)
             return;
-        await exec("gh", args, { allowNonZero: true, githubRepoFullName: this.repoFullName });
+        const result = await exec("gh", args, { allowNonZero: true, githubRepoFullName: this.repoFullName });
+        if (result.exitCode !== 0) {
+            throw new Error(`Failed to edit labels for PR #${prNumber}: ${result.stderr.trim() || `exit ${result.exitCode}`}`);
+        }
     }
 }
 /** Map GitHub REST API check-run status/conclusion to our union. */

package/dist/github-auth.js

@@ -5,12 +5,14 @@ const TOKEN_REFRESH_MS = 30 * 60_000;
 const TOKEN_EXPIRY_MARGIN_MS = 5 * 60_000;
 const RECENT_AUTH_FAILURE_WINDOW_MS = 15 * 60_000;
 const MAX_AUTH_FAILURES_TO_KEEP = 50;
+const GITHUB_APP_JWT_MAX_LIFETIME_SECONDS = 10 * 60;
+const GITHUB_APP_JWT_CLOCK_SKEW_SECONDS = 60;
 export function generateJwt(appId, privateKey) {
     const now = Math.floor(Date.now() / 1000);
     const header = Buffer.from(JSON.stringify({ alg: "RS256", typ: "JWT" })).toString("base64url");
     const payload = Buffer.from(JSON.stringify({
-        iat: now - 60,
-        exp: now + 600,
+        iat: now - GITHUB_APP_JWT_CLOCK_SKEW_SECONDS,
+        exp: now + GITHUB_APP_JWT_MAX_LIFETIME_SECONDS - GITHUB_APP_JWT_CLOCK_SKEW_SECONDS,
         iss: appId,
     })).toString("base64url");
     const signer = createSign("RSA-SHA256");

package/dist/service-queue.js

@@ -146,7 +146,13 @@ export class MergeStewardQueueCommands {
                 this.logger.debug({ prNumber, reviewDecision: status.reviewDecision }, "PR review gate is not satisfied, skipping admission");
                 return false;
             }
-            const labels = await this.github.listLabels(prNumber);
+            let labels = [];
+            try {
+                labels = await this.github.listLabels(prNumber);
+            }
+            catch (error) {
+                this.logger.debug({ prNumber, err: error }, "Could not read labels for priority detection; continuing without priority label");
+            }
             const priority = labels.includes(this.config.priorityQueueLabel) ? 1 : 0;
             const checks = await this.github.listChecks(prNumber);
             const requiredChecks = this.policy.getRequiredChecks();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {