From 6bd75d520fe01c2fb81ec7e0b9cb752135f58a92 Mon Sep 17 00:00:00 2001 From: Alberto Pose Date: Thu, 4 Jun 2026 15:43:24 +0100 Subject: [PATCH 1/3] fix(config): drop removed rebaseStalePrs from lockFileMaintenance default --- lib/config/__snapshots__/index.spec.ts.snap | 1 - lib/config/options/index.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/config/__snapshots__/index.spec.ts.snap b/lib/config/__snapshots__/index.spec.ts.snap index 58e9c0941ac..c689dffa66e 100644 --- a/lib/config/__snapshots__/index.spec.ts.snap +++ b/lib/config/__snapshots__/index.spec.ts.snap @@ -11,7 +11,6 @@ exports[`config/index > mergeChildConfig(parentConfig, childConfig) > merges 1`] "prBodyDefinitions": { "Change": "All locks refreshed", }, - "rebaseStalePrs": true, "recreateWhen": "always", "schedule": [ "on monday", diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts index c8fde16386a..8510c94ceb0 100644 --- a/lib/config/options/index.ts +++ b/lib/config/options/index.ts @@ -2526,7 +2526,6 @@ const options: Readonly[] = [ default: { enabled: false, recreateWhen: 'always', - rebaseStalePrs: true, branchTopic: 'lock-file-maintenance', commitMessageAction: 'Lock file maintenance', commitMessageTopic: null, From f159a6b7af277b77d958b8c1f119dda43c75f590 Mon Sep 17 00:00:00 2001 From: Alberto Pose Date: Thu, 4 Jun 2026 16:22:31 +0100 Subject: [PATCH 2/3] fix(config): set rebaseWhen behind-base-branch in lockFileMaintenance default The previous commit only removed rebaseStalePrs. Restore the default's intent by setting its documented equivalent rebaseWhen: behind-base-branch (the same mapping used by the rebaseStalePrs migration and the :rebaseStalePrs preset). Co-Authored-By: Claude Opus 4.8 (1M context) --- lib/config/__snapshots__/index.spec.ts.snap | 1 + lib/config/options/index.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/config/__snapshots__/index.spec.ts.snap b/lib/config/__snapshots__/index.spec.ts.snap index c689dffa66e..7d434220aa1 100644 --- a/lib/config/__snapshots__/index.spec.ts.snap +++ b/lib/config/__snapshots__/index.spec.ts.snap @@ -11,6 +11,7 @@ exports[`config/index > mergeChildConfig(parentConfig, childConfig) > merges 1`] "prBodyDefinitions": { "Change": "All locks refreshed", }, + "rebaseWhen": "behind-base-branch", "recreateWhen": "always", "schedule": [ "on monday", diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts index 8510c94ceb0..29555271f90 100644 --- a/lib/config/options/index.ts +++ b/lib/config/options/index.ts @@ -2526,6 +2526,7 @@ const options: Readonly[] = [ default: { enabled: false, recreateWhen: 'always', + rebaseWhen: 'behind-base-branch', branchTopic: 'lock-file-maintenance', commitMessageAction: 'Lock file maintenance', commitMessageTopic: null, From 50bc3a08a416b7a29053f719b9332bd1bf34f047 Mon Sep 17 00:00:00 2001 From: Alberto Pose Date: Fri, 5 Jun 2026 10:03:51 +0100 Subject: [PATCH 3/3] fix(config): just remove deprecated rebaseStalePrs, no default change Per maintainer feedback on the PR: keep this to removing the dead key so lockFileMaintenance keeps tracking the global rebaseWhen default. Revisit behind-base-branch in a future major. Co-Authored-By: Claude Opus 4.8 (1M context) --- lib/config/__snapshots__/index.spec.ts.snap | 1 - lib/config/options/index.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/config/__snapshots__/index.spec.ts.snap b/lib/config/__snapshots__/index.spec.ts.snap index 7d434220aa1..c689dffa66e 100644 --- a/lib/config/__snapshots__/index.spec.ts.snap +++ b/lib/config/__snapshots__/index.spec.ts.snap @@ -11,7 +11,6 @@ exports[`config/index > mergeChildConfig(parentConfig, childConfig) > merges 1`] "prBodyDefinitions": { "Change": "All locks refreshed", }, - "rebaseWhen": "behind-base-branch", "recreateWhen": "always", "schedule": [ "on monday", diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts index 29555271f90..8510c94ceb0 100644 --- a/lib/config/options/index.ts +++ b/lib/config/options/index.ts @@ -2526,7 +2526,6 @@ const options: Readonly[] = [ default: { enabled: false, recreateWhen: 'always', - rebaseWhen: 'behind-base-branch', branchTopic: 'lock-file-maintenance', commitMessageAction: 'Lock file maintenance', commitMessageTopic: null,