diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72970ffa3..817aebca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -152,6 +152,8 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Changed
 
+- **bug-hunt-pool-supervisor Non-Blocking Tracking**: Updated bug-hunt-pool-supervisor agent instructions to make automation tracking non-blocking.
+
 - **Decision Tree Full ULID Display** (#5825): The `agents plan tree` command now
   displays full 26-character ULIDs for all decisions instead of truncating them to
   8 characters. This enables users to copy decision IDs directly from tree output
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 60ee6fb1d..4acd4e62b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -21,3 +21,4 @@ Below are some of the specific details of various contributions.
 * HAL 9000 has contributed the plugin entry point security hardening fix (#7476): enforced entry point allowlist validation before importing plugin modules to prevent malicious plugin loading.
 * This project was made possible thanks to considerable donation of time, money, and resources by CleverThis, Inc.
 * HAL 9000 has contributed automated bug fixes, CLI output formatting improvements, and ongoing maintenance as part of the CleverAgents automation system.
+* HAL 9000 has contributed the `bug-hunt-pool-supervisor` non-blocking tracking fix: updated agent instructions to prevent initialization hangs by making automation tracking non-blocking, ensuring the supervisor continues even if tracking issue creation fails.