@muggleai/works 5.30.0 → 5.31.0-staging.268

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
       "name": "muggleai",
       "source": "./plugin",
       "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
-      "version": "5.30.0"
+      "version": "5.31.0-staging.268"
     }
   ]
 }

package/dist/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "muggle",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "author": {
     "name": "Muggle AI",
     "email": "support@muggle-ai.com"

package/dist/plugin/.codex-mcp.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@muggleai/works@5.30.0",
+        "@muggleai/works@5.31.0-staging.268",
         "serve"
       ],
       "env": {

package/dist/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "muggle",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
   "author": {
     "name": "Muggle AI",

package/dist/plugin/.cursor-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "muggle",
   "displayName": "Muggle AI",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "author": {
     "name": "Muggle AI",
     "email": "support@muggle-ai.com"

package/dist/plugin/.mcp.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@muggleai/works@5.30.0",
+        "@muggleai/works@5.31.0-staging.268",
         "serve"
       ]
     }

package/dist/plugin/hooks/README.md

@@ -37,7 +37,7 @@ Pre-filters are bash builtins only (`guardrail-lib.sh`), so an irrelevant event
 | Hook event | Wrapper | Strength | Condition | Preference | Effect |
 | :--------- | :------ | :------- | :-------- | :--------- | :----- |
 | `PostToolUse` (Bash) | `guardrail-pr-opened.sh` | advise | a `gh pr create`/`gh pr ready` just succeeded | `autoWatchPR` | start a `muggle-pr-followup` watcher on the new PR |
-| `PostToolUse` (Bash + muggle execute/replay MCP tools) | `guardrail-record-tests.sh` | record | a unit-test command passed, an E2E run happened (execute/replay call), or an `echo "MUGGLE_E2E_SKIP: <reason>"` marker declared E2E un-runnable, or a walkthrough carrying the `build-pr-section` sentinel was posted / declared un-postable via `echo "MUGGLE_WALKTHROUGH_SKIP: <reason>"` | — | set `unitTestsGreen` / `e2eRun` / `e2eSkipped` / `walkthroughPostedPrUrls` / `walkthroughSkipped` session state. A post settles only the PR its output names (`gh pr comment`/`create` print it; a `gh api` comment edit returns `html_url`); a post whose output names none is timestamped (`walkthroughPostedAt`), and a scan begun after it decides. An accepted skip records the change it was verified for — the working tree's origin repo and checked-out branch (`e2eSkipVerifiedChange`) — and settles only that change: the PRs opened for it (`prChanges`, tracked in `e2eSkipCoveredPrs`) and its checked-out branch's PR. A PR's change is its URL's repo plus the command's `--head`/`--source-branch`, or else the hook tree's branch when the command never changed directory and that tree is in the PR's repo; a PR whose change is unknown is never covered, so `Push-Location`/`cd`/`--repo` cannot hand it another change's skip |
+| `PostToolUse` (Bash + muggle execute/replay MCP tools) | `guardrail-record-tests.sh` | record | a unit-test command passed, an E2E run happened (execute/replay call), or an `echo "MUGGLE_E2E_SKIP: <reason>"` marker declared E2E un-runnable, or a walkthrough carrying the `build-pr-section` sentinel was posted / declared un-postable via `echo "MUGGLE_WALKTHROUGH_SKIP: <reason>"` | — | set `unitTestsGreen` / `e2eRun` / `e2eSkipped` / `walkthroughPostedPrUrls` / `walkthroughSkipped` session state. A post settles only the PR its output names (`gh pr comment`/`create` print it; a `gh api` comment edit returns `html_url`); a post whose output names none is timestamped (`walkthroughPostedAt`), and a scan begun after it decides. An accepted skip records the change it was verified for — the working tree's origin repo and checked-out branch (`e2eSkipVerifiedChange`) — and settles only that change: the PRs opened for it (`prChanges`, tracked in `e2eSkipCoveredPrs`) and its checked-out branch's PR. One whose tree's change cannot be resolved records none, never the previous declaration's, and a PR an earlier skip covered keeps that skip's record. A PR's change is its URL's repo plus the command's `--head`/`--source-branch`, or else the hook tree's branch when the command never changed directory and that tree is in the PR's repo; a PR whose change is unknown is never covered, so `Push-Location`/`cd`/`--repo` cannot hand it another change's skip |
 | `PostToolUse` (Bash) | `guardrail-pr-terminal.sh` | advise | a PR just went terminal — a `gh pr merge`/`gh pr close` success line or the `TERMINAL pr=N` line the watch scripts print in a shell result (never bare `"state":"MERGED"` metadata). Not registered on `Monitor`: a Monitor call returns before its script prints anything, so its result never carries that line | — | record `terminalPending`, direct the post-merge handoff: finalize the watcher slot, tear down per `autoCleanup`, offer next options via AskUserQuestion — or as text in the closing message while the session still owns an open PR's watch slot, since a pending AskUserQuestion holds the turn and that watcher with it |
 | `PostToolUse` (AskUserQuestion) | `guardrail-offer-ran.sh` | record | a next-options offer ran while a terminal PR was pending | — | clear `terminalPending` — the only exit for the post-merge Stop gate |
 | `PostToolUse` (Agent, Task) | `guardrail-record-delegation.sh` | record | a `muggle:acceptance-tester` was launched into the background — its response carries no finished report yet | — | append to `e2eDelegations` with the PR URLs its brief names; for a bounded window the E2E and debug-path gates hold off, and the walkthrough gate sets those PRs aside, so the session is never steered into a second browser run alongside the agent's. Shares the AskUserQuestion group's dispatch |

package/dist/plugin/scripts/guardrails.mjs

@@ -520,8 +520,11 @@ function withoutDelegatedPrs(prUrls, state, now) {
 
 // src/guardrails/shouldRunE2E.ts
 var MAX_E2E_BLOCKS = 3;
+function isEnvironmentSkip(skip) {
+  return skip !== null && !CYCLE_SCOPED_SKIP_CODES.includes(skip.code);
+}
 function applyE2eSkipDeclaration(state, skip) {
-  if (!skip || CYCLE_SCOPED_SKIP_CODES.includes(skip.code)) return state;
+  if (!isEnvironmentSkip(skip)) return state;
   return { ...state, e2eSkipDeclaration: { code: skip.code, detail: skip.detail } };
 }
 function shouldRunE2E(state) {
@@ -682,6 +685,9 @@ function isSameChange(left, right) {
 function isPrOfSkipChange(state, prUrl) {
   return isSameChange(state.prChanges?.[prUrl], state.e2eSkipVerifiedChange);
 }
+function prsOfSkipChange(state) {
+  return state.prsHandled.filter((prUrl) => isPrOfSkipChange(state, prUrl));
+}
 function withCoveredPrs(state, prUrls) {
   const covered = new Set(state.e2eSkipCoveredPrs ?? []);
   const uncovered = prUrls.filter((prUrl) => !covered.has(prUrl));
@@ -697,12 +703,14 @@ function applyPrOpenedToSkipScope(state, prUrl, prChange) {
   return isPrOfSkipChange(recorded, prUrl) && recorded.e2eSkipDeclaration ? withCoveredPrs(recorded, [prUrl]) : recorded;
 }
 function applyE2eSkipScope(state, verifiedChange) {
-  if (!verifiedChange || !state.e2eSkipDeclaration) return state;
+  if (!state.e2eSkipDeclaration) return state;
+  if (!verifiedChange) {
+    if (!state.e2eSkipVerifiedChange) return state;
+    const { e2eSkipVerifiedChange: _previousDeclarationChange, ...unscoped } = state;
+    return unscoped;
+  }
   const scoped = { ...state, e2eSkipVerifiedChange: verifiedChange };
-  return withCoveredPrs(
-    scoped,
-    scoped.prsHandled.filter((prUrl) => isPrOfSkipChange(scoped, prUrl))
-  );
+  return withCoveredPrs(scoped, prsOfSkipChange(scoped));
 }
 
 // src/pr-walkthrough/types.ts
@@ -1855,7 +1863,7 @@ function classificationGateDecision(state, input2) {
 // src/guardrails/stateCommit.ts
 function applyToolOutcome(state, outcome) {
   const declared = applyE2eSkipDeclaration(applyRecordedRun(state, outcome.run), outcome.acceptedSkip);
-  const recorded = applyE2eSkipScope(declared, outcome.skipVerifiedChange);
+  const recorded = isEnvironmentSkip(outcome.acceptedSkip) ? applyE2eSkipScope(declared, outcome.skipVerifiedChange) : declared;
   const withWatchSkip = applyWatchSkip(recorded, outcome.isWatchSkip);
   const withBuildSkip = applyBuildSkip(withWatchSkip, outcome.isBuildSkip);
   const withWalkthroughPost = applyWalkthroughPosted(
@@ -3130,7 +3138,7 @@ function recordTests() {
   const judgedSkip = judgeE2eSkip(input, stateBefore);
   const acceptedSkip = judgedSkip?.accepted ? judgedSkip.skip : null;
   const walkthroughPosted = detectWalkthroughPost(input);
-  const isDeclaredHere = acceptedSkip !== null && !CYCLE_SCOPED_SKIP_CODES.includes(acceptedSkip.code);
+  const isDeclaredHere = isEnvironmentSkip(acceptedSkip);
   const outcome = {
     kind: "tool-outcome" /* ToolOutcome */,
     run: {
@@ -3163,7 +3171,7 @@ function recordSkipReasonOnPrs(state, skip) {
     startBackgroundJob("settle-walkthrough-no-app-logic-change" /* SettleWalkthroughNoAppLogicChange */, [skip.detail], input.cwd);
     return;
   }
-  for (const prUrl of state.prsHandled.filter((handledPrUrl) => isPrCoveredBySkip(state, handledPrUrl))) {
+  for (const prUrl of prsOfSkipChange(state)) {
     startBackgroundJob("settle-walkthrough-skipped" /* SettleWalkthroughSkipped */, [prUrl, skip.code, skip.detail]);
   }
   startBackgroundJob("settle-branch-walkthrough-skipped" /* SettleBranchWalkthroughSkipped */, [skip.code, skip.detail], input.cwd);
@@ -3379,7 +3387,7 @@ function walkthroughGate() {
   if (decision.action !== "block" /* Block */) return "{}";
   recordGateBlock("walkthroughBlockCount", decision.blockCount);
   const declaredSkip = state.e2eSkipDeclaration;
-  const skipOwedPrUrls = declaredSkip ? decision.owed.filter((prUrl) => isPrCoveredBySkip(state, prUrl)) : [];
+  const skipOwedPrUrls = declaredSkip ? decision.owed.filter((prUrl) => isPrOfSkipChange(state, prUrl)) : [];
   if (declaredSkip && skipOwedPrUrls.length > 0) {
     return blockOnUnsettledSkip(declaredSkip, skipOwedPrUrls, decision.blockCount);
   }

package/dist/release-manifest.json

@@ -1,7 +1,7 @@
 {
   "release": "5.26.0",
-  "buildId": "run-266-1",
-  "commitSha": "c79ba47696868d4d7e5d1d884f4edf77ee3fc393",
-  "buildTime": "2026-10-31T06:04:17Z",
+  "buildId": "run-268-1",
+  "commitSha": "034abfdee292104743ae296d7c24aa85de74066e",
+  "buildTime": "2026-10-31T20:23:14Z",
   "serviceName": "muggle-ai-works-mcp"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@muggleai/works",
   "mcpName": "io.github.multiplex-ai/muggle",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "description": "13 years of Microsoft hyperscale engineering, packaged as a harness for your AI coding agent.",
   "type": "module",
   "main": "dist/index.js",
@@ -62,21 +62,21 @@
     "typecheck:browser-bench": "tsc --noEmit -p internal/browser-bench/tsconfig.json"
   },
   "muggleConfig": {
-    "electronAppVersion": "1.17.0",
+    "electronAppVersion": "1.22.3",
     "downloadBaseUrl": "https://github.com/multiplex-ai/muggle-ai-works/releases/download",
-    "runtimeTargetDefault": "production",
+    "runtimeTargetDefault": "staging",
     "checksumsByStream": {
       "production": {
-        "win32-x64": "03687e6c511f407875354954cb1b0f8e95d4ad0602174d76388a52d1aa1554e4",
-        "linux-x64": "10bb4d6450d52cf7872800cebfa1243f4e29668adb79117afc518473219d7aad",
-        "darwin-arm64": "c47dfa3b3289562aba4e43ed90aba302bdbc604fa2b08949763a7f65444c8e27",
-        "darwin-x64": "cca36704aed389bb886bb70ade6e555c93d55a540fe05b8ea531de5bde4f9d8c"
+        "win32-x64": "be2b541f81e40e74f084548dbb193d556e5c1a66107fe5b345c2b4408dd7febe",
+        "linux-x64": "e0810a4e62bd94f6935f5a216ede71725b64eaba576bb7a8cda6731c5fff8bf6",
+        "darwin-arm64": "12015e835605fb98a58e00ca78be0b4b854e0042de143e3546a29fb2eca49e40",
+        "darwin-x64": "14987dbe6e47ddab4aa09688def0f49cc65bce78398ab890059e9ff96ea8c417"
       },
       "staging": {
-        "darwin-arm64": "2512aded2d5fa4afee86d491b154a46ba367cf34072fbd609fd16531dab1f418",
-        "linux-x64": "88c70c34c0764c1648600c72bbdc2625e5fdfdd1bb61f9a9e664c73302211b60",
-        "win32-x64": "597464cd252050daac65e0c3f3a210b36abc33ec4a85a882cb95fc21e369243f",
-        "darwin-x64": "0c1520ffa260feae7f373ce9840fd9fc847803401b73e52d930d7c00a0aa45d7"
+        "darwin-arm64": "e5fc6928ff29239e9eba3f34dea8080f1dba9953fc444e4af5387193b55d2416",
+        "linux-x64": "064a9dbcfb833e3d1e67613a681d9d390503bc38f877699ce434f48c390f5ac5",
+        "win32-x64": "8c83ba98faab1e89416088b42ff4bfb22f57a4de43598b881ef2cb6da7af58a8",
+        "darwin-x64": "56ac2d80c98057b8360c526734001ef0fd1c60f60e492f11e97aae04eee955c8"
       }
     },
     "electronAppSignedFromVersion": "1.10.0",

package/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "muggle",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "author": {
     "name": "Muggle AI",
     "email": "support@muggle-ai.com"

package/plugin/.codex-mcp.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@muggleai/works@5.30.0",
+        "@muggleai/works@5.31.0-staging.268",
         "serve"
       ],
       "env": {

package/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "muggle",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
   "author": {
     "name": "Muggle AI",

package/plugin/.cursor-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "muggle",
   "displayName": "Muggle AI",
   "description": "Real-browser E2E acceptance for your coding agent: test the flows you changed and open the PR with screenshots. Built for flows other tools can't reach: managed test identities with live inboxes (magic links, email OTP and 2FA, verification mail, password resets), an encrypted secret store for login and test credentials, and a test graph that runs prerequisite flows first. Plain-English tests become replayable scripts on localhost or preview URLs.",
-  "version": "5.30.0",
+  "version": "5.31.0-staging.268",
   "author": {
     "name": "Muggle AI",
     "email": "support@muggle-ai.com"

package/plugin/.mcp.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@muggleai/works@5.30.0",
+        "@muggleai/works@5.31.0-staging.268",
         "serve"
       ]
     }

package/plugin/hooks/README.md

@@ -37,7 +37,7 @@ Pre-filters are bash builtins only (`guardrail-lib.sh`), so an irrelevant event
 | Hook event | Wrapper | Strength | Condition | Preference | Effect |
 | :--------- | :------ | :------- | :-------- | :--------- | :----- |
 | `PostToolUse` (Bash) | `guardrail-pr-opened.sh` | advise | a `gh pr create`/`gh pr ready` just succeeded | `autoWatchPR` | start a `muggle-pr-followup` watcher on the new PR |
-| `PostToolUse` (Bash + muggle execute/replay MCP tools) | `guardrail-record-tests.sh` | record | a unit-test command passed, an E2E run happened (execute/replay call), or an `echo "MUGGLE_E2E_SKIP: <reason>"` marker declared E2E un-runnable, or a walkthrough carrying the `build-pr-section` sentinel was posted / declared un-postable via `echo "MUGGLE_WALKTHROUGH_SKIP: <reason>"` | — | set `unitTestsGreen` / `e2eRun` / `e2eSkipped` / `walkthroughPostedPrUrls` / `walkthroughSkipped` session state. A post settles only the PR its output names (`gh pr comment`/`create` print it; a `gh api` comment edit returns `html_url`); a post whose output names none is timestamped (`walkthroughPostedAt`), and a scan begun after it decides. An accepted skip records the change it was verified for — the working tree's origin repo and checked-out branch (`e2eSkipVerifiedChange`) — and settles only that change: the PRs opened for it (`prChanges`, tracked in `e2eSkipCoveredPrs`) and its checked-out branch's PR. A PR's change is its URL's repo plus the command's `--head`/`--source-branch`, or else the hook tree's branch when the command never changed directory and that tree is in the PR's repo; a PR whose change is unknown is never covered, so `Push-Location`/`cd`/`--repo` cannot hand it another change's skip |
+| `PostToolUse` (Bash + muggle execute/replay MCP tools) | `guardrail-record-tests.sh` | record | a unit-test command passed, an E2E run happened (execute/replay call), or an `echo "MUGGLE_E2E_SKIP: <reason>"` marker declared E2E un-runnable, or a walkthrough carrying the `build-pr-section` sentinel was posted / declared un-postable via `echo "MUGGLE_WALKTHROUGH_SKIP: <reason>"` | — | set `unitTestsGreen` / `e2eRun` / `e2eSkipped` / `walkthroughPostedPrUrls` / `walkthroughSkipped` session state. A post settles only the PR its output names (`gh pr comment`/`create` print it; a `gh api` comment edit returns `html_url`); a post whose output names none is timestamped (`walkthroughPostedAt`), and a scan begun after it decides. An accepted skip records the change it was verified for — the working tree's origin repo and checked-out branch (`e2eSkipVerifiedChange`) — and settles only that change: the PRs opened for it (`prChanges`, tracked in `e2eSkipCoveredPrs`) and its checked-out branch's PR. One whose tree's change cannot be resolved records none, never the previous declaration's, and a PR an earlier skip covered keeps that skip's record. A PR's change is its URL's repo plus the command's `--head`/`--source-branch`, or else the hook tree's branch when the command never changed directory and that tree is in the PR's repo; a PR whose change is unknown is never covered, so `Push-Location`/`cd`/`--repo` cannot hand it another change's skip |
 | `PostToolUse` (Bash) | `guardrail-pr-terminal.sh` | advise | a PR just went terminal — a `gh pr merge`/`gh pr close` success line or the `TERMINAL pr=N` line the watch scripts print in a shell result (never bare `"state":"MERGED"` metadata). Not registered on `Monitor`: a Monitor call returns before its script prints anything, so its result never carries that line | — | record `terminalPending`, direct the post-merge handoff: finalize the watcher slot, tear down per `autoCleanup`, offer next options via AskUserQuestion — or as text in the closing message while the session still owns an open PR's watch slot, since a pending AskUserQuestion holds the turn and that watcher with it |
 | `PostToolUse` (AskUserQuestion) | `guardrail-offer-ran.sh` | record | a next-options offer ran while a terminal PR was pending | — | clear `terminalPending` — the only exit for the post-merge Stop gate |
 | `PostToolUse` (Agent, Task) | `guardrail-record-delegation.sh` | record | a `muggle:acceptance-tester` was launched into the background — its response carries no finished report yet | — | append to `e2eDelegations` with the PR URLs its brief names; for a bounded window the E2E and debug-path gates hold off, and the walkthrough gate sets those PRs aside, so the session is never steered into a second browser run alongside the agent's. Shares the AskUserQuestion group's dispatch |

package/plugin/scripts/guardrails.mjs

@@ -520,8 +520,11 @@ function withoutDelegatedPrs(prUrls, state, now) {
 
 // src/guardrails/shouldRunE2E.ts
 var MAX_E2E_BLOCKS = 3;
+function isEnvironmentSkip(skip) {
+  return skip !== null && !CYCLE_SCOPED_SKIP_CODES.includes(skip.code);
+}
 function applyE2eSkipDeclaration(state, skip) {
-  if (!skip || CYCLE_SCOPED_SKIP_CODES.includes(skip.code)) return state;
+  if (!isEnvironmentSkip(skip)) return state;
   return { ...state, e2eSkipDeclaration: { code: skip.code, detail: skip.detail } };
 }
 function shouldRunE2E(state) {
@@ -682,6 +685,9 @@ function isSameChange(left, right) {
 function isPrOfSkipChange(state, prUrl) {
   return isSameChange(state.prChanges?.[prUrl], state.e2eSkipVerifiedChange);
 }
+function prsOfSkipChange(state) {
+  return state.prsHandled.filter((prUrl) => isPrOfSkipChange(state, prUrl));
+}
 function withCoveredPrs(state, prUrls) {
   const covered = new Set(state.e2eSkipCoveredPrs ?? []);
   const uncovered = prUrls.filter((prUrl) => !covered.has(prUrl));
@@ -697,12 +703,14 @@ function applyPrOpenedToSkipScope(state, prUrl, prChange) {
   return isPrOfSkipChange(recorded, prUrl) && recorded.e2eSkipDeclaration ? withCoveredPrs(recorded, [prUrl]) : recorded;
 }
 function applyE2eSkipScope(state, verifiedChange) {
-  if (!verifiedChange || !state.e2eSkipDeclaration) return state;
+  if (!state.e2eSkipDeclaration) return state;
+  if (!verifiedChange) {
+    if (!state.e2eSkipVerifiedChange) return state;
+    const { e2eSkipVerifiedChange: _previousDeclarationChange, ...unscoped } = state;
+    return unscoped;
+  }
   const scoped = { ...state, e2eSkipVerifiedChange: verifiedChange };
-  return withCoveredPrs(
-    scoped,
-    scoped.prsHandled.filter((prUrl) => isPrOfSkipChange(scoped, prUrl))
-  );
+  return withCoveredPrs(scoped, prsOfSkipChange(scoped));
 }
 
 // src/pr-walkthrough/types.ts
@@ -1855,7 +1863,7 @@ function classificationGateDecision(state, input2) {
 // src/guardrails/stateCommit.ts
 function applyToolOutcome(state, outcome) {
   const declared = applyE2eSkipDeclaration(applyRecordedRun(state, outcome.run), outcome.acceptedSkip);
-  const recorded = applyE2eSkipScope(declared, outcome.skipVerifiedChange);
+  const recorded = isEnvironmentSkip(outcome.acceptedSkip) ? applyE2eSkipScope(declared, outcome.skipVerifiedChange) : declared;
   const withWatchSkip = applyWatchSkip(recorded, outcome.isWatchSkip);
   const withBuildSkip = applyBuildSkip(withWatchSkip, outcome.isBuildSkip);
   const withWalkthroughPost = applyWalkthroughPosted(
@@ -3130,7 +3138,7 @@ function recordTests() {
   const judgedSkip = judgeE2eSkip(input, stateBefore);
   const acceptedSkip = judgedSkip?.accepted ? judgedSkip.skip : null;
   const walkthroughPosted = detectWalkthroughPost(input);
-  const isDeclaredHere = acceptedSkip !== null && !CYCLE_SCOPED_SKIP_CODES.includes(acceptedSkip.code);
+  const isDeclaredHere = isEnvironmentSkip(acceptedSkip);
   const outcome = {
     kind: "tool-outcome" /* ToolOutcome */,
     run: {
@@ -3163,7 +3171,7 @@ function recordSkipReasonOnPrs(state, skip) {
     startBackgroundJob("settle-walkthrough-no-app-logic-change" /* SettleWalkthroughNoAppLogicChange */, [skip.detail], input.cwd);
     return;
   }
-  for (const prUrl of state.prsHandled.filter((handledPrUrl) => isPrCoveredBySkip(state, handledPrUrl))) {
+  for (const prUrl of prsOfSkipChange(state)) {
     startBackgroundJob("settle-walkthrough-skipped" /* SettleWalkthroughSkipped */, [prUrl, skip.code, skip.detail]);
   }
   startBackgroundJob("settle-branch-walkthrough-skipped" /* SettleBranchWalkthroughSkipped */, [skip.code, skip.detail], input.cwd);
@@ -3379,7 +3387,7 @@ function walkthroughGate() {
   if (decision.action !== "block" /* Block */) return "{}";
   recordGateBlock("walkthroughBlockCount", decision.blockCount);
   const declaredSkip = state.e2eSkipDeclaration;
-  const skipOwedPrUrls = declaredSkip ? decision.owed.filter((prUrl) => isPrCoveredBySkip(state, prUrl)) : [];
+  const skipOwedPrUrls = declaredSkip ? decision.owed.filter((prUrl) => isPrOfSkipChange(state, prUrl)) : [];
   if (declaredSkip && skipOwedPrUrls.length > 0) {
     return blockOnUnsettledSkip(declaredSkip, skipOwedPrUrls, decision.blockCount);
   }