Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
103eea2
Add initial skill version
MoshiMoshiMochi Jan 27, 2026
3b024d4
Edit skill for upstream PR specifically
MoshiMoshiMochi Jan 27, 2026
6b5fd9a
Add credit to original author & modifications made
MoshiMoshiMochi Jan 27, 2026
a2d386e
Improve specificity of PR drafting
MoshiMoshiMochi Jan 27, 2026
99a92cd
Add note to specify that PR was generated using skill
MoshiMoshiMochi Jan 27, 2026
e2f2bc2
Add PR body content for create-pull-request skill
MoshiMoshiMochi Jan 27, 2026
97887e2
Revert "Add PR body content for create-pull-request skill"
MoshiMoshiMochi Jan 27, 2026
4801c31
Add more specifics when filling template
MoshiMoshiMochi Jan 27, 2026
55570c5
Add more specifics to diff analysis & create pr
MoshiMoshiMochi Jan 28, 2026
4033947
Move skill to .opencode directory
MoshiMoshiMochi Jan 28, 2026
85ce686
Add dry run option for local PR creation
MoshiMoshiMochi Jan 28, 2026
d14888b
Add opencode.json and more explicit steps in skill
MoshiMoshiMochi Jan 28, 2026
37e0d4c
Update opencode.json
MoshiMoshiMochi Feb 1, 2026
6618f85
Move Skill back to .github directory
MoshiMoshiMochi Feb 5, 2026
6f07382
Remove ability to directly create a reviewable PR
MoshiMoshiMochi Feb 5, 2026
c4d80c3
Fix frontmatter issue causing failed detection of skill
MoshiMoshiMochi Feb 8, 2026
f597716
Add helpers scripts and additional resources
MoshiMoshiMochi Feb 8, 2026
5686ace
Remove standard mode
MoshiMoshiMochi Feb 8, 2026
54189ff
Remove standard mode note in skill
MoshiMoshiMochi Feb 8, 2026
ceb024f
Update description to include 2 modes supported
MoshiMoshiMochi Feb 8, 2026
7df252c
Remove old redundant empty script
MoshiMoshiMochi Feb 8, 2026
b93227f
Update gather context to get diff on master
MoshiMoshiMochi Feb 8, 2026
fa0ab10
Fix accidental references to main instead of master
MoshiMoshiMochi Feb 8, 2026
9977f67
Merge branch 'master' into feat/experiment-create-pr-skill
MoshiMoshiMochi Feb 12, 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
11 changes: 11 additions & 0 deletions .github/skills/create-pull-request/ANALYSIS_GUIDE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Deep Diff Analysis Rubric

## 1. File Linkage Patterns
- **Package Logic**: Changes in `packages/*/src` should usually be paired with changes in `packages/*/test`.
- **Documentation**: Logic changes that affect user-facing features **must** have corresponding updates in `docs/` or `_markbind/`.
- **Dependency Changes**: Changes to `package.json` require a review of `package-lock.json` and a check for unused imports in `.js/.ts` files.

## 2. Change Classification
- **Bug Fix**: Look for evidence of error handling, edge case management, or logic correction.
- **Feature**: Look for new exported constants, classes, or public methods.
- **Refactor**: Changes that modify structure/readability without changing external behavior.
15 changes: 15 additions & 0 deletions .github/skills/create-pull-request/PR_STANDARDS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Markbind PR Classification Rules

## Purpose Checklist Rules
- **Documentation update**: Check ONLY if `docs/` folder contains diffs.
- **Feature Addition**: Check ONLY if the **Deep Diff Analysis** & **Information Gathering** corresponds to one of the following.
- Creation of new logic is added to files within the `packages/` directory (specifically **NOT refactored or fixed logic.**).
- **Bug fix**: Check ONLY if the **Deep Diff Analysis** & **Information Gathering** suggest that changes in the `packages/` logic suggests a correction and more robust logic handling.
- **Developer Experience**: Check ONLY if changes are refactors improving code quality, CI/CD, or internal dev-tooling.
- If it doesn't fit the main categories, use the **Others** box and provide a 1-sentence explanation.

## Final Checklist Section
- **Updated documentation**: Check if `docs/` is modified.
- **Added tests**: Check if `test/` or `spec/` files are modified.
- **Linked issues**: Check if an Issue ID was found and linked in the body.
- **No unrelated changes**: Check after verifying the diff doesn't contain stray edits.
16 changes: 16 additions & 0 deletions .github/skills/create-pull-request/RESOURCES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Troubleshooting & Resources

## Installation: gh CLI
- **macOS**: `brew install gh`
- **Windows**: `winget install --id GitHub.cli`
- **Linux**: See [cli.github.com](https://cli.github.com/)

## Authentication
Run `gh auth login` and follow the interactive prompts to authenticate with your GitHub account.

## Working Directory
If there are uncommitted changes, ask the user whether to:
1. `git add . && git commit -m "your message"`
2. `git stash`
3. `git checkout -- .` (Warning: Discards changes)
**Important** Do not stage any uncommitted changes without explict request/reply by the user
197 changes: 197 additions & 0 deletions .github/skills/create-pull-request/SKILL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
---
name: create-pull-request
description: Create a GitHub pull request following project conventions. Use when the user asks to create a PR, submit changes for review, or open a pull request. Handles commit analysis, branch management, and PR creation using the gh CLI tool. Please specify if you would like a Draft PR (for early feedback), or a Dry Run (to preview the PR locally).
compatibility: opencode
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this mean that users can't use other tools with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, i guess i was a little unclear there. This just means that I've only tested it using opencode.

credit: |
This skill was adapted from the original `create-pull-request` skill developed by the **[Cline](https://github.com/cline/cline)** team.
- **Original Source**: [cline/cline/.cline/skills/create-pull-request](https://github.com/cline/cline/blob/main/.cline/skills/create-pull-request/SKILL.md)
modification: Modified to support **Fork-to-Upstream** workflows and automated upstream remote detection.
---

# Create Pull Request (Fork-to-Upstream Version)

This skill guides you through creating a well-structured GitHub pull request that follows project conventions and best practices.
**Important**: Follow each step closely. Do not default to a more direct approach. For each section, you **must** follow these each step number incrementally (**DO NOT SKIP ANY STEPS**).

## Step 1. Mode Validation (Mandatory Start)

**Strict Requirement**: You must determine the PR mode from the user's initial request before executing any other commands.

## Step 1.1. **Check Mode**: Run `bash helpers/validate_mode.sh "{{user_message}}"`.

## Step 1.2. **Evaluate**:
- **If `MODE: UNDEFINED`**:
- **TERMINATE IMMEDIATELY**. Do not check prerequisites. Do not gather context. Do not proceed with the skill.
- **Response to User**:
> "To create a pull request, I need to know the intended mode. Please specify if you would like a **Draft PR** (for early feedback), or a **Dry Run** (to preview the PR locally)."
- **If `MODE: DRAFT` or `DRY_RUN`**:
- Record the mode and proceed to **## Step 2. Prerequisites Check**.

## Step 2. Prerequisites Check

**Strict Requirement**: You must verify the environment before any other actions. Do not proceed if any check fails.

### Step 2.1. **Execute Checks**: Run `bash helpers/check_prereqs.sh`.
Copy link
Contributor

Choose a reason for hiding this comment

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

this file doesn't seem to exist


### Step 2.2. **Handle Results**:
- **If `gh_not_installed`**: Output the installation instructions found in `RESOURCES.md` and stop.
- **If `gh_not_authenticated`**: Instruct the user to run `gh auth login` as detailed in `RESOURCES.md` and stop.
- **If `dirty_working_dir`**:
- **STOP** and display the current `git status`.
- Explicitly ask the user: "Would you like to commit these changes, stash them, or discard them?" as detailed in `RESOURCES.md`
- **Important**: Do not stage any uncommitted changes without explicit confirmation.
- **If `all_systems_go`**: Proceed to "Gather Context."

## Step 3. Gather Context

**Strict Requirement**: You must analyze the delta between your local branch and `origin` while ensuring an `upstream` target is configured.

**Strict Requirement**: You **must** follow these 4 steps incrementally (**DO NOT SKIP ANY STEPS**)

### Step 3.1. **Execute Discovery**: Run `bash helpers/gather_context.sh`.

### Step 3.2. **Upstream Verification**:
- Check the `UPSTREAM_STATUS`.
- **If `MISSING`**:
- **STOP**. Inform the user that the `upstream` remote is required for the Fork-to-Upstream workflow.
- Provide the command: `git remote add upstream <url_of_original_repo>`.
- **If `EXISTS`**: Proceed.

### Step 3.3. **Branch & Commit Validation**:
- Ensure `CURRENT_BRANCH` is not `main` or `master`.
- Review the commits in the `AHEAD_BY` count to understand scope and intent.

### Step 3.4. **Deep Diff Analysis (Three-Step Process)**:

**Step A: Structural Mapping**
- Use the `DIFF_SUMMARY` to identify all affected directories.
- Identify the **Primary Impact Zone** (where the most significant logic resides).

**Step B: Detailed Investigation**
- For every file in the Primary Impact Zone, run `git diff master..HEAD -- [file_path]`. (Use `main` if `COMPARISON_BASE` was `main`).
- **Requirement**: Do not just skim. Read the logic to understand *how* the implementation achieves the intent found in the commits.
- Cross-reference with `ANALYSIS_GUIDE.md` to identify missing linkages (e.g., "Logic changed, but no tests found in `DIFF_SUMMARY`").

**Step C: Synthesis**
- Mentally map how these files interact.
- *Example: "The logic change in `packages/core` necessitates the configuration update seen in `opencode.json`."*

## Step 4. Information Gathering

### Step 4.1. **Validate & Infer**:
- **Type of Change (Nature & Purpose Analysis)**: Do not rely solely on keywords. Use your **Deep Diff Analysis** to classify the changes based on its architectural impact.
- **Description**: Do not provide a generic summary. Construct a "Technical Summary" that covers:
- **The "What"**: Document the specific mechanical changes.
- **The "Why"**: Based on the code context, infer the technical necessity. Why was this specific approach taken over another?
- **The "Context"**: Describe how this change flows through the system.
- **The "Conclusion"**: State the expected final state of the system once this PR is merged.
- **Test Procedure**: Review the `DIFF_SUMMARY`. If no new tests were added, you **must** ask: *"How should this change be manually tested, and what are the potential breaking points?"*.

### Step 4.2. **User Confirmation**:
- Present your gathered "PR Profile" to the user:
- **Type**: [Type]
- **Description**: [Summary]
- **Tests**: [Procedure]
- Ask: *"Does this profile look correct, or should I adjust anything before I check Git Best Practices?"*

## Step 5. Git Best Practices

**Strict Requirement**: You must audit the branch history and ensure it is "PR-ready" according to project standards.

### Step 5.1. **Run Hygiene Audit**: Execute `bash helpers/check_git_hygiene.sh`.

### Step 5.2. **Address Commit Hygiene**:
- **Atomic Commits**: If `LARGE_COMMITS` are detected, ask: *"I noticed commit [hash] touches many files. Should we squash or split these to maintain atomic commit history?"*
- **Conventional Commits**: Verify if existing messages follow the [SE-Education standards](https://se-education.org/guides/conventions/git.html). If not, suggest: `git commit --amend` for the most recent one.
- **Merge Commits**: If `MERGE_COMMITS_FOUND` is not "None", inform the user: *"I detected merge commits. Project policy prefers a clean history via rebasing."*

### Step 5.3. **Branch Management (Rebase Flow)**:
- Check `BEHIND_UPSTREAM`.
- **If > 0**: You **must** recommend a rebase to ensure no conflicts occur after PR creation:
```bash
git fetch upstream
git rebase upstream/main
```
- **Warning**: If a rebase occurs, explicitly notify the user that the next push will require `--force-with-lease`.

### Step 5.4. **Final Synchronization**:
- Ensure all local work is reflected on the remote fork:
```bash
git push origin HEAD
```
- If a rebase was performed: `git push origin HEAD --force-with-lease`.
- **Verification**: Confirm the push was successful before moving to "Create the Pull Request."

## Step 6. Create the Pull Request

**Strict Requirement**: You must use the project's PR template and follow the Fork-to-Upstream execution flow.

### Step 6.1. Template Preparation
- **Check Template**: Run `bash helpers/prepare_pr_bundle.sh`.
- **If `TEMPLATE_MISSING`**: Notify the user and ask: *"The .github/PULL_REQUEST_TEMPLATE is missing. Should I proceed with a standard format?"*
- **Formatting**: Populate the template. Your PR body **must** strictly match the template's Markdown structure.

### Step 6.2. Content Generation Logic (based on the Template fill in each section accordingly)
- **What is the purpose of this pull request?**: Apply rules from **Purpose Checklist Rules** in `PR_STANDARDS.md`.
- **Overview of changes**: Write 1-2 sentences. **Mandatory**: Append "This PR was generated using the `create-pull-request` skill."
- **Anything you'd like to highlight/discuss**: Explain the *how* and *why* of specific technical choices. **Important**: This section should go in depth based on the **Deep Diff Analysis** & **Information Gathering** findings. You **must** avoid buzzwords at all costs to keep the writing natural.
- **Testing instructions**: Detail manual steps (e.g., `markbind serve`). If none, leave the section blank.
- **Proposed commit message: (wrap lines at 72 characters)**: Title < 50 chars, Body wrapped at 72. Follow [SE-Education standards](https://se-education.org/guides/conventions/git.html) referenced in the template.
- **Checklist**: Apply rules from **Final Checklist Section** in `PR_STANDARDS.md`.
- **Reviewer checklist**: Leave the **Reviewer checklist** and **SEMVER** sections **unchecked** and unmodified. These are for the maintainers to fill out during review.

### Step 6.3. Final Execution Choice
- **STOP**: You must ask the user which type of PR to create before running the command:
1. **Draft PR**: For early feedback.
2. **Dry Run**: Preview the PR locally.

### Step 6.4. CLI Execution
Execute the command based on the choice:

- **Draft PR**:
```bash
gh pr create --repo upstream_owner/repo_name --base main --head your_username:your_branch --title "PR_TITLE" --body "PR_BODY" --draft
```

- **Dry Run**:
```bash
gh pr create --repo upstream_owner/repo_name --base main --head your_username:your_branch --title "PR_TITLE" --body "PR_BODY" --dry-run
Copy link
Contributor

Choose a reason for hiding this comment

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

idk if its my version problem but there doesn't seem to be a --dry-run flag available

Copy link
Contributor

@yihao03 yihao03 Feb 13, 2026

Choose a reason for hiding this comment

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

my bad seems like my gh cli was outdated because ubuntu apt is outdated lol

```

## Step 7. Post-Creation

After creating the PR:

1. **Display the PR URL** so the user can review it
2. **Remind about CI checks**: Tests and linting will run automatically
3. **Suggest next steps**:
- Add reviewers if needed: `gh pr edit --add-reviewer USERNAME`
- Add labels if needed: `gh pr edit --add-label "bug"`

## Error Handling

### Common Issues

1. **No commits ahead of main**: The branch has no changes to submit
- Ask if the user meant to work on a different branch

2. **Branch not pushed**: Remote doesn't have the branch
- Push the branch first: `git push -u origin HEAD`

3. **PR already exists**: A PR for this branch already exists
- Show the existing PR: `gh pr view`
- Ask if they want to update it instead

4. **Merge conflicts**: Branch conflicts with base
- Guide user through resolving conflicts or rebasing

## Summary Checklist

Before finalizing, ensure:
- [ ] `gh` CLI is installed and authenticated
- [ ] Working directory is clean
- [ ] Branch is up-to-date with base branch
- [ ] Related issue number is identified, or placeholder is used
- [ ] PR description follows the template exactly
- [ ] Appropriate type of change is selected
- [ ] Pre-flight checklist items are addressed
28 changes: 28 additions & 0 deletions .github/skills/create-pull-request/helpers/check_git_hygiene.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

# 1. Determine the correct base branch (master vs main)
BASE_BRANCH="master"
if ! git rev-parse --verify "$BASE_BRANCH" &>/dev/null; then
BASE_BRANCH="main"
fi

# 2. Check for Merge Commits
MERGE_COMMITS=$(git rev-list --merges "$BASE_BRANCH"..HEAD)

# 3. Check for Atomic Commit potential (Size check)
# Flags commits that touch more than 10 files as potentially non-atomic
LARGE_COMMITS=$(git log "$BASE_BRANCH"..HEAD --pretty=format:"%H" | while read hash; do
count=$(git diff-tree --no-commit-id --name-only -r $hash | wc -l)
if [ "$count" -gt 10 ]; then echo "$hash ($count files)"; fi
done)

# 4. Check if Local is behind Upstream Main
git fetch upstream "$BASE_BRANCH" --quiet
BEHIND_COUNT=$(git rev-list --count HEAD..upstream/$BASE_BRANCH)

echo "---HYGIENE_START---"
echo "MERGE_COMMITS_FOUND: ${MERGE_COMMITS:-None}"
echo "LARGE_COMMITS: ${LARGE_COMMITS:-None}"
echo "BEHIND_UPSTREAM: $BEHIND_COUNT"
echo "BASE_BRANCH_USED: $BASE_BRANCH"
echo "---HYGIENE_END---"
34 changes: 34 additions & 0 deletions .github/skills/create-pull-request/helpers/gather_context.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash

# 1. Get current branch name
CURRENT_BRANCH=$(git branch --show-current)
LOCAL_MASTER="master"

# Verify local master exists (fall back to main if necessary)
if ! git rev-parse --verify "$LOCAL_MASTER" &>/dev/null; then
LOCAL_MASTER="main"
fi

# 2. Upstream Verification
# Check if 'upstream' remote exists
UPSTREAM_URL=$(git remote get-url upstream 2>/dev/null)
if [ -z "$UPSTREAM_URL" ]; then
UPSTREAM_STATUS="MISSING"
else
UPSTREAM_STATUS="EXISTS"
fi

# 3. Generate Analysis Data
# We compare HEAD (current branch) against the LOCAL_MASTER identified in step 1
COMMIT_COUNT=$(git rev-list --count $LOCAL_MASTER..HEAD)
DIFF_STAT=$(git diff $LOCAL_MASTER..HEAD --stat)

echo "---CONTEXT_DATA---"
echo "CURRENT_BRANCH: $CURRENT_BRANCH"
echo "COMPARISON_BASE: $LOCAL_MASTER"
echo "UPSTREAM_STATUS: $UPSTREAM_STATUS"
echo "UPSTREAM_URL: $UPSTREAM_URL"
echo "AHEAD_BY: $COMMIT_COUNT"
echo "DIFF_SUMMARY:"
echo "$DIFF_STAT"
echo "---END_CONTEXT_DATA---"
22 changes: 22 additions & 0 deletions .github/skills/create-pull-request/helpers/prepare_pr_bundle.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# 1. Get Upstream Details
UPSTREAM_REPO=$(git remote get-url upstream | sed 's/.*github.com[\/:]//;s/\.git$//')
UPSTREAM_OWNER=$(echo "$UPSTREAM_REPO" | cut -d'/' -f1)

# 2. Get Head Details (Your Fork)
MY_USERNAME=$(gh api user -q .login)
CURRENT_BRANCH=$(git branch --show-current)

# 3. Read Template (if exists)
TEMPLATE_PATH=".github/PULL_REQUEST_TEMPLATE"
if [ ! -f "$TEMPLATE_PATH" ]; then
echo "STATUS: TEMPLATE_MISSING"
else
echo "STATUS: TEMPLATE_FOUND"
fi

echo "---PR_BUNDLE_START---"
echo "UPSTREAM: $UPSTREAM_REPO"
echo "HEAD_STRING: $MY_USERNAME:$CURRENT_BRANCH"
echo "---PR_BUNDLE_END---"
12 changes: 12 additions & 0 deletions .github/skills/create-pull-request/helpers/validate_mode.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

# The first argument to this script should be the full user prompt/request
USER_MESSAGE=$(echo "$1" | tr '[:upper:]' '[:lower:]')

if [[ "$USER_MESSAGE" == *"draft"* ]]; then
echo "MODE: DRAFT"
elif [[ "$USER_MESSAGE" == *"dry run"* ]] || [[ "$USER_MESSAGE" == *"dry-run"* ]]; then
echo "MODE: DRY_RUN"
else
echo "MODE: UNDEFINED"
fi
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,7 @@ packages/core/src/lib/progress/*.js
.nx/cache
.nx/workspace-data

# AI tool-specific configuration
.opencode
# Build folder
dist/