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

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

tsconfig.host.json

@@ -10,8 +10,11 @@
   "include": [
     "apps/web/tests/scaffold.ts",
     "apps/web/tests/support.ts",
+    "apps/web/tests/scaffold-hermetic.e2e.ts",
     "apps/web/tests/live-interactions.e2e.ts",
     "apps/web/tests/question-composer.e2e.ts",
+    "apps/web/tests/approval-composer.e2e.ts",
+    "apps/web/tests/plan-review.e2e.ts",
     "apps/web/tests/steering.e2e.ts",
     "apps/web/tests/navigation-panes.e2e.ts",
     "apps/web/tests/lifecycle-chrome.e2e.ts",