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
..
public	revert(web): drop the 32x32 PNG favicon fallback	2026-08-10 14:17:17 +08:00
src	Merge remote-tracking branch 'origin/master' into codex/trim-redundant-comments	2026-07-25 13:06:40 +08:00
stress-tests	test(web): add opt-in reasoning chunk stress lane	2026-08-04 14:37:31 +08:00
tests	Merge branch 'codex/disable-telemetry-default' into master	2026-08-12 17:27:37 +08:00
.npmignore	Merge remote-tracking branch 'origin/master' into feat/web-message-feedback-ui	2026-08-12 10:43:23 +08:00
index.html	revert(web): drop the 32x32 PNG favicon fallback	2026-08-10 14:17:17 +08:00
package.json	Merge remote-tracking branch 'origin/master' into feat/web-message-feedback-ui	2026-08-12 10:43:23 +08:00
tsconfig.json	Merge remote-tracking branch 'origin/master' into feat/web-message-feedback-ui	2026-08-12 16:36:10 +08:00
vite.config.ts	Merge remote-tracking branch 'origin/master' into worktree/multimodal-ui	2026-08-11 18:20:35 +08:00