@muggleai/works 4.10.0 → 4.11.0

package/plugin/skills/do/open-prs.md

@@ -1,106 +1,104 @@
-# PR Creation Agent (Stage 7/7)
+# PR Creation Agent (Stage 7 — Open PR)
 
-You are creating pull requests for each repository that has changes after a successful dev cycle run.
+Open a pull request for each repo that has changes. If an E2E walkthrough report is available from the previous stage, attach it. Honor preference gates. Hand off to stage 8 once done.
 
 ## Turn preamble
 
-Start the turn with:
-
 ```
-**Stage 7/7 — Open PR** — rendering the visual walkthrough and pushing the PR.
+**Stage 7 — Open PR** — pushing the branch and opening the PR.
 ```
 
-## Non-negotiable: visual walkthrough is required
-
-**You MUST invoke `muggle-pr-visual-walkthrough` (Mode B) to render the E2E section of the PR body.** Hand-writing the PR body with a text summary and `gh pr create` is a stage failure — reviewers rely on the dashboard links and per-step screenshots the walkthrough produces.
-
-If the E2E stage was skipped (validation was `unit-only` or `skip`), you may omit the walkthrough section — but mark the PR title with `[UNVERIFIED]` or `[UNIT-ONLY]` accordingly, and record the reason in the PR body under `## Validation`.
+## Inputs
 
-Before calling `gh pr create`, self-check:
+- Per-repo: name, path, branch.
+- Requirements: goal, acceptance criteria.
+- **Optional** E2E acceptance report from stage 6 — only present when validation ran. Produced by [`e2e-acceptance.md`](e2e-acceptance.md); schema is canonical in [`muggle-pr-visual-walkthrough/SKILL.md`](../muggle-pr-visual-walkthrough/SKILL.md) (Zod-validated by the CLI).
 
-- [ ] `muggle-pr-visual-walkthrough` was invoked (or the skip reason is recorded).
-- [ ] The `body` returned by the skill is embedded verbatim in the PR body.
-- [ ] If `comment` is non-null, it will be posted as a follow-up after the PR is created.
+## Per repo
 
-If you cannot check all three, **halt** — do not create the PR. Fix the upstream stage first.
+0. **`autoCreatePR` gate** — apply per [`../muggle-preferences/preference-gates/autoCreatePR.md`](../muggle-preferences/preference-gates/autoCreatePR.md). On skip, record the reason in `result.md` and move on.
 
-## Input
+1. **Push:** `git push -u origin <branch>` in the repo directory.
 
-You receive:
-- Per-repo: repo name, path, branch name
-- Requirements: goal, acceptance criteria
-- E2E acceptance report: passed/failed test cases, each with:
-  - `testCaseId`, `testScriptId`, `runId`, `projectId`
-  - `viewUrl`: link to view run on muggle-ai.com
-  - `steps`: array of `{ stepIndex, action, screenshotUrl }`
-  - `failureStepIndex` and `error` (if failed)
-  - `artifactsDir` (for local debugging)
-  - `description` and `useCaseName` (optional but recommended) — test case one-liner and parent use case title; drive the grouped overview and the per-test collapsible headers in the rendered walkthrough. Prefer values already in the `e2e-acceptance.md` stage's conversation context; only call `muggle-remote-test-case-get` / `muggle-remote-use-case-get` for anything you don't already have.
+2. **Title** (under 70 chars):
+   - E2E report exists and has failures → `[E2E FAILING] <goal>`
+   - No E2E report at all (validation was `unit-only` or `skip`) → `[UNVERIFIED] <goal>` or `[UNIT-ONLY] <goal>` to match the validation strategy
+   - Otherwise → `<goal>`
 
-## Your Job
+3. **Body** — assemble in order:
+   - `## Goal` — from requirements.
+   - `## Acceptance Criteria` — bulleted; omit section if empty.
+   - `## Changes` — summary of what changed in this repo.
+   - `## Validation` — one line: link to E2E report, or `unit-only`, or `skip — <reason>`.
+   - **If an E2E report exists,** invoke [`muggle-pr-visual-walkthrough`](../muggle-pr-visual-walkthrough/SKILL.md) Mode B to render the walkthrough block. Embed the returned `body` verbatim (it brings its own `## E2E Acceptance Results` heading). If no report, skip this block entirely.
 
-For each repo with changes:
-
-1. **Push the branch** to origin: `git push -u origin <branch-name>` in the repo directory.
-2. **Build the PR title:**
-   - If E2E acceptance tests have failures: `[E2E FAILING] <goal>`
-   - Otherwise: `<goal>`
-   - Keep under 70 characters
-3. **Render the E2E acceptance block** by invoking the shared `muggle-pr-visual-walkthrough` skill in **Mode B** (render-only for embedding). See "Rendering the E2E acceptance block via the shared skill" below. You receive `{body, comment}` where `body` is the E2E markdown block and `comment` is a non-null overflow comment only when the content exceeds the CLI's byte budget.
-4. **Build the PR body** by concatenating, in order:
-   - `## Goal` — the requirements goal
-   - `## Acceptance Criteria` — bulleted list (omit section if empty)
-   - `## Changes` — summary of what changed in this repo
-   - The `body` field from the skill output (already contains its own `## E2E Acceptance Results` header — do not add another)
-5. **Create the PR** using `gh pr create --title "..." --body "..." --head <branch>` in the repo directory.
-6. **Capture the PR URL** and extract the PR number.
-7. **Post the overflow `comment` only if it is non-null.** In the common case, `comment` is `null` and nothing is posted. Never post speculatively.
+4. **Create:** `gh pr create --title "..." --body "..." --head <branch>`. Capture the PR URL and number.
 
+5. **Overflow comment:** if the walkthrough skill returned a non-null `comment`, post it once:
    ```bash
-   gh pr comment <PR#> --body "$(cat <<'EOF'
-   <comment field contents>
-   EOF
-   )"
+   jq -r '.comment' /tmp/muggle-pr-section.json | gh pr comment <PR#> --body-file -
    ```
+   Never post when `comment` is `null`.
 
-## Rendering the E2E acceptance block via the shared skill
-
-**Do not hand-write the `## E2E Acceptance Results` markdown, and do not call `muggle build-pr-section` directly from this stage.** The rendering workflow is owned by the shared **`muggle-pr-visual-walkthrough`** skill (see `plugin/skills/muggle-pr-visual-walkthrough/SKILL.md`), which wraps the CLI and enforces the `E2eReport` input contract with a Zod schema.
-
-### Input — the `E2eReport` JSON
+## Stage 8 handoff
 
-The `e2e-acceptance.md` stage already produces an `E2eReport` with the exact shape the skill expects (`projectId` + `tests[]` with per-test `name`, `testCaseId`, `testScriptId`, `runId`, `viewUrl`, `status`, and `steps[]` of `{stepIndex, action, screenshotUrl}`; failed tests additionally have `failureStepIndex`, `error`, and optionally `artifactsDir`; every test may additionally carry `description` and `useCaseName` — optional but recommended — which drive the grouped overview and per-test collapsible headers in the rendered walkthrough). Pass it through unchanged — do not reshape it. The full schema is documented in the shared skill.
+After every repo is processed, build the manifest and dispatch **one follow-up loop per opened PR**. The dispatches are the LAST action this stage takes — once they fire, the original session is free.
 
-### Invocation — Mode B (render-only)
+Write `.muggle-do/sessions/<slug>/prs.json` with one entry per **opened** PR (skip repos where `autoCreatePR` short-circuited or PR creation failed):
 
-Invoke `muggle-pr-visual-walkthrough` via the `Skill` tool with the `E2eReport` already in context. The skill will:
+```json
+[{ "repo": "owner/repo", "number": 142, "url": "...", "head_sha": "...", "state": "open" }]
+```
 
-1. Validate the `E2eReport` and call `muggle build-pr-section` (piping the JSON to stdin).
-2. Parse the CLI's `{body, comment}` stdout.
-3. **Return `{body, comment}` to this stage's conversation** without posting anything — because Mode B is render-only. `body` is the E2E markdown block; `comment` is a non-null overflow follow-up comment only when content exceeds the byte budget, otherwise `null`.
+Seed `.muggle-do/sessions/<slug>/last_seen.json` keyed by `"<owner>/<repo>#<n>"` with the empty-cursor shape (full shape in [`../muggle-pr-followup/contract.md`](../muggle-pr-followup/contract.md)). Stage 7 only seeds; each per-PR loop owns advancing its own cursor.
+
+Also seed `.muggle-do/sessions/<slug>/cycle.json` — the muggle-do implementation cycle declaration the follow-up loop will invoke on each actionable review:
+
+```json
+{
+  "cycleName": "muggle-do dev cycle",
+  "steps": [
+    { "stage": 3, "file": "../do/build.md" },
+    { "stage": 4, "file": "../do/impact-analysis.md" },
+    { "stage": 5, "file": "../do/unit-tests.md" },
+    { "stage": 6, "file": "../do/e2e-acceptance.md" },
+    { "name": "post-walkthrough", "skill": "muggle-pr-visual-walkthrough", "mode": "A" }
+  ],
+  "pushHandler": "git push origin <branch>",
+  "useSubagent": false
+}
+```
 
-Mode A (where the skill itself finds an existing PR and posts a `gh pr comment`) is **not used by `muggle-do`** — it's for interactive callers like `muggle-test` that are mid-development with a PR already open. `muggle-do` always creates new PRs, so it always uses Mode B.
+For each entry in `prs.json`, dispatch its own loop as the final action:
+```
+/loop 1m /muggle:muggle-pr-followup <slug> <pr-number>
+```
+Resolve `<slug>` from the session directory's basename. One loop per PR — multi-repo sessions opening N PRs result in N independent loops, each tracking its own PR's review thread.
 
-### After rendering
+If `prs.json` is empty (all repos skipped, or all PR creations failed), **do not dispatch** — record the reason in `result.md` and exit.
 
-Back in this stage:
+## Self-check before exit
 
-- Embed `body` in the `gh pr create --body` body (see step 4 above).
-- Post the overflow `comment` as a follow-up **only when it is non-null** (see step 7 above).
-- If the CLI exited non-zero, the skill surfaces the stderr error — do not swallow it, surface it to the user.
+- [ ] Every non-skipped repo got `gh pr create` to succeed.
+- [ ] When an E2E report existed, the walkthrough block was rendered via Mode B (not hand-written).
+- [ ] Overflow `comment` was posted only when non-null.
+- [ ] `prs.json` and `last_seen.json` reflect the PRs actually opened.
+- [ ] If `prs.json` is non-empty, the `/loop` dispatch was the last action.
 
-### Notes on fit vs. overflow
+## Output
 
-- **Common case (fit):** the full evidence (summary, per-test rows, collapsible failure details) lives in the PR description, `comment` is `null`, no follow-up comment is posted.
-- **Overflow case:** the CLI detects the full body would exceed its byte budget; `body` contains the summary, per-test rows, and a pointer line; `comment` contains the overflow details. Post both.
-- You do not make the fit-vs-overflow decision — the CLI does. Never post the comment when it is `null`.
+**PRs Created:** repo → URL
+**Skipped:** repo → reason (when `autoCreatePR` short-circuited)
+**Overflow comments posted:** repo → PR #
+**Stage 8:** `Watching <N> PR(s) — one /loop 1m /muggle:muggle-pr-followup <slug> <pr#> per PR` | `No PRs to watch — stage 8 not dispatched`
+**Errors:** repo → message
 
-## Output
+## Post-merge cleanup
 
-**PRs Created:**
-- (repo name): (PR URL)
+Gated by `autoCleanup`. Fires in a follow-up turn after merge — never from this stage. See [`../_shared/post-merge-cleanup.md`](../_shared/post-merge-cleanup.md).
 
-**E2E acceptance overflow comments posted:** (only include repos where an overflow comment was actually posted)
-- (repo name): comment posted to PR #(number)
+Append one short reminder tied to the gate value:
 
-**Errors:** (any repos where PR creation or comment posting failed, with the error message)
+- `always` → `Once merged, I'll run the cleanup sequence automatically.`
+- `never` → omit.
+- `ask` / absent → `Once merged, I'll check with you about cleanup.`

package/plugin/skills/do/pre-flight.md

@@ -1,4 +1,4 @@
-# Pre-flight Agent (Stage 1/7)
+# Pre-flight Agent (Stage 1)
 
 You are running the **only user-facing stage** of the muggle-do dev cycle. Your job is to consolidate every ambiguity — task scope, repos, validation strategy, environment, credentials, PR target — into a **single turn** so the rest of the cycle can run unattended.
 
@@ -9,7 +9,7 @@ You are running the **only user-facing stage** of the muggle-do dev cycle. Your
 Start the turn with:
 
 ```
-**Stage 1/7 — Pre-flight** — consolidating everything the cycle needs before going silent.
+**Stage 1 — Pre-flight** — consolidating everything the cycle needs before going silent.
 ```
 
 ## Input
@@ -17,7 +17,7 @@ Start the turn with:
 You receive:
 
 - The user's task description (from `$ARGUMENTS`).
-- The list of configured repos (names + paths) from the Muggle config.
+- The list of configured repos (names + paths) from the Muggle Test config.
 - Any session directory that already exists (resumption case).
 
 ## Silent detection (do this first — no user prompts)
@@ -26,31 +26,38 @@ Before asking anything, gather every fact you can resolve without the user:
 
 1. **Candidate repo(s).** Match keywords in the task description against configured repo names. If one repo is an obvious match, propose it as the default; if two or three are plausible, list them.
 2. **Current branch and default branch** for each candidate repo. Run `git -C <repo> symbolic-ref refs/remotes/origin/HEAD --short` and `git -C <repo> branch --show-current`. If the current branch is the default, the pre-flight must collect a new branch name.
-3. **Running dev server.** Scan common dev ports — `lsof -iTCP -sTCP:LISTEN -nP | grep -E ':(3000|3001|3999|4200|5173|8080)'` — and hit `/` with `curl -s -o /dev/null -w "%{http_code}"` to confirm 2xx.
-4. **Running backend.** If the repo's `.env.local` (or equivalent) declares a backend URL (e.g. `REACT_APP_BACKEND_BASE_URL=http://localhost:5050`), probe the health endpoint; note up/down.
-5. **Muggle MCP auth.** Call `muggle-remote-auth-status`. If expired, you will ask to re-auth in the questionnaire.
-6. **Candidate Muggle projects.** Call `muggle-remote-project-list` and rank by semantic match against the task description and the repo's dev URL.
-7. **Existing test-user secrets.** For each candidate Muggle project, call `muggle-remote-secret-list` and note whether `managed_profile_email` / `managed_profile_password` exist.
+3. **Running dev server.** Detect listening ports and reconcile env-file URL/port using [`../_shared/dev-server-readiness.md`](../_shared/dev-server-readiness.md).
+4. **Running backend.** Probe backend health per [`../_shared/dev-server-readiness.md`](../_shared/dev-server-readiness.md) ("Backend health"). Note up/down.
+5. **Muggle Test MCP auth.** Call `muggle-remote-auth-status`. If expired, you will ask to re-auth in the questionnaire.
+6. **Candidate Muggle Test projects.** Call `muggle-remote-project-list` and rank by semantic match against the task description and the repo's dev URL.
+7. **Existing test-user secrets.** For each candidate Muggle Test project, call `muggle-remote-secret-list` and note whether `managed_profile_email` / `managed_profile_password` exist.
 8. **Auth0 tenant in use for local dev.** Grep the repo's env file for `*AUTH0_DOMAIN*`; record the tenant. This tells the user whether the staging-tenant test user will work or not.
+9. **Branch hygiene signals** for the `autoUseWorktree` and `autoRebase` gates (see [`../_shared/use-worktrees.md`](../_shared/use-worktrees.md), [`../_shared/rebase-before-e2e.md`](../_shared/rebase-before-e2e.md)):
+   - Is the current checkout already a worktree? `git -C <repo> rev-parse --is-inside-work-tree` plus `git -C <repo> worktree list`.
+   - How many commits behind `origin/<default>`? `git -C <repo> fetch origin && git -C <repo> rev-list --count "HEAD..origin/$(git -C <repo> symbolic-ref refs/remotes/origin/HEAD --short | sed 's|origin/||')"`.
+10. **`autoE2ETest` preference.** Read the session-context preferences line. Unset → treat as `always` (this gate's default — opposite of the system-wide `ask` default). `ask` → surface in Q13. `always` → no question; stage 6 runs.
 
 ## The consolidated questionnaire
 
-Present **one `AskQuestion`** (or the platform's structured-selection equivalent) that collects every remaining decision. Use detected values as defaults whenever possible. Questions to include, in this order:
+Present **one `AskUserQuestion`** (or the platform's structured-selection equivalent) that collects every remaining decision. Use detected values as defaults whenever possible. Questions to include, in this order:
 
 1. **Task scope clarification** — only if the task description is genuinely ambiguous. Offer 2–3 interpretations as options plus "Other — type a clarification." If the task is unambiguous, omit.
 2. **Repo(s) to modify** — pre-selected with the best silent match. "Confirm <repo>" / "Change repo" / "Multi-repo (list them)".
 3. **Branch name** — default: `users/<user>/<slug>` derived from the task. "Use default" / "Use different name (type)".
 4. **Validation strategy** — the single most important question. Options:
-   - **Local E2E** (Muggle Electron against a running localhost) — default if a dev server was detected.
+   - **Local E2E** (Muggle Test Electron against a running localhost) — default if a dev server was detected.
    - **Staging replay** — for changes already deployed to a preview URL.
    - **Unit tests only** — skip E2E, acceptable for pure refactors or backend-only changes.
    - **Skip validation** — explicit opt-out; the PR title gets `[UNVERIFIED]`.
 5. **Local URL** — only if validation is Local E2E. Default: the detected port. "Confirm `<detected>`" / "Type a different URL".
 6. **Backend reachable?** — only if validation is Local E2E and a backend URL is declared. If the health probe failed, ask "Start the backend now and I'll re-probe" / "Proceed anyway" / "Skip to unit tests only".
-7. **Muggle project** — pre-selected with the best silent match. "Use <top match>" / "Use a different existing project (list)" / "Create new".
+7. **Muggle Test project** — pre-selected with the best silent match. "Use <top match>" / "Use a different existing project (list)" / "Create new".
 8. **Test-user credentials** — only if validation is Local E2E AND the Auth0 tenant in the repo differs from the tenant the managed secrets were created under. Options: "Reuse existing secrets (may fail if tenant mismatch — will surface failure)" / "Create new secrets for this tenant (provide email + password)" / "Switch to staging replay".
 9. **PR target branch** — default: the repo's default branch. "Use default" / "Target a different branch".
-10. **Re-auth Muggle MCP?** — only if auth was missing/expired. "Log in now" / "Abort".
+10. **Re-auth Muggle Test MCP?** — only if auth was missing/expired. "Log in now" / "Abort".
+11. **Worktree for this change?** — gate: [`autoUseWorktree`](../muggle-preferences/preference-gates/autoUseWorktree.md). Options: create a sibling worktree, or work in the current checkout.
+12. **Rebase onto `origin/<default>` first?** — gate: [`autoRebase`](../muggle-preferences/preference-gates/autoRebase.md), only if `behind > 0`. Options: rebase before stage 6, or run as-is.
+13. **Run E2E at the end of every cycle?** — gate: [`autoE2ETest`](../muggle-preferences/preference-gates/autoE2ETest.md), only if step 10's silent detection resolved to `ask`. Options: always run stage 6, or ask each cycle.
 
 If fewer than two of the above need the user, still gather them in a single turn — never open a second round.
 
@@ -73,7 +80,7 @@ After the user answers, write **`state.md`** with every resolved value, verbatim
 - Validation: <strategy>
 - Local URL: <url or N/A>
 - Backend status: <up | down | N/A>
-- Muggle project: <name> (<uuid>)
+- Muggle Test project: <name> (<uuid>)
 - Test credentials: <existing | new | skip>
 - PR target: <branch>
 - Auth status: <ok | re-authed | N/A>
@@ -87,7 +94,7 @@ Also initialize `iterations/001.md` with a header:
 ```markdown
 # Iteration 001 — <ISO-8601 timestamp>
 
-### Stage 1/7 — Pre-flight (<timestamp>)
+### Stage 1 — Pre-flight (<timestamp>)
 
 <verbatim copy of pre-flight answers>
 ```

package/plugin/skills/do/requirements.md

@@ -1,4 +1,4 @@
-# Requirements Analysis Agent (Stage 2/7)
+# Requirements Analysis Agent (Stage 2)
 
 You are analyzing a user's task description to extract structured requirements for an autonomous development cycle.
 
@@ -7,7 +7,7 @@ You are analyzing a user's task description to extract structured requirements f
 Start the turn with:
 
 ```
-**Stage 2/7 — Requirements** — extracting structured goals from the pre-flight-clarified task.
+**Stage 2 — Requirements** — extracting structured goals from the pre-flight-clarified task.
 ```
 
 Pre-flight already resolved ambiguity via the consolidated questionnaire. **Do not ask the user any questions here** — infer silently and record assumptions in Notes.

package/plugin/skills/do/unit-tests.md

@@ -1,4 +1,4 @@
-# Unit Test Runner Agent (Stage 5/7)
+# Unit Test Runner Agent (Stage 5)
 
 You are running unit tests for each repository that has changes in the dev cycle pipeline.
 
@@ -7,7 +7,7 @@ You are running unit tests for each repository that has changes in the dev cycle
 Start the turn with:
 
 ```
-**Stage 5/7 — Unit tests** — running each repo's test suite.
+**Stage 5 — Unit tests** — running each repo's test suite.
 ```
 
 ## Input

package/plugin/skills/m/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: m
+description: Explicit short alias for the `muggle` skill (router/menu). ONLY invoke when the user explicitly types `m` or `/m` — never auto-trigger from any other phrasing.
+---
+
+# m — alias for muggle
+
+Invoke the `muggle` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mdo/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mdo
+description: Explicit short alias for the `muggle-do-task` skill. ONLY invoke when the user explicitly types `mdo` or `/mdo` — never auto-trigger from any other phrasing.
+---
+
+# mdo — alias for muggle-do-task
+
+Invoke the `muggle-do-task` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mfeedback/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mfeedback
+description: Explicit short alias for the `muggle-feedback` skill. ONLY invoke when the user explicitly types `mfeedback` or `/mfeedback` — never auto-trigger from any other phrasing.
+---
+
+# mfeedback — alias for muggle-feedback
+
+Invoke the `muggle-feedback` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mimport/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mimport
+description: Explicit short alias for the `muggle-test-import` skill. ONLY invoke when the user explicitly types `mimport` or `/mimport` — never auto-trigger from any other phrasing.
+---
+
+# mimport — alias for muggle-test-import
+
+Invoke the `muggle-test-import` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mpr/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mpr
+description: Explicit short alias for the `muggle-pr-visual-walkthrough` skill. ONLY invoke when the user explicitly types `mpr` or `/mpr` — never auto-trigger from any other phrasing.
+---
+
+# mpr — alias for muggle-pr-visual-walkthrough
+
+Invoke the `muggle-pr-visual-walkthrough` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mprefs/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mprefs
+description: Explicit short alias for the `muggle-preferences` skill. ONLY invoke when the user explicitly types `mprefs` or `/mprefs` — never auto-trigger from any other phrasing.
+---
+
+# mprefs — alias for muggle-preferences
+
+Invoke the `muggle-preferences` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mregen/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mregen
+description: Explicit short alias for the `muggle-test-regenerate-missing` skill. ONLY invoke when the user explicitly types `mregen` or `/mregen` — never auto-trigger from any other phrasing.
+---
+
+# mregen — alias for muggle-test-regenerate-missing
+
+Invoke the `muggle-test-regenerate-missing` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mrelease/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mrelease
+description: Explicit short alias for the `muggle-works-npm-release` skill. ONLY invoke when the user explicitly types `mrelease` or `/mrelease` — never auto-trigger from any other phrasing.
+---
+
+# mrelease — alias for muggle-works-npm-release
+
+Invoke the `muggle-works-npm-release` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mrepair/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mrepair
+description: Explicit short alias for the `muggle-repair` skill. ONLY invoke when the user explicitly types `mrepair` or `/mrepair` — never auto-trigger from any other phrasing.
+---
+
+# mrepair — alias for muggle-repair
+
+Invoke the `muggle-repair` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mstatus/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mstatus
+description: Explicit short alias for the `muggle-status` skill. ONLY invoke when the user explicitly types `mstatus` or `/mstatus` — never auto-trigger from any other phrasing.
+---
+
+# mstatus — alias for muggle-status
+
+Invoke the `muggle-status` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mtest/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mtest
+description: Explicit short alias for the `muggle-test` skill. ONLY invoke when the user explicitly types `mtest` or `/mtest` — never auto-trigger from any other phrasing.
+---
+
+# mtest — alias for muggle-test
+
+Invoke the `muggle-test` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mtestlocal/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mtestlocal
+description: Explicit short alias for the `muggle-test-feature-local` skill. ONLY invoke when the user explicitly types `mtestlocal` or `/mtestlocal` — never auto-trigger from any other phrasing.
+---
+
+# mtestlocal — alias for muggle-test-feature-local
+
+Invoke the `muggle-test-feature-local` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/mtestprep/SKILL.md

@@ -0,0 +1,8 @@
+---
+name: mtestprep
+description: Explicit short alias for the `muggle-test-prepare` skill. ONLY invoke when the user explicitly types `mtestprep` or `/mtestprep` — never auto-trigger from any other phrasing.
+---
+
+# mtestprep — alias for muggle-test-prepare
+
+Invoke the `muggle-test-prepare` skill via the Skill tool. Forward any user-provided arguments unchanged.

package/plugin/skills/muggle/SKILL.md

@@ -1,15 +1,17 @@
 ---
 name: muggle
-description: Muggle AI command router and menu. Use when user types "muggle" or asks for available Muggle commands.
+description: Muggle AI command router and menu. Use when user types "muggle" or asks for available Muggle Test commands.
 ---
 
-# Muggle
+# Muggle Test
 
-Use this as the top-level Muggle command router.
+> Telemetry first step: see [`_shared/telemetry-emit.md`](../_shared/telemetry-emit.md). Use `skillName: "muggle"`.
+
+Use this as the top-level Muggle Test command router.
 
 ## Preferences
 
-User preferences are injected by the SessionStart hook into a `Muggle Preferences` line in session context (key=value pairs). Resolution: defaults → `~/.muggle-ai/preferences.json` (global) → `<repo>/.muggle-ai/preferences.json` (project). Treat absent prefs as `ask`.
+User preferences are injected by the SessionStart hook into a `Muggle Test Preferences` line in session context (key=value pairs). Resolution: defaults → `~/.muggle-ai/preferences.json` (global) → `<repo>/.muggle-ai/preferences.json` (project). Treat absent prefs as `ask`.
 
 This router skill itself does not gate any decision on a preference — it just routes user intent to a downstream skill. Each downstream skill consults its own preferences. For example, `checkForUpdates` is consulted by `muggle-status` (Check 4), not here.
 
@@ -17,7 +19,7 @@ If the user types "muggle" with no subcommand and you want to surface a contextu
 
 ## Menu
 
-When user asks for "muggle" with no specific subcommand, use `AskQuestion` to present these four options:
+When user asks for "muggle" with no specific subcommand, use `AskUserQuestion` to present these four options:
 
 - "Test a feature — run E2E acceptance tests locally or remotely" → `muggle-test-feature-local` (local) or `muggle-test` (remote/change-driven)
 - "Build something — implement a feature with E2E acceptance tests and a visual PR" → `muggle-do`
@@ -35,5 +37,6 @@ If the user intent clearly matches one command, route directly — no menu neede
 - test localhost/validate single feature/test a feature → `muggle-test-feature-local`
 - build/implement from request/end-to-end → `muggle-do`
 - post results to PR/attach walkthrough/visual evidence on PR → `muggle-pr-visual-walkthrough`
+- give feedback on a run/the test was wrong/step N didn't work/show my feedback/delete feedback → `muggle-feedback`
 
-If intent is ambiguous, use `AskQuestion` with the most likely options rather than asking the user to type a clarification.
+If intent is ambiguous, use `AskUserQuestion` with the most likely options rather than asking the user to type a clarification.

package/plugin/skills/muggle-do/SKILL.md

@@ -4,94 +4,69 @@ description: Unified Muggle AI workflow entry point. Use when user types muggle
 disable-model-invocation: true
 ---
 
-# Muggle Do
+# Muggle Test Do
 
-Muggle Do runs a battle-tested autonomous dev cycle: **pre-flight → requirements → impact analysis → validate code → unit tests → E2E acceptance → open PR**.
+> Telemetry first step: see [`_shared/telemetry-emit.md`](../_shared/telemetry-emit.md). Use `skillName: "muggle-do"`.
 
-The design goal is **fire and review**: the user answers one consolidated pre-flight questionnaire, then walks away. Every subsequent stage runs unattended until completion or a genuine blocker.
+Runs an autonomous dev cycle from requirements to PR. **Fire and review:** the user answers one pre-flight questionnaire, then walks away.
 
-For maintenance tasks, use the dedicated skills:
+For maintenance, use the dedicated skills:
 
 - `/muggle:muggle-status`
 - `/muggle:muggle-repair`
 - `/muggle:muggle-upgrade`
 
-## Input routing
-
-Treat `$ARGUMENTS` as the user command:
-
-- Empty / `help` / `menu` / `?` → show menu and session selector.
-- Anything else → treat as a new task description and start/resume a dev-cycle session.
-
-## The seven stages
+## The pipeline
 
 | # | Stage | File | User-facing? |
 | :- | :---- | :--- | :----------- |
-| 1 | Pre-flight | [../do/pre-flight.md](../do/pre-flight.md) | **Yes — single consolidated turn** |
+| 1 | Pre-flight | [../do/pre-flight.md](../do/pre-flight.md) | **Yes — one consolidated turn** |
 | 2 | Requirements | [../do/requirements.md](../do/requirements.md) | No |
-| 3 | Impact analysis | [../do/impact-analysis.md](../do/impact-analysis.md) | No |
-| 4 | Validate code | [../do/validate-code.md](../do/validate-code.md) | No |
+| 3 | Build | [../do/build.md](../do/build.md) | No |
+| 4 | Impact analysis | [../do/impact-analysis.md](../do/impact-analysis.md) | No |
 | 5 | Unit tests | [../do/unit-tests.md](../do/unit-tests.md) | No |
 | 6 | E2E acceptance | [../do/e2e-acceptance.md](../do/e2e-acceptance.md) | No |
 | 7 | Open PR | [../do/open-prs.md](../do/open-prs.md) | No |
+| 8 | PR follow-up | [../muggle-pr-followup/SKILL.md](../muggle-pr-followup/SKILL.md) (generic) — invoked with muggle-do's cycle declaration | **Yes — only on ambiguous reviews** |
 
-**Stage 1 (pre-flight) is the ONLY stage that talks to the user.** Stages 2–7 run silently to completion. If a later stage hits a genuine blocker that the pre-flight didn't cover, escalate with a single terminal message — do not open a second round of questions.
-
-## Front-loading (stage 1 non-negotiable)
-
-All ambiguity — task scope, repo selection, validation strategy, localhost URL, backend health, Muggle project, test-user credentials, branch name, PR target — is resolved in a **single** pre-flight turn. See `pre-flight.md` for the exact questionnaire.
+Stage 1 talks to the user once. Stages 2–7 run silently. Stage 7 dispatches **one Stage-8 follow-up loop per PR** it opens (not one per session); each loop polls its own PR independently for new submitted reviews. When a review lands, the loop cycles back through Stage 3 (Build) → 4 → 5 → 6 → fresh visual walkthrough → push to the existing branch, then resumes polling for the next round. Each loop may escalate once on an ambiguous review.
 
-**Red-flag behaviors (do not do):**
+**Each stage's file is the single source of truth for that stage** — definition, contract, inputs/outputs, preference gates, output format. Read each stage file directly for its rules. This file is only the orchestration spine.
 
-- Asking a clarifying question mid-cycle because "I didn't think of that at pre-flight."
-- Starting a dev server mid-cycle and discovering the port is wrong.
-- Reaching the E2E stage before knowing how the user wants it validated.
-- Asking the user to "pick one" across multiple turns instead of one turn.
+## Preferences
 
-If any of these happen, the pre-flight was incomplete — treat it as a skill bug, not a user bug, and expand `pre-flight.md` to cover the missed case after the run.
-
-## Session model
+| Preference | Stage | Decision it gates |
+|------------|-------|-------------------|
+| `autoE2ETest` | 6 (E2E acceptance) | Run E2E every cycle (default `always`), or fold the question into pre-flight |
 
-Every run writes to `.muggle-do/sessions/<slug>/`:
+Other gates that fire during this cycle (`autoUseWorktree`, `autoRebase`, `autoCreatePR`, `autoCleanup`) are owned by the per-stage files; see each stage for its contract.
 
-- `state.md` — one-screen live status: current stage (N/7), last update timestamp, pre-flight answers verbatim, any blockers.
-- `iterations/<NNN>.md` — append-only log of stage transitions for iteration NNN: what ran, what was decided, what artifacts were produced.
-- `requirements.md` — frozen output of stage 2.
-- `result.md` — final summary written by stage 7 (PR URLs, E2E outcome, open issues).
-
-**On every stage transition, you MUST:**
+## Input routing
 
-1. Append a dated entry to the active `iterations/<NNN>.md`: `### Stage N/7 — <name> (<timestamp>)` followed by the stage's output.
-2. Rewrite `state.md` to reflect the new current stage and any relevant counters.
+Treat `$ARGUMENTS` as the user command:
 
-If these files don't exist, create them — missing session files means the user lost visibility into the cycle, which is the exact failure mode this skill exists to prevent.
+- Empty / `help` / `menu` / `?` → show menu and session selector.
+- Anything else → infer intent:
+  - **Task automation** (perform an action on a website — post something, fill a form, click through a flow) → invoke `muggle:muggle-do-task` with the full prompt.
+  - **Feature development** (build / fix / refactor code) → start or resume a dev-cycle session.
 
-## Turn preamble
+When in doubt, ask one question: "Browser automation task, or code change?"
 
-Each stage turn MUST begin with one line in this form before any other output:
+## Session model
 
-```
-**Stage N/7 — <stage name>** — <one-line intent>
-```
+Every run writes to `.muggle-do/sessions/<slug>/`. Stages own the files they produce:
 
-This is how the user can tell, at a glance, what phase the cycle is in without parsing a long response.
+| File | Owned by | Purpose |
+| :--- | :------- | :------ |
+| `state.md` | Stage 1 (rewritten by every transition) | Current stage, pre-flight answers, blockers |
+| `iterations/<NNN>.md` | Every stage | Append-only stage transition log |
+| `requirements.md` | Stage 2 | Frozen requirements |
+| `prs.json`, `last_seen.json`, `followup.log` | Stage 8 | See [`pr-followup.md`](../do/pr-followup.md) |
+| `result.md` | Stage 7 (seeded), Stage 8 (finalized) | Per-PR final state |
 
 ## Guardrails
 
-- **No mid-cycle user questions.** Anything not covered by pre-flight is a skill bug; escalate once, do not loop.
-- **Do not skip unit tests before E2E acceptance tests.**
-- **Do not skip E2E acceptance tests due to missing scripts** — generate when needed.
-- **Do not hand-write the E2E block of the PR body.** The `open-prs.md` stage MUST invoke `muggle-pr-visual-walkthrough` Mode B to render the screenshots-and-steps section. Hand-writing it loses the dashboard links the user relies on for review.
-- **If the same stage fails 3 times in a row, escalate with details.**
-- **If total iterations reach 3 and E2E acceptance tests still fail**, continue to PR creation with `[E2E FAILING]` in the title; the visual walkthrough section makes the failures reviewable.
-
-## Completion contract
-
-When stage 7 finishes, the final message to the user contains at minimum:
-
-- PR URL(s)
-- E2E status (passing / `[E2E FAILING]`)
-- Link to the run dashboard for each test case (via the walkthrough skill output)
-- Path to `result.md` for full details
-
-No other content. The user already read the walkthrough in the PR body — do not re-summarize it here.
+- **Stage 1 is the only forward-pipeline user-facing stage.** Stages 2–7 don't ask questions mid-cycle. If a stage hits a blocker pre-flight didn't cover, treat as a pre-flight bug — escalate once and expand `pre-flight.md` after the run.
+- **Stage 8 may escalate** once per ambiguous review comment, and may dispatch back to Stage 3 when needed — see [`pr-followup.md`](../do/pr-followup.md).
+- **If the same stage fails 3 times in a row, escalate** with details.
+- **If 3 cycle iterations reach E2E with failures**, ship with `[E2E FAILING]` per [`open-prs.md`](../do/open-prs.md). The walkthrough section keeps the failures reviewable.