Chinesezjc 93b400a1de Merge branch 'codex/disable-telemetry-default' into master ... Resolved conflicts: - packages/client/ui-settings-general/README.md, README.zh.md: kept PR opt-in telemetry description (DSH_TELEMETRY_MODE) - scripts/snapshots/translation-prompt-v4: kept master's newer README structure snapshot - i18n.yaml pairing records: resolved per file state - pnpm-lock.yaml: regenerated - Modify/delete conflicts (scaffold/telemetry, sdk-follow-up-capabilities): kept master deletions		2026-08-12 17:27:37 +08:00
..
fixtures	Merge origin/master into codex/dsh-badge-plugin	2026-08-07 15:33:56 +08:00
base.spec.ts	Merge branch 'codex/disable-telemetry-default' into master	2026-08-12 17:27:37 +08:00