From 3f0171ea95bbec4f447a48d5c22746b6c857f04d Mon Sep 17 00:00:00 2001 From: alexsoyes Date: Fri, 9 Oct 2026 11:21:31 +0700 Subject: [PATCH 1/2] fix(aidd-vcs): scope PR verification to changed behavior --- .../02-pull-request/actions/01-collect.md | 8 +++++--- .../02-pull-request/actions/02-draft.md | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md b/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md index ef5042d99..695ffd293 100644 --- a/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md +++ b/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md @@ -8,15 +8,17 @@ An optional base branch, overriding the resolved one. ## Output -The VCS tool, the head and base branches, and the commits and changed files since the base. +The VCS tool, the head and base branches, the commits and diff since the base, the changed observable behaviors, and their available validation evidence. ## Process 1. **Tool.** Use the VCS tool from project memory, else infer it from the remote URL. 2. **Base.** Use a provided base, else resolve it per the project's branch convention, else the repo's default branch. Surface the base and why. -3. **Gather.** Summarize the commits and changed files since the base. +3. **Read.** Read the diff against the resolved base. +4. **Identify.** Identify the observable behaviors changed by the diff. +5. **Evidence.** Collect available validation evidence for those behaviors. ## Test - The resolved base matches the branch prefix when one maps, not a blind `main`. -- The summary reflects the commits between base and head. +- The changed behaviors reflect the diff between base and head. diff --git a/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md b/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md index be7170123..0f700f945 100644 --- a/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md +++ b/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md @@ -4,7 +4,7 @@ Write the request title and body from the change. ## Input -The collected base, commits, and changed files from `01-collect`, and optional title or body overrides. +The collected base, commits, diff, changed behaviors, and validation evidence from `01-collect`, and optional title or body overrides. ## Output @@ -13,11 +13,26 @@ The proposed title, body, and base, approved by the user. ## Process 1. **Template.** Load the request template, the project's own when set, else the bundled [pull_request.md](../assets/pull_request.md). -2. **Write.** Draft a concise title and a body following the template from the change summary. Link every changed `**/qa/*.webm` under the template's testing or verification section. +2. **Write.** Draft a concise title and body from the collected diff following the template. + - Derive verification steps from the changed behaviors. + - Choose the smallest set of scenarios that demonstrates the change. + - Each scenario must distinguish the previous behavior from the new behavior. + - Specify a concrete input or action for each step. + - State the observable expected result for each step. + - Include edge cases whose handling changed. + - Omit unrelated edge cases. + - Omit generic regression commands and CI summaries. + - Include a targeted check when it directly validates the change. + - Label scenarios that were not run. + - Never present them as validated. + - Link every changed `**/qa/*.webm` under the testing or verification section. 3. **Confirm.** Show the title, body, and base, apply any overrides, and wait for approval. ## Test - The body follows the project's template sections when one exists. - Every changed `**/qa/*.webm` is linked in the body. +- Every verification step maps to a changed behavior. +- Every step specifies an action and an expected result. +- Every validation claim has supporting evidence. - The user approved the title, body, and base before creation. From 4fd37e58271474249bf9a688d93f2a839a19946c Mon Sep 17 00:00:00 2001 From: alexsoyes Date: Fri, 9 Oct 2026 11:31:09 +0700 Subject: [PATCH 2/2] refactor(aidd-vcs): trim PR verification guidance --- .../02-pull-request/actions/01-collect.md | 8 +++---- .../02-pull-request/actions/02-draft.md | 23 +++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md b/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md index 695ffd293..d7b0b6e0c 100644 --- a/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md +++ b/plugins/aidd-vcs/skills/02-pull-request/actions/01-collect.md @@ -8,17 +8,15 @@ An optional base branch, overriding the resolved one. ## Output -The VCS tool, the head and base branches, the commits and diff since the base, the changed observable behaviors, and their available validation evidence. +The VCS tool, the head and base branches, and the commits and changed files since the base. ## Process 1. **Tool.** Use the VCS tool from project memory, else infer it from the remote URL. 2. **Base.** Use a provided base, else resolve it per the project's branch convention, else the repo's default branch. Surface the base and why. -3. **Read.** Read the diff against the resolved base. -4. **Identify.** Identify the observable behaviors changed by the diff. -5. **Evidence.** Collect available validation evidence for those behaviors. +3. **Gather.** Summarize the change from the diff against the resolved base. ## Test - The resolved base matches the branch prefix when one maps, not a blind `main`. -- The changed behaviors reflect the diff between base and head. +- The summary reflects the commits between base and head. diff --git a/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md b/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md index 0f700f945..496dbd502 100644 --- a/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md +++ b/plugins/aidd-vcs/skills/02-pull-request/actions/02-draft.md @@ -4,7 +4,7 @@ Write the request title and body from the change. ## Input -The collected base, commits, diff, changed behaviors, and validation evidence from `01-collect`, and optional title or body overrides. +The collected base, commits, and changed files from `01-collect`, and optional title or body overrides. ## Output @@ -13,26 +13,15 @@ The proposed title, body, and base, approved by the user. ## Process 1. **Template.** Load the request template, the project's own when set, else the bundled [pull_request.md](../assets/pull_request.md). -2. **Write.** Draft a concise title and body from the collected diff following the template. - - Derive verification steps from the changed behaviors. - - Choose the smallest set of scenarios that demonstrates the change. - - Each scenario must distinguish the previous behavior from the new behavior. - - Specify a concrete input or action for each step. - - State the observable expected result for each step. - - Include edge cases whose handling changed. - - Omit unrelated edge cases. - - Omit generic regression commands and CI summaries. - - Include a targeted check when it directly validates the change. - - Label scenarios that were not run. - - Never present them as validated. - - Link every changed `**/qa/*.webm` under the testing or verification section. +2. **Write.** Draft a concise title and a body following the template from the change summary. Link every changed `**/qa/*.webm` under the template's testing or verification section. + - Give the fewest concrete verification steps needed for the changed behavior. + - State the expected result for each step. + - Omit generic CI summaries. + - Label scenarios that were not run. 3. **Confirm.** Show the title, body, and base, apply any overrides, and wait for approval. ## Test - The body follows the project's template sections when one exists. - Every changed `**/qa/*.webm` is linked in the body. -- Every verification step maps to a changed behavior. -- Every step specifies an action and an expected result. -- Every validation claim has supporting evidence. - The user approved the title, body, and base before creation.