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 |
||
|---|---|---|
| .. | ||
| fixtures | ||
| args.spec.ts | ||
| built-bin.e2e.ts | ||
| dsh-badge.snapshot.ts | ||
| headless-shutdown.e2e.ts | ||
| lazy-search-startup.compat.spec.ts | ||
| memory-mcp-configs.spec.ts | ||
| process-shutdown.spec.ts | ||
| source-launch.compat.spec.ts | ||
| telemetry-switch.spec.ts | ||
| web-agent-presets.e2e.ts | ||
| windows-shell.spec.ts | ||