@rmartz/pr-lifecycle 8.0.0 → 9.0.0

package/dist/bin/pr-lifecycle.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-ENU2AAWK.js";
+} from "../chunk-K5K64YZP.js";
 
 // src/bin/pr-lifecycle.ts
 process.exitCode = await runCli(

package/dist/{chunk-ENU2AAWK.js → chunk-K5K64YZP.js}

@@ -678,6 +678,7 @@ var LIFECYCLE_LABELS = [
   "review requested"
 ];
 var AUTO_MERGE_LABEL = "auto-merge enabled";
+var DEPENDABOT_REBASING_LABEL = "dependabot rebasing";
 var UPDATE_REQUIRED_LABEL = "update required";
 function lifecycleLabels(state) {
   switch (state) {
@@ -733,8 +734,11 @@ function planReconcile(facts, policy) {
       autoMerge = facts.immediatelyMergeable ? "merge" : "arm";
     }
   }
-  const owned = [...LIFECYCLE_LABELS];
+  const owned = [...LIFECYCLE_LABELS, DEPENDABOT_REBASING_LABEL];
   const desired = new Set(lifecycleLabels(state));
+  if (facts.updater === "dependabot" && facts.dependabotRebasing) {
+    desired.add(DEPENDABOT_REBASING_LABEL);
+  }
   if (arming) {
     owned.push(AUTO_MERGE_LABEL);
     if (shouldArm && autoMerge !== "merge") {
@@ -763,6 +767,10 @@ function withoutReleaseActions(plan) {
 // src/github/dependabot-rebase.ts
 var DEPENDABOT_REBASE_COMMAND = "@dependabot rebase";
 var DEPENDABOT_REBASING_NOTICE = "Dependabot is rebasing this PR";
+var DEPENDABOT_RECREATING_NOTICE = "Dependabot is recreating this PR";
+function isDependabotRebasing(prBody) {
+  return prBody.includes(DEPENDABOT_REBASING_NOTICE) || prBody.includes(DEPENDABOT_RECREATING_NOTICE);
+}
 function rebaseRequestMarker(headSha) {
   return `<!-- pr-lifecycle:dependabot-rebase head=${headSha} -->`;
 }
@@ -772,7 +780,7 @@ function buildRebaseRequestBody(headSha) {
 ${rebaseRequestMarker(headSha)}`;
 }
 function isRebasePending(prBody, comments, headSha) {
-  if (prBody.includes(DEPENDABOT_REBASING_NOTICE)) {
+  if (isDependabotRebasing(prBody)) {
     return true;
   }
   const marker = rebaseRequestMarker(headSha);
@@ -807,6 +815,11 @@ var OWNED_LABEL_DEFINITIONS = {
     color: "B60205",
     description: "The PR's required CI (excluding gate checks) is failing on its head."
   },
+  "dependabot rebasing": {
+    name: DEPENDABOT_REBASING_LABEL,
+    color: "0366D6",
+    description: "Dependabot is rebasing or recreating this PR; its branch is about to change."
+  },
   "fix required": {
     name: "fix required",
     color: "D93F0B",
@@ -1260,7 +1273,7 @@ async function gatherRebasePending(client, pr, pull, updater, policy) {
   if (updater !== "dependabot") {
     return false;
   }
-  if (pull.body.includes(DEPENDABOT_REBASING_NOTICE)) {
+  if (isDependabotRebasing(pull.body)) {
     return true;
   }
   const couldUpdate = policy.autoUpdate === true && pull.state === "open" && pull.labels.includes(UPDATE_REQUIRED_LABEL);
@@ -1300,6 +1313,7 @@ async function gatherFacts(client, pr, policy = {}, options = {}) {
       cleanAncestors: lineage?.cleanAncestors ?? [],
       updater,
       rebasePending,
+      dependabotRebasing: updater === "dependabot" && isDependabotRebasing(pull.body),
       reviews: reviews.map((review) => toReviewFact(review, permissions)),
       pendingBotReviewers: pull.requestedBotReviewers
     }
@@ -1519,11 +1533,14 @@ export {
   computeState,
   LIFECYCLE_LABELS,
   AUTO_MERGE_LABEL,
+  DEPENDABOT_REBASING_LABEL,
   UPDATE_REQUIRED_LABEL,
   planReconcile,
   withoutReleaseActions,
   DEPENDABOT_REBASE_COMMAND,
   DEPENDABOT_REBASING_NOTICE,
+  DEPENDABOT_RECREATING_NOTICE,
+  isDependabotRebasing,
   rebaseRequestMarker,
   buildRebaseRequestBody,
   isRebasePending,

package/dist/index.d.ts

@@ -178,6 +178,13 @@ interface PullRequestFacts {
      * error. Always `false` for other PRs.
      */
     rebasePending: boolean;
+    /**
+     * For a Dependabot PR: the PR body says Dependabot is rebasing or recreating the
+     * branch right now. Unlike `rebasePending`, our own request doesn't count — only
+     * Dependabot's notice, which it removes when done. Drives the
+     * `dependabot rebasing` label. Always `false` for other PRs.
+     */
+    dependabotRebasing: boolean;
     reviews: readonly ReviewFact[];
     /**
      * Logins of the bots (e.g. Copilot) whose review is requested and not yet
@@ -451,12 +458,18 @@ declare function computeState(facts: PullRequestFacts, policy: ReconcilePolicy):
 /**
  * The reconcile plan: the minimal label and auto-merge changes that converge a PR
  * to its computed lifecycle state. Labels are output only — the core owns the
- * lifecycle labels (plus `auto-merge enabled` in arming mode) and never touches
- * any other label. See docs/reconciler-design.md §Plan.
+ * lifecycle labels and `dependabot rebasing` (plus `auto-merge enabled` in arming
+ * mode) and never touches any other label. See docs/reconciler-design.md §Plan.
  */
 declare const LIFECYCLE_LABELS: readonly ["approved", "changes requested", "escalation needed", "fix required", "ci failing", "review requested"];
 type LifecycleLabel = (typeof LIFECYCLE_LABELS)[number];
 declare const AUTO_MERGE_LABEL = "auto-merge enabled";
+/**
+ * Shown while Dependabot rebases or recreates its PR, so workflows can hold off
+ * until the branch settles. Owned like the lifecycle labels, but independent of
+ * the state.
+ */
+declare const DEPENDABOT_REBASING_LABEL = "dependabot rebasing";
 /** merge-safety's label for a PR whose base moved in a way that matters. Read, never written. */
 declare const UPDATE_REQUIRED_LABEL = "update required";
 /**
@@ -676,6 +689,14 @@ declare function formatSummary(target: ReconcileTarget, result: ReconcileResult)
 declare const DEPENDABOT_REBASE_COMMAND = "@dependabot rebase";
 /** Dependabot puts this in the PR body while a rebase runs, and removes it after. */
 declare const DEPENDABOT_REBASING_NOTICE = "Dependabot is rebasing this PR";
+/** The same notice for `@dependabot recreate`, which force-pushes a fresh branch. */
+declare const DEPENDABOT_RECREATING_NOTICE = "Dependabot is recreating this PR";
+/**
+ * Whether Dependabot says, in the PR body, that it is rebasing or recreating the
+ * branch right now. Only Dependabot's own notice counts — not our request marker,
+ * which means "asked", not "running".
+ */
+declare function isDependabotRebasing(prBody: string): boolean;
 /** Hidden marker recording which head a request was made for. */
 declare function rebaseRequestMarker(headSha: string): string;
 /** The command on its own first line, as Dependabot parses it, then the marker. */
@@ -709,7 +730,7 @@ declare function executePlan(client: GitHubClient, target: PlanTarget, plan: Rec
  * a consumer repo is missing; an existing label's color and description are never
  * changed.
  */
-declare const OWNED_LABEL_DEFINITIONS: Record<LifecycleLabel | typeof AUTO_MERGE_LABEL, LabelDefinition>;
+declare const OWNED_LABEL_DEFINITIONS: Record<LifecycleLabel | typeof AUTO_MERGE_LABEL | typeof DEPENDABOT_REBASING_LABEL, LabelDefinition>;
 
 /**
  * The advisory comment posted when a PR is ready to arm or merge but no release
@@ -747,4 +768,4 @@ declare function isTrustedAuthor(author: ReviewAuthor, policy: ReconcilePolicy):
 /** The latest verdict that counts for the PR's current head, if any. */
 declare function currentVerdict(facts: PullRequestFacts, policy: ReconcilePolicy): Verdict | undefined;
 
-export { ACTOR_TYPES, AUTO_MERGE_LABEL, type ActorType, type AutoMergeAction, BRANCH_UPDATERS, type BotEligibility, type BotPrCommit, type BotPrFacts, type BotPrType, type BranchUpdater, type ChangedFile, type CliDeps, type CliIo, type CollaboratorPermission, type CommitData, DEFAULT_SETTLE_MS, DEPENDABOT_LOGIN, DEPENDABOT_REBASE_COMMAND, DEPENDABOT_REBASING_NOTICE, DEPENDABOT_UPDATE_TYPES, type DependabotUpdateType, type GatherOptions, type GatheredPullRequest, GitHubApiError, type GitHubClient, type GitResult, type GitRunner, type HttpClientOptions, LIFECYCLE_LABELS, LIFECYCLE_STATES, type LabelDefinition, type LifecycleLabel, type LifecycleState, type Lineage, type LineageInput, MAX_CHAIN_STEPS, type MergeStep, type MergeVerifier, OWNED_LABEL_DEFINITIONS, PR_STATUSES, type ParsedArgs, type ParsedVerdict, type PlanTarget, type PullRequestData, type PullRequestFacts, type PullRequestStatus, RELEASE_PLEASE_BRANCH_PREFIX, RELEASE_TOKEN_DOCS_URL, REPO_PERMISSIONS, REVIEW_STATES, type ReconcileArgs, type ReconcileJson, type ReconcileOptions, type ReconcilePlan, type ReconcilePolicy, type ReconcileResult, type ReconcileTarget, type ReleaseActions, type ReleaseDiffVerdict, type RepoPermission, type RepoSource, type ReviewAuthor, type ReviewData, type ReviewFact, type ReviewState, SCHEMA_VERSION, type SettleOptions, TOKEN_ADVISORY_MARKER, UPDATE_REQUIRED_LABEL, USAGE, type UpdateAction, VERDICTS, type Verdict, buildRebaseRequestBody, buildTokenAdvisoryBody, classifyBotPr, classifyReleaseDiff, computeState, createGitRunner, createHttpClient, createMergeVerifier, currentVerdict, executePlan, formatSummary, gatherFacts, gatherLineage, isApiStatus, isRebasePending, isTrustedAuthor, isVersionOnlyPatch, parseArgs, parseDependabotUpdateType, parseGitVersion, parseVerdict, planReconcile, postTokenAdvisory, rebaseRequestMarker, reconcilePullRequest, runCli, toReconcileJson, withoutReleaseActions };
+export { ACTOR_TYPES, AUTO_MERGE_LABEL, type ActorType, type AutoMergeAction, BRANCH_UPDATERS, type BotEligibility, type BotPrCommit, type BotPrFacts, type BotPrType, type BranchUpdater, type ChangedFile, type CliDeps, type CliIo, type CollaboratorPermission, type CommitData, DEFAULT_SETTLE_MS, DEPENDABOT_LOGIN, DEPENDABOT_REBASE_COMMAND, DEPENDABOT_REBASING_LABEL, DEPENDABOT_REBASING_NOTICE, DEPENDABOT_RECREATING_NOTICE, DEPENDABOT_UPDATE_TYPES, type DependabotUpdateType, type GatherOptions, type GatheredPullRequest, GitHubApiError, type GitHubClient, type GitResult, type GitRunner, type HttpClientOptions, LIFECYCLE_LABELS, LIFECYCLE_STATES, type LabelDefinition, type LifecycleLabel, type LifecycleState, type Lineage, type LineageInput, MAX_CHAIN_STEPS, type MergeStep, type MergeVerifier, OWNED_LABEL_DEFINITIONS, PR_STATUSES, type ParsedArgs, type ParsedVerdict, type PlanTarget, type PullRequestData, type PullRequestFacts, type PullRequestStatus, RELEASE_PLEASE_BRANCH_PREFIX, RELEASE_TOKEN_DOCS_URL, REPO_PERMISSIONS, REVIEW_STATES, type ReconcileArgs, type ReconcileJson, type ReconcileOptions, type ReconcilePlan, type ReconcilePolicy, type ReconcileResult, type ReconcileTarget, type ReleaseActions, type ReleaseDiffVerdict, type RepoPermission, type RepoSource, type ReviewAuthor, type ReviewData, type ReviewFact, type ReviewState, SCHEMA_VERSION, type SettleOptions, TOKEN_ADVISORY_MARKER, UPDATE_REQUIRED_LABEL, USAGE, type UpdateAction, VERDICTS, type Verdict, buildRebaseRequestBody, buildTokenAdvisoryBody, classifyBotPr, classifyReleaseDiff, computeState, createGitRunner, createHttpClient, createMergeVerifier, currentVerdict, executePlan, formatSummary, gatherFacts, gatherLineage, isApiStatus, isDependabotRebasing, isRebasePending, isTrustedAuthor, isVersionOnlyPatch, parseArgs, parseDependabotUpdateType, parseGitVersion, parseVerdict, planReconcile, postTokenAdvisory, rebaseRequestMarker, reconcilePullRequest, runCli, toReconcileJson, withoutReleaseActions };

package/dist/index.js

@@ -5,7 +5,9 @@ import {
   DEFAULT_SETTLE_MS,
   DEPENDABOT_LOGIN,
   DEPENDABOT_REBASE_COMMAND,
+  DEPENDABOT_REBASING_LABEL,
   DEPENDABOT_REBASING_NOTICE,
+  DEPENDABOT_RECREATING_NOTICE,
   DEPENDABOT_UPDATE_TYPES,
   GitHubApiError,
   LIFECYCLE_LABELS,
@@ -36,6 +38,7 @@ import {
   gatherFacts,
   gatherLineage,
   isApiStatus,
+  isDependabotRebasing,
   isRebasePending,
   isTrustedAuthor,
   isVersionOnlyPatch,
@@ -50,7 +53,7 @@ import {
   runCli,
   toReconcileJson,
   withoutReleaseActions
-} from "./chunk-ENU2AAWK.js";
+} from "./chunk-K5K64YZP.js";
 export {
   ACTOR_TYPES,
   AUTO_MERGE_LABEL,
@@ -58,7 +61,9 @@ export {
   DEFAULT_SETTLE_MS,
   DEPENDABOT_LOGIN,
   DEPENDABOT_REBASE_COMMAND,
+  DEPENDABOT_REBASING_LABEL,
   DEPENDABOT_REBASING_NOTICE,
+  DEPENDABOT_RECREATING_NOTICE,
   DEPENDABOT_UPDATE_TYPES,
   GitHubApiError,
   LIFECYCLE_LABELS,
@@ -89,6 +94,7 @@ export {
   gatherFacts,
   gatherLineage,
   isApiStatus,
+  isDependabotRebasing,
   isRebasePending,
   isTrustedAuthor,
   isVersionOnlyPatch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmartz/pr-lifecycle",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "description": "Event-driven PR lifecycle reconciler: recomputes a pull request's lifecycle labels from its current facts on every GitHub event and arms native auto-merge on approval.",
   "keywords": [
     "ci",