diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bfee3e8..82c99716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## 0.6.0 — 2026-03-22
+
+### Highlights
+- 本地配置、Gateway 凭证和 Assistant 任务会话改为以 secure storage 管理的密钥做加密持久化，重启和覆盖安装后不再丢失。
+- `仅 AI Gateway` 线程补齐本地技能自动发现和当前线程可选技能列表恢复，线程状态与模型选择继续保持隔离。
+- Flutter Web assistant shell、Web Chrome 会话持久化和移动端安全控件一起补齐，多端可用性明显提升。
+- Assistant composer 高度自适应、执行目标切换即时刷新、侧栏默认宽度等桌面交互问题已收敛。
+- Windows / Linux parity、macOS DMG 打包和多平台构建发布流程持续补强。
+
+### Current Delivery Scope
+- 已交付：加密后的本地 settings snapshot、assistant threads 和 sealed backup 恢复链路。
+- 已交付：Gateway-only 线程技能自动发现、线程状态清理和重启恢复。
+- 已交付：Flutter Web assistant shell、Web 持久化修复、移动端安全壳控件和桌面布局微调。
+- 已交付：Windows / Linux parity 修复、多平台 build and release workflow、macOS 安装与分发产物。
+
+### Not Yet Implemented
+- `Settings external agents detail shows Codex bridge runtime states` 相关全量测试基线仍需单独收敛，不纳入本次 release 变更。
+- 内置 Codex / Rust FFI 仍保持 experimental，不视为稳定默认运行模式。
+- 更通用的外部 Code Agent provider 调度和可视化管理 UI 还未完成。
+
+### Known Issues
+- 远程或外部 CLI 协同仍受本机安装状态、Gateway 可达性和环境依赖影响，建议按 case 文档补一轮人工验收。
+- macOS integration 测试仍可能受到宿主前台拉起行为影响，需要串行执行并结合人工检查。
+
+### Dev
+- `pubspec.yaml`: 当前版本更新为 `0.6.0+1`
+- `release/v0.6` 作为本次发版分支，预期 tag 为 `v0.6`
+
 ## 0.5.0 — 2026-03-20
 
 ### Highlights
diff --git a/docs/planning/xworkmate-ui-feature-matrix.md b/docs/planning/xworkmate-ui-feature-matrix.md
index 62b79289..56052aa5 100644
--- a/docs/planning/xworkmate-ui-feature-matrix.md
+++ b/docs/planning/xworkmate-ui-feature-matrix.md
@@ -2,7 +2,7 @@
 
 > Generated by `tool/render_release_docs.dart`
 > Source manifest: [`config/feature_flags.yaml`](../../config/feature_flags.yaml)
-> Generated at: `2026-03-22T10:48:05.981301`
+> Generated at: `2026-03-22T14:40:00.994323`
 
 ## Release Policy
 
diff --git a/docs/planning/xworkmate-ui-feature-roadmap.md b/docs/planning/xworkmate-ui-feature-roadmap.md
index ff48b22e..1f3c27ad 100644
--- a/docs/planning/xworkmate-ui-feature-roadmap.md
+++ b/docs/planning/xworkmate-ui-feature-roadmap.md
@@ -2,7 +2,7 @@
 
 > Generated by `tool/render_release_docs.dart`
 > Source manifest: [`config/feature_flags.yaml`](../../config/feature_flags.yaml)
-> Generated at: `2026-03-22T10:48:05.981301`
+> Generated at: `2026-03-22T14:40:00.994323`
 
 ## 规划规则
 
diff --git a/docs/releases/xworkmate-changelog.md b/docs/releases/xworkmate-changelog.md
index e5fc4744..2ceba035 100644
--- a/docs/releases/xworkmate-changelog.md
+++ b/docs/releases/xworkmate-changelog.md
@@ -2,14 +2,14 @@
 
 > Generated by `tool/render_release_docs.dart`
 > Source manifest: [`config/feature_flags.yaml`](../../config/feature_flags.yaml)
-> Generated at: `2026-03-22T10:48:05.981301`
+> Generated at: `2026-03-22T14:40:00.994323`
 
 ## Git Snapshot
 
 | 字段 | 值 |
 | --- | --- |
-| Branch | `main` |
-| Head Commit | `650071a` |
+| Branch | `release/v0.6` |
+| Head Commit | `7cf4957` |
 | Head Tags | `-` |
 | Latest Tag | `v0.5` |
 | Previous Tag | `v0.4` |
@@ -28,6 +28,20 @@
 
 | Hash | Date | Author | Subject |
 | --- | --- | --- | --- |
+| `7cf4957` | `2026-03-22` | Haitao Pan | Stabilize assistant composer shell sizing |
+| `4ea4c06` | `2026-03-22` | Haitao Pan | Fix assistant execution target switch refresh timing |
+| `50f38e8` | `2026-03-22` | Haitao Pan | Fix assistant composer shell height adaptation |
+| `c6e077e` | `2026-03-22` | Haitao Pan | docs: add secure persistence architecture and release pack |
+| `10717a0` | `2026-03-22` | Haitao Pan | fix(runtime): encrypt local settings and assistant thread persistence |
+| `1b6710a` | `2026-03-22` | Haitao Pan | Add assistant thread IA docs |
+| `0ca992f` | `2026-03-22` | Haitao Pan | Merge branch 'codex/fix-thread-gateway-status' |
+| `09287cc` | `2026-03-22` | Haitao Pan | Fix assistant thread connection status |
+| `6604711` | `2026-03-22` | Haitao Pan | Auto-import gateway-only discovered skills into available list |
+| `77ab128` | `2026-03-22` | Haitao Pan | Persist assistant state and add local recovery cleanup |
+| `d57ca31` | `2026-03-22` | Haitao Pan | Merge branch 'codex/web-chrome-db-parity' |
+| `90e20a7` | `2026-03-22` | Haitao Pan | Harden web session persistence flow |
+| `8f655d3` | `2026-03-22` | Haitao Pan | Fix web chrome test isolation and session persistence |
+| `c24f2ab` | `2026-03-22` | Haitao Pan | feat: add ui feature flag release docs pipeline |
 | `650071a` | `2026-03-21` | Haitao Pan | Merge branch 'codex/windows-parity' |
 | `f2fb948` | `2026-03-21` | Haitao Pan | Merge branch 'codex/linux-gnome-desktop-parity' |
 | `cbcfb90` | `2026-03-21` | Haitao Pan | Add Flutter web assistant shell |
diff --git a/docs/releases/xworkmate-release-notes.md b/docs/releases/xworkmate-release-notes.md
index 7501606c..aa60d410 100644
--- a/docs/releases/xworkmate-release-notes.md
+++ b/docs/releases/xworkmate-release-notes.md
@@ -2,19 +2,19 @@
 
 > Generated by `tool/render_release_docs.dart`
 > Source manifest: [`config/feature_flags.yaml`](../../config/feature_flags.yaml)
-> Generated at: `2026-03-22T10:48:05.981301`
+> Generated at: `2026-03-22T14:40:00.994323`
 
 ## Git Snapshot
 
 | 字段 | 值 |
 | --- | --- |
-| Branch | `main` |
-| Head Commit | `650071a` |
+| Branch | `release/v0.6` |
+| Head Commit | `7cf4957` |
 | Head Tags | `-` |
 | Latest Tag | `v0.5` |
 | Previous Tag | `v0.4` |
 | Comparison Range | `v0.5..HEAD` |
-| Commit Count | 13 |
+| Commit Count | 27 |
 
 ## Feature Snapshot
 
@@ -34,6 +34,8 @@
 
 ### Features
 
+- `1b6710a` Add assistant thread IA docs
+- `c24f2ab` feat: add ui feature flag release docs pipeline
 - `cbcfb90` Add Flutter web assistant shell
 - `de8710e` Add mobile-safe controls for mobile shell
 - `dab77eb` Add multi-platform build and release workflow
@@ -41,9 +43,18 @@
 
 ### Fixes
 
+- `4ea4c06` Fix assistant execution target switch refresh timing
+- `50f38e8` Fix assistant composer shell height adaptation
+- `10717a0` fix(runtime): encrypt local settings and assistant thread persistence
+- `09287cc` Fix assistant thread connection status
+- `8f655d3` Fix web chrome test isolation and session persistence
 - `a4225d5` fix(windows): vendor secure storage plugin without ATL
 - `3bf71e9` fix(linux): unblock parity desktop builds
 
+### Docs
+
+- `c6e077e` docs: add secure persistence architecture and release pack
+
 ### Tests
 
 - `89ed967` test(ai-gateway): keep secrets in secure storage
@@ -55,11 +66,17 @@
 
 ### Merges
 
+- `0ca992f` Merge branch 'codex/fix-thread-gateway-status'
+- `d57ca31` Merge branch 'codex/web-chrome-db-parity'
 - `650071a` Merge branch 'codex/windows-parity'
 - `f2fb948` Merge branch 'codex/linux-gnome-desktop-parity'
 
 ### Other
 
+- `7cf4957` Stabilize assistant composer shell sizing
+- `6604711` Auto-import gateway-only discovered skills into available list
+- `77ab128` Persist assistant state and add local recovery cleanup
+- `90e20a7` Harden web session persistence flow
 - `f65bb15` Adjust desktop sidebar default width
 - `04f3474` Synchronize assistant threads and markdown view
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 2ec55256..bf2fe100 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: xworkmate
 description: "XWorkmate desktop-first AI workspace shell."
 publish_to: 'none'
 
-version: 0.5.0+1
+version: 0.6.0+1
 build-date: 2026-03-20
 build-id: 4183a40