Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation

# Conflicts:
#	packages/client/ui-conversation/README.i18n.yaml

apps/web/tsconfig.json

@@ -23,8 +23,11 @@
   // 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/approval-composer.e2e.ts",
+    "tests/plan-review.e2e.ts",
     "tests/steering.e2e.ts",
     "tests/navigation-panes.e2e.ts",
     "tests/lifecycle-chrome.e2e.ts",