diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 1513e19..11558b9 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "0.8.5",
-  "packages/cli": "0.7.4"
+  ".": "0.8.6",
+  "packages/cli": "0.8.6"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 341f0c1..06e5230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.8.6](https://github.com/theagenticguy/opencodehub/compare/root-v0.8.5...root-v0.8.6) (2026-06-11)
+
+
+### Bug Fixes
+
+* **release:** collapse release-please to one published @opencodehub/cli component ([#222](https://github.com/theagenticguy/opencodehub/issues/222)) ([ab749bd](https://github.com/theagenticguy/opencodehub/commit/ab749bdcc9a337481b0cbda2b7ddd623e6d027fc))
+* **release:** make npm publish idempotent on stuck-release re-runs ([#224](https://github.com/theagenticguy/opencodehub/issues/224)) ([12e1c66](https://github.com/theagenticguy/opencodehub/commit/12e1c66a893d0fdef3dc0a253f1aab313d13666a))
+* **release:** restore two-component config + linked-versions to fix CLI starvation ([#227](https://github.com/theagenticguy/opencodehub/issues/227)) ([f849f24](https://github.com/theagenticguy/opencodehub/commit/f849f24f6657c2c0ec9a5e62abdb8969f392ca48))
+* **release:** set explicit empty component so the CLI release PR matches ([#226](https://github.com/theagenticguy/opencodehub/issues/226)) ([4188b52](https://github.com/theagenticguy/opencodehub/commit/4188b528f1d09a3ef4b8336dc1dadb6c76f9ce4d))
+
 ## [0.8.5](https://github.com/theagenticguy/opencodehub/compare/root-v0.8.4...root-v0.8.5) (2026-06-10)
 
 
diff --git a/package.json b/package.json
index b89a640..0204f28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opencodehub-monorepo",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "private": true,
   "description": "OpenCodeHub — Apache-2.0 code intelligence graph + MCP server for AI coding agents",
   "license": "Apache-2.0",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 40d46b5..c0cb262 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.8.6](https://github.com/theagenticguy/opencodehub/compare/cli-v0.7.4...cli-v0.8.6) (2026-06-11)
+
+
+### Bug Fixes
+
+* **release:** restore two-component config + linked-versions to fix CLI starvation ([#227](https://github.com/theagenticguy/opencodehub/issues/227)) ([f849f24](https://github.com/theagenticguy/opencodehub/commit/f849f24f6657c2c0ec9a5e62abdb8969f392ca48))
+
 ## [0.7.6](https://github.com/theagenticguy/opencodehub/compare/v0.7.5...v0.7.6) (2026-06-11)
 
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4f55bfb..5d743a6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencodehub/cli",
-  "version": "0.7.4",
+  "version": "0.8.6",
   "description": "OpenCodeHub — codehub CLI (analyze, setup, mcp, list, status, clean, query, context, impact, sql)",
   "license": "Apache-2.0",
   "repository": {