diff --git a/.claude/rules/first-session.md b/.claude/rules/first-session.md
index 12ef66e..206749b 100644
--- a/.claude/rules/first-session.md
+++ b/.claude/rules/first-session.md
@@ -1,11 +1,11 @@
 ## First Session Protocol
 
-Triggered when `get_domain_summary("markitect")` shows **no workstreams**.
+Triggered when `get_domain_summary("communication")` shows **no workstreams**.
 The project is registered but work has not yet been structured.
 
 **Step 1 — Read, don't write**
-- `~/the-custodian/canon/projects/markitect/project_charter_v0.1.md` — purpose, scope
-- `~/the-custodian/canon/projects/markitect/roadmap_v0.1.md` — planned phases
+- `~/the-custodian/canon/projects/communication/project_charter_v0.1.md` — purpose, scope
+- `~/the-custodian/canon/projects/communication/roadmap_v0.1.md` — planned phases
 - Scan repo root: README, directory structure, existing code or docs
 
 **Step 2 — Survey in-progress work**
@@ -17,20 +17,20 @@ roadmap phase. **Wait for approval before creating.**
 
 **Step 4 — Create workplan file first, then DB record (ADR-001)**
 ```
-workplans/phase-memory-WP-NNNN-<slug>.md   ← write this first
+workplans/PMEM-WP-NNNN-<slug>.md   ← write this first
 ```
 Then register in the hub:
 ```
-create_workstream(topic_id="5571d954-0d30-4950-980d-7bcaaad8e3e2", title="...", owner="...", description="...")
+create_workstream(topic_id="36c7421b-c537-4723-bf75-42a3ebc6a1dc", title="...", owner="...", description="...")
 create_task(workstream_id="<id>", title="...", priority="high|medium|low")
 ```
 
 **Step 5 — Record the setup**
 ```
 add_progress_event(
-    summary="First session: structured markitect into N workstreams, M tasks",
+    summary="First session: structured communication into N workstreams, M tasks",
     event_type="milestone",
-    topic_id="5571d954-0d30-4950-980d-7bcaaad8e3e2",
+    topic_id="36c7421b-c537-4723-bf75-42a3ebc6a1dc",
     detail={"workstreams": [...], "tasks_created": M}
 )
 ```
diff --git a/.claude/rules/repo-identity.md b/.claude/rules/repo-identity.md
index 5f80486..9e7a9dd 100644
--- a/.claude/rules/repo-identity.md
+++ b/.claude/rules/repo-identity.md
@@ -1,5 +1,5 @@
 **Purpose:** phase-memory - (fill in purpose)
 
-**Domain:** markitect
+**Domain:** communication
 **Repo slug:** phase-memory
-**Topic ID:** 5571d954-0d30-4950-980d-7bcaaad8e3e2
+**Topic ID:** 36c7421b-c537-4723-bf75-42a3ebc6a1dc
diff --git a/.claude/rules/session-protocol.md b/.claude/rules/session-protocol.md
index ed402de..a73c0e6 100644
--- a/.claude/rules/session-protocol.md
+++ b/.claude/rules/session-protocol.md
@@ -1,6 +1,7 @@
 ## Session Protocol
 
-State Hub: http://127.0.0.1:8000
+Dev Hub (State Hub API): http://127.0.0.1:8000
+MCP server name in `~/.claude.json`: `dev-hub`
 
 **Step 1 — Orient**
 
@@ -10,7 +11,7 @@ cat .custodian-brief.md
 ```
 Then call the MCP tool for richer cross-domain context when MCP tools are exposed:
 ```
-get_domain_summary("markitect")
+get_domain_summary("communication")
 ```
 If MCP tools are unavailable in the current agent session, use the REST API:
 ```bash
@@ -39,11 +40,11 @@ curl -s -X PATCH "http://127.0.0.1:8000/messages/<id>/read" \
 ls workplans/
 ```
 For each file with `status: ready`, `active`, or `blocked`, note pending
-`todo`/`in_progress` tasks.
+`wait`/`todo`/`progress` tasks.
 
 **Step 4 — Present brief**
 
-1. **Active workstreams** for `markitect` — title, task counts, blocking decisions
+1. **Active workstreams** for `communication` — title, task counts, blocking decisions
 2. **Pending tasks** from `workplans/` + any `[repo:phase-memory]` hub tasks
 3. **Goal guidance** — if `goal_guidance` in summary:
    - `needs_workplan`: surface as top action — *"Repo goal '{title}' has no workplan yet"*
@@ -61,13 +62,13 @@ If no workstreams: follow First Session Protocol (`first-session.md`).
 **Session close:**
 With MCP tools:
 ```
-add_progress_event(summary="...", topic_id="5571d954-0d30-4950-980d-7bcaaad8e3e2", workstream_id="<uuid>")
+add_progress_event(summary="...", topic_id="36c7421b-c537-4723-bf75-42a3ebc6a1dc", workstream_id="<uuid>")
 ```
 Without MCP tools:
 ```bash
 curl -s -X POST http://127.0.0.1:8000/progress/ \
   -H "Content-Type: application/json" \
-  -d '{"topic_id":"5571d954-0d30-4950-980d-7bcaaad8e3e2","workstream_id":"<uuid>","event_type":"note","summary":"what changed","author":"codex"}'
+  -d '{"topic_id":"36c7421b-c537-4723-bf75-42a3ebc6a1dc","workstream_id":"<uuid>","event_type":"note","summary":"what changed","author":"codex"}'
 ```
 If workplan files were modified, ensure the local copy is up to date first:
 ```bash
diff --git a/.claude/rules/workplan-convention.md b/.claude/rules/workplan-convention.md
index cf6e075..84f2382 100644
--- a/.claude/rules/workplan-convention.md
+++ b/.claude/rules/workplan-convention.md
@@ -1,7 +1,7 @@
 ## Workplan Convention (ADR-001)
 
-File location: `workplans/phase-memory-WP-NNNN-<slug>.md`
-ID prefix: `PHASE-WP`
+File location: `workplans/PMEM-WP-NNNN-<slug>.md`
+ID prefix: `PMEM-WP-`
 
 Work items originate as files in this repo **before** being registered in the hub.
 
@@ -12,7 +12,7 @@ repo state, and `finished` when implementation is complete. `stalled` and
 `needs_review` are derived health labels, not stored statuses.
 
 Closed workplans may be moved to `workplans/archived/` with a completion-date
-prefix: `YYMMDD-phase-memory-WP-NNNN-<slug>.md`. The frontmatter id remains
+prefix: `YYMMDD-PMEM-WP-NNNN-<slug>.md`. The frontmatter id remains
 unchanged; the prefix is only for quick visual reference.
 
 Small opportunistic tasks discovered during another session use **Ad Hoc Tasks**:
@@ -25,4 +25,16 @@ Ecosystem todos from other agents arrive as `[repo:phase-memory]` hub tasks —
 visible at session start. Pick one up by creating the workplan file, then registering
 the workstream.
 
+Task blocks use this shape:
+
+```task
+id: PMEM-WP-NNNN-T01
+status: wait | todo | progress | done | cancel
+priority: high | medium | low
+state_hub_task_id: "<uuid>"         # written by fix-consistency — do not edit
+```
+
+Status progression is `todo` → `progress` → `done`; use `wait` for waiting or
+blocked work and `cancel` for stopped work.
+
 <!-- Ralph Loop rules and HEUREKA sequence: ~/.claude/CLAUDE.md — do not duplicate here -->
diff --git a/AGENTS.md b/AGENTS.md
index fb9f33a..cf74317 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,10 +4,10 @@
 
 **Purpose:** phase-memory - (fill in purpose)
 
-**Domain:** markitect
+**Domain:** communication
 **Repo slug:** phase-memory
-**Topic ID:** `5571d954-0d30-4950-980d-7bcaaad8e3e2`
-**Workplan prefix:** `PHASE-WP-`
+**Topic ID:** `36c7421b-c537-4723-bf75-42a3ebc6a1dc`
+**Workplan prefix:** `PMEM-WP-`
 
 ---
 
@@ -28,7 +28,7 @@ there is no MCP server for Codex agents.
 cat .custodian-brief.md
 
 # Active workstreams for this domain
-curl -s "http://127.0.0.1:8000/workstreams/?topic_id=5571d954-0d30-4950-980d-7bcaaad8e3e2&status=active" \
+curl -s "http://127.0.0.1:8000/workstreams/?topic_id=36c7421b-c537-4723-bf75-42a3ebc6a1dc&status=active" \
   | python3 -m json.tool
 
 # Check inbox
@@ -63,8 +63,8 @@ Omit `workstream_id` / `task_id` when not applicable.
 ```bash
 curl -s -X PATCH "http://127.0.0.1:8000/tasks/<task_id>" \
   -H "Content-Type: application/json" \
-  -d '{"status": "in_progress"}'
-# values: todo | in_progress | done | blocked
+  -d '{"status": "progress"}'
+# values: wait | todo | progress | done | cancel
 ```
 
 ### Flag a task for human review
@@ -83,7 +83,7 @@ curl -s -X PATCH "http://127.0.0.1:8000/tasks/<task_id>" \
 1. `cat .custodian-brief.md` — domain goal and open workstreams (offline-safe)
 2. Check inbox: `GET /messages/?to_agent=phase-memory&unread_only=true`; mark read
 3. Scan workplans: `ls workplans/` — note `status: ready`, `active`, or `blocked` files and open tasks
-4. Check blocked tasks: `GET /tasks/?needs_human=true`
+4. Check human-needed tasks: `GET /tasks/?needs_human=true`
 
 **During work:**
 - Update task statuses in workplan files as tasks progress
@@ -151,6 +151,11 @@ every repo's agent instructions because it is high-frequency, high-risk, and eas
 get wrong.
 
 **Canon:** `~/ops-warden/wiki/CredentialRouting.md` · catalog `~/ops-warden/registry/routing/catalog.yaml`
+
+<!-- REPO-AGENTS-EXTENSIONS -->
+<!-- Append repo-specific agent instructions below this marker.
+     The state-hub template sync preserves content after this line. -->
+
 ---
 
 ## Workplan Convention (ADR-001)
@@ -176,7 +181,7 @@ anything needing analysis, design, approval, dependencies, or multiple phases.
 id: PHASE-WP-NNNN
 type: workplan
 title: "..."
-domain: markitect
+domain: communication
 repo: phase-memory
 status: proposed | ready | active | blocked | backlog | finished | archived
 owner: codex
@@ -198,7 +203,7 @@ derived health labels, not frontmatter statuses.
 
 ` ` `task
 id: PHASE-WP-NNNN-T01
-status: todo | in_progress | done | blocked
+status: wait | todo | progress | done | cancel
 priority: high | medium | low
 state_hub_task_id: "<uuid>"         # written by fix-consistency — do not edit
 ` ` `
@@ -206,7 +211,7 @@ state_hub_task_id: "<uuid>"         # written by fix-consistency — do not edit
 Task description text.
 ```
 
-Status progression: `todo` → `in_progress` → `done` (or `blocked`)
+Status progression: `todo` → `progress` → `done`; use `wait` for waiting/blocked work and `cancel` for stopped work.
 
 To create a new workplan:
 1. Write the file following the format above
diff --git a/workplans/PMEM-WP-0001-architecture-and-foundation.md b/workplans/PMEM-WP-0001-architecture-and-foundation.md
index 6ace5f8..354335d 100644
--- a/workplans/PMEM-WP-0001-architecture-and-foundation.md
+++ b/workplans/PMEM-WP-0001-architecture-and-foundation.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0001
 type: workplan
 title: "Phase Memory Architecture And Foundation"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0002-local-runtime-facade-and-cli.md b/workplans/PMEM-WP-0002-local-runtime-facade-and-cli.md
index a497995..eed6e36 100644
--- a/workplans/PMEM-WP-0002-local-runtime-facade-and-cli.md
+++ b/workplans/PMEM-WP-0002-local-runtime-facade-and-cli.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0002
 type: workplan
 title: "Local Runtime Facade And CLI"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0003-file-backed-stores-and-event-path-runtime.md b/workplans/PMEM-WP-0003-file-backed-stores-and-event-path-runtime.md
index 494fc20..5596266 100644
--- a/workplans/PMEM-WP-0003-file-backed-stores-and-event-path-runtime.md
+++ b/workplans/PMEM-WP-0003-file-backed-stores-and-event-path-runtime.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0003
 type: workplan
 title: "File-Backed Stores And Event Path Runtime"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0004-policy-audit-and-review-gates.md b/workplans/PMEM-WP-0004-policy-audit-and-review-gates.md
index 276134f..1e6bce4 100644
--- a/workplans/PMEM-WP-0004-policy-audit-and-review-gates.md
+++ b/workplans/PMEM-WP-0004-policy-audit-and-review-gates.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0004
 type: workplan
 title: "Policy, Audit, And Review Gates"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0005-markitect-package-bridge-and-contract-interop.md b/workplans/PMEM-WP-0005-markitect-package-bridge-and-contract-interop.md
index 634e9fa..b80c5f3 100644
--- a/workplans/PMEM-WP-0005-markitect-package-bridge-and-contract-interop.md
+++ b/workplans/PMEM-WP-0005-markitect-package-bridge-and-contract-interop.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0005
 type: workplan
 title: "Markitect Package Bridge And Contract Interop"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0006-retrieval-activation-quality-and-evaluation.md b/workplans/PMEM-WP-0006-retrieval-activation-quality-and-evaluation.md
index a7d278e..b72b71f 100644
--- a/workplans/PMEM-WP-0006-retrieval-activation-quality-and-evaluation.md
+++ b/workplans/PMEM-WP-0006-retrieval-activation-quality-and-evaluation.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0006
 type: workplan
 title: "Retrieval, Activation Quality, And Evaluation"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0007-service-readiness-and-external-adapters.md b/workplans/PMEM-WP-0007-service-readiness-and-external-adapters.md
index 75810ca..a9ef0f7 100644
--- a/workplans/PMEM-WP-0007-service-readiness-and-external-adapters.md
+++ b/workplans/PMEM-WP-0007-service-readiness-and-external-adapters.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0007
 type: workplan
 title: "Service Readiness And External Adapters"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: phase-memory
diff --git a/workplans/PMEM-WP-0008-profile-driven-runtime-configuration.md b/workplans/PMEM-WP-0008-profile-driven-runtime-configuration.md
index 30ffe59..9a39534 100644
--- a/workplans/PMEM-WP-0008-profile-driven-runtime-configuration.md
+++ b/workplans/PMEM-WP-0008-profile-driven-runtime-configuration.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0008
 type: workplan
 title: "Profile-Driven Runtime Configuration"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0009-profile-driven-lifecycle-rules.md b/workplans/PMEM-WP-0009-profile-driven-lifecycle-rules.md
index 92bdec9..a43275e 100644
--- a/workplans/PMEM-WP-0009-profile-driven-lifecycle-rules.md
+++ b/workplans/PMEM-WP-0009-profile-driven-lifecycle-rules.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0009
 type: workplan
 title: "Profile-Driven Lifecycle Rules"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0010-fake-external-adapter-packs.md b/workplans/PMEM-WP-0010-fake-external-adapter-packs.md
index cf6f977..ec3ae8b 100644
--- a/workplans/PMEM-WP-0010-fake-external-adapter-packs.md
+++ b/workplans/PMEM-WP-0010-fake-external-adapter-packs.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0010
 type: workplan
 title: "Fake External Adapter Packs"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0011-refinement-hardening-and-operational-readiness.md b/workplans/PMEM-WP-0011-refinement-hardening-and-operational-readiness.md
index 7e1bd34..71ad158 100644
--- a/workplans/PMEM-WP-0011-refinement-hardening-and-operational-readiness.md
+++ b/workplans/PMEM-WP-0011-refinement-hardening-and-operational-readiness.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0011
 type: workplan
 title: "Refinement Hardening And Operational Readiness"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0012-live-adapter-and-service-binding-readiness.md b/workplans/PMEM-WP-0012-live-adapter-and-service-binding-readiness.md
index 98b46d7..cb1c949 100644
--- a/workplans/PMEM-WP-0012-live-adapter-and-service-binding-readiness.md
+++ b/workplans/PMEM-WP-0012-live-adapter-and-service-binding-readiness.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0012
 type: workplan
 title: "Live Adapter And Service Binding Readiness"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0013-credentialed-adapter-drills-and-deployment-packaging.md b/workplans/PMEM-WP-0013-credentialed-adapter-drills-and-deployment-packaging.md
index 18df293..83a653f 100644
--- a/workplans/PMEM-WP-0013-credentialed-adapter-drills-and-deployment-packaging.md
+++ b/workplans/PMEM-WP-0013-credentialed-adapter-drills-and-deployment-packaging.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0013
 type: workplan
 title: "Credentialed Adapter Drills And Deployment Packaging"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0014-live-credential-execution-and-managed-deployment-hardening.md b/workplans/PMEM-WP-0014-live-credential-execution-and-managed-deployment-hardening.md
index f46c58b..f881cd1 100644
--- a/workplans/PMEM-WP-0014-live-credential-execution-and-managed-deployment-hardening.md
+++ b/workplans/PMEM-WP-0014-live-credential-execution-and-managed-deployment-hardening.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0014
 type: workplan
 title: "Live Credential Execution And Managed Deployment Hardening"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: finished
 owner: codex
diff --git a/workplans/PMEM-WP-0015-credentialed-live-pilot-and-deployment-evidence.md b/workplans/PMEM-WP-0015-credentialed-live-pilot-and-deployment-evidence.md
index 62048b4..df7c19c 100644
--- a/workplans/PMEM-WP-0015-credentialed-live-pilot-and-deployment-evidence.md
+++ b/workplans/PMEM-WP-0015-credentialed-live-pilot-and-deployment-evidence.md
@@ -2,7 +2,7 @@
 id: PMEM-WP-0015
 type: workplan
 title: "Credentialed Live Pilot And Deployment Evidence"
-domain: markitect
+domain: communication
 repo: phase-memory
 status: ready
 owner: codex