Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Paths b

- The `/commit` skill applies the commit message format.
- Open PRs against `develop` as drafts. The `/open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `/update-pr` refreshes the description.
- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (drag-drop them into the PR via the GitHub web UI).
- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`/open-pr` asks before attaching them to the PR).

## Screenshots

Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; drag-drop them into the PR via the GitHub web UI instead.
Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `/open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).

## Code Conventions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ Per ticket: `/implement` (worktree, test-first, `/commit`) → `/open-pr`.

- The `/commit` skill applies the commit message format.
- Open PRs against `develop` as drafts. PR titles carry no ticket number; the body ends with `Closes #{ticket}`. The `/open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `/update-pr` refreshes the description.
- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (drag-drop them into the PR via the GitHub web UI).
- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`/open-pr` asks before attaching them to the PR).

## Screenshots

Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; drag-drop them into the PR via the GitHub web UI instead.
Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `/open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).

## Code Conventions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ description: Run pre-PR checks, push the branch, and open a draft pull request o
First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.

1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
2. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`), and report the URL.
3. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.

## PR body

Expand All @@ -18,4 +19,4 @@ Fill the worktree's `.github/pull_request_template.md` from the diff, following
- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
- At most three backtick uses in the body.
- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
- UI changes: put `_screenshot pending_` and remind the user to drag-drop the shots from the project's screenshot folder. Never commit screenshots.
- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ name: update-pr
description: Update a branch's PR description to reflect the latest changes
---

Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
Loading