Resolved conflicts: - src/modes/agent/index.ts: Kept v1-dev approach (user controls via claude_args) - src/modes/review/index.ts: Kept deleted (review mode removed in v1-dev)
Resolved conflicts: - src/modes/agent/index.ts: Kept v1-dev approach (user controls via claude_args) - src/modes/review/index.ts: Kept deleted (review mode removed in v1-dev)