feat(bootstrap): surface fork upstream drift at session start - #15
Merged
Merged
Conversation
Detect when a configured upstream remote has commits this home lacks, and report count plus subjects through the existing bootstrap diagnostic path so forks stop silently drifting behind without auto-merging third-party changes. Co-authored-by: Cursor <cursoragent@cursor.com>
Amplify-Logic
force-pushed
the
fm/firstmate-upstream-update-detect-n8
branch
from
July 21, 2026 11:08
c91630e to
0088a30
Compare
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
1 participant
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.
Intent
Re-open the PR against Amplify-Logic/firstmate:main for the already-validated upstream-drift detection work on HEAD c91630e.
Same commits already cleared review/test/document/lint on run 01KY1SHNE9CH54BRA3J29JPSJW; skipping those steps only because the pipeline agent (claude) is blocked by the org monthly spend limit, and the sole remaining need is a correctly-targeted Amplify-Logic PR with the no-mistakes body signature plus CI green.
CRITICAL: PR target must be Amplify-Logic/firstmate:main, never kunchenguid/firstmate. Wrong upstream PR kunchenguid#801 was closed; hand-opened Amplify-Logic #14 was closed for missing signature.
Feature intent unchanged: detect and surface upstream Firstmate drift at session start (detection only, no auto-merge, firstmate-only scope).
What Changed
c91630e no-mistakes(document): document FM_UPSTREAM_* env knobs in configuration reference
0c3bb92 feat(bootstrap): surface fork upstream drift at session start
Testing
Pipeline
Updates from git push no-mistakes
✅ **intent** - passed
✅ No issues found.
✅ **Rebase** - passed
✅ No issues found.
⏭️ **Review** - skipped
Step was skipped.
⏭️ **Test** - skipped
Step was skipped.
⏭️ **Document** - skipped
Step was skipped.
⏭️ **Lint** - skipped
Step was skipped.
✅ **Push** - passed
✅ No issues found.