Conflict: the generated event-producer-consumer doc — regenerated over merged sources. Also strips the trailing whitespace / extra EOF blank line that master's vitest.config.ts and client api.ts arrived with (the pre-commit whitespace hook rejects any commit touching them otherwise).