Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context

# Conflicts:
#	apps/web/tests/scaffold.ts

apps/web/tsconfig.json

@@ -23,6 +23,7 @@
   // cannot see both sides of the cordis Context merges).
   "exclude": [
     "tests/scaffold.ts",
+    "tests/scaffold-hermetic.e2e.ts",
     "tests/live-interactions.e2e.ts",
     "tests/question-composer.e2e.ts",
     "tests/steering.e2e.ts",