@muggleai/works 4.10.0 → 4.10.1

package/plugin/skills/_shared/use-worktrees.md

@@ -0,0 +1,53 @@
+# Worktrees for Dev Work
+
+Use this for feature development, local validation, and PR iteration.
+
+## Core guidance
+
+- **One worktree per branch.** Never switch branches inside a long-lived checkout.
+- **Isolate runtime resources.** Parallel worktrees need unique ports and isolated mutable test state.
+- **Keep worktrees disposable.** Create for focused work, remove after merge.
+
+## Start new change work
+
+1. Update the base branch (usually `main`).
+2. Create a new worktree and branch:
+   ```bash
+   git worktree add <repo>-worktrees/<slug> -b <branch>
+   ```
+3. Install dependencies and run setup in that worktree.
+4. Keep all edits and commits for the change in that same worktree.
+
+## Test in the worktree
+
+- Run lint, typecheck, and unit/integration tests from the worktree.
+- Run your local E2E acceptance flow from that same worktree for user-facing validation.
+- Run the dev server from the same worktree so code, env, and cache all match.
+- In parallel runs, ensure each worktree has a unique port and isolated test data.
+
+## E2E + worktree checklist
+
+1. Confirm command cwd, checked-out branch, and server source are the same worktree.
+2. Start the app from that worktree and verify readiness first (see [`dev-server-readiness.md`](dev-server-readiness.md)).
+3. Run local E2E acceptance checks in that same session.
+4. Isolate test data across parallel branches (separate users/accounts/orgs or resettable fixtures).
+5. Re-run E2E acceptance checks after meaningful code changes during PR review.
+
+## Common failure modes to avoid
+
+- **Mixed checkouts:** Test command and server run from different directories.
+- **Port collision:** Multiple branches share a dev-server port.
+- **Shared mutable state:** Parallel runs mutate the same account or fixtures.
+- **Stale server:** Old process still serves previous branch code.
+
+## Pull request workflow
+
+1. Commit on the branch tied to the worktree.
+2. Push the branch and open the PR.
+3. Keep review fixes in that same worktree.
+4. Re-run relevant checks before each push, including E2E acceptance checks for user-facing changes.
+
+## Tear down
+
+After merge, remove the worktree.  
+See [`post-merge-cleanup.md`](post-merge-cleanup.md).

package/plugin/skills/do/e2e-acceptance.md

@@ -1,6 +1,10 @@
-# E2E / acceptance agent (Stage 6/7)
+# E2E Acceptance Agent (Stage 6/7)
 
-You are running **end-to-end (E2E) acceptance** test cases against code changes using Muggle AI's local testing infrastructure. These tests simulate real users in a browser — they are not unit tests.
+You are executing E2E acceptance validation for the muggle-do cycle.
+
+Stage 6 of `muggle-do`. Runs browser acceptance tests against code changes and records evidence for downstream PR rendering.
+
+Standalone subagent (different invocation path, used by `muggle-test` Mode C): [`../../agents/acceptance-tester.md`](../../agents/acceptance-tester.md).
 
 ## Turn preamble
 
@@ -12,23 +16,29 @@ Start the turn with:
 
 ## Design
 
-E2E acceptance testing runs **locally** using the `test-feature-local` approach:
+This stage is **mode-driven by pre-flight**:
+
+- `local-e2e` runs the local browser flow (`test-feature-local` approach).
+- `unit-only` or `skip` does not execute browser runs and must emit an explicit non-pass verdict (`SKIPPED` / `UNIT-ONLY` equivalent in downstream reporting).
+- `staging-replay` is not executed in this stage path and should be surfaced as `INCONCLUSIVE` unless the caller has already routed to a dedicated staging runner.
+
+For local runs, the tool boundaries are:
 
 | Scope | MCP tools |
 | :---- | :-------- |
 | Cloud (projects, cases, scripts, auth) | `muggle-remote-*` |
 | Local (Electron run, publish, results) | `muggle-local-*` |
 
-This guarantees E2E acceptance tests always run — no dependency on cloud replay service availability.
+This keeps execution deterministic: local runs do not depend on cloud replay execution availability.
 
 ## Input
 
 You receive everything from `state.md` already — pre-flight resolved it:
 
-- `localUrl` — the locally running dev server URL
-- `projectId` — the chosen Muggle project
+- `localUrl` — the running validation target URL (typically localhost in local mode)
+- `projectId` — the chosen Muggle Test project
 - The validation strategy (`local-e2e`, `staging-replay`, `unit-only`, `skip`)
-- Test-user credential status (existing / new / skip)
+- Test-user credential status (existing / new / skip), when credentials are needed
 - The list of changed repos, files, and a summary of changes
 - The requirements goal
 
@@ -36,23 +46,41 @@ You receive everything from `state.md` already — pre-flight resolved it:
 
 ### Step 0: Consume pre-flight (no user questions)
 
-Read `state.md`. If the validation strategy is `unit-only` or `skip`, **do not run this stage** — skip to stage 7 and record the skip reason. Otherwise use `localUrl` directly; **do not ask the user** for it.
+Read `state.md`. Resolve [`autoE2ETest`](../muggle-preferences/preference-gates/autoE2ETest.md) first — `always` (default, including when unset) runs this stage. `ask` should already have been resolved by pre-flight Q13. Use the resolved validation mode (`local-e2e`, `staging-replay`, `unit-only`, `skip`) to pick execution vs early-exit behavior.
 
-If `localUrl` or `projectId` is missing from `state.md`, that is a pre-flight bug. **Do not paper over it by asking the user** — escalate once with the session path and halt. The fix is to expand `pre-flight.md`, not to grow a new question here.
+Use `localUrl`, `projectId`, and `worktreePath` from `state.md`. Missing any → pre-flight bug; escalate with the session path and halt; do not ask the user.
 
 ### Step 0.5: Pre-flight verification probes
 
-Before launching Electron, run these live checks and fail loudly if any fails:
+Before launching the local runner:
 
-1. `curl -s -o /dev/null -w "%{http_code}" <localUrl>` — expect 2xx or 3xx. If the dev server isn't up, halt with the exact command the user needs to start it.
-2. If a backend URL is recorded, probe its health endpoint. A 5xx or unreachable backend means the dashboard will render in an error state and test results will be meaningless — halt.
-3. `muggle-remote-auth-status` — must be `authenticated`. If not, the pre-flight missed this; escalate.
-4. If test credentials were marked `existing`, confirm the Auth0 tenant in the repo's env matches the tenant the secrets were created under (recorded in `state.md`). Tenant mismatch → halt with "existing secrets target tenant X, local dev targets tenant Y — update pre-flight to collect new credentials."
+1. **Dev-server + backend readiness** — per [`../_shared/dev-server-readiness.md`](../_shared/dev-server-readiness.md) (port + compile log + backend health). Halt on any failure.
+2. **Auth** — `muggle-remote-auth-status` must be `authenticated`; else escalate.
+3. **Identity tenant/domain match** — if test credentials were marked `existing`, confirm the repo's configured identity tenant/domain matches the recorded tenant/domain. Mismatch → halt.
 
 ### Step 1: Authentication already verified
 
 Pre-flight handled auth. If `muggle-remote-auth-status` somehow shows expired here (session clock skew, etc.), re-auth silently via `muggle-remote-auth-login` + `muggle-remote-auth-poll` — but do not ask the user "continue with this account?" again.
 
+If validation is `unit-only` or `skip`, emit a `SKIPPED` report with a one-line reason and exit cleanly.
+
+If validation is `staging-replay`, emit `INCONCLUSIVE` with reason `staging replay not handled in Stage 6 local runner path` and exit cleanly.
+
+### Step 1.5: Placeholder branch detection
+
+Read `pathClassification` from the impact-analysis output (emitted by `do/impact-analysis.md`). If it is `none` — i.e. `git diff <default-branch>...HEAD --stat` was empty after rebase — there is no code under test and running test cases would only re-test master. Write a one-paragraph SKIPPED result to the E2E report (or return a SKIPPED verdict to the caller) and exit the stage cleanly. **Do not** synthesize test cases or run anything.
+
+### Step 1.7: Route + project classification
+
+Consume `pathClassification` from impact-analysis and resolve the dispatch target:
+
+- `surface-a` → use the classification-specific route + project mapping defined by impact-analysis output
+- `surface-b` → use the classification-specific route + project mapping defined by impact-analysis output
+- `mixed` → run once per classification mapping (route + project), or surface as INCONCLUSIVE if running both is over the wall-time budget
+- `none` → already handled in Step 1.5
+
+The `devServerUrl` and project resolved here override any defaults in `state.md` for the remainder of this stage. Treat classification labels as routing hints provided by impact-analysis; do not hardcode product-specific paths in this stage.
+
 ### Step 2: Get Test Cases
 
 Use `muggle-remote-test-case-list` with the project ID to fetch all test cases.
@@ -93,7 +121,7 @@ For each relevant test case:
 
 ### Local Execution Timeout (`timeoutMs`)
 
-The MCP client often uses a **default wait of 300000 ms (5 minutes)**. **Exploratory script generation** (Auth0 login, dashboards, multi-step wizards, many LLM iterations) routinely **runs longer than 5 minutes** while Electron is still healthy.
+The MCP client often uses a **default wait of 300000 ms (5 minutes)**. **Exploratory script generation** (identity login, multi-step app flows, many LLM iterations) routinely **runs longer than 5 minutes** while Electron is still healthy.
 
 - **Always pass `timeoutMs`** — `600000` (10 min) or `900000` (15 min) — unless the test case is known to be simple.
 - If the tool reports **`Electron execution timed out after 300000ms`** but Electron logs show the run still progressing (steps, screenshots, LLM calls), treat it as **orchestration timeout**, not an Electron app defect: **increase `timeoutMs` and retry**.
@@ -135,7 +163,7 @@ For each published test script:
 For each test case:
 - Record pass or fail from the run result
 - If failed, capture the error message, failure step index, and `artifactsDir` for local debugging
-- Every test case must be executed — generate a new script if none exists (no skips)
+- In `local-e2e` mode, every relevant test case must be executed — generate a new script if none exists (no skips)
 
 ## Output
 
@@ -160,10 +188,26 @@ For each test case:
   - steps: `[{ stepIndex, action, screenshotUrl }, ...]`
   - artifactsDir: `<path>` (for local debugging)
 
+**Inconclusive:** (count) — use for runs that couldn't yield a pass/fail signal: no replayable script, environment precondition unmet, infra error, agent stalled on auth/cookie banner before reaching the assertion, missing secrets. The product is **not** implicated — that's `failed`, not `inconclusive`.
+- (test case name):
+  - testCaseId: `<id>`
+  - runId: `<id>` (synthesize a UUID if no run started)
+  - viewUrl: `<url>` (project-level run-results fallback when no specific run URL exists)
+  - reason: `<one short sentence>`
+  - steps: `[{ stepIndex, action, screenshotUrl }, ...]` (may be empty)
+
 **Metadata:**
 - projectId: `<projectId>`
 
-**Overall:** ALL PASSED | FAILURES DETECTED
+**Overall:** PASS | FAIL | PARTIAL | INCONCLUSIVE | BLOCKED | SKIPPED — see [`../_shared/failure-mode-handling.md`](../_shared/failure-mode-handling.md) section F for the canonical taxonomy.
+
+## Hard constraints
+
+- **Do NOT shut down the dev server.** The caller manages dev-server lifecycle.
+- **Do NOT delete or move workspace config/state files** (for example `.muggle-ai/`, `.env.local`, or equivalent runtime config artifacts) in the worktree.
+- **Do NOT call destructive remote MCP tools** — no `*-delete`, `*-revoke`, `*-cancel`, or `*-update` against remote-owned definitions.
+- **One replacement script generation max per stage cycle.**
+- **Honor `wallTimeBudgetSec` from the caller** — on approach, write a PARTIAL report; never silently exceed.
 
 ## Non-negotiables
 
@@ -171,5 +215,6 @@ For each test case:
 - Replay: never hand-build or simplify `actionScript` — only use full response from `muggle-remote-action-script-get`.
 - Always pass `timeoutMs` for execution calls; do not rely on default 5-minute timeout.
 - No hiding failures: surface errors, exit codes, and artifact paths.
-- Every test case must be executed — generate a new script if none exists (no skips).
+- In `local-e2e` mode, every relevant test case must be executed — generate a new script if none exists (no skips).
 - Always publish after execution to ensure screenshots are cloud-accessible for PR comments.
+- **Never drop a test case from the report because it "couldn't run cleanly."** A test that didn't reach its assertion is `inconclusive`, not absent. Dropping it produces misleading verdicts and pushes downstream PR-comment renderers to hand-write the comment — which is the failure mode this stage exists to prevent.

package/plugin/skills/do/impact-analysis.md

@@ -15,22 +15,34 @@ Start the turn with:
 You receive:
 - A list of repos with their local filesystem paths
 - The requirements goal and affected repos from the requirements stage
+- Pre-flight state, including `worktreePath` when a worktree was selected (see [`../_shared/use-worktrees.md`](../_shared/use-worktrees.md))
 
 ## Your Job
 
 For each repo path provided:
 
-1. **Check the current branch:** Run `git branch --show-current` in the repo. If it returns empty (detached HEAD), report an error for that repo.
-2. **Detect the default branch:** Run `git symbolic-ref refs/remotes/origin/HEAD --short` to find the default branch (e.g., `origin/main`). Strip the `origin/` prefix. If this fails, check if `main` or `master` exist locally via `git rev-parse --verify`.
-3. **Verify it's a feature branch:** The current branch must NOT be the default branch. If it is, report an error.
-4. **List changed files:** Run `git diff --name-only <default-branch>...HEAD` to find files changed on this branch relative to the default branch. If no merge base exists, fall back to `git diff --name-only HEAD`.
-5. **Get the diff:** Run `git diff <default-branch>...HEAD` for the full diff.
+1. **Resolve analysis path with worktree awareness:**
+   - If `worktreePath` exists for this repo/session, run all git commands from `worktreePath`.
+   - Otherwise run from the repo path.
+   - Never mix command cwd across base repo + worktree in one analysis pass.
+2. **Detect worktree context:** Run `git worktree list --porcelain` and determine whether the analysis path is:
+   - a linked worktree checkout, or
+   - the primary checkout.
+   Record this in output as `checkoutType`.
+3. **Check the current branch:** Run `git branch --show-current` in the resolved analysis path. If it returns empty (detached HEAD), report an error for that repo.
+4. **Detect the default branch:** Run `git symbolic-ref refs/remotes/origin/HEAD --short` to find the default branch (e.g., `origin/main`). Strip the `origin/` prefix. If this fails, check if `main` or `master` exist locally via `git rev-parse --verify`.
+5. **Verify it's a feature branch:** The current branch must NOT be the default branch. If it is, report an error.
+6. **List changed files:** Run `git diff --name-only <default-branch>...HEAD` to find files changed on this branch relative to the default branch. If no merge base exists, fall back to `git diff --name-only HEAD`.
+7. **Get the diff:** Run `git diff <default-branch>...HEAD` for the full diff.
+8. **Classify changed paths** to drive downstream test routing — emit `pathClassification` (see "Output state — pathClassification" below).
 
 ## Output
 
 Report per repo:
 
 **Repo: (name)**
+- Analysis path: (resolved path used for git commands)
+- Checkout type: `worktree` | `primary`
 - Branch: (current branch name)
 - Default branch: (detected default branch)
 - Changed files: (list)
@@ -40,3 +52,31 @@ Report per repo:
 **Summary:** (which repos have changes, which don't, any errors)
 
 If NO repos have any changes, clearly state: "No changes detected in any repo."
+
+## Output state — pathClassification
+
+Per repo, emit one additional field that the E2E acceptance stage (`do/e2e-acceptance.md` Steps 1.5 and 1.7) consumes to pick routing + project mapping without hardcoding product paths:
+
+```
+pathClassification: <surface-a | surface-b | mixed | none>
+```
+
+Definitions:
+- **`surface-a`** — all changed files match the repo's configured pattern set A.
+- **`surface-b`** — all changed files match the repo's configured pattern set B.
+- **`mixed`** — at least one file matches pattern set A and at least one file matches pattern set B.
+- **`none`** — empty diff (placeholder branch — see standardized output below).
+
+Pattern sets must be treated as repo-configured routing buckets (for example, marketing-vs-app areas), not global hardcoded paths in this stage.
+
+### Standardized "no changes" output (placeholder branch)
+
+If `git diff <default>...HEAD --stat` is empty for a repo, emit:
+
+```
+pathClassification: none
+filesChanged: []
+recommendation: SKIPPED — placeholder branch, no code under test
+```
+
+`do/e2e-acceptance.md` Step 1.5 reads this and exits the stage cleanly with a SKIPPED verdict — do not silently run tests against master.

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

@@ -41,6 +41,8 @@ You receive:
 
 For each repo with changes:
 
+0. **Apply the `autoCreatePR` gate** per [`../muggle-preferences/preference-gates/README.md`](../muggle-preferences/preference-gates/README.md) + [`autoCreatePR.md`](../muggle-preferences/preference-gates/autoCreatePR.md). On the skip path, record the reason in `result.md` and move to the next repo.
+
 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>`
@@ -57,10 +59,7 @@ For each repo with changes:
 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.
 
    ```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 -
    ```
 
 ## Rendering the E2E acceptance block via the shared skill
@@ -104,3 +103,13 @@ Back in this stage:
 - (repo name): comment posted to PR #(number)
 
 **Errors:** (any repos where PR creation or comment posting failed, with the error message)
+
+## Post-merge cleanup (gated by `autoCleanup`)
+
+Cleanup fires in a follow-up turn after merge — never from this stage. See [`../_shared/post-merge-cleanup.md`](../_shared/post-merge-cleanup.md).
+
+After printing PR URLs, append one short reminder tied to the gate's current value:
+
+- `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/pr-followup.md

@@ -0,0 +1,225 @@
+# PR follow-up agent (Stage 8/8)
+
+You are babysitting one or more open pull requests opened by stage 7. Each invocation of this stage is **one polling tick** dispatched by `/loop 5m /muggle:muggle-do-pr-followup <slug>`. The tick is short, idempotent, and addresses **at most one item per PR**.
+
+The loop ends when every PR in the session is merged or closed.
+
+## Turn preamble
+
+Start the turn with:
+
+```
+**Stage 8/8 — PR follow-up** — polling <N> PR(s), tick #<K>.
+```
+
+Resolve `<N>` from `prs.json` (non-terminal entries only) and `<K>` from the tick counter in `state.md`.
+
+## Stage-8 exception to the no-mid-cycle-questions rule
+
+Stages 2–7 never ask the user mid-cycle. **Stage 8 may escalate** when a reviewer comment is ambiguous (see [Decision rule: classify](#decision-rule-classify) below). This is deliberate — the user has already walked away by the time stage 8 starts, and forcing a guess on an ambiguous design comment is worse than pausing.
+
+Escalation is the **only** user-facing path in stage 8. Anything else — directives, questions, CI failures, retries — runs silently.
+
+## Inputs
+
+Read these from `.muggle-do/sessions/<slug>/`:
+
+- `state.md` — current tick counter, session metadata, the pre-flight answers (for context when classifying comments).
+- `prs.json` — list of `{repo, number, url, head_sha, state}`. Entries with `state: "merged"` or `state: "closed"` are skipped.
+- `last_seen.json` — per-PR cursor: `{commentId, reviewId, checkRunCompletedAt, last_pushed_sha, idle_tick_count, escalated_comment_ids[]}`.
+
+If any of these don't exist, the tick is a no-op — log an error to `followup.log` and exit.
+
+## Per-tick contract
+
+Do these steps in order. **Do not batch — at most one actionable item per PR.**
+
+### Step 1: Refresh PR states
+
+For each PR in `prs.json` not already terminal:
+
+```bash
+gh pr view <number> --repo <repo> --json state,mergedAt,closedAt,headRefOid
+```
+
+If `state` is `MERGED` or `CLOSED`, mark the entry terminal in `prs.json`. Update `head_sha` if it changed.
+
+### Step 2: Termination check
+
+If every entry in `prs.json` is now terminal:
+
+1. Write `result.md` with one section per PR (URL, final state, count of items addressed, count escalated, final commit SHA).
+2. **Do not schedule the next tick.** End the turn with no `ScheduleWakeup`-equivalent — `/loop` ends naturally.
+3. Emit the final tick-summary telemetry event (see [Telemetry](#telemetry)) with `prs_terminal == pr_count`.
+
+### Step 3: Resolve the reviewer allow-list (every tick)
+
+For each non-terminal PR, compute the set of GitHub logins allowed to drive changes:
+
+```bash
+gh pr view <number> --repo <repo> --json reviewRequests,author
+```
+
+Add requested reviewers. Add CODEOWNERS by parsing `.github/CODEOWNERS` (or `CODEOWNERS` / `docs/CODEOWNERS`) from the PR's head branch. Remove the PR author and any bot accounts (logins ending in `[bot]`, plus the standard list: `dependabot`, `github-actions`, `renovate`).
+
+This is per-tick by design (decision 9): reviewers added or removed after the PR opened take effect on the next poll.
+
+### Step 4: Pull new actionable items
+
+For each non-terminal PR, fetch items newer than the cursor in `last_seen.json`:
+
+- **Line-level review comments**:
+  ```bash
+  gh api repos/<owner>/<repo>/pulls/<number>/comments --paginate
+  ```
+  Filter to comments with `id > last_seen.commentId` AND `user.login` in the allow-list AND not already in `escalated_comment_ids` (avoid re-escalating).
+
+- **CHANGES_REQUESTED review bodies** (only when the review has a non-empty body and no associated line comments):
+  ```bash
+  gh api repos/<owner>/<repo>/pulls/<number>/reviews --paginate
+  ```
+  Filter to reviews with `id > last_seen.reviewId` AND `state == "CHANGES_REQUESTED"` AND `user.login` in the allow-list AND `body` is non-empty.
+
+- **Failing CI checks** (apply the `head_sha` guard, decision 11):
+  ```bash
+  gh pr checks <number> --repo <repo> --json name,state,completedAt,detailsUrl,workflow
+  ```
+  Filter to checks where `state == "FAILURE"` AND `completedAt > last_seen.checkRunCompletedAt`. **Skip any check whose target SHA equals `last_pushed_sha`** — CI is still digesting our last push, addressing it again would double-handle.
+
+### Step 5: Pick one item per PR
+
+If a PR has zero actionable items, increment `idle_tick_count` for that PR. Otherwise sort the PR's items by timestamp ascending and take the **oldest one**. Reset `idle_tick_count` to 0 for that PR.
+
+If every PR has zero actionable items this tick:
+- Append a one-line heartbeat to `followup.log`: `<ts> tick #<K> idle (PRs: #A, #B, ...)`.
+- If `idle_tick_count >= 12` for any PR, also rewrite `state.md` with `idle since <ts>, last poll <ts>` for that PR (decision 12).
+- Emit tick-summary telemetry, exit the turn (next tick fires in 5 min via `/loop`).
+
+### Step 6: Classify and route
+
+For each picked item, classify it:
+
+#### Decision rule: classify
+
+| Class | Signals | Action |
+| :---- | :------ | :----- |
+| **directive** | Imperative verb on a concrete target: "rename X to Y", "extract this", "add a null check", "remove this branch", "use `const` here", "this should be `async`", "delete this comment". Includes review-body summaries that read as a list of changes. | Fix → commit → push → reply `Done in <sha> — <one-line>`. |
+| **question** | Ends with `?` and is not a rhetorical disguise. "Why this approach?", "Is this called from X?", "Does this need to handle Z?". | Reply inline with the answer. No code change. No push. |
+| **CI failure** | Source is a failing check, not a comment. | Read the failing job log, fix, commit, push. No reply. |
+| **ambiguous** (default) | Proposes an alternative without instructing ("I think we should use Z instead", "Have you considered Y?"), conflicts with a deliberate choice in the PR description or design doc, or is a multi-part comment mixing question and change request. | **Escalate.** See [Step 7: Escalate](#step-7-escalate). |
+
+When the comment matches neither **directive** nor **question** cleanly, default to **ambiguous**. Do not guess. The cost of escalating a directive that could have been auto-handled is small; the cost of pushing a wrong change because we guessed is large.
+
+#### Decision rule: reply text (adaptive, decision 6)
+
+- **directive**: short, one-line. `Done in <sha> — renamed \`fooBar\` to \`foo_bar\` per request.` Use the [reply-routing helper](#reply-routing) to hit the correct endpoint.
+- **question**: answer inline. Pull surrounding-code context if needed. Reply length matches the question's complexity — don't write three paragraphs to answer a yes/no.
+- **CI failure**: no comment to reply to. The fix commit is the response. The commit message should reference the failing check by name (e.g. `fix(ci): typecheck — narrow type of foo`).
+- **ambiguous**: no reply written by the bot. The escalation goes to the user, who replies to the comment themselves.
+
+### Step 7: Escalate
+
+When the picked item is **ambiguous**:
+
+1. Add the comment id to `last_seen.escalated_comment_ids` so it isn't re-picked next tick.
+2. Append an entry to `followup.log` describing the comment and why it was classified ambiguous.
+3. Pause this PR's loop by writing `escalated: true` against the PR's entry in `prs.json`. Subsequent ticks skip this PR until the user clears the escalation.
+4. End the turn with a **single terminal message** to the user:
+
+```
+**Stage 8 escalation — <repo>#<number>**
+
+<reviewer-login> left an ambiguous comment on <file>:<line>:
+
+> <quoted comment body>
+
+Classifying it as a directive would mean: <one-line interpretation>
+Classifying it as a question would mean: <one-line alternative>
+
+Reply to that GitHub comment yourself, or tell me which way to go. I'll resume polling once the comment is either resolved or has a follow-up from you.
+```
+
+The user clears the escalation by either resolving the GitHub thread (the next tick sees it resolved and removes it from `escalated_comment_ids`) or by replying in this terminal session with a directive that the next tick will pick up.
+
+### Step 8: Update cursors and push
+
+After addressing a non-escalated item:
+
+- Advance `last_seen.commentId` / `last_seen.reviewId` / `last_seen.checkRunCompletedAt` past the addressed item.
+- If a push happened, set `last_seen.last_pushed_sha` to the new HEAD SHA. This arms the `head_sha` guard for the next tick (decision 11).
+- Emit per-item telemetry (see [Telemetry](#telemetry)).
+
+### Step 9: Emit tick-summary telemetry and exit
+
+Emit one `muggle-local-telemetry-skill-emit` event per tick (see [Telemetry](#telemetry)). Exit the turn. Next tick fires in 5 min via `/loop`.
+
+## Reply routing
+
+GitHub's PR comment APIs are not uniform. Route by parent type:
+
+- **Reply to a line-level review comment** (most common): `POST /repos/{owner}/{repo}/pulls/{n}/comments/{comment_id}/replies` with `{"body": "..."}`. The reply lands in the same review thread.
+- **Reply to a CHANGES_REQUESTED review body** (no inline comment to reply to): post a fresh top-level PR comment via `gh pr comment <number> --body "..."` referencing the review. There is no "reply to review body" endpoint.
+- **Failing CI**: no reply. The fix commit is the response.
+
+Never post the same reply twice — the cursor in `last_seen.json` is the only re-entry guard.
+
+## Telemetry
+
+Two telemetry shapes per tick (decision 14):
+
+**Per-item** (one event per addressed/escalated item):
+
+```json
+{
+  "skill": "muggle-do-pr-followup",
+  "event": "item",
+  "session_slug": "<slug>",
+  "repo": "<repo>",
+  "pr_number": <n>,
+  "item_type": "directive|question|ci_failure|ambiguous",
+  "outcome": "fixed_and_pushed|replied|escalated",
+  "comment_id": <id-or-null>,
+  "head_sha": "<sha-or-null>"
+}
+```
+
+**Per-tick summary** (always one, even on idle ticks):
+
+```json
+{
+  "skill": "muggle-do-pr-followup",
+  "event": "tick",
+  "session_slug": "<slug>",
+  "tick": <K>,
+  "pr_count": <total>,
+  "prs_terminal": <count>,
+  "items_seen": <count>,
+  "items_addressed": <count>,
+  "items_escalated": <count>,
+  "pushed": true|false,
+  "tick_duration_ms": <ms>
+}
+```
+
+## Output
+
+This stage produces no console output beyond:
+- The turn preamble (always).
+- An escalation terminal message (only when an item is classified ambiguous).
+- The final `result.md` summary (only on the terminating tick — written to disk, not printed).
+
+Everything else lives in `followup.log` and `last_seen.json`.
+
+## Self-check before ending the turn
+
+Before exiting, confirm:
+
+- [ ] `last_seen.json` was advanced for every item handled.
+- [ ] `prs.json` reflects current PR states (terminal entries marked).
+- [ ] `followup.log` has at minimum a heartbeat or per-item line for this tick.
+- [ ] Telemetry events were emitted (per-item + per-tick).
+- [ ] If pushed, `last_pushed_sha` is set.
+- [ ] If escalated, `escalated_comment_ids` contains the comment id.
+- [ ] If terminal, the loop is NOT continued (do not schedule another tick).
+
+If any are missing, fix before exit — a dropped cursor causes double-handling next tick.

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

@@ -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>

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.