[frontegg-david]

What and why

When stack #1057 merged, #1056's change landed on release/1.11.x as its own commit, 2a43a8b66, and #1056's merge commit, 29920b485, was empty. cherry-pick-prompt.yml cherry-picks merge_commit_sha, so it picked the empty commit. That left nothing to commit, so it commented on #1056 that main already had the change. main didn't; #1069 back-ports it by hand.

• New script: scripts/cherry-pick-commits.mjs <merge-sha> <pr-number> prints the commits that hold a PR's change, oldest first:
  • it walks back along first parents from the merge commit, through the commits whose subject ends with the PR's (#N) suffix, as GitHub's squash commits do;
  • it keeps only those that change files;
  • a merge commit with several parents is printed alone, as is the merge commit when none of the commits changes anything (then the workflow still reports "already applied").
• The workflow:
  • "Resolve target branches" runs the script and outputs commits, falling back to the merge commit with a warning if the script fails;
  • "Prepare cherry-pick branch" cherry-picks those commits;
  • the cherry-pick commit's Original commit: line, the "No cherry-pick needed" comment and the conflict issue's instructions name them.
• CLAUDE.md: the stacked-PR note describes this case.

This is the bottom of the skill-search stack, so the stack's own cherry-picks use it when it merges.

Tests

• New: scripts/cherry-pick-commits.test.mjs, 6 tests on a temporary repository laid out like release/1.11.x:
  • a squash merge;
  • a stacked PR whose change sits before an empty merge commit;
  • a stacked PR that stops at its parent's commit;
  • an empty-only merge commit;
  • a two-parent merge commit;
  • bad arguments.
• On the real release/1.11.x history: the script gives 2a43a8b66 for fix(sdk): httpRespond.redirect() takes a path, and an @HttpRoute output that fails its schema answers 500 #1056 (merge commit 29920b485), and the merge commit itself for fix(sdk): @frontmcp/sdk exports JobAdmission, jobRunUri and mayAccessRun, which a custom job host needs #1054, fix(sdk): createDirect() and create() keep the headers http.forwardHeaders names on in-process calls #1055, fix(sdk): no empty _meta['frontmcp/trace'] on an answer for which no hook ran #1046 and fix(sdk): a browser starts the guard on a caller's redis.client, and on per-instance counters with fallback: 'memory' #1047.
• The workflow's pick step, run as bash in a worktree of origin/main: fix(sdk): httpRespond.redirect() takes a path, and an @HttpRoute output that fails its schema answers 500 #1056 gives 18 files to cherry-pick, the same as Cherry-pick: fix(sdk): httpRespond.redirect() takes a path, and an @HttpRoute output that fails its schema answers 500 #1069, and fix(sdk): createDirect() and create() keep the headers http.forwardHeaders names on in-process calls #1055 is reported as already applied (Cherry-pick: fix(sdk): createDirect() and create() keep the headers http.forwardHeaders names on in-process calls #1063 carried it).
• The workflow file parses as YAML.

Summary by CodeRabbit

• Improvements
  • Cherry-pick requests now include the commits that contain a pull request’s changes, including changes from stacked pull requests, rather than relying only on the merge commit.
  • Status updates, conflict details, and manual instructions now refer to the commits being cherry-picked.
  • If the relevant commits cannot be identified, the workflow warns and falls back to the merge commit.

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

The pull request adds a script that selects commits containing a PR’s changes. The cherry-pick workflow uses the selected commit list for cherry-pick operations, status messages, comments, conflict details, and manual instructions.

Changes: Cherry-pick commit resolution

Layer / File(s)	Summary
Commit selection and validation scripts/cherry-pick-commits.mjs, scripts/cherry-pick-commits.test.mjs	The script selects commits by walking first parents while commit subjects match the PR-number suffix. It handles merge commits, filters commits without file changes, and falls back to the merge commit when needed. Tests cover stacked PRs, empty commits, merge commits, and invalid inputs.
Workflow integration and stacked-PR guidance .github/workflows/cherry-pick-prompt.yml, CLAUDE.md	The workflow resolves and cherry-picks the commit list, and uses it in status output, comments, conflict details, and manual instructions. The guidance describes the stacked-PR case.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Sequence Diagram(s)

sequenceDiagram
  participant CherryPickWorkflow
  participant CommitScript as cherry-pick-commits.mjs
  participant Git
  CherryPickWorkflow->>CommitScript: Pass merge SHA and PR number
  CommitScript->>Git: Inspect commit history and file changes
  Git-->>CommitScript: Return commit metadata
  CommitScript-->>CherryPickWorkflow: Return selected commit list
  CherryPickWorkflow->>Git: Cherry-pick selected commits

Loading

Possibly related PRs

• agentfront/frontmcp#1069: Addresses the same empty-merge cherry-pick failure by applying the file-changing commit instead.

Suggested reviewers: alexmercerpo

Merge Risk: Moderate · up to 308fe

Some stacked PRs may be reported as conflicted or cherry-picked without all their changes. Resolve both commit-list failures before merging.

- [ ] Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

[github-actions]

Cherry-pick Created

A cherry-pick PR to main has been automatically created.

Please review and merge if this change should also be in main.

If the cherry-pick is not needed, close the PR.

[github-actions]

Performance Test Results

Status: ✅ All tests passed

Summary

Project	Tests	Passed	Warnings	Failed	Leaks
✅ demo-e2e-agents	4	4	0	0	0
✅ demo-e2e-cache	11	11	0	0	0
✅ demo-e2e-codecall	4	4	0	0	0
✅ demo-e2e-config	4	4	0	0	0
✅ demo-e2e-direct	3	3	0	0	0
✅ demo-e2e-elicitation	1	1	0	0	0
✅ demo-e2e-errors	4	4	0	0	0
✅ demo-e2e-hooks	3	3	0	0	0
✅ demo-e2e-multiapp	4	4	0	0	0
✅ demo-e2e-notifications	3	3	0	0	0
✅ demo-e2e-openapi	2	2	0	0	0
✅ demo-e2e-providers	4	4	0	0	0
✅ demo-e2e-public	4	4	0	0	0
✅ demo-e2e-redis	15	15	0	0	0
✅ demo-e2e-remember	4	4	0	0	0
✅ demo-e2e-remote	5	5	0	0	0
✅ demo-e2e-serverless	2	2	0	0	0
✅ demo-e2e-skills	15	15	0	0	0
✅ demo-e2e-standalone	2	2	0	0	0
✅ demo-e2e-transport-recreation	3	3	0	0	0
✅ demo-e2e-ui	4	4	0	0	0

Total: 101 tests across 21 projects

📊 View full report in workflow run

---

Generated at: 2026-11-04T11:53:52.113Z
Commit: 4c8152b3