diff --git a/workplans/ADHOC-2026-06-04.md b/workplans/ADHOC-2026-06-04.md
index 3eae519..6a2c4e4 100644
--- a/workplans/ADHOC-2026-06-04.md
+++ b/workplans/ADHOC-2026-06-04.md
@@ -1,5 +1,5 @@
 ---
-id: ADHOC-2026-06-04
+id: STATE-WP-ADHOC-2026-06-04
 type: workplan
 title: "Ad hoc fixes - 2026-06-04"
 domain: custodian
@@ -9,7 +9,6 @@ owner: codex
 topic_slug: custodian
 created: "2026-06-04"
 updated: "2026-06-04"
-state_hub_workstream_id: "2a8f3aff-8f5d-4e42-b33f-225d60e0b30b"
 ---
 
 # Ad hoc fixes - 2026-06-04
@@ -17,10 +16,9 @@ state_hub_workstream_id: "2a8f3aff-8f5d-4e42-b33f-225d60e0b30b"
 ## Fix Dashboard Overview API Loading
 
 ```task
-id: ADHOC-2026-06-04-T01
+id: STATE-WP-ADHOC-2026-06-04-T01
 status: done
 priority: high
-state_hub_task_id: "5f6aa1e4-ccc5-4c8b-8183-cc1578190b7b"
 ```
 
 The overview page reported `Dashboard data load failed: NetworkError when
diff --git a/workplans/ADHOC-2026-07-01.md b/workplans/ADHOC-2026-07-01.md
index a32ed96..3e924ff 100644
--- a/workplans/ADHOC-2026-07-01.md
+++ b/workplans/ADHOC-2026-07-01.md
@@ -1,5 +1,5 @@
 ---
-id: ADHOC-2026-07-01
+id: STATE-WP-ADHOC-2026-07-01
 type: workplan
 title: "Ad hoc fixes - 2026-07-01"
 domain: infotech
@@ -9,7 +9,6 @@ owner: codex
 topic_slug: custodian
 created: "2026-07-01"
 updated: "2026-07-01"
-state_hub_workstream_id: "1cdb288a-9bcb-4e53-8c4f-cb43e3abe9c5"
 ---
 
 # Ad hoc fixes - 2026-07-01
@@ -17,10 +16,9 @@ state_hub_workstream_id: "1cdb288a-9bcb-4e53-8c4f-cb43e3abe9c5"
 ## Add Local State Hub Consistency CLI
 
 ```task
-id: ADHOC-2026-07-01-T01
+id: STATE-WP-ADHOC-2026-07-01-T01
 status: done
 priority: medium
-state_hub_task_id: "060e6e63-b456-418e-83c5-7660fa206800"
 ```
 
 Add `statehub fix-consistency` so agents can reconcile ADR-001 workplan files
@@ -31,10 +29,9 @@ agent instructions to make the CLI sync a normal agent close-out step.
 ## Clear Closed-Workstream C-12 Orphan Warnings
 
 ```task
-id: ADHOC-2026-07-01-T02
+id: STATE-WP-ADHOC-2026-07-01-T02
 status: done
 priority: medium
-state_hub_task_id: "076b97bd-fb97-47f9-9733-c8eac6cd6355"
 ```
 
 Treat terminal DB-only tasks in closed workstreams as non-actionable historical
diff --git a/workplans/ADHOC-2026-08-08.md b/workplans/ADHOC-2026-08-08.md
index f751c72..5aba9ff 100644
--- a/workplans/ADHOC-2026-08-08.md
+++ b/workplans/ADHOC-2026-08-08.md
@@ -1,5 +1,5 @@
 ---
-id: ADHOC-2026-08-08
+id: STATE-WP-ADHOC-2026-08-08
 type: workplan
 title: "Ad hoc fixes — 2026-08-08"
 domain: infotech
@@ -9,17 +9,14 @@ owner: codex
 topic_slug: state-hub
 created: "2026-08-08"
 updated: "2026-08-08"
-state_hub_workstream_id: "f0175ce9-452b-4e52-b835-b8736d94e3d5"
-state_hub_workstream_id: "f0175ce9-452b-4e52-b835-b8736d94e3d5"
 ---
 
 ## Integrate State Hub connectivity into Codex setup
 
 ```task
-id: ADHOC-2026-08-08-T01
+id: STATE-WP-ADHOC-2026-08-08-T01
 status: done
 priority: medium
-state_hub_task_id: "5ad8b6f7-f005-43da-9d01-1fe7b0a5c8f8"
 ```
 
 Add an idempotent Codex configuration step to the operator bootstrap, verify
@@ -29,7 +26,7 @@ isolation from an actual hub outage, and propagate accurate agent guidance.
 ## Repair Codex stdio MCP launcher
 
 ```task
-id: ADHOC-2026-08-08-T02
+id: STATE-WP-ADHOC-2026-08-08-T02
 status: done
 priority: high
 ```
@@ -41,7 +38,7 @@ initialize exchange through the registered launcher.
 ## Split a slim Codex MCP surface from full dev-hub administration
 
 ```task
-id: ADHOC-2026-08-08-T03
+id: STATE-WP-ADHOC-2026-08-08-T03
 status: done
 priority: high
 ```
@@ -53,7 +50,7 @@ that need the administrative surface.
 ## Make Codex MCP opt-in
 
 ```task
-id: ADHOC-2026-08-08-T04
+id: STATE-WP-ADHOC-2026-08-08-T04
 status: done
 priority: high
 ```