diff --git a/workplans/HUB-WP-0005-core-hub-absorption-execution.md b/workplans/HUB-WP-0005-core-hub-absorption-execution.md
index d8de2ab..9cfb7df 100644
--- a/workplans/HUB-WP-0005-core-hub-absorption-execution.md
+++ b/workplans/HUB-WP-0005-core-hub-absorption-execution.md
@@ -15,6 +15,7 @@ related:
   - HUB-WP-0004
   - CORE-WP-0010
   - RAPPCOREHUB-WP-0002
+state_hub_workstream_id: "73099dd7-5eac-499e-8632-cef0c0331d90"
 ---
 
 # Core Hub absorption execution
@@ -32,6 +33,7 @@ stabilization gate closes.
 id: HUB-WP-0005-T01
 status: done
 priority: high
+state_hub_task_id: "8a88e580-d94b-40d2-bac7-f434f20cc332"
 ```
 
 Add hub-core-owned PostgreSQL models/migrations, a durable `PortStore`, audit
@@ -44,6 +46,7 @@ backend remains local/conformance only.
 id: HUB-WP-0005-T02
 status: done
 priority: high
+state_hub_task_id: "fbbc739c-cc7c-449a-985f-c7aeb769c885"
 ```
 
 Add legacy bearer authentication, non-overlapping route/write group controls,
@@ -56,6 +59,7 @@ comparison, and safe evidence. Never serialize a raw key or secret.
 id: HUB-WP-0005-T03
 status: done
 priority: high
+state_hub_task_id: "3b205d8a-add9-480c-90ca-e7152a6a32ed"
 ```
 
 Implement the health/readiness, catalog, OpenAPI/docs, and compatibility alias
@@ -67,6 +71,7 @@ surface with normalized response comparison against Core Hub.
 id: HUB-WP-0005-T04
 status: done
 priority: high
+state_hub_task_id: "6d391a34-dab8-4aa6-ba83-72d6ad694183"
 ```
 
 Absorb hubs, manifests/activation, hub registry, API consumers, key issuance,
@@ -79,6 +84,7 @@ reverse-delta support.
 id: HUB-WP-0005-T05
 status: done
 priority: high
+state_hub_task_id: "042662c7-7472-46d4-962d-6af75757a113"
 ```
 
 Absorb widgets and interaction events through the named interaction port,
@@ -91,6 +97,7 @@ surface without reads from the legacy schema.
 id: HUB-WP-0005-T06
 status: done
 priority: high
+state_hub_task_id: "ba7956a5-af12-4de3-9d8a-f816bdefec2c"
 ```
 
 Publish immutable artifacts, pass all conformance and consumer gates, support
diff --git a/workplans/HUB-WP-0006-repository-classification-navigation.md b/workplans/HUB-WP-0006-repository-classification-navigation.md
index 3ec83d5..f78c57a 100644
--- a/workplans/HUB-WP-0006-repository-classification-navigation.md
+++ b/workplans/HUB-WP-0006-repository-classification-navigation.md
@@ -16,6 +16,7 @@ related:
   - HUB-WP-0005
   - RMGR-WP-0008
   - RMGR-CONTRACT-CLASSIFICATION-0001
+state_hub_workstream_id: "c5abf6a3-0ea9-43b8-8757-179829dd8a9c"
 ---
 
 # Repository classification aggregation and navigation
@@ -33,6 +34,7 @@ for State Hub retirement slices A5 and the repository-facing part of A4/B5.
 id: HUB-WP-0006-T01
 status: done
 priority: high
+state_hub_task_id: "b1e2fe24-8a38-4672-a7a7-4a45f90355fb"
 ```
 
 Review `RMGR-CONTRACT-CLASSIFICATION-0001` version 1.0 and record the hub-core
@@ -50,6 +52,7 @@ STATE-WP-0079 retains the consumer-route switch and rollback flag.
 id: HUB-WP-0006-T02
 status: todo
 priority: high
+state_hub_task_id: "47d7d168-217f-45c6-b4d7-ab9cf4dd5329"
 ```
 
 Define the input envelope, supported contract versions, stable repository
@@ -63,6 +66,7 @@ temporary compatibility metadata, not mutable topic authority.
 id: HUB-WP-0006-T03
 status: todo
 priority: high
+state_hub_task_id: "2884eb0f-046f-4122-a422-8a06c7c32298"
 ```
 
 Add an injected `port.repo` client, deterministic full rebuild plus incremental
@@ -76,6 +80,7 @@ versions without coercion.
 id: HUB-WP-0006-T04
 status: todo
 priority: high
+state_hub_task_id: "a1d85610-c3ea-4718-b394-ba4abcecf177"
 ```
 
 Expose cross-repository query routes and MCP tools for domain, secondary
@@ -89,6 +94,7 @@ classification authority.
 id: HUB-WP-0006-T05
 status: todo
 priority: medium
+state_hub_task_id: "a3c0efba-9913-4617-b167-8853b34de36e"
 ```
 
 Add contract fixtures and checks for full rebuild, incremental changes,
@@ -102,6 +108,7 @@ foreign database access.
 id: HUB-WP-0006-T06
 status: wait
 priority: high
+state_hub_task_id: "5c6f3006-b1c7-422b-ad38-8727ae4dc7c2"
 ```
 
 With `STATE-WP-0079`, compare legacy topic/navigation consumers with the new