docs: update CHANGELOG for session work

- Added entry for merge integration + CLAUDE.md cleanup
- Documented conflict resolution strategy and consolidation ratios

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

Author: lanmower

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [Unreleased] - merge: integrate remote UI redesign + cleanup CLAUDE.md
+
+- Merge origin/main: resolve UU conflicts in server.js (take remote _jsonlWatcher setter) and static/index.html (take remote UI redesign with overflow menu + SVG icons)
+- Accept AA (both-added) files from new modules: lib/jsonl-parser.js, lib/jsonl-watcher.js, lib/process-message.js, lib/server-startup.js, lib/stream-event-handler.js, static/css/main.css, static/js/client.js, static/js/conversations.js
+- docs: cleanup CLAUDE.md — trim verbosity (499→368L, -26%): consolidate REST API (42→9L), tighten XState docs (21→4L), shrink WebSocket wire format (29→2L), compress message flow (15→1L), tighten tool detection (21→6L), merge voice model + debug sections. All key patterns preserved.
+
 ## [Unreleased] - refactor: extract routes registry + wire tool/debug routes
 
 - Extract all route and WS handler registrations from server.js L201-270 to lib/routes-registry.js (63L, createRegistry factory)