Repository navigation
feat(aidd-vcs): make pull requests easier to review and keep current #1151
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.
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
alexsoyes
wants to merge
14
commits into
next
Choose a base branch
from
feat/pull-request-direct-summary
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
e760c6a
feat(aidd-vcs): open draft pull requests directly
alexsoyes 9806813
fix(aidd-vcs): omit generic test commands from pull requests
alexsoyes 71bc3be
fix(aidd-vcs): keep pull request descriptions current
alexsoyes cea7ecd
fix(aidd-vcs): clarify pull request verification and updates
alexsoyes 7a95834
docs(framework): prioritize framework behavior changes
alexsoyes e15b1af
fix(aidd-vcs): update requests after pushing changes
alexsoyes 9f781f7
feat(aidd-vcs): reuse pull request changes in summaries
alexsoyes 766b34a
fix(aidd-vcs): keep pull requests concise and scoped
alexsoyes f092dfe
fix(aidd-vcs): group pull request verification steps
alexsoyes b63c940
fix(aidd-vcs): express verification as acceptance criteria
alexsoyes 20f93bd
fix(aidd-vcs): clarify pull request intent and criteria
alexsoyes 53612e2
refactor(aidd-vcs): shorten pull request instructions
alexsoyes 371d29a
fix(aidd-vcs): give pull request updates an action
alexsoyes 8f9d94e
docs(framework): remove pull request certification
alexsoyes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,29 @@ | ||
| --- | ||
| name: 02-pull-request | ||
| description: Create a draft pull or merge request from the current branch, in whatever VCS tool the project uses. Use when the user wants to open a pull or merge request. Not for committing, pushing, or merging a branch. | ||
| description: Create a draft pull or merge request, or update an existing request to reflect its current changes. Use when the user wants to open or update a pull or merge request. Not for committing, pushing, or merging a branch. | ||
| argument-hint: base | title | ||
| --- | ||
|
|
||
| # Pull Request | ||
|
|
||
| Collect the change, draft the request, create it as a draft. `01 β 02 β 03`. | ||
| For a new request, run `01 β 02 β 03`. For an existing request, run `04`. | ||
|
|
||
| ## Actions | ||
|
|
||
| | # | Action | Step | | ||
| | --- | --------- | ----------------------------------------------------------- | | ||
| | 01 | `collect` | Resolve the base and gather the commits since it | | ||
| | 02 | `draft` | Write the title and body from the template | | ||
| | 03 | `create` | Open the draft request, label it, return the URL | | ||
| | 03 | `create` | Open the draft request, label it, and summarize it | | ||
| | 04 | `update` | Update an existing request within the requested scope | | ||
|
|
||
| Before running an action, read its file in `actions/`, not only the table or assets. | ||
|
|
||
| ## Transversal rules | ||
|
|
||
| - Follow the project's request practices in `aidd_docs/memory/vcs.md` and the repo's own request template when set, else the bundled `assets/pull_request.md`. | ||
| - Resolve the base from the branch's prefix per the project's convention (`vcs.md`), else the repo's default branch. Never assume `main`. | ||
| - The request is always a draft; the user promotes it. | ||
| - Create new requests as drafts; the user promotes them. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. on passe aux pluriel ici normal ? |
||
| - Apply only the triage label the branch prefix maps to, when it exists. Labels never change the base. | ||
| - Read the VCS tool from project memory, else infer it from the remote URL. | ||
| - Never commit, push, or branch here. | ||
|
|
||
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
11 changes: 7 additions & 4 deletions
11
plugins/aidd-vcs/skills/02-pull-request/actions/03-create.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,26 @@ | ||
| # 03 - Create | ||
|
|
||
| Open the approved draft request and label it. | ||
| Open the draft request and label it. | ||
|
|
||
| ## Input | ||
|
|
||
| The approved title, body, and base from `02-draft`. | ||
| The title, body, and base from `02-draft`. | ||
|
|
||
| ## Output | ||
|
|
||
| The draft request's URL and number, with its head and base. | ||
| The draft request, its title, link, and main changes. | ||
|
|
||
| ## Process | ||
|
|
||
| 1. **Open.** Create the request as a draft via the configured tool, passing the base, title, and body. | ||
| 2. **Label.** When the head prefix maps to a triage label that exists, apply it; skip silently otherwise. | ||
| 3. **Return.** Surface the URL, number, head, and base. | ||
| 3. **Return.** Verify the draft, base, title, and body. | ||
| Return a table with its title, link, and main-change bullets from the body. | ||
| Include the head and base when useful. | ||
|
|
||
| ## Test | ||
|
|
||
| - The request exists as a draft with its base equal to the resolved base. | ||
| - A mapped, existing triage label is applied; an absent one is skipped without error. | ||
| - The request is reachable at its URL with the head branch as its source. | ||
| - The response table contains the title, request link, and the same main-change bullets as the body. |
23 changes: 23 additions & 0 deletions
23
plugins/aidd-vcs/skills/02-pull-request/actions/04-update.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # 04 - Update | ||
|
|
||
| Update an existing request within the requested scope. | ||
|
|
||
| ## Input | ||
|
|
||
| The request and the requested edit or change in scope. | ||
|
|
||
| ## Output | ||
|
|
||
| The updated request, its title, link, and main changes. | ||
|
|
||
| ## Process | ||
|
|
||
| 1. **Read.** Read the request's title and body. For a change in scope, read its full diff against its actual base. | ||
| 2. **Write.** Make only the requested edit, or update the title and body for the changed scope. Apply the writing guidance in [02-draft](02-draft.md); preserve author-owned checkboxes and relevant context. | ||
| 3. **Update.** Save the changes and return a table with the title, link, and main-change bullets. | ||
|
|
||
| ## Test | ||
|
|
||
| - A targeted edit leaves unrelated content unchanged. | ||
| - A scope update reflects the full diff and preserves author-owned checkboxes. | ||
| - The returned table uses the request's main-change bullets. |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on avait pas dit qu'on Γ©vitait de nommer trop d'autres skills ?