The squash-merge of story-115 (hot-reload project.toml agent config) left unresolved conflict markers in client.ts and Chat.tsx where reconciliation_progress code from master collided with agent_config_changed additions. Both features are retained. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>