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 @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
19 changes: 17 additions & 2 deletions plugins/magpie-release-management/skills/prepare/post.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
19 changes: 17 additions & 2 deletions plugins/magpie-release-management/skills/prepare/prep.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ def _patterns(names: Sequence[str], short: Sequence[str], prefixes: Sequence[str
for name in short:
leading.append(rf"^[ \t]*{re.escape(name)}{_VERSION}[ \t]*{_MARK}[ \t]*")
trailing.append(rf"[ \t]*\({re.escape(name)}{_VERSION}\)\.?[ \t]*$")
# The version is required: a bare short name may be a real noun in the title.
trailing.append(rf"[ \t]+in[ \t]+{re.escape(name)}[ \t]+v?\d+(?:\.\d+)*(?:\.x)?[ \t]*\.?$")
# Reporter attribution belongs in the credits field; kept end-anchored because
# the pattern is loose enough to eat a substantive clause mid-title.
trailing.append(r"[ \t]*\([\w.][\w. -]*[ \t]+follow-up\)\.?[ \t]*$")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
4 changes: 2 additions & 2 deletions plugins/magpie-security/skills/issue-import-from-pr/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ argument-hint: "[pr-number] [repo:owner/name]"
capability: capability:intake
surface_hash: sha256:26be912ca52168e5
license: Apache-2.0
measured_tokens: 6431
measured_tokens: 6441
---

<!-- Placeholder convention (see AGENTS.md#placeholder-convention-used-in-skill-files):
Expand Down Expand Up @@ -324,7 +324,7 @@ Step 7e's tool writes the `<details>` envelope and creates the rollup with its m
## Step 6 — User confirmation

This skill has no upstream clone and runs in the tracker checkout.
Review the PR with `--target pr:<number> --repo <upstream>` and an empty temporary directory as `--repo-dir` — never the tracker checkout, which the tool refuses.
Review the PR with `--target pr:<number> --repo <upstream>` and an export of the PR's head as `--repo-dir`, made as the review procedure below describes — never the tracker checkout, which the tool refuses.

**Adversarial review by other models.** Run it now, per [pre-pr-adversarial-review.md](pre-pr-adversarial-review.md).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ Group them by category:
Re-read [`status-rollup.md` — The rollup comment shape](../../../../tools/github/status-rollup.md#the-rollup-comment-shape)
before posting, and do not indent entries for "readability".

- **Remediation-developer fill-fields, release-manager hand-off and publication-ready comments** — read [`release-manager-comments.md`](release-manager-comments.md) before proposing anything when this pass proposes `pr created` → `pr merged` or `pr merged` → `fix released`, when it proposes populating the *Public advisory URL* body field, or when the tracker already carries a `remediation-developer-fill-fields`, `release-manager-handoff` or `release-manager-publication-ready` marker comment.
- **Remediation-developer fill-fields, release-manager hand-off and publication-ready comments** — read [`release-manager-comments.md`](release-manager-comments.md) before proposing anything when this pass proposes `pr created` → `pr merged`, on any open tracker labelled `pr merged` or `fix released`, even when a gate blocks the next label, when it proposes populating the *Public advisory URL* body field, or when the tracker already carries a `remediation-developer-fill-fields`, `release-manager-handoff` or `release-manager-publication-ready` marker comment.

- **Advisory-records update and security-pages reminder comment** — on a closed-`announced` tracker from the Step 1g scan, read [`post-advisory-records.md`](post-advisory-records.md) before proposing anything.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,23 @@ around that through the body file.
**Where it runs.** `--repo-dir` is a checkout of the code under review —
the reviewers can read every file in it. Never the project's private
tracker: the tool refuses that checkout. With `--target pr:<number>` and
no such checkout, create an empty temporary directory first, as its own
command, and pass its path. When the change is not a committed local
no such checkout, export the PR's head into a new temporary directory and
pass that: an empty directory leaves the reviewers only the diff, so they
cannot check a claim against the surrounding code, and no findings from them
is not a clean review. Run each line as its own command, in a throwaway
repository so nothing lands in the current one:

```bash
git init -q <scratch>/pr-<number>
git -C <scratch>/pr-<number> fetch --depth=1 https://github.com/<owner/name>.git pull/<number>/head
git -C <scratch>/pr-<number> archive FETCH_HEAD -- . ':(exclude).apache-magpie-overrides/tools/vetted-ops' | tar -x -C <export-dir>
```

Keep the exclusion: the secure setup denies writes to that path wherever it
appears, so a full export fails partway through. The exported tree reaches
the reviewers' providers, so export only a PR that is already public.

When the change is not a committed local
branch — a helper builds it elsewhere, or the skill applies file diffs
through the API — save the diff to a file in a temporary directory and
review it with `--target diff:<file>`.
Expand Down
Loading
Loading