Merge remote-tracking branch 'origin/master' into codex/pr-1150-conflict-fix

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

apps/web/tests/snapshots/subagent-conversation/ui.expected.md

@@ -3,8 +3,8 @@
     - button "Ask a research subagent to"
     - text: /
     - button "event-sourcing researcher" [disabled]
-  - button "1 个子代理":
-    - text: 1 个子代理
+  - button "1 subagent":
+    - text: 1 subagent
     - img
   - tablist:
     - tab "Chat" [selected]