fix(stack): treat already-based overlays as rebase success - #116
Merged
Conversation
The post-sync overlay gate compared skip reasons against strings that
never match rebaseOpenFeaturePullRequests ("already based on new
fork/changes"). Overlays that were already on the tip were reported as
incomplete, hard-failing the stack job and blocking compose/dispatch.
Accept the actual reason strings via isSuccessfulFeatureRebaseSkip so a
no-op cascade still composes integration overlays.
patroza
added a commit
that referenced
this pull request
Jul 27, 2026
The post-sync overlay gate compared skip reasons against strings that
never match rebaseOpenFeaturePullRequests ("already based on new
fork/changes"). Overlays that were already on the tip were reported as
incomplete, hard-failing the stack job and blocking compose/dispatch.
Accept the actual reason strings via isSuccessfulFeatureRebaseSkip so a
no-op cascade still composes integration overlays.
patroza
added a commit
that referenced
this pull request
Jul 27, 2026
The post-sync overlay gate compared skip reasons against strings that
never match rebaseOpenFeaturePullRequests ("already based on new
fork/changes"). Overlays that were already on the tip were reported as
incomplete, hard-failing the stack job and blocking compose/dispatch.
Accept the actual reason strings via isSuccessfulFeatureRebaseSkip so a
no-op cascade still composes integration overlays.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
rebaseOpenFeaturePullRequestsemits (already based on new fork/changesvs actualalready based on fork/changes).fork/changestip (the common case after a cascade or when re-running the workflow), the job hard-failed withIntegration overlay auto-rebase incomplete… already based on fork/changesand never reached compose/dispatch.fork/integrationstale (e.g. missing Discord fix(discord-bot): stop shadowing httpBaseUrl so steernow can load the queue #114) even though overlay branches were healthy.Fix
isSuccessfulFeatureRebaseSkipthat matches the actual skip reason strings.Operational recovery (done in this session)
node scripts/compose-integration-overlays.tssofork/integrationnow includes the latest overlay commits (including fix(discord-bot): stop shadowing httpBaseUrl so steernow can load the queue #114).Downstream Fork Relationship
Base:
fork/changes. Stack automation only; no product feature dependency.Verification
vp test run scripts/rebase-pr-stack.test.ts(28 passed)vp check(0 errors)Prevention