sjw1231
cdd7c76f2a
Merge branch 'master' into feat/apply-patch
# Conflicts:
# apps/cli/tests/profiles/headless/tests/expected/subagent-inheritance/parent.expected.jsonl
# docs/config-catalog.md
# docs/config-catalog.zh.md
# packages/fs/tool-fs/README.i18n.yaml
# scripts/verify-package-readme-model-experience.ts
# snapshots/sdk/dynamic-tool-updates/notifications.expected.jsonl
# snapshots/sdk/dynamic-tool-updates/session.v4.jsonl
# snapshots/sdk/tool-error-details/notifications.expected.jsonl
# snapshots/sdk/tool-error-details/session.v4.jsonl
# snapshots/session/advanced-toolchain/session.v4.jsonl
# snapshots/session/dynamic-tool-prompt-updates/session.v4.jsonl
# snapshots/session/dynamic-tool-updates/session.v4.jsonl
# snapshots/session/pi-ai-conversation-updates/session.v4.jsonl
# snapshots/session/plugin-manager-mcp/session.v4.jsonl
# snapshots/web/collapse-timing/next-message.expected.md
# snapshots/web/collapse-timing/verbose.expected.md