diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7de4b66c..9d6df35b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,73 @@
 # Changelog
 
+## v2.2.0 — 2026-07-24
+
+### Features
+
+- submit interactive (ConPTY) work for review (109a35c)
+- gate Approve & Merge behind opening the diff (2aaaa23)
+- run interactive planning sessions via embedded ConPTY (ef285b2)
+- AskUser question banner in the detail island (798d100)
+- conflict resolver shows why Continue is disabled (da6a70a)
+- session-skills empty-state + neutral subtask terminology (85d0f9d)
+
+### Fixes
+
+- use default permission mode so MCP planning tools don't prompt (624ec7a)
+- hide misleading Idle chip on planning parents (e8f7e3a)
+- show structured-output summary instead of raw JSON in OUTCOME (8a7275a)
+- live-refresh child rows on parent planning transitions (f4dd67d)
+- restore turn/token counts on task reload (0226c98)
+- clearer rename display in diff viewer (b9b3053)
+- diagnostic error surfacing on attachment drop (671c886)
+- surface resume-planning-session failures (ffff1ee)
+- render Plus and agent-settings gear icons (ad2acdd)
+- kill cancelled runs' processes and make MCP approve actually merge (fee6999)
+- make external MCP filter params optional, surface tool errors (d7ebafd)
+- merge preflights ignore untracked files in target working tree (14e4c08)
+- UnifiedDiffParser mishandles paths with spaces and git-quoted paths (0f2d202)
+- validate conflict markers before staging in ContinueMergeAsync (377409e)
+- cascade cancel of a WaitingForChildren parent to its non-terminal children (941c8b9)
+- advance parent when the last non-terminal child is deleted (2452e39)
+- keep planning-chain cascade moving past an Idle middle link (816f247)
+
+### Documentation
+
+- spec for ConPTY planning sessions (2612831)
+- record session progress (A/B done, C#9+#11, D#13+#14; C#10/#12 + group E deferred) (04044bd)
+- add fix-plan for fresh session (findings grouped by fixability); defer §10, mark §11 OK per Mika (efd7cc9)
+- §3 UnfinishedPlanning modal (Finalize/Discard PASS, Resume BUG); generalize child-row live-refresh finding; edges done (75a6e0e)
+- finding — Resume planning session is broken (session_id never captured) + error swallowed by empty catch (9efc5c9)
+- §1 DiffModal error-state resolved via code analysis (defensive/unreachable, gates prevent it) (6ca8cac)
+- §4 merge-editor Abort PASS (tree clean, task stays WaitingForReview) (9a1fa3d)
+- §9 attachments drag&drop UI PASS (overlay/drop/picker/remove); finding — intermittent first-drop error (9b4d343)
+- §8 Session Skills complete (Remove PASS); refresh handoff summary + fixture state (a1ba3b6)
+- §8 per-task activation + no-leak counterprobe PASS; UI partial (cards/general-tab open) (9b041ba)
+- finding — agent-settings gear uses Unicode glyph, not Icon.Settings PathIcon (inconsistent) (39fc594)
+- §8 skill install PASS (6 skills, commit-pinned); finding — Skills tab has no empty-state (b353ed6)
+- note Mika explicitly wants AskUser interaction in detail island (416e47e)
+- §7 AskUser complete — timeout UI-cleanup visually verified (banner clears) (e8b5e97)
+- §7 AskUser PASS (happy-path + backend timeout); finding — banner only in Mission Control, absent in detail island (d19ef54)
+- note fixture cleanup (verif tasks/worktrees removed, ClaudeDoTests reset) (ded068c)
+- refresh handoff for next session — progress, remaining (§7-§11+edges), gotchas, fixture state (9556e0e)
+- trim to actively-verified 2026-07-24 findings; drop stale manual-verif/historical blocks (9d39a8f)
+- §5 ConPTY/Mission Control PASS (prompt-send, close kills proc); ad-hoc icon invisible + re-open re-sends noted (b536b6f)
+- §5 findings — invisible New-session icon (Icon.Plus stroke-only), re-open re-sends prompt (1b80bb0)
+- §3 PASS end-to-end (+§1 children-band, +§4 planning-conflict); dequeue-X UX nit (4394623)
+- §3 finalize findings — improvements-mislabel, child-badge live-refresh, chain not visualized (f0b0582)
+- planning session permission-prompt bug + planning-active parent shows Idle (UX) (07de897)
+- clean additive approve PASS (2101228)
+- §1 commit-range-after-merge PASS; blocked-merge silent-fail confirmed on clean path too (8241bf8)
+- §4 merge editor PASS end-to-end + UX findings (continue-btn, multi-file, blocked-merge) (255705d)
+- Approve & Merge silently swallows a blocked merge (no footer error) (3dfd75f)
+- §1 findings — raw-JSON outcome bug, rename/turns nits, session-tab expected (26c03a5)
+- correct permission finding — auto+haiku denies writes (not a CLI regression), §2 happy-path PASS (3211bfc)
+- log autonomous-batch results (§2/§6/§9/§12) (79ce7af)
+- track CLI 2.1.207 --permission-mode auto write-denial regression (0ad93f4)
+- remove chain-cascade bug bullet (fixed in 110364a) (3d668da)
+- explore-notes convention + verification handoff for manual checks (d6891b8)
+- update for v2.1.0 (ad58129)
+
 ## v2.1.0 — 2026-07-23
 
 ### Features