diff --git a/workplans/IHUB-WP-0016-build-infrastructure-and-error-loop.md b/workplans/IHUB-WP-0016-build-infrastructure-and-error-loop.md
index 290070d..ba1504e 100644
--- a/workplans/IHUB-WP-0016-build-infrastructure-and-error-loop.md
+++ b/workplans/IHUB-WP-0016-build-infrastructure-and-error-loop.md
@@ -10,6 +10,7 @@ topic_slug: inter_hub
 created: "2026-04-10"
 updated: "2026-04-10"
 depends_on: []
+state_hub_workstream_id: "5dcacb24-f4a2-407c-a526-d39ef9d4a51a"
 ---
 
 # IHUB-WP-0016 — Build Infrastructure: Incremental Compilation and Autonomous Error-Fix Loop
@@ -75,6 +76,7 @@ skips the database startup, port binding, and service orchestration overhead.
 id: C1
 status: done
 priority: high
+state_hub_task_id: "4c812cfa-8204-4714-8493-a29529f605ea"
 ```
 
 Also created `scripts/compile-check-core` and `.ghci-core` to compile Layer 1+2
@@ -113,6 +115,7 @@ This relies on `.ghci` (already present) which sets up `-j1` and loads the IHP c
 id: C2
 status: done
 priority: medium
+state_hub_task_id: "18d4d383-5f66-4780-a066-f25e51ccb158"
 ```
 
 **Finding (2026-04-10):** IHP's `applicationGhciConfig` sets `-fbyte-code`. GHCi compiles
@@ -136,6 +139,7 @@ be needed — not worth adding given IHP's design tradeoffs.
 id: C3
 status: done
 priority: high
+state_hub_task_id: "56c45c72-1978-48c4-98ec-15d169c4417b"
 ```
 
 Delivered as `workplans/IHUB-WP-0017-error-fix-loop.md`. Run inside `devenv shell`:
@@ -161,6 +165,7 @@ Configure a ralph-workplan loop:
 id: C4
 status: done
 priority: high
+state_hub_task_id: "5660575a-7fe4-471e-800f-a256964a0301"
 ```
 
 ```
@@ -179,6 +184,7 @@ stopping at the first failure — critical for batch error fixing.
 id: C5
 status: done
 priority: medium
+state_hub_task_id: "243e1469-89e0-4966-a50f-33279a3be34f"
 ```
 
 Added "Compilation Layers" section to CLAUDE.md covering:
diff --git a/workplans/IHUB-WP-0017-error-fix-loop.md b/workplans/IHUB-WP-0017-error-fix-loop.md
index 02d04fd..3e55551 100644
--- a/workplans/IHUB-WP-0017-error-fix-loop.md
+++ b/workplans/IHUB-WP-0017-error-fix-loop.md
@@ -9,6 +9,7 @@ owner: custodian
 created: "2026-04-10"
 updated: "2026-04-10"
 depends_on: [IHUB-WP-0016]
+state_hub_workstream_id: "4636eb67-f7fb-409c-8d13-7fb461ef5db2"
 ---
 
 # IHUB-WP-0017 — Autonomous Error-Fix Loop: Reach Clean Build
@@ -63,6 +64,7 @@ devenv shell
 id: E1
 status: todo
 priority: high
+state_hub_task_id: "0ddc0559-55a4-405d-b568-afabcf9d2242"
 ```
 
 Run `scripts/compile-check --bg` and read `/tmp/ihub-compile-errors.txt`. List all
@@ -74,6 +76,7 @@ failing modules and their layers.
 id: E2
 status: todo
 priority: high
+state_hub_task_id: "2cd3dbb3-32d6-4348-8c04-e820feff96c0"
 ```
 
 Fix all errors in `Application/Helper/*.hs`. Verify via ghcid reload. Mark done when
@@ -85,6 +88,7 @@ Layer 2 shows no errors.
 id: E3
 status: todo
 priority: high
+state_hub_task_id: "99c4345c-57fa-4e00-afa3-3d10d948ba02"
 ```
 
 Fix errors in controllers and views. Work module-by-module, bottom-up. Mark done when
@@ -96,6 +100,7 @@ Layer 3 shows no errors.
 id: E4
 status: todo
 priority: medium
+state_hub_task_id: "c5dda487-b091-4ce8-b7ad-782d2c462298"
 ```
 
 Fix wiring errors last. Mark done when `ghcid` reports "All good, N modules loaded".
@@ -106,6 +111,7 @@ Fix wiring errors last. Mark done when `ghcid` reports "All good, N modules load
 id: E5
 status: todo
 priority: medium
+state_hub_task_id: "e20d48ea-6819-4222-a614-7dce74951e7c"
 ```
 
 After "All good" state: