diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5333fe00c..1902004ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,6 +76,9 @@ jobs:
 
   e2e-local:
     name: E2E (stdio MCP)
+    # Skipped on pull_request: the local scenario boots a real `executor web`
+    # plus a browser and is currently flaky on PRs. Still runs on push to main.
+    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.oxlintrc.jsonc b/.oxlintrc.jsonc
index 39f58ead4..3985f6b68 100644
--- a/.oxlintrc.jsonc
+++ b/.oxlintrc.jsonc
@@ -101,12 +101,13 @@
       },
     },
     {
-      "files": ["apps/marketing/src/**/*.astro"],
+      "files": ["apps/marketing/src/**/*.{astro,ts,tsx}"],
       "rules": {
         "executor/no-effect-escape-hatch": "off",
         "executor/no-error-constructor": "off",
         "executor/no-instanceof-error": "off",
         "executor/no-json-parse": "off",
+        "executor/no-promise-catch": "off",
         "executor/no-try-catch-or-throw": "off",
         "executor/no-unknown-error-message": "off",
       },