diff --git a/skills/paseo-committee/SKILL.md b/skills/paseo-committee/SKILL.md index 147ec4880..6e6fb88de 100644 --- a/skills/paseo-committee/SKILL.md +++ b/skills/paseo-committee/SKILL.md @@ -45,7 +45,7 @@ Write a problem-level prompt: - Symptoms (if a bug) - What you tried and why it failed - Explicit: "do root cause analysis" -- Explicit: "use think-harder — state assumptions, ask why three levels deep, check whether you're patching a symptom or removing the problem" +- Explicit: "state assumptions, ask why three levels deep, check whether you're patching a symptom or removing the problem" Create both agents in parallel via Paseo with `[Committee] ` titles and the same prompt. Wait for both — not just whichever finishes first. diff --git a/skills/paseo-epic/SKILL.md b/skills/paseo-epic/SKILL.md index 90b65d9d0..dd70a224a 100644 --- a/skills/paseo-epic/SKILL.md +++ b/skills/paseo-epic/SKILL.md @@ -180,7 +180,7 @@ The final check before deliver audits every bullet here. - [ ] **Phase N+2** · deliver · ``` -Phase types: `refactor`, `implement`, `verify`, `gate`, `deliver`. Verify variants written inline: `verify · unslop`, `verify · qa`, `verify · spec`, `verify · review`. See the roles reference. +Phase types: `refactor`, `implement`, `verify`, `gate`, `deliver`. Verify variants written inline: `verify · qa`, `verify · spec`, `verify · review`. See the roles reference. Status markers: `[ ]` not started, `[~]` in progress, `[x]` done, `[!]` blocked. @@ -285,10 +285,10 @@ Never push to main directly. Never force-push without explicit permission. Never ### Mode B — worktree → PR + merge 1. **Commit cleanly in the worktree.** One tidy commit per logical change. Match repo style. -2. **Rebase if behind main.** Spawn an agent that loads the rebase skill. Provider from `impl`. Tell it to rebase onto origin/main, resolve conflicts by intent (never blanket-accept one side), confirm typecheck and tests still pass, do not push. +2. **Rebase if behind main.** Spawn an agent. Provider from `impl`. Tell it to rebase onto origin/main, resolve conflicts by intent (never blanket-accept one side), confirm typecheck and tests still pass, do not push. 3. **Push the branch** — `git -C push -u origin `. 4. **Open the PR** — `gh pr create` with summary from plan Objective + Phases and test plan from acceptance lines. Capture URL → frontmatter `pr:`. Status → `pr-open`. -5. **Monitor CI.** Either watch directly (`gh pr checks --watch`), or spawn a fix-build agent that loads the fix-build skill. Provider from `impl`. Tell it to drive the PR to green: when checks fail, read failure logs, fix, push, repeat. Don't merge — your call. +5. **Monitor CI.** Either watch directly (`gh pr checks --watch`), or spawn an agent to babysit the build. Provider from `impl`. Tell it to drive the PR to green: when checks fail, read failure logs, fix, push, repeat. Don't merge — your call. When green: append Notes, frontmatter `status: ready-to-merge`. 6. **Merge** when green — ask the user (`AskUserQuestion`: squash / rebase / merge / wait). Read repo convention from recent merged PRs (`gh pr list --state merged -L 5 --json mergeCommit,title`). ```bash diff --git a/skills/paseo-epic/references/roles.md b/skills/paseo-epic/references/roles.md index 7a16b3478..0c9227fec 100644 --- a/skills/paseo-epic/references/roles.md +++ b/skills/paseo-epic/references/roles.md @@ -6,13 +6,13 @@ Shared vocabulary for `paseo-epic`. The plan file format and the implement-phase Each phase line has exactly one type after the `·`. The type tells the orchestrator which role to dispatch and which provider category to use. -| Type | What the phase does | Role dispatched | Provider category | -| ----------- | ----------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------- | -| `refactor` | Reshape existing code so the upcoming change slots in. Behavior-preserving. | `refactorer` | `impl` (or `ui` if the reshape is purely styling) | -| `implement` | Build the slice. Default = vertical slice. May be interface-first when the work calls for it. | `impl` (or `ui-impl` for styling-only passes) | `impl` (or `ui`) | -| `verify` | Read-only gate. Variant after the `·` selects the auditor: `spec` / `unslop` / `qa` / `review`. | `auditor` | `audit` | -| `gate` | Human-in-the-loop. Orchestrator yields. | none | none | -| `deliver` | Ship: commit / PR / cherry-pick. | handled inline | `impl` (for rebase / fix-build agents) | +| Type | What the phase does | Role dispatched | Provider category | +| ----------- | --------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------------- | +| `refactor` | Reshape existing code so the upcoming change slots in. Behavior-preserving. | `refactorer` | `impl` (or `ui` if the reshape is purely styling) | +| `implement` | Build the slice. Default = vertical slice. May be interface-first when the work calls for it. | `impl` (or `ui-impl` for styling-only passes) | `impl` (or `ui`) | +| `verify` | Read-only gate. Variant after the `·` selects the auditor: `spec` / `qa` / `review`. | `auditor` | `audit` | +| `gate` | Human-in-the-loop. Orchestrator yields. | none | none | +| `deliver` | Ship: commit / PR / cherry-pick. | handled inline | `impl` (for rebase / CI-babysit agents) | ## Agent roles @@ -54,7 +54,6 @@ Dispatched for `refactor` phases. - Provider: `impl` (or `ui` if the reshape is purely styling) - Edits: yes -- Loads: the **unslop** skill (focus on bolt-on, structure, module, and tests categories) - Behavior: behavior-preserving. Existing tests stay green. Add a parity test if missing. - Done: typecheck pass + relevant tests green; **does not commit; does not update the plan file**. @@ -64,10 +63,7 @@ Dispatched for `implement` phases. Default unit of work is a vertical slice. - Provider: `impl` - Edits: yes -- Loads: - - The **unslop** skill (will be audited) - - The **e2e-playwright** skill if frontend/E2E - - Any repo docs the plan or user names — given by path, never inlined +- Loads: any repo docs the plan or user names — given by path, never inlined - Behavior: TDD. Failing test first, then make it pass. All relevant tests green when done. - Push-back: if the existing shape doesn't accommodate the change, push back to the orchestrator instead of bolting on. A refactor phase should have come first. - Done: typecheck pass + every test the agent touched is green; **does not commit; does not update the plan file**. @@ -78,10 +74,7 @@ Dispatched for `implement` phases that are explicitly styling/layout passes. Per - Provider: `ui` - Edits: yes (styles, layout, copy) -- Loads: - - The **unslop** skill - - The **e2e-playwright** skill (visual test discipline) - - The repo's design system doc by path if one exists +- Loads: the repo's design system doc by path if one exists - Behavior: study existing components in adjacent screens, follow conventions exactly, no new patterns, design minimal and consistent. - Done: typecheck pass; **does not commit; does not update the plan file**. @@ -92,12 +85,11 @@ Dispatched for `verify` phases. The variant selects the audit type. - Provider: `audit` - Edits: no -| Variant | Loads | Output | -| -------- | -------------------------------------------- | -------------------------------------------------------------------------------------------- | -| `spec` | nothing | YES/NO per acceptance criterion in Phase N, with evidence (file/line/test) | -| `unslop` | the **unslop** skill in `--report-only` mode | Findings by category and severity from the diff | -| `qa` | the **e2e-playwright** skill | Walkthrough of user flows with screenshots | -| `review` | nothing | Adversarial concerns: edge cases, failure modes, alternatives the impl agent didn't consider | +| Variant | Output | +| -------- | -------------------------------------------------------------------------------------------- | +| `spec` | YES/NO per acceptance criterion in Phase N, with evidence (file/line/test) | +| `qa` | Walkthrough of user flows with screenshots | +| `review` | Adversarial concerns: edge cases, failure modes, alternatives the impl agent didn't consider | ## Hard rules across roles