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
72 changes: 54 additions & 18 deletions skills/alignment-check/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,62 @@ Invoked automatically by `writing-plans` in autonomous mode. Can also be invoked

## Dispatching the Alignment Agent

Dispatch a Sonnet agent to perform the comparison:
Dispatch a `balanced`-tier subagent to verify alignment. The subagent reads both documents and produces an Alignment Report:

Comment on lines +28 to 29
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

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

The alignment-agent dispatch instructions are now completely wrapped in <host: claude-code>, leaving no host-neutral guidance for other environments even though this skill is part of the autonomous pipeline. Add a generic instruction outside the host block (e.g., “use a balanced-tier model / your host’s subagent mechanism”) or provide explicit per-host alternatives so the skill remains usable cross-host.

Suggested change
Dispatch a `balanced`-tier subagent to verify alignment. The subagent reads both documents and produces an Alignment Report:
Use a `balanced`-tier model, subagent, or your host's equivalent task-dispatch mechanism to verify alignment. The alignment checker should read both documents and produce an Alignment Report following the instructions below.
If your environment supports subagents, dispatch this as a focused review task. If it does not, run the same check directly with the current assistant using the same inputs and report format.

Copilot uses AI. Check for mistakes.
**Input:**
- Design document: `docs/plans/YYYY-MM-DD-<topic>-design.md`
- Implementation plan: `docs/plans/YYYY-MM-DD-<feature>.md`

**Forward trace (design → plan):**
For each requirement in the design:
- Find the plan task(s) that implement it
- If no task covers it: flag as MISSING

**Reverse trace (plan → design):**
For each task in the plan:
- Find the design requirement it satisfies
- If no requirement justifies it: flag as SCOPE CREEP

**Report format:**

### Alignment Report

**Status:** PASS | FAIL

**Coverage:**
| Design Requirement | Plan Task(s) | Status |
|---|---|---|
| [requirement] | Task N | ✅ Covered |
| [requirement] | — | ❌ MISSING |

**Scope Check:**
| Plan Task | Design Requirement | Status |
|---|---|---|
| Task N | [requirement] | ✅ Justified |
| Task N | — | ⚠️ SCOPE CREEP |

**Drift Items:** [list specific items to fix]

<host: claude-code>
Dispatch using the Agent tool:

```
Agent tool (general-purpose, model: sonnet):
Agent tool (general-purpose, model: balanced):
description: "Check alignment: design vs plan"
prompt: |
You are verifying that an implementation plan aligns with its design document.

## Design Document
[Read: docs/plans/YYYY-MM-DD-<topic>-design.md]

## Implementation Plan
[Read: docs/plans/YYYY-MM-DD-<feature>.md]
Read docs/plans/YYYY-MM-DD-<topic>-design.md and docs/plans/YYYY-MM-DD-<feature>.md.

## Your Job
Perform a forward trace (design → plan):
- For each requirement, constraint, and acceptance criterion in the design, find the plan task(s) that implement it.
- If no plan task covers a design item, flag it as MISSING.

**Forward trace (design → plan):**
For each requirement in the design:
- Find the plan task(s) that implement it
- If no task covers it: flag as MISSING
Perform a reverse trace (plan → design):
- For each task in the implementation plan, find the design requirement, constraint, or acceptance criterion it satisfies.
- If no design item justifies a plan task, flag it as SCOPE CREEP.

**Reverse trace (plan → design):**
For each task in the plan:
- Find the design requirement it satisfies
- If no requirement justifies it: flag as SCOPE CREEP

**Report format:**
Return exactly this report format:

### Alignment Report

Expand All @@ -70,7 +99,14 @@ Agent tool (general-purpose, model: sonnet):
| Task N | — | ⚠️ SCOPE CREEP |

**Drift Items:** [list specific items to fix]

Set **Status:** to PASS only if every design item is covered and every plan task is justified. Otherwise set it to FAIL.
```
</host>

<host: codex, opencode, cursor>
Run the alignment check inline: read both documents, perform the forward and reverse traces using the Comparison Procedure above, and produce the Alignment Report.
</host>

## On FAIL

Expand Down
21 changes: 15 additions & 6 deletions skills/brainstorming/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description: "You MUST use this before any creative work - creating features, bu

Help turn ideas into fully formed designs and specs through natural collaborative dialogue.

Start by understanding the current project context, then ask questions one at a time to refine the idea. Once you understand what you're building, present the design and get user approval.
Start by understanding the current project context, then ask questions using adaptive batching to refine the idea. Once you understand what you're building, present the design and get user approval.

<HARD-GATE>
Do NOT invoke any implementation skill, write any code, scaffold any project, or take any implementation action until you have presented a design and the user has approved it. This applies to EVERY project regardless of perceived simplicity.
Expand All @@ -24,7 +24,7 @@ Every project goes through this process. A todo list, a single-function utility,
You MUST create a task for each of these items and complete them in order:

1. **Explore project context** — check files, docs, recent commits
2. **Ask clarifying questions** — adaptive batching: group 2-4 related questions per form, follow up with targeted singles
2. **Ask clarifying questions** — adaptive batching: group related questions to reduce round-trips; use targeted singles for follow-ups
3. **Propose 2-3 approaches** — with trade-offs and your recommendation
4. **Present design** — in sections scaled to their complexity, get user approval after each section
5. **Write design doc** — save to `docs/plans/YYYY-MM-DD-<topic>-design.md` and commit
Expand Down Expand Up @@ -58,11 +58,20 @@ digraph brainstorming {

**Understanding the idea:**
- Check out the current project state first (files, docs, recent commits)
- Ask questions using adaptive batching with AskUserQuestion:
- **First form:** Group 2-4 related questions covering purpose, constraints, scope, and tech choices
- **Follow-ups:** Targeted single questions based on interesting or ambiguous answers from previous forms
- Ask questions using adaptive batching — group related questions to reduce round-trips:
- **First batch:** covers purpose, constraints, scope, and tech choices
- **Follow-ups:** Targeted single questions based on interesting or ambiguous answers

<host: claude-code>
- Use multiple choice options when possible (AskUserQuestion supports 2-4 options per question)
- AskUserQuestion supports up to 4 questions per form — use this to reduce round-trips
</host>

<host: codex, opencode, cursor>
- Present options as a numbered list and ask the user to reply with the chosen number
- Group no more than 3 questions per turn to avoid overloading the chat
</host>

- Focus on understanding: purpose, constraints, success criteria

**Exploring approaches:**
Expand Down Expand Up @@ -106,7 +115,7 @@ When the user wants design exploration without execution, they pass `--design-on

## Key Principles

- **Adaptive question batching** - Group 2-4 related questions per form, follow up with targeted singles
- **Adaptive question batching** - Group related questions to reduce round-trips; use targeted singles for follow-ups
- **Multiple choice preferred** - Easier to answer than open-ended when possible
- **YAGNI ruthlessly** - Remove unnecessary features from all designs
- **Explore alternatives** - Always propose 2-3 approaches before settling
Expand Down
10 changes: 9 additions & 1 deletion skills/executing-plans/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ Load plan, review critically, execute tasks in batches, report for review betwee
1. Read plan file
2. Review critically - identify any questions or concerns about the plan
3. If concerns: Raise them with your human partner before starting
4. If no concerns: Create TodoWrite and proceed
4. If no concerns: create one task entry per plan task in your host's task system, then proceed to Step 2

Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

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

This step used to require creating a TodoWrite/task list before execution; after the change, only Claude Code gets that instruction (inside the host block) and other hosts get no equivalent task-tracking step. If task tracking is still intended as part of the workflow, add a host-neutral instruction outside the host block (e.g., “create one task entry per plan task in your host’s task system”) and keep the TodoWrite-specific wording only as a Claude Code addendum.

Suggested change
Create one task entry per plan task in your host's task system before starting.

Copilot uses AI. Check for mistakes.
<host: claude-code>
Use TodoWrite — one entry per plan task.
</host>
Comment on lines +22 to +26
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

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

Step 2 instructs to mark tasks as in_progress/completed, but Step 1 no longer establishes any task list/tracking mechanism for non-claude-code hosts (the only tracking instruction is now inside the <host: claude-code> block). Add a host-neutral instruction in Step 1 to create/track tasks in the current host’s task system so the status updates in Step 2 are actionable everywhere.

Copilot uses AI. Check for mistakes.

<host: codex, opencode, cursor>
If your environment has no built-in task system, maintain a numbered checklist tracking each task as pending, in-progress, or completed.
</host>

### Step 2: Execute Batch
**Default: First 3 tasks**
Expand Down
27 changes: 21 additions & 6 deletions skills/pr-monitoring/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ Invoked automatically by `finishing-a-development-branch` in autonomous mode aft

## The Process

Spawn a background agent that monitors the PR in a loop:
Run a `balanced`-tier agent that monitors the PR in a loop until all CI checks pass and no unresolved reviews remain.

```
Agent tool (general-purpose, model: sonnet, run_in_background: true):
<host: claude-code>
Use the Agent tool to run the monitor in the background:

````
Agent tool (general-purpose, model: balanced, run_in_background: true):
description: "Monitor PR #N for CI and reviews"
Comment on lines +22 to 27
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

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

PR description lists Group I + III skill rewrites, but this file (and other non-listed skills like alignment-check / executing-plans) is also changed in this PR. Please update the PR description to include these additional modified skills so reviewers can correctly scope what’s being altered.

Copilot uses AI. Check for mistakes.
prompt: |
You are monitoring PR #<number> on <repo> and automatically fixing issues.
Expand All @@ -33,9 +36,7 @@ Agent tool (general-purpose, model: sonnet, run_in_background: true):
Design doc: <path>
Plan doc: <path>

## Monitor Loop

Repeat until exit conditions met:
Repeat the Monitor Loop until exit conditions are met:

### 1. Check CI Status

Expand Down Expand Up @@ -88,6 +89,20 @@ Agent tool (general-purpose, model: sonnet, run_in_background: true):
### 4. Wait Between Checks

Sleep 60 seconds between check cycles. Do not poll more frequently.
````
</host>

<host: codex, opencode, cursor>

Use your host's equivalent mechanism to periodically poll the following in a loop:
- `gh pr checks <number>` — fix any failing CI checks
- `gh api repos/<owner>/<repo>/pulls/<number>/comments` — respond to inline review comments
- `gh api repos/<owner>/<repo>/pulls/<number>/reviews` — handle any "CHANGES_REQUESTED" reviews

Continue until all checks pass, no unresolved inline comments remain, and no "changes requested" reviews are pending.

</host>


## Safety Limits

Expand Down
Loading
Loading