Skip to content

fix(skill): Detect stacked PR context from branch #5223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinauer wants to merge 3 commits into
base: main
Choose a base branch
from
+38 −6
Open

fix(skill): Detect stacked PR context from branch #5223

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdcc396
fix(skill): Detect stacked PR context from branch
adinauer Mar 23, 2026
f68f205
fix(create-java-pr): Detect collection branches with downstream PRs
adinauer Mar 25, 2026
be930c1
fix(create-java-pr): Map stack base detection to defined PR type
adinauer Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions .claude/skills/create-java-pr/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,47 @@ Prepare local changes and create a pull request for the sentry-java repo.

**Required reading:** Before proceeding, read `.cursor/rules/pr.mdc` for the full PR and stacked PR workflow details. That file is the source of truth for PR conventions, stack comment format, branch naming, and merge strategy.

## Step 0: Determine PR Type
## Step 0: Determine PR Type From Git Branch Context

Ask the user (or infer from context) whether this is:
Infer PR type from the current branch before asking the user.

- **Standalone PR** — a regular PR targeting `main`. Follow Steps 1–6 as written.
- **First PR of a new stack** — ask for a topic name (e.g. "Global Attributes"). Create a collection branch from `main`, then branch the first PR off it. The first PR targets the collection branch.
- **Next PR in an existing stack** — identify the previous stack branch and topic. This PR targets the previous stack branch.
1. Get current branch:

If the user mentions "stack", "stacked PR", or provides a topic name with a number (e.g. `[Topic 2]`), treat it as a stacked PR. See `.cursor/rules/pr.mdc` § "Stacked PRs" for full details.
```bash
git branch --show-current
```

2. Apply these rules:

- **If branch is `main` or `master`**: default to a **standalone PR**.
- Do **not** assume stack mode from `main`.
- Only use stack mode if the user explicitly asks for a stacked PR.
- **If branch is not `main`/`master`**:
- Check whether that branch already has a PR and what its base is:
```bash
gh pr list --head "$(git branch --show-current)" --json number,baseRefName,title --jq '.[0]'
```
- If that branch PR exists and `baseRefName` is **not** `main`/`master`, treat the work as a **stacked PR context**.
- If that branch PR exists and `baseRefName` **is** `main`/`master`, also check whether other PRs target the current branch:
```bash
gh pr list --base "$(git branch --show-current)" --json number,headRefName,title
```
- If there are downstream PRs, treat this as **next PR in an existing stack** with the current branch as the stack base (collection branch).
- If there are no downstream PRs, treat it as **standalone PR context**.
- If no PR exists for the current branch, check whether other PRs target it:
```bash
gh pr list --base "$(git branch --show-current)" --json number,headRefName,title
```
If there are downstream PRs, treat this as **next PR in an existing stack** with the current branch as the stack base (collection branch).
Copy link

@cursor cursor bot Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing decision branch for fresh feature branches

Medium Severity

The decision tree for non-main branches has a missing case: when no PR exists for the current branch and no downstream PRs target it. This is the most common scenario (a fresh feature branch before any PR is created). The "If no PR exists" block only handles the sub-case where downstream PRs exist but never specifies a fallback (e.g., defaulting to standalone PR) when no downstream PRs are found either. The catch-all "mixed or ambiguous" clause at step 3 doesn't naturally apply here since the signals aren't ambiguous — they're just absent.

Fix in Cursor Fix in Web


Comment on lines +39 to +44
Copy link

@sentry sentry bot Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: The decision tree for inferring PR type has a missing case for a non-main branch with no existing PR and no downstream PRs, forcing a fallback to user prompting.
Severity: MEDIUM

Suggested Fix

Update the decision tree in SKILL.md to explicitly handle the missing case. When on a non-main branch with no PR and no downstream PRs, the skill should default to treating it as a 'standalone PR context' instead of falling back to asking the user.

Prompt for AI Agent 
Review the code at the location below. A potential bug has been identified by an AI
agent.
Verify if this is a real issue. If it is, propose a fix; if not, explain why it's not
valid.

Location: .claude/skills/create-java-pr/SKILL.md#L39-L44

Potential issue: The decision tree in the skill instructions for inferring PR context is
incomplete. It fails to specify an outcome for a common scenario: when the current
branch is not `main` or `master`, has no existing PR, and has no downstream PRs. In this
case, the logic falls back to prompting the user for clarification. This contradicts the
stated goal of the PR, which is to infer context automatically and reduce manual
prompting. The sensible default in this situation would be to assume a 'standalone PR
context', similar to other defined cases.

Did we get this right? 👍 / 👎 to inform future reviews.

3. If signals are mixed or ambiguous, ask one focused question to confirm.

PR types:
- **Standalone PR** — regular PR targeting `main`.
- **First PR of a new stack** — create collection branch from `main`, then first PR off it.
- **Next PR in an existing stack** — target the current stack base branch (usually the previous stack PR branch, or the collection branch if creating the first follow-up PR from the collection branch).

If the user explicitly says "stack", "stacked PR", or provides numbered stack titles (e.g. `[Topic 2]`), honor that even if branch heuristics are inconclusive.

## Step 1: Ensure Feature Branch

Expand Down
Loading