diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab0fc798f..eec85be69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -263,8 +263,7 @@ ensuring data is stored with proper parameter values.
 
 - **A2A module rename BDD test suite** (#8615): Comprehensive Behave tests validating that the ACP→A2A module rename is complete — verifying all 22 A2A symbols are properly exported, no legacy ACP references remain in `.py` files under `cleveragents.a2a/`, and the module docstring uses current A2A naming.  The step definitions include self-contained symbol lookups to avoid cross-scenario dependency failures.
 
-### Added
-- **ContextStrategy protocol and plugin registration system** (#10590): Implemented the domain-model `ContextStrategy` Protocol with supporting value objects (BackendSet, PlanContext, StrategyCapabilities, StrategyConfig, ContextStrategyResult, StrategyRegistryEntry). Six built-in strategies: SimpleKeywordStrategy (text search, quality 0.3), SemanticEmbeddingStrategy (vector similarity, quality 0.6), BreadthDepthNavigatorStrategy (graph-aware traversal, quality 0.85), ARCEStrategy (multi-modal pipeline, quality 0.95), TemporalArchaeologyStrategy (historical pattern discovery, quality 0.5), and PlanDecisionContextStrategy (parent/ancestor plan context, quality 0.7). The StrategyRegistry class provides registration, unregistration, query, configuration updates with Pydantic-validated fields, plugin discovery via register_from_module() with module-prefix allowlist security, per-strategy enable/disable toggling, deterministic fragment ordering, MappingProxyType-immutable config fields, thread-safe concurrent operations, and validation warnings for missing resource types or capabilities. Comprehensive BDD test coverage in `features/context_strategies.feature` (batch 1) and `features/context_strategy_registry.feature` (registry protocol conformance, registration, query, configuration, plugin discovery, thread safety, boundary tests). Based on docs/specification.md sections 25162–25233, 28682–28708.
+- **ContextStrategy protocol and plugin registration system** (#8616): Implemented the domain-model `ContextStrategy` Protocol with supporting value objects (BackendSet, PlanContext, StrategyCapabilities, StrategyConfig, ContextStrategyResult, StrategyRegistryEntry). Six built-in strategies: SimpleKeywordStrategy (text search, quality 0.3), SemanticEmbeddingStrategy (vector similarity, quality 0.6), BreadthDepthNavigatorStrategy (graph-aware traversal, quality 0.85), ARCEStrategy (multi-modal pipeline, quality 0.95), TemporalArchaeologyStrategy (historical pattern discovery, quality 0.5), and PlanDecisionContextStrategy (parent/ancestor plan context, quality 0.7). The StrategyRegistry class provides registration, unregistration, query, configuration updates with Pydantic-validated fields, plugin discovery via register_from_module() with module-prefix allowlist security, per-strategy enable/disable toggling, deterministic fragment ordering, MappingProxyType-immutable config fields, thread-safe concurrent operations, and validation warnings for missing resource types or capabilities. Comprehensive BDD test coverage in `features/context_strategies.feature` (batch 1) and `features/context_strategy_registry.feature` (registry protocol conformance, registration, query, configuration, plugin discovery, thread safety, boundary tests). Based on docs/specification.md sections 25162–25233, 28682–28708.
 
 - Fixed `ReactiveEventBus.emit()` exception handler to log the full exception
   message (`str(exc)`) and enable traceback forwarding (`exc_info=True`).
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7cbac9093..e91b49293 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -96,7 +96,7 @@ Below are some of the specific details of various contributions.
 * HAL 9000 has contributed the ACMS context show/clear CLI commands (PR #9675 / issue #9586): implemented `context show <view>` displaying assembled context with per-tier budget utilization summary (hot/warm/cold), and `context clear` with --path, --tag, --tier filtering plus confirmation prompt with --yes bypass. Includes 12 Behave BDD scenarios, 9 Robot Framework integration tests, ASV benchmarks, full type annotations, and _TierServiceProtocol for type safety.
 * HAL 9000 <hal9000@cleverthis.com> has contributed cost and session budget tracking and enforcement (issue #8609): implemented `CostTrackingService`, `BudgetExceededError`, three-tier budget hierarchy (plan/session/organization), warning thresholds at 90% utilization, per-provider cost tracking, and comprehensive BDD test suite.
 * HAL 9000 has contributed the AutoDebug node state mutation fix (#10496): fixed _analyze_error, _generate_fix, and _validate_fix in src/cleveragents/agents/graphs/auto_debug.py to return partial update dicts per LangGraph s node contract, preventing duplicate state entries and checkpoint inconsistencies.
-* HAL 9000 has contributed the ContextStrategy protocol and plugin registration system (PR #10590 / issue #10590): implemented the domain-model `ContextStrategy` Protocol with BackendSet, PlanContext, StrategyCapabilities, StrategyConfig, ContextStrategyResult, and StrategyRegistryEntry models. Six built-in strategies each implement real backend query logic respecting budget constraints. The StrategyRegistry service provides thread-safe registration/unregistration, Pydantic-validated config updates with immutable MappingProxyType fields, plugin discovery via register_from_module() with CWE-706 module-prefix allowlist guard, enabled list management, deterministic fragment ordering, and validation warnings. Comprehensive BDD test coverage in features/context_strategies.feature and features/context_strategy_registry.feature (120+ scenarios) (#10590).
+* HAL 9000 has contributed the ContextStrategy protocol and plugin registration system (PR #11106 / issue #8616): implemented the domain-model `ContextStrategy` Protocol with BackendSet, PlanContext, StrategyCapabilities, StrategyConfig, ContextStrategyResult, and StrategyRegistryEntry models. Six built-in strategies each implement real backend query logic respecting budget constraints. The StrategyRegistry service provides thread-safe registration/unregistration, Pydantic-validated config updates with immutable MappingProxyType fields, plugin discovery via register_from_module() with CWE-706 module-prefix allowlist guard, enabled list management, deterministic fragment ordering, and validation warnings. Comprehensive BDD test coverage in features/context_strategies.feature and features/context_strategy_registry.feature (120+ scenarios) (#8616).
 
 # Details (PR Contributions)