diff --git a/frontend/scripts/openspec/init-change-workspace.sh b/frontend/scripts/openspec/init-change-workspace.sh
index e417495..8f878e7 100755
--- a/frontend/scripts/openspec/init-change-workspace.sh
+++ b/frontend/scripts/openspec/init-change-workspace.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [[ $# -lt 1 || $# -gt 2 ]]; then
-  echo "Usage: $0 <change-slug> [capability-slug]"
-  echo "Example: $0 add-dashboard-live-usage runtime-migration"
+if [[ $# -lt 1 || $# -gt 3 ]]; then
+  echo "Usage: $0 <change-slug> [capability-slug] [agent-branch]"
+  echo "Example: $0 add-dashboard-live-usage runtime-migration agent/claude-odin/add-dashboard-live-usage-123456"
   exit 1
 fi
 
 CHANGE_SLUG="$1"
 CAPABILITY_SLUG="${2:-$CHANGE_SLUG}"
+AGENT_BRANCH="${3:-agent/<your-name>/<branch-slug>}"
 
 if [[ "$CHANGE_SLUG" =~ [^a-z0-9-] ]]; then
   echo "Error: change slug must be kebab-case (lowercase letters, numbers, hyphens)."
@@ -24,7 +25,17 @@ CHANGE_DIR="openspec/changes/${CHANGE_SLUG}"
 SPEC_DIR="${CHANGE_DIR}/specs/${CAPABILITY_SLUG}"
 TODAY="$(date -u +%Y-%m-%d)"
 
-mkdir -p "$SPEC_DIR"
+MINIMAL_RAW="${GUARDEX_OPENSPEC_MINIMAL:-0}"
+case "$(printf '%s' "$MINIMAL_RAW" | tr '[:upper:]' '[:lower:]')" in
+  1|true|yes|on) MINIMAL=1 ;;
+  *) MINIMAL=0 ;;
+esac
+
+if [[ "$MINIMAL" -eq 1 ]]; then
+  mkdir -p "$CHANGE_DIR"
+else
+  mkdir -p "$SPEC_DIR"
+fi
 
 if [[ ! -f "${CHANGE_DIR}/.openspec.yaml" ]]; then
   cat > "${CHANGE_DIR}/.openspec.yaml" <<YAMLEOF
@@ -33,6 +44,27 @@ created: ${TODAY}
 YAMLEOF
 fi
 
+if [[ "$MINIMAL" -eq 1 ]]; then
+  if [[ ! -f "${CHANGE_DIR}/notes.md" ]]; then
+    cat > "${CHANGE_DIR}/notes.md" <<NOTESEOF
+# ${CHANGE_SLUG} (minimal / T1)
+
+Branch: \`${AGENT_BRANCH}\`
+
+Describe the change in a sentence or two. Commit message is the spec of record.
+
+## Cleanup
+
+- [ ] Run: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`
+- [ ] Record PR URL + \`MERGED\` state in the completion handoff.
+- [ ] Confirm sandbox worktree is gone (\`git worktree list\`, \`git branch -a\`).
+NOTESEOF
+  fi
+  echo "[guardex] OpenSpec change workspace (minimal) ready: ${CHANGE_DIR}"
+  echo "[guardex] Notes-only scaffold: ${CHANGE_DIR}/notes.md"
+  exit 0
+fi
+
 if [[ ! -f "${CHANGE_DIR}/proposal.md" ]]; then
   cat > "${CHANGE_DIR}/proposal.md" <<PROPOSALEOF
 ## Why
@@ -51,6 +83,14 @@ fi
 
 if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
   cat > "${CHANGE_DIR}/tasks.md" <<TASKSEOF
+## Definition of Done
+
+This change is complete only when **all** of the following are true:
+
+- Every checkbox below is checked.
+- The agent branch reaches \`MERGED\` state on \`origin\` and the PR URL + state are recorded in the completion handoff.
+- If any step blocks (test failure, conflict, ambiguous result), append a \`BLOCKED:\` line under section 4 explaining the blocker and **STOP**. Do not tick remaining cleanup boxes; do not silently skip the cleanup pipeline.
+
 ## 1. Specification
 
 - [ ] 1.1 Finalize proposal scope and acceptance criteria for \`${CHANGE_SLUG}\`.
@@ -67,11 +107,11 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Cleanup
+## 4. Cleanup (mandatory; run before claiming completion)
 
-- [ ] 4.1 Finish the agent branch via PR merge + cleanup (\`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`).
-- [ ] 4.2 Record PR URL + final \`MERGED\` state in the completion handoff.
-- [ ] 4.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or capture a \`BLOCKED:\` handoff if merge/cleanup is pending.
+- [ ] 4.1 Run the cleanup pipeline: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`. This handles commit -> push -> PR create -> merge wait -> worktree prune in one invocation.
+- [ ] 4.2 Record the PR URL and final merge state (\`MERGED\`) in the completion handoff.
+- [ ] 4.3 Confirm the sandbox worktree is gone (\`git worktree list\` no longer shows the agent path; \`git branch -a\` shows no surviving local/remote refs for the branch).
 TASKSEOF
 fi
 
@@ -89,5 +129,5 @@ The system SHALL enforce ${CAPABILITY_SLUG} behavior as defined by this change.
 SPECEOF
 fi
 
-echo "[gitguardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
-echo "[gitguardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
+echo "[guardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
+echo "[guardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
diff --git a/frontend/scripts/openspec/init-plan-workspace.sh b/frontend/scripts/openspec/init-plan-workspace.sh
index c6dd4da..c96dba3 100755
--- a/frontend/scripts/openspec/init-plan-workspace.sh
+++ b/frontend/scripts/openspec/init-plan-workspace.sh
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 if [[ $# -lt 1 ]]; then
-  echo "Usage: $0 <plan-slug> [role ...]"
-  echo "Example: $0 stabilize-dashboard planner architect critic executor writer verifier"
+  echo "Usage: $0 <plan-slug> [agent-role ...]"
+  echo "Example: $0 add-ralplan-openspec-plan-export planner architect critic executor writer verifier"
   exit 1
 fi
 
@@ -11,10 +11,14 @@ PLAN_SLUG="$1"
 shift || true
 
 if [[ "$PLAN_SLUG" =~ [^a-z0-9-] ]]; then
-  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)." >&2
+  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)."
   exit 1
 fi
 
+to_kebab() {
+  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//'
+}
+
 if [[ $# -gt 0 ]]; then
   ROLES=("$@")
 else
@@ -24,139 +28,635 @@ fi
 PLAN_DIR="openspec/plan/${PLAN_SLUG}"
 mkdir -p "$PLAN_DIR"
 
-write_if_missing() {
-  local file="$1"
-  shift
-  if [[ ! -f "$file" ]]; then
-    mkdir -p "$(dirname "$file")"
-    cat > "$file" <<EOF
-$*
-EOF
-  fi
-}
-
-write_if_missing "$PLAN_DIR/summary.md" "# Plan Summary: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/summary.md" ]]; then
+  cat > "$PLAN_DIR/summary.md" <<SUMEOF
+# Plan Summary: ${PLAN_SLUG}
 
 - **Mode:** ralplan
 - **Status:** draft
 
 ## Context
 
-Describe the problem, constraints, and intended outcomes.
-"
+Describe the planning context, constraints, and desired outcomes.
+SUMEOF
+fi
 
-write_if_missing "$PLAN_DIR/checkpoints.md" "# Plan Checkpoints: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/checkpoints.md" ]]; then
+  cat > "$PLAN_DIR/checkpoints.md" <<CPTEOF
+# Plan Checkpoints: ${PLAN_SLUG}
 
 Chronological checkpoint log for all roles.
-"
 
-write_if_missing "$PLAN_DIR/README.md" "# Plan Workspace: ${PLAN_SLUG}
+CPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/README.md" ]]; then
+  {
+    echo "# Plan Workspace: ${PLAN_SLUG}"
+    echo
+    echo "This folder stores durable planning artifacts before implementation changes."
+    echo
+    echo "## Role folders"
+    for role in "${ROLES[@]}"; do
+      echo "- \`${role}/\`"
+    done
+    echo
+    echo "Each role folder contains OpenSpec-style artifacts:"
+    echo "- \`.openspec.yaml\`"
+    echo "- \`proposal.md\`"
+    echo "- \`tasks.md\` (Spec / Tests / Implementation / Checkpoints checklists)"
+    echo "- \`specs/<role>/spec.md\`"
+    echo "Planner also gets \`plan.md\`; executor also gets \`checkpoints.md\`."
+    echo "Planner plans should follow \`openspec/plan/PLANS.md\`."
+  } > "$PLAN_DIR/README.md"
+fi
+
+if [[ ! -f "$PLAN_DIR/coordinator-prompt.md" ]]; then
+  cat > "$PLAN_DIR/coordinator-prompt.md" <<COORDPROMPTEOF
+# Master Coordinator Prompt
+
+You are the coordinator for plan \`${PLAN_SLUG}\`.
+
+## Objective
+
+Drive this plan from draft to execution-ready status with strict checkpoint discipline and no scope drift.
+
+## Source-of-truth artifacts
+
+- \`openspec/plan/${PLAN_SLUG}/summary.md\`
+- \`openspec/plan/${PLAN_SLUG}/checkpoints.md\`
+- \`openspec/plan/${PLAN_SLUG}/planner/plan.md\`
+- role \`tasks.md\` files for planner/architect/critic/executor/writer/verifier
+
+## Coordinator responsibilities
+
+1. Keep checkpoints current in each role \`tasks.md\` and root \`checkpoints.md\`.
+2. Ensure each role has explicit acceptance criteria and verification evidence.
+3. Prevent implementation from starting before planning gates are complete.
+4. Keep handoffs concise: files changed, behavior touched, verification output, risks.
+
+## Wave-splitting decision (optional)
+
+Create wave prompts in \`kickoff-prompts.md\` only when at least one applies:
+
+- 3+ independent implementation lanes can run in parallel.
+- Runtime cutover/rollback sequencing needs explicit lane ownership.
+- Risk is high enough that bounded execution packets reduce coordination mistakes.
+
+If wave splitting is not needed, keep execution under a single owner with normal role checkpoints.
+
+## Exit criteria
+
+- All role checkpoints required for planning are done.
+- Execution lanes (if any) have clear ownership boundaries.
+- Verification plan and rollback expectations are explicit and testable.
+COORDPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/kickoff-prompts.md" ]]; then
+  cat > "$PLAN_DIR/kickoff-prompts.md" <<KICKOFFPROMPTEOF
+# Kickoff Prompts (Copy/Paste)
+
+Use these only when the coordinator decides wave-splitting is needed.
+
+## Prompt A — Wave A (Primary lane)
 
-Durable pre-implementation planning workspace.
+\`\`\`text
+You own Wave-A for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
 
-Each role folder includes a copyable \`prompt.md\` for joined Codex helpers.
-Helpers reuse the owner branch/worktree, claim the role files they touch, and
-leave PR merge + sandbox cleanup to the owner change lane.
+Goal:
+Implement the assigned Wave-A scope and return verification evidence.
 
-Use this command to update checkpoints:
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
 
-\`\`\`bash
-/opsx:checkpoint ${PLAN_SLUG} <role> <checkpoint-id> <state> <note...>
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt B — Wave B (Secondary lane)
+
+\`\`\`text
+You own Wave-B for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-B scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
 \`\`\`
-"
 
-write_if_missing "$PLAN_DIR/planner/plan.md" "# ExecPlan: ${PLAN_SLUG}
+## Prompt C — Wave C (Secondary lane)
+
+\`\`\`text
+You own Wave-C for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-C scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt D — Integrator lane
+
+\`\`\`text
+You are the integrator for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Integrate completed waves, resolve conflicts, run final verification, and prepare rollout/cutover notes.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Preserve safety-critical behavior unless explicitly planned and tested.
+- Keep final output evidence-first.
+
+Owned scope:
+- integration glue and shared touchpoints
+- final validation + handoff summary
+
+Verification:
+- <fill commands>
+
+Final report:
+- Files changed
+- Integration decisions
+- Verification outputs
+- Remaining risks
+\`\`\`
+KICKOFFPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/phases.md" ]]; then
+  cat > "$PLAN_DIR/phases.md" <<PHASESEOF
+# Plan Phases: ${PLAN_SLUG}
 
-This document is a living plan. Keep progress and decisions current.
+One entry per phase. Checkbox marks map to: \`x\` = completed, \`>\` = in progress, space = pending.
+Indented sub-bullets are optional metadata consumed by the Plans UI:
+
+- \`session\`: which agent kind runs the phase (\`codex\` / \`claude\`).
+- \`checkpoints\`: comma-separated role checkpoint ids delivered within the phase.
+- \`summary\`: one short sentence rendered under the phase title.
+
+One phase is intended to fit into a single Codex or Claude session task.
+
+- [ ] [PH01] First milestone title goes here
+  - session: codex
+  - checkpoints: P1, A1
+  - summary: Describe the single session outcome expected for this phase.
+PHASESEOF
+fi
+
+for role in "${ROLES[@]}"; do
+  ROLE_DIR="$PLAN_DIR/$role"
+  mkdir -p "$ROLE_DIR"
+
+  if [[ ! -f "$ROLE_DIR/README.md" ]]; then
+    cat > "$ROLE_DIR/README.md" <<ROLEEOF
+# ${role}
+
+Role workspace for \`${role}\`.
+
+Default artifacts:
+- \`.openspec.yaml\`
+- \`proposal.md\`
+- \`tasks.md\`
+- \`specs/<role>/spec.md\`
+
+Use this folder for role notes, artifacts, and status updates.
+ROLEEOF
+  fi
+
+  ROLE_SPEC_SLUG="$(to_kebab "$role")"
+  if [[ -z "$ROLE_SPEC_SLUG" ]]; then
+    ROLE_SPEC_SLUG="role"
+  fi
+
+  if [[ ! -f "$ROLE_DIR/.openspec.yaml" ]]; then
+    cat > "$ROLE_DIR/.openspec.yaml" <<ROLEYAMLEOF
+schema: 1
+plan: ${PLAN_SLUG}
+role: ${role}
+status: draft
+artifacts:
+  proposal: proposal.md
+  tasks: tasks.md
+  spec: specs/${ROLE_SPEC_SLUG}/spec.md
+ROLEYAMLEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/proposal.md" ]]; then
+    cat > "$ROLE_DIR/proposal.md" <<ROLEPROPOSALEOF
+# Proposal: ${role} (${PLAN_SLUG})
+
+## Why
+
+Summarize why this role's work is required for plan \`${PLAN_SLUG}\`.
+
+## What Changes
+
+- [ ] List the planned role-specific changes
+
+## Impact
+
+- Scope:
+- Risks:
+- Dependencies:
+ROLEPROPOSALEOF
+  fi
+
+  ROLE_SPEC_DIR="$ROLE_DIR/specs/$ROLE_SPEC_SLUG"
+  mkdir -p "$ROLE_SPEC_DIR"
+
+  if [[ ! -f "$ROLE_SPEC_DIR/spec.md" ]]; then
+    cat > "$ROLE_SPEC_DIR/spec.md" <<ROLESPECEOF
+# Capability Spec: ${role}
+
+## ADDED Requirements
+
+### Requirement: ${role} responsibilities for \`${PLAN_SLUG}\`
+This role MUST define and deliver its scoped outputs with evidence.
+
+#### Scenario: Role executes assigned scope
+- **WHEN** the role begins execution for \`${PLAN_SLUG}\`
+- **THEN** it follows \`tasks.md\` and records evidence for completion
+ROLESPECEOF
+  fi
+
+  if [[ "$role" == "planner" && ! -f "$ROLE_DIR/plan.md" ]]; then
+    cat > "$ROLE_DIR/plan.md" <<PLANEOF
+# ExecPlan: ${PLAN_SLUG}
+
+This ExecPlan is a living document. Keep \`Progress\`, \`Surprises & Discoveries\`, \`Decision Log\`, and \`Outcomes & Retrospective\` current as work proceeds.
+
+Follow repository guidance in \`openspec/plan/PLANS.md\`.
 
 ## Purpose / Big Picture
 
+Describe what becomes possible after this plan is executed and how a user/operator can observe it working.
+
 ## Progress
 
-- [ ] Initial draft
-- [ ] Review + iterate
-- [ ] Approved for execution
+- [ ] (YYYY-MM-DD HH:MMZ) Capture initial scope and acceptance criteria.
+- [ ] (YYYY-MM-DD HH:MMZ) Draft architecture/tradeoff plan and verification strategy.
+- [ ] (YYYY-MM-DD HH:MMZ) Finalize execution-ready handoff.
 
 ## Surprises & Discoveries
 
+- Observation: _none yet_
+  Evidence: _n/a_
+
 ## Decision Log
 
+- Decision: Use OpenSpec plan workspace as source of truth for this planning cycle.
+  Rationale: Keeps planning artifacts in-repo and reviewable.
+  Date/Author: YYYY-MM-DD / planner
+
 ## Outcomes & Retrospective
 
+Summarize outcomes, gaps, and lessons learned when a milestone or the full plan is completed.
+
+## Context and Orientation
+
+Describe relevant modules, files, constraints, and assumptions for a newcomer. Use repository-relative paths.
+
+## Plan of Work
+
+Describe the sequence of edits and deliverables in prose. Name target files and expected effects.
+
+## Concrete Steps
+
+List exact commands with working directory and short expected outcomes.
+
+    cd /home/deadpool/Documents/codex-lb
+    openspec validate --specs
+
 ## Validation and Acceptance
-"
 
-for role in "${ROLES[@]}"; do
-  ROLE_DIR="$PLAN_DIR/$role"
-  mkdir -p "$ROLE_DIR"
+State observable behavior and verification evidence required before execution handoff.
 
-  write_if_missing "$ROLE_DIR/README.md" "# ${role}
+## Idempotence and Recovery
 
-Role workspace for \`${role}\`.
-"
+Document safe re-run behavior, rollback strategy, and failure recovery notes.
+
+## Artifacts and Notes
+
+Capture concise command output snippets, evidence pointers, and references.
+
+## Interfaces and Dependencies
 
-  write_if_missing "$ROLE_DIR/prompt.md" "# ${role} prompt
+Name concrete interfaces/modules/dependencies and any required signatures/contracts.
 
-You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
+## Revision Note
 
-## Scope
+- YYYY-MM-DD HH:MMZ: Initial scaffold generated by \`scripts/openspec/init-plan-workspace.sh\`.
+PLANEOF
+  fi
+
+  if [[ "$role" == "executor" && ! -f "$ROLE_DIR/checkpoints.md" ]]; then
+    cat > "$ROLE_DIR/checkpoints.md" <<EXCCPTEOF
+# executor checkpoints
+
+Timestamped execution checkpoints for \`${PLAN_SLUG}\`.
+
+EXCCPTEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/tasks.md" ]]; then
+    case "$role" in
+      planner)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# planner tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define planning principles, decision drivers, and viable options for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate that scope, constraints, and acceptance criteria are captured in \`summary.md\`
+
+## 2. Tests
+
+- [ ] 2.1 Define verification approach for plan quality (traceability, testability, evidence expectations)
+- [ ] 2.2 Validate OpenSpec consistency checkpoints (including \`openspec validate --specs\` when applicable)
+
+## 3. Implementation
+
+- [ ] 3.1 Produce the initial RALPLAN-DR plan draft
+- [ ] 3.2 Integrate Architect/Critic feedback into revised plan iterations
+- [ ] 3.3 Publish final planning handoff with explicit execution lanes
+
+## 4. Checkpoints
+
+- [ ] [P1] READY - Initial planning draft checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      architect)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# architect tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ownership boundaries, interfaces, and artifact responsibilities for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate architecture constraints and non-functional requirements coverage
 
-- Work inside \`openspec/plan/${PLAN_SLUG}/${role}/\` plus directly-related shared plan files you explicitly claim.
-- Reuse the owner's branch/worktree instead of creating a separate sandbox unless the owner says otherwise.
+## 2. Tests
 
-## Ownership
+- [ ] 2.1 Define architectural verification checkpoints (integration boundaries, failure modes, compatibility)
+- [ ] 2.2 Validate that acceptance criteria map to concrete architecture decisions
 
-- Before editing, claim this role's files in the shared owner lane:
-  \`python3 scripts/agent-file-locks.py claim --branch <owner-branch> openspec/plan/${PLAN_SLUG}/${role}/README.md openspec/plan/${PLAN_SLUG}/${role}/prompt.md openspec/plan/${PLAN_SLUG}/${role}/tasks.md openspec/plan/${PLAN_SLUG}/checkpoints.md\`
-- Record branch, worktree, and scope in \`tasks.md\`.
-- Do not change another role's files without reassignment.
+## 3. Implementation
 
-## Deliverables
+- [ ] 3.1 Review plan for strongest antithesis/tradeoff tensions
+- [ ] 3.2 Propose synthesis path and guardrails for implementation teams
+- [ ] 3.3 Record architecture sign-off notes for downstream execution
 
-- Complete the role checklist in \`tasks.md\`.
-- Leave a handoff with files changed, verification, and risks.
-- The owner alone runs the change completion flow and sandbox cleanup after change tasks 4.1-4.3 are done.
-"
+## 4. Checkpoints
 
-  write_if_missing "$ROLE_DIR/tasks.md" "# ${role} tasks
+- [ ] [A1] READY - Architecture review checkpoint
 
-## Ownership
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
 
-- [ ] Claim this role's files in the shared owner branch/worktree before editing.
-- [ ] Record branch, worktree, and scope for this role.
-- [ ] Copy or hand off \`prompt.md\` when another agent joins this role.
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      critic)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# critic tasks
 
 ## 1. Spec
 
-- [ ] Define requirements and scope for ${role}
-- [ ] Confirm acceptance criteria are explicit and testable
+- [ ] 1.1 Validate principle-driver-option consistency across the plan
+- [ ] 1.2 Validate risks, consequences, and mitigation clarity (including idempotency expectations)
 
 ## 2. Tests
 
-- [ ] Define verification approach and evidence requirements
-- [ ] List concrete commands for verification
+- [ ] 2.1 Validate testability and measurability of all acceptance criteria
+- [ ] 2.2 Validate verification steps are concrete and reproducible
 
 ## 3. Implementation
 
-- [ ] Execute role-specific deliverables
-- [ ] Capture decisions, risks, and handoff notes
+- [ ] 3.1 Produce verdict (APPROVE / ITERATE / REJECT) with actionable feedback
+- [ ] 3.2 Confirm revised drafts resolve prior findings before approval
+- [ ] 3.3 Publish final quality/risk sign-off notes
 
 ## 4. Checkpoints
 
-- [ ] Publish checkpoint update for this role
+- [ ] [C1] READY - Quality gate checkpoint
 
 ## 5. Collaboration
 
-- [ ] Leave a role handoff with files changed, verification, and risks.
-- [ ] Owner records \`accept\`, \`revise\`, or \`reject\` for joined output, or marks \`N/A\` if no helper joined.
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
 
 ## 6. Cleanup
 
-- [ ] If this role owns finish, run \`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`.
-- [ ] Record PR URL + final \`MERGED\` state in the role handoff or owner change task.
-- [ ] Confirm sandbox cleanup, or capture a \`BLOCKED:\` handoff if finish is still pending.
-"
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      executor)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# executor tasks
+
+## 1. Spec
+
+- [ ] 1.1 Map approved plan requirements to concrete implementation work items
+- [ ] 1.2 Validate touched components/files are explicitly listed before coding starts
+
+## 2. Tests
+
+- [ ] 2.1 Define test additions/updates required to lock intended behavior
+- [ ] 2.2 Validate regression and smoke verification commands for delivery
+
+## 3. Implementation
+
+- [ ] 3.1 Execute implementation tasks in approved order
+- [ ] 3.2 Keep progress and evidence linked back to plan checkpoints
+- [ ] 3.3 Complete final verification bundle for handoff
+
+## 4. Checkpoints
+
+- [ ] [E1] READY - Execution start checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      writer)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# writer tasks
+
+## 1. Spec
+
+- [ ] 1.1 Validate documentation scope and audience for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate consistency between plan terminology and OpenSpec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define documentation verification checklist (accuracy, completeness, command correctness)
+- [ ] 2.2 Validate command/help text examples against current workflow behavior
+
+## 3. Implementation
+
+- [ ] 3.1 Update workflow docs and command guidance for approved plan behavior
+- [ ] 3.2 Add or refine examples for operator usage and handoff clarity
+- [ ] 3.3 Publish final docs change summary with references
+
+## 4. Checkpoints
+
+- [ ] [W1] READY - Docs update checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      verifier)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# verifier tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define end-to-end validation matrix for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate success/failure conditions and evidence requirements
+
+## 2. Tests
+
+- [ ] 2.1 Execute verification commands and collect outputs
+- [ ] 2.2 Validate idempotency/re-run behavior and error-path handling
+
+## 3. Implementation
+
+- [ ] 3.1 Verify completed work against acceptance criteria
+- [ ] 3.2 Produce pass/fail findings with concrete evidence links
+- [ ] 3.3 Publish final verification sign-off (or blocker report)
+
+## 4. Checkpoints
+
+- [ ] [V1] READY - Verification checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      *)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# ${role} tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ${role}-specific requirements and acceptance criteria
+- [ ] 1.2 Validate relevant OpenSpec/spec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define verification scope for ${role}
+- [ ] 2.2 Confirm regression coverage expectations
+
+## 3. Implementation
+
+- [ ] 3.1 Execute ${role} deliverables for this plan
+- [ ] 3.2 Record handoff/status notes for downstream roles
+- [ ] 3.3 Mark completion with evidence links
+
+## 4. Checkpoints
+
+- [ ] [${role^^}1] READY - Role checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+    esac
+  fi
 done
 
-echo "[gitguardex] OpenSpec plan workspace ready: ${PLAN_DIR}"
-echo "[gitguardex] Roles: ${ROLES[*]}"
+echo "Plan workspace ready: $PLAN_DIR"
diff --git a/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/.openspec.yaml b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/.openspec.yaml
new file mode 100644
index 0000000..4b8c565
--- /dev/null
+++ b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-04-21
diff --git a/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/proposal.md b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/proposal.md
new file mode 100644
index 0000000..c620545
--- /dev/null
+++ b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/proposal.md
@@ -0,0 +1,23 @@
+## Why
+
+- `gx setup` installs OpenSpec helper scripts that are older than the live `recodee` copies already guiding current work.
+- The published `gitguardex` AGENTS contract already promises tier-aware OpenSpec scaffolding, but the installed helper scripts still miss the richer change and plan workspace behavior.
+- Downstream repos bootstrapped with `gx setup` should get the same OpenSpec workspace shape that `recodee` is already using.
+
+## What Changes
+
+- Sync the published `init-change-workspace.sh` helper to the richer `recodee` version, including:
+  - T1/minimal notes-only change scaffolding support
+  - stronger cleanup and Definition-of-Done guidance in `tasks.md`
+  - optional agent-branch placeholder support for manual scaffolds
+- Sync the published `init-plan-workspace.sh` helper to the richer `recodee` version, including:
+  - coordinator, kickoff, and phases artifacts
+  - per-role OpenSpec proposal/spec/task scaffolds
+  - stronger ExecPlan and checkpoint prompts
+- Keep runtime/template copies aligned and expand regression coverage for the richer scaffold outputs.
+
+## Impact
+
+- Affected surface: `gx setup` / `gx doctor` managed OpenSpec helper scripts plus their runtime/template parity tests.
+- User-facing effect: new repos bootstrapped with Guardex get the same richer OpenSpec workspace shape already present in `recodee`.
+- Risk: low-to-moderate because the change is limited to scaffold content, but stale tests would hide drift if they are not updated together.
diff --git a/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/specs/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/spec.md b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/specs/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/spec.md
new file mode 100644
index 0000000..ba4073a
--- /dev/null
+++ b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/specs/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/spec.md
@@ -0,0 +1,26 @@
+## ADDED Requirements
+
+### Requirement: setup-managed repos receive the richer change scaffold
+Guardex setup-managed repos SHALL receive the same richer OpenSpec change scaffold already present in `recodee`.
+
+#### Scenario: full change scaffold is initialized
+- **GIVEN** a repo managed by `gx setup` or `gx doctor`
+- **WHEN** the operator runs `scripts/openspec/init-change-workspace.sh <change-slug> <capability-slug>`
+- **THEN** the script writes `.openspec.yaml`, `proposal.md`, `tasks.md`, and `specs/<capability>/spec.md`
+- **AND** `tasks.md` includes Definition-of-Done language plus explicit cleanup and merge evidence steps.
+
+#### Scenario: minimal T1 scaffold is initialized
+- **GIVEN** `GUARDEX_OPENSPEC_MINIMAL=1`
+- **WHEN** the operator runs `scripts/openspec/init-change-workspace.sh <change-slug> <capability-slug> <agent-branch>`
+- **THEN** the script creates `.openspec.yaml` and `notes.md` without the full change bundle
+- **AND** `notes.md` records the provided agent branch placeholder plus cleanup expectations.
+
+### Requirement: setup-managed repos receive the richer plan scaffold
+Guardex setup-managed repos SHALL receive the same richer OpenSpec plan scaffold already present in `recodee`.
+
+#### Scenario: plan workspace is initialized
+- **GIVEN** a repo managed by `gx setup` or `gx doctor`
+- **WHEN** the operator runs `scripts/openspec/init-plan-workspace.sh <plan-slug>`
+- **THEN** the script creates summary, checkpoint, and root plan artifacts for the workspace
+- **AND** it creates coordinator, kickoff, and phases artifacts
+- **AND** each default role receives proposal, spec, and task scaffolds that preserve Spec, Tests, Implementation, Checkpoints, Collaboration, and Cleanup structure.
diff --git a/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/tasks.md b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/tasks.md
new file mode 100644
index 0000000..23885f5
--- /dev/null
+++ b/openspec/changes/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/tasks.md
@@ -0,0 +1,25 @@
+## 1. Specification
+
+- [x] 1.1 Capture the parity gap between `recodee`'s live OpenSpec helpers and the published `gitguardex` setup-managed copies.
+- [x] 1.2 Define normative requirements for richer change and plan scaffolds in `specs/agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20/spec.md`.
+
+## 2. Implementation
+
+- [x] 2.1 Sync `scripts/openspec/*` and `templates/scripts/openspec/*` to the richer `recodee` scaffolds.
+- [x] 2.2 Keep mirrored frontend copies aligned where Guardex still ships duplicate helper surfaces.
+- [x] 2.3 Update regression tests to lock the richer scaffold outputs.
+
+## 3. Verification
+
+- [x] 3.1 Run focused `node --test` coverage for the OpenSpec scaffold/install tests.
+- [x] 3.2 Run `node --check bin/multiagent-safety.js`.
+- [x] 3.3 Run `openspec validate agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20 --type change --strict`.
+- [x] 3.4 Run `openspec validate --specs`.
+
+Verification note: `node --test --test-name-pattern OpenSpec test/install.test.js` passed with 4 focused OpenSpec/install tests. `node --test test/metadata.test.js` passed with 14 metadata/parity tests. `node --check bin/multiagent-safety.js` passed. `git diff --check` passed. `openspec validate agent-codex-sync-recodee-openspec-bootstrap-into-gx-2026-04-21-17-20 --type change --strict` passed, and `openspec validate --specs` returned `No items found to validate.`
+
+## 4. Cleanup
+
+- [ ] 4.1 Finish the agent branch via PR merge + cleanup (`gx finish --via-pr --wait-for-merge --cleanup` or `bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup`).
+- [ ] 4.2 Record PR URL + final `MERGED` state in the completion handoff.
+- [ ] 4.3 Confirm sandbox cleanup (`git worktree list`, `git branch -a`) or capture a `BLOCKED:` handoff if merge/cleanup is pending.
diff --git a/scripts/openspec/init-change-workspace.sh b/scripts/openspec/init-change-workspace.sh
index e417495..8f878e7 100755
--- a/scripts/openspec/init-change-workspace.sh
+++ b/scripts/openspec/init-change-workspace.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [[ $# -lt 1 || $# -gt 2 ]]; then
-  echo "Usage: $0 <change-slug> [capability-slug]"
-  echo "Example: $0 add-dashboard-live-usage runtime-migration"
+if [[ $# -lt 1 || $# -gt 3 ]]; then
+  echo "Usage: $0 <change-slug> [capability-slug] [agent-branch]"
+  echo "Example: $0 add-dashboard-live-usage runtime-migration agent/claude-odin/add-dashboard-live-usage-123456"
   exit 1
 fi
 
 CHANGE_SLUG="$1"
 CAPABILITY_SLUG="${2:-$CHANGE_SLUG}"
+AGENT_BRANCH="${3:-agent/<your-name>/<branch-slug>}"
 
 if [[ "$CHANGE_SLUG" =~ [^a-z0-9-] ]]; then
   echo "Error: change slug must be kebab-case (lowercase letters, numbers, hyphens)."
@@ -24,7 +25,17 @@ CHANGE_DIR="openspec/changes/${CHANGE_SLUG}"
 SPEC_DIR="${CHANGE_DIR}/specs/${CAPABILITY_SLUG}"
 TODAY="$(date -u +%Y-%m-%d)"
 
-mkdir -p "$SPEC_DIR"
+MINIMAL_RAW="${GUARDEX_OPENSPEC_MINIMAL:-0}"
+case "$(printf '%s' "$MINIMAL_RAW" | tr '[:upper:]' '[:lower:]')" in
+  1|true|yes|on) MINIMAL=1 ;;
+  *) MINIMAL=0 ;;
+esac
+
+if [[ "$MINIMAL" -eq 1 ]]; then
+  mkdir -p "$CHANGE_DIR"
+else
+  mkdir -p "$SPEC_DIR"
+fi
 
 if [[ ! -f "${CHANGE_DIR}/.openspec.yaml" ]]; then
   cat > "${CHANGE_DIR}/.openspec.yaml" <<YAMLEOF
@@ -33,6 +44,27 @@ created: ${TODAY}
 YAMLEOF
 fi
 
+if [[ "$MINIMAL" -eq 1 ]]; then
+  if [[ ! -f "${CHANGE_DIR}/notes.md" ]]; then
+    cat > "${CHANGE_DIR}/notes.md" <<NOTESEOF
+# ${CHANGE_SLUG} (minimal / T1)
+
+Branch: \`${AGENT_BRANCH}\`
+
+Describe the change in a sentence or two. Commit message is the spec of record.
+
+## Cleanup
+
+- [ ] Run: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`
+- [ ] Record PR URL + \`MERGED\` state in the completion handoff.
+- [ ] Confirm sandbox worktree is gone (\`git worktree list\`, \`git branch -a\`).
+NOTESEOF
+  fi
+  echo "[guardex] OpenSpec change workspace (minimal) ready: ${CHANGE_DIR}"
+  echo "[guardex] Notes-only scaffold: ${CHANGE_DIR}/notes.md"
+  exit 0
+fi
+
 if [[ ! -f "${CHANGE_DIR}/proposal.md" ]]; then
   cat > "${CHANGE_DIR}/proposal.md" <<PROPOSALEOF
 ## Why
@@ -51,6 +83,14 @@ fi
 
 if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
   cat > "${CHANGE_DIR}/tasks.md" <<TASKSEOF
+## Definition of Done
+
+This change is complete only when **all** of the following are true:
+
+- Every checkbox below is checked.
+- The agent branch reaches \`MERGED\` state on \`origin\` and the PR URL + state are recorded in the completion handoff.
+- If any step blocks (test failure, conflict, ambiguous result), append a \`BLOCKED:\` line under section 4 explaining the blocker and **STOP**. Do not tick remaining cleanup boxes; do not silently skip the cleanup pipeline.
+
 ## 1. Specification
 
 - [ ] 1.1 Finalize proposal scope and acceptance criteria for \`${CHANGE_SLUG}\`.
@@ -67,11 +107,11 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Cleanup
+## 4. Cleanup (mandatory; run before claiming completion)
 
-- [ ] 4.1 Finish the agent branch via PR merge + cleanup (\`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`).
-- [ ] 4.2 Record PR URL + final \`MERGED\` state in the completion handoff.
-- [ ] 4.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or capture a \`BLOCKED:\` handoff if merge/cleanup is pending.
+- [ ] 4.1 Run the cleanup pipeline: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`. This handles commit -> push -> PR create -> merge wait -> worktree prune in one invocation.
+- [ ] 4.2 Record the PR URL and final merge state (\`MERGED\`) in the completion handoff.
+- [ ] 4.3 Confirm the sandbox worktree is gone (\`git worktree list\` no longer shows the agent path; \`git branch -a\` shows no surviving local/remote refs for the branch).
 TASKSEOF
 fi
 
@@ -89,5 +129,5 @@ The system SHALL enforce ${CAPABILITY_SLUG} behavior as defined by this change.
 SPECEOF
 fi
 
-echo "[gitguardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
-echo "[gitguardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
+echo "[guardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
+echo "[guardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
diff --git a/scripts/openspec/init-plan-workspace.sh b/scripts/openspec/init-plan-workspace.sh
index c6dd4da..c96dba3 100755
--- a/scripts/openspec/init-plan-workspace.sh
+++ b/scripts/openspec/init-plan-workspace.sh
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 if [[ $# -lt 1 ]]; then
-  echo "Usage: $0 <plan-slug> [role ...]"
-  echo "Example: $0 stabilize-dashboard planner architect critic executor writer verifier"
+  echo "Usage: $0 <plan-slug> [agent-role ...]"
+  echo "Example: $0 add-ralplan-openspec-plan-export planner architect critic executor writer verifier"
   exit 1
 fi
 
@@ -11,10 +11,14 @@ PLAN_SLUG="$1"
 shift || true
 
 if [[ "$PLAN_SLUG" =~ [^a-z0-9-] ]]; then
-  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)." >&2
+  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)."
   exit 1
 fi
 
+to_kebab() {
+  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//'
+}
+
 if [[ $# -gt 0 ]]; then
   ROLES=("$@")
 else
@@ -24,139 +28,635 @@ fi
 PLAN_DIR="openspec/plan/${PLAN_SLUG}"
 mkdir -p "$PLAN_DIR"
 
-write_if_missing() {
-  local file="$1"
-  shift
-  if [[ ! -f "$file" ]]; then
-    mkdir -p "$(dirname "$file")"
-    cat > "$file" <<EOF
-$*
-EOF
-  fi
-}
-
-write_if_missing "$PLAN_DIR/summary.md" "# Plan Summary: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/summary.md" ]]; then
+  cat > "$PLAN_DIR/summary.md" <<SUMEOF
+# Plan Summary: ${PLAN_SLUG}
 
 - **Mode:** ralplan
 - **Status:** draft
 
 ## Context
 
-Describe the problem, constraints, and intended outcomes.
-"
+Describe the planning context, constraints, and desired outcomes.
+SUMEOF
+fi
 
-write_if_missing "$PLAN_DIR/checkpoints.md" "# Plan Checkpoints: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/checkpoints.md" ]]; then
+  cat > "$PLAN_DIR/checkpoints.md" <<CPTEOF
+# Plan Checkpoints: ${PLAN_SLUG}
 
 Chronological checkpoint log for all roles.
-"
 
-write_if_missing "$PLAN_DIR/README.md" "# Plan Workspace: ${PLAN_SLUG}
+CPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/README.md" ]]; then
+  {
+    echo "# Plan Workspace: ${PLAN_SLUG}"
+    echo
+    echo "This folder stores durable planning artifacts before implementation changes."
+    echo
+    echo "## Role folders"
+    for role in "${ROLES[@]}"; do
+      echo "- \`${role}/\`"
+    done
+    echo
+    echo "Each role folder contains OpenSpec-style artifacts:"
+    echo "- \`.openspec.yaml\`"
+    echo "- \`proposal.md\`"
+    echo "- \`tasks.md\` (Spec / Tests / Implementation / Checkpoints checklists)"
+    echo "- \`specs/<role>/spec.md\`"
+    echo "Planner also gets \`plan.md\`; executor also gets \`checkpoints.md\`."
+    echo "Planner plans should follow \`openspec/plan/PLANS.md\`."
+  } > "$PLAN_DIR/README.md"
+fi
+
+if [[ ! -f "$PLAN_DIR/coordinator-prompt.md" ]]; then
+  cat > "$PLAN_DIR/coordinator-prompt.md" <<COORDPROMPTEOF
+# Master Coordinator Prompt
+
+You are the coordinator for plan \`${PLAN_SLUG}\`.
+
+## Objective
+
+Drive this plan from draft to execution-ready status with strict checkpoint discipline and no scope drift.
+
+## Source-of-truth artifacts
+
+- \`openspec/plan/${PLAN_SLUG}/summary.md\`
+- \`openspec/plan/${PLAN_SLUG}/checkpoints.md\`
+- \`openspec/plan/${PLAN_SLUG}/planner/plan.md\`
+- role \`tasks.md\` files for planner/architect/critic/executor/writer/verifier
+
+## Coordinator responsibilities
+
+1. Keep checkpoints current in each role \`tasks.md\` and root \`checkpoints.md\`.
+2. Ensure each role has explicit acceptance criteria and verification evidence.
+3. Prevent implementation from starting before planning gates are complete.
+4. Keep handoffs concise: files changed, behavior touched, verification output, risks.
+
+## Wave-splitting decision (optional)
+
+Create wave prompts in \`kickoff-prompts.md\` only when at least one applies:
+
+- 3+ independent implementation lanes can run in parallel.
+- Runtime cutover/rollback sequencing needs explicit lane ownership.
+- Risk is high enough that bounded execution packets reduce coordination mistakes.
+
+If wave splitting is not needed, keep execution under a single owner with normal role checkpoints.
+
+## Exit criteria
+
+- All role checkpoints required for planning are done.
+- Execution lanes (if any) have clear ownership boundaries.
+- Verification plan and rollback expectations are explicit and testable.
+COORDPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/kickoff-prompts.md" ]]; then
+  cat > "$PLAN_DIR/kickoff-prompts.md" <<KICKOFFPROMPTEOF
+# Kickoff Prompts (Copy/Paste)
+
+Use these only when the coordinator decides wave-splitting is needed.
+
+## Prompt A — Wave A (Primary lane)
 
-Durable pre-implementation planning workspace.
+\`\`\`text
+You own Wave-A for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
 
-Each role folder includes a copyable \`prompt.md\` for joined Codex helpers.
-Helpers reuse the owner branch/worktree, claim the role files they touch, and
-leave PR merge + sandbox cleanup to the owner change lane.
+Goal:
+Implement the assigned Wave-A scope and return verification evidence.
 
-Use this command to update checkpoints:
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
 
-\`\`\`bash
-/opsx:checkpoint ${PLAN_SLUG} <role> <checkpoint-id> <state> <note...>
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt B — Wave B (Secondary lane)
+
+\`\`\`text
+You own Wave-B for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-B scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
 \`\`\`
-"
 
-write_if_missing "$PLAN_DIR/planner/plan.md" "# ExecPlan: ${PLAN_SLUG}
+## Prompt C — Wave C (Secondary lane)
+
+\`\`\`text
+You own Wave-C for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-C scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt D — Integrator lane
+
+\`\`\`text
+You are the integrator for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Integrate completed waves, resolve conflicts, run final verification, and prepare rollout/cutover notes.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Preserve safety-critical behavior unless explicitly planned and tested.
+- Keep final output evidence-first.
+
+Owned scope:
+- integration glue and shared touchpoints
+- final validation + handoff summary
+
+Verification:
+- <fill commands>
+
+Final report:
+- Files changed
+- Integration decisions
+- Verification outputs
+- Remaining risks
+\`\`\`
+KICKOFFPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/phases.md" ]]; then
+  cat > "$PLAN_DIR/phases.md" <<PHASESEOF
+# Plan Phases: ${PLAN_SLUG}
 
-This document is a living plan. Keep progress and decisions current.
+One entry per phase. Checkbox marks map to: \`x\` = completed, \`>\` = in progress, space = pending.
+Indented sub-bullets are optional metadata consumed by the Plans UI:
+
+- \`session\`: which agent kind runs the phase (\`codex\` / \`claude\`).
+- \`checkpoints\`: comma-separated role checkpoint ids delivered within the phase.
+- \`summary\`: one short sentence rendered under the phase title.
+
+One phase is intended to fit into a single Codex or Claude session task.
+
+- [ ] [PH01] First milestone title goes here
+  - session: codex
+  - checkpoints: P1, A1
+  - summary: Describe the single session outcome expected for this phase.
+PHASESEOF
+fi
+
+for role in "${ROLES[@]}"; do
+  ROLE_DIR="$PLAN_DIR/$role"
+  mkdir -p "$ROLE_DIR"
+
+  if [[ ! -f "$ROLE_DIR/README.md" ]]; then
+    cat > "$ROLE_DIR/README.md" <<ROLEEOF
+# ${role}
+
+Role workspace for \`${role}\`.
+
+Default artifacts:
+- \`.openspec.yaml\`
+- \`proposal.md\`
+- \`tasks.md\`
+- \`specs/<role>/spec.md\`
+
+Use this folder for role notes, artifacts, and status updates.
+ROLEEOF
+  fi
+
+  ROLE_SPEC_SLUG="$(to_kebab "$role")"
+  if [[ -z "$ROLE_SPEC_SLUG" ]]; then
+    ROLE_SPEC_SLUG="role"
+  fi
+
+  if [[ ! -f "$ROLE_DIR/.openspec.yaml" ]]; then
+    cat > "$ROLE_DIR/.openspec.yaml" <<ROLEYAMLEOF
+schema: 1
+plan: ${PLAN_SLUG}
+role: ${role}
+status: draft
+artifacts:
+  proposal: proposal.md
+  tasks: tasks.md
+  spec: specs/${ROLE_SPEC_SLUG}/spec.md
+ROLEYAMLEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/proposal.md" ]]; then
+    cat > "$ROLE_DIR/proposal.md" <<ROLEPROPOSALEOF
+# Proposal: ${role} (${PLAN_SLUG})
+
+## Why
+
+Summarize why this role's work is required for plan \`${PLAN_SLUG}\`.
+
+## What Changes
+
+- [ ] List the planned role-specific changes
+
+## Impact
+
+- Scope:
+- Risks:
+- Dependencies:
+ROLEPROPOSALEOF
+  fi
+
+  ROLE_SPEC_DIR="$ROLE_DIR/specs/$ROLE_SPEC_SLUG"
+  mkdir -p "$ROLE_SPEC_DIR"
+
+  if [[ ! -f "$ROLE_SPEC_DIR/spec.md" ]]; then
+    cat > "$ROLE_SPEC_DIR/spec.md" <<ROLESPECEOF
+# Capability Spec: ${role}
+
+## ADDED Requirements
+
+### Requirement: ${role} responsibilities for \`${PLAN_SLUG}\`
+This role MUST define and deliver its scoped outputs with evidence.
+
+#### Scenario: Role executes assigned scope
+- **WHEN** the role begins execution for \`${PLAN_SLUG}\`
+- **THEN** it follows \`tasks.md\` and records evidence for completion
+ROLESPECEOF
+  fi
+
+  if [[ "$role" == "planner" && ! -f "$ROLE_DIR/plan.md" ]]; then
+    cat > "$ROLE_DIR/plan.md" <<PLANEOF
+# ExecPlan: ${PLAN_SLUG}
+
+This ExecPlan is a living document. Keep \`Progress\`, \`Surprises & Discoveries\`, \`Decision Log\`, and \`Outcomes & Retrospective\` current as work proceeds.
+
+Follow repository guidance in \`openspec/plan/PLANS.md\`.
 
 ## Purpose / Big Picture
 
+Describe what becomes possible after this plan is executed and how a user/operator can observe it working.
+
 ## Progress
 
-- [ ] Initial draft
-- [ ] Review + iterate
-- [ ] Approved for execution
+- [ ] (YYYY-MM-DD HH:MMZ) Capture initial scope and acceptance criteria.
+- [ ] (YYYY-MM-DD HH:MMZ) Draft architecture/tradeoff plan and verification strategy.
+- [ ] (YYYY-MM-DD HH:MMZ) Finalize execution-ready handoff.
 
 ## Surprises & Discoveries
 
+- Observation: _none yet_
+  Evidence: _n/a_
+
 ## Decision Log
 
+- Decision: Use OpenSpec plan workspace as source of truth for this planning cycle.
+  Rationale: Keeps planning artifacts in-repo and reviewable.
+  Date/Author: YYYY-MM-DD / planner
+
 ## Outcomes & Retrospective
 
+Summarize outcomes, gaps, and lessons learned when a milestone or the full plan is completed.
+
+## Context and Orientation
+
+Describe relevant modules, files, constraints, and assumptions for a newcomer. Use repository-relative paths.
+
+## Plan of Work
+
+Describe the sequence of edits and deliverables in prose. Name target files and expected effects.
+
+## Concrete Steps
+
+List exact commands with working directory and short expected outcomes.
+
+    cd /home/deadpool/Documents/codex-lb
+    openspec validate --specs
+
 ## Validation and Acceptance
-"
 
-for role in "${ROLES[@]}"; do
-  ROLE_DIR="$PLAN_DIR/$role"
-  mkdir -p "$ROLE_DIR"
+State observable behavior and verification evidence required before execution handoff.
 
-  write_if_missing "$ROLE_DIR/README.md" "# ${role}
+## Idempotence and Recovery
 
-Role workspace for \`${role}\`.
-"
+Document safe re-run behavior, rollback strategy, and failure recovery notes.
+
+## Artifacts and Notes
+
+Capture concise command output snippets, evidence pointers, and references.
+
+## Interfaces and Dependencies
 
-  write_if_missing "$ROLE_DIR/prompt.md" "# ${role} prompt
+Name concrete interfaces/modules/dependencies and any required signatures/contracts.
 
-You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
+## Revision Note
 
-## Scope
+- YYYY-MM-DD HH:MMZ: Initial scaffold generated by \`scripts/openspec/init-plan-workspace.sh\`.
+PLANEOF
+  fi
+
+  if [[ "$role" == "executor" && ! -f "$ROLE_DIR/checkpoints.md" ]]; then
+    cat > "$ROLE_DIR/checkpoints.md" <<EXCCPTEOF
+# executor checkpoints
+
+Timestamped execution checkpoints for \`${PLAN_SLUG}\`.
+
+EXCCPTEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/tasks.md" ]]; then
+    case "$role" in
+      planner)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# planner tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define planning principles, decision drivers, and viable options for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate that scope, constraints, and acceptance criteria are captured in \`summary.md\`
+
+## 2. Tests
+
+- [ ] 2.1 Define verification approach for plan quality (traceability, testability, evidence expectations)
+- [ ] 2.2 Validate OpenSpec consistency checkpoints (including \`openspec validate --specs\` when applicable)
+
+## 3. Implementation
+
+- [ ] 3.1 Produce the initial RALPLAN-DR plan draft
+- [ ] 3.2 Integrate Architect/Critic feedback into revised plan iterations
+- [ ] 3.3 Publish final planning handoff with explicit execution lanes
+
+## 4. Checkpoints
+
+- [ ] [P1] READY - Initial planning draft checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      architect)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# architect tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ownership boundaries, interfaces, and artifact responsibilities for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate architecture constraints and non-functional requirements coverage
 
-- Work inside \`openspec/plan/${PLAN_SLUG}/${role}/\` plus directly-related shared plan files you explicitly claim.
-- Reuse the owner's branch/worktree instead of creating a separate sandbox unless the owner says otherwise.
+## 2. Tests
 
-## Ownership
+- [ ] 2.1 Define architectural verification checkpoints (integration boundaries, failure modes, compatibility)
+- [ ] 2.2 Validate that acceptance criteria map to concrete architecture decisions
 
-- Before editing, claim this role's files in the shared owner lane:
-  \`python3 scripts/agent-file-locks.py claim --branch <owner-branch> openspec/plan/${PLAN_SLUG}/${role}/README.md openspec/plan/${PLAN_SLUG}/${role}/prompt.md openspec/plan/${PLAN_SLUG}/${role}/tasks.md openspec/plan/${PLAN_SLUG}/checkpoints.md\`
-- Record branch, worktree, and scope in \`tasks.md\`.
-- Do not change another role's files without reassignment.
+## 3. Implementation
 
-## Deliverables
+- [ ] 3.1 Review plan for strongest antithesis/tradeoff tensions
+- [ ] 3.2 Propose synthesis path and guardrails for implementation teams
+- [ ] 3.3 Record architecture sign-off notes for downstream execution
 
-- Complete the role checklist in \`tasks.md\`.
-- Leave a handoff with files changed, verification, and risks.
-- The owner alone runs the change completion flow and sandbox cleanup after change tasks 4.1-4.3 are done.
-"
+## 4. Checkpoints
 
-  write_if_missing "$ROLE_DIR/tasks.md" "# ${role} tasks
+- [ ] [A1] READY - Architecture review checkpoint
 
-## Ownership
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
 
-- [ ] Claim this role's files in the shared owner branch/worktree before editing.
-- [ ] Record branch, worktree, and scope for this role.
-- [ ] Copy or hand off \`prompt.md\` when another agent joins this role.
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      critic)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# critic tasks
 
 ## 1. Spec
 
-- [ ] Define requirements and scope for ${role}
-- [ ] Confirm acceptance criteria are explicit and testable
+- [ ] 1.1 Validate principle-driver-option consistency across the plan
+- [ ] 1.2 Validate risks, consequences, and mitigation clarity (including idempotency expectations)
 
 ## 2. Tests
 
-- [ ] Define verification approach and evidence requirements
-- [ ] List concrete commands for verification
+- [ ] 2.1 Validate testability and measurability of all acceptance criteria
+- [ ] 2.2 Validate verification steps are concrete and reproducible
 
 ## 3. Implementation
 
-- [ ] Execute role-specific deliverables
-- [ ] Capture decisions, risks, and handoff notes
+- [ ] 3.1 Produce verdict (APPROVE / ITERATE / REJECT) with actionable feedback
+- [ ] 3.2 Confirm revised drafts resolve prior findings before approval
+- [ ] 3.3 Publish final quality/risk sign-off notes
 
 ## 4. Checkpoints
 
-- [ ] Publish checkpoint update for this role
+- [ ] [C1] READY - Quality gate checkpoint
 
 ## 5. Collaboration
 
-- [ ] Leave a role handoff with files changed, verification, and risks.
-- [ ] Owner records \`accept\`, \`revise\`, or \`reject\` for joined output, or marks \`N/A\` if no helper joined.
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
 
 ## 6. Cleanup
 
-- [ ] If this role owns finish, run \`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`.
-- [ ] Record PR URL + final \`MERGED\` state in the role handoff or owner change task.
-- [ ] Confirm sandbox cleanup, or capture a \`BLOCKED:\` handoff if finish is still pending.
-"
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      executor)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# executor tasks
+
+## 1. Spec
+
+- [ ] 1.1 Map approved plan requirements to concrete implementation work items
+- [ ] 1.2 Validate touched components/files are explicitly listed before coding starts
+
+## 2. Tests
+
+- [ ] 2.1 Define test additions/updates required to lock intended behavior
+- [ ] 2.2 Validate regression and smoke verification commands for delivery
+
+## 3. Implementation
+
+- [ ] 3.1 Execute implementation tasks in approved order
+- [ ] 3.2 Keep progress and evidence linked back to plan checkpoints
+- [ ] 3.3 Complete final verification bundle for handoff
+
+## 4. Checkpoints
+
+- [ ] [E1] READY - Execution start checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      writer)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# writer tasks
+
+## 1. Spec
+
+- [ ] 1.1 Validate documentation scope and audience for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate consistency between plan terminology and OpenSpec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define documentation verification checklist (accuracy, completeness, command correctness)
+- [ ] 2.2 Validate command/help text examples against current workflow behavior
+
+## 3. Implementation
+
+- [ ] 3.1 Update workflow docs and command guidance for approved plan behavior
+- [ ] 3.2 Add or refine examples for operator usage and handoff clarity
+- [ ] 3.3 Publish final docs change summary with references
+
+## 4. Checkpoints
+
+- [ ] [W1] READY - Docs update checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      verifier)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# verifier tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define end-to-end validation matrix for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate success/failure conditions and evidence requirements
+
+## 2. Tests
+
+- [ ] 2.1 Execute verification commands and collect outputs
+- [ ] 2.2 Validate idempotency/re-run behavior and error-path handling
+
+## 3. Implementation
+
+- [ ] 3.1 Verify completed work against acceptance criteria
+- [ ] 3.2 Produce pass/fail findings with concrete evidence links
+- [ ] 3.3 Publish final verification sign-off (or blocker report)
+
+## 4. Checkpoints
+
+- [ ] [V1] READY - Verification checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      *)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# ${role} tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ${role}-specific requirements and acceptance criteria
+- [ ] 1.2 Validate relevant OpenSpec/spec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define verification scope for ${role}
+- [ ] 2.2 Confirm regression coverage expectations
+
+## 3. Implementation
+
+- [ ] 3.1 Execute ${role} deliverables for this plan
+- [ ] 3.2 Record handoff/status notes for downstream roles
+- [ ] 3.3 Mark completion with evidence links
+
+## 4. Checkpoints
+
+- [ ] [${role^^}1] READY - Role checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+    esac
+  fi
 done
 
-echo "[gitguardex] OpenSpec plan workspace ready: ${PLAN_DIR}"
-echo "[gitguardex] Roles: ${ROLES[*]}"
+echo "Plan workspace ready: $PLAN_DIR"
diff --git a/templates/scripts/openspec/init-change-workspace.sh b/templates/scripts/openspec/init-change-workspace.sh
old mode 100644
new mode 100755
index e417495..8f878e7
--- a/templates/scripts/openspec/init-change-workspace.sh
+++ b/templates/scripts/openspec/init-change-workspace.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [[ $# -lt 1 || $# -gt 2 ]]; then
-  echo "Usage: $0 <change-slug> [capability-slug]"
-  echo "Example: $0 add-dashboard-live-usage runtime-migration"
+if [[ $# -lt 1 || $# -gt 3 ]]; then
+  echo "Usage: $0 <change-slug> [capability-slug] [agent-branch]"
+  echo "Example: $0 add-dashboard-live-usage runtime-migration agent/claude-odin/add-dashboard-live-usage-123456"
   exit 1
 fi
 
 CHANGE_SLUG="$1"
 CAPABILITY_SLUG="${2:-$CHANGE_SLUG}"
+AGENT_BRANCH="${3:-agent/<your-name>/<branch-slug>}"
 
 if [[ "$CHANGE_SLUG" =~ [^a-z0-9-] ]]; then
   echo "Error: change slug must be kebab-case (lowercase letters, numbers, hyphens)."
@@ -24,7 +25,17 @@ CHANGE_DIR="openspec/changes/${CHANGE_SLUG}"
 SPEC_DIR="${CHANGE_DIR}/specs/${CAPABILITY_SLUG}"
 TODAY="$(date -u +%Y-%m-%d)"
 
-mkdir -p "$SPEC_DIR"
+MINIMAL_RAW="${GUARDEX_OPENSPEC_MINIMAL:-0}"
+case "$(printf '%s' "$MINIMAL_RAW" | tr '[:upper:]' '[:lower:]')" in
+  1|true|yes|on) MINIMAL=1 ;;
+  *) MINIMAL=0 ;;
+esac
+
+if [[ "$MINIMAL" -eq 1 ]]; then
+  mkdir -p "$CHANGE_DIR"
+else
+  mkdir -p "$SPEC_DIR"
+fi
 
 if [[ ! -f "${CHANGE_DIR}/.openspec.yaml" ]]; then
   cat > "${CHANGE_DIR}/.openspec.yaml" <<YAMLEOF
@@ -33,6 +44,27 @@ created: ${TODAY}
 YAMLEOF
 fi
 
+if [[ "$MINIMAL" -eq 1 ]]; then
+  if [[ ! -f "${CHANGE_DIR}/notes.md" ]]; then
+    cat > "${CHANGE_DIR}/notes.md" <<NOTESEOF
+# ${CHANGE_SLUG} (minimal / T1)
+
+Branch: \`${AGENT_BRANCH}\`
+
+Describe the change in a sentence or two. Commit message is the spec of record.
+
+## Cleanup
+
+- [ ] Run: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`
+- [ ] Record PR URL + \`MERGED\` state in the completion handoff.
+- [ ] Confirm sandbox worktree is gone (\`git worktree list\`, \`git branch -a\`).
+NOTESEOF
+  fi
+  echo "[guardex] OpenSpec change workspace (minimal) ready: ${CHANGE_DIR}"
+  echo "[guardex] Notes-only scaffold: ${CHANGE_DIR}/notes.md"
+  exit 0
+fi
+
 if [[ ! -f "${CHANGE_DIR}/proposal.md" ]]; then
   cat > "${CHANGE_DIR}/proposal.md" <<PROPOSALEOF
 ## Why
@@ -51,6 +83,14 @@ fi
 
 if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
   cat > "${CHANGE_DIR}/tasks.md" <<TASKSEOF
+## Definition of Done
+
+This change is complete only when **all** of the following are true:
+
+- Every checkbox below is checked.
+- The agent branch reaches \`MERGED\` state on \`origin\` and the PR URL + state are recorded in the completion handoff.
+- If any step blocks (test failure, conflict, ambiguous result), append a \`BLOCKED:\` line under section 4 explaining the blocker and **STOP**. Do not tick remaining cleanup boxes; do not silently skip the cleanup pipeline.
+
 ## 1. Specification
 
 - [ ] 1.1 Finalize proposal scope and acceptance criteria for \`${CHANGE_SLUG}\`.
@@ -67,11 +107,11 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Cleanup
+## 4. Cleanup (mandatory; run before claiming completion)
 
-- [ ] 4.1 Finish the agent branch via PR merge + cleanup (\`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`).
-- [ ] 4.2 Record PR URL + final \`MERGED\` state in the completion handoff.
-- [ ] 4.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or capture a \`BLOCKED:\` handoff if merge/cleanup is pending.
+- [ ] 4.1 Run the cleanup pipeline: \`bash scripts/agent-branch-finish.sh --branch ${AGENT_BRANCH} --base dev --via-pr --wait-for-merge --cleanup\`. This handles commit -> push -> PR create -> merge wait -> worktree prune in one invocation.
+- [ ] 4.2 Record the PR URL and final merge state (\`MERGED\`) in the completion handoff.
+- [ ] 4.3 Confirm the sandbox worktree is gone (\`git worktree list\` no longer shows the agent path; \`git branch -a\` shows no surviving local/remote refs for the branch).
 TASKSEOF
 fi
 
@@ -89,5 +129,5 @@ The system SHALL enforce ${CAPABILITY_SLUG} behavior as defined by this change.
 SPECEOF
 fi
 
-echo "[gitguardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
-echo "[gitguardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
+echo "[guardex] OpenSpec change workspace ready: ${CHANGE_DIR}"
+echo "[guardex] OpenSpec change spec scaffold: ${SPEC_DIR}/spec.md"
diff --git a/templates/scripts/openspec/init-plan-workspace.sh b/templates/scripts/openspec/init-plan-workspace.sh
old mode 100644
new mode 100755
index c6dd4da..c96dba3
--- a/templates/scripts/openspec/init-plan-workspace.sh
+++ b/templates/scripts/openspec/init-plan-workspace.sh
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 if [[ $# -lt 1 ]]; then
-  echo "Usage: $0 <plan-slug> [role ...]"
-  echo "Example: $0 stabilize-dashboard planner architect critic executor writer verifier"
+  echo "Usage: $0 <plan-slug> [agent-role ...]"
+  echo "Example: $0 add-ralplan-openspec-plan-export planner architect critic executor writer verifier"
   exit 1
 fi
 
@@ -11,10 +11,14 @@ PLAN_SLUG="$1"
 shift || true
 
 if [[ "$PLAN_SLUG" =~ [^a-z0-9-] ]]; then
-  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)." >&2
+  echo "Error: plan slug must be kebab-case (lowercase letters, numbers, hyphens)."
   exit 1
 fi
 
+to_kebab() {
+  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//'
+}
+
 if [[ $# -gt 0 ]]; then
   ROLES=("$@")
 else
@@ -24,139 +28,635 @@ fi
 PLAN_DIR="openspec/plan/${PLAN_SLUG}"
 mkdir -p "$PLAN_DIR"
 
-write_if_missing() {
-  local file="$1"
-  shift
-  if [[ ! -f "$file" ]]; then
-    mkdir -p "$(dirname "$file")"
-    cat > "$file" <<EOF
-$*
-EOF
-  fi
-}
-
-write_if_missing "$PLAN_DIR/summary.md" "# Plan Summary: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/summary.md" ]]; then
+  cat > "$PLAN_DIR/summary.md" <<SUMEOF
+# Plan Summary: ${PLAN_SLUG}
 
 - **Mode:** ralplan
 - **Status:** draft
 
 ## Context
 
-Describe the problem, constraints, and intended outcomes.
-"
+Describe the planning context, constraints, and desired outcomes.
+SUMEOF
+fi
 
-write_if_missing "$PLAN_DIR/checkpoints.md" "# Plan Checkpoints: ${PLAN_SLUG}
+if [[ ! -f "$PLAN_DIR/checkpoints.md" ]]; then
+  cat > "$PLAN_DIR/checkpoints.md" <<CPTEOF
+# Plan Checkpoints: ${PLAN_SLUG}
 
 Chronological checkpoint log for all roles.
-"
 
-write_if_missing "$PLAN_DIR/README.md" "# Plan Workspace: ${PLAN_SLUG}
+CPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/README.md" ]]; then
+  {
+    echo "# Plan Workspace: ${PLAN_SLUG}"
+    echo
+    echo "This folder stores durable planning artifacts before implementation changes."
+    echo
+    echo "## Role folders"
+    for role in "${ROLES[@]}"; do
+      echo "- \`${role}/\`"
+    done
+    echo
+    echo "Each role folder contains OpenSpec-style artifacts:"
+    echo "- \`.openspec.yaml\`"
+    echo "- \`proposal.md\`"
+    echo "- \`tasks.md\` (Spec / Tests / Implementation / Checkpoints checklists)"
+    echo "- \`specs/<role>/spec.md\`"
+    echo "Planner also gets \`plan.md\`; executor also gets \`checkpoints.md\`."
+    echo "Planner plans should follow \`openspec/plan/PLANS.md\`."
+  } > "$PLAN_DIR/README.md"
+fi
+
+if [[ ! -f "$PLAN_DIR/coordinator-prompt.md" ]]; then
+  cat > "$PLAN_DIR/coordinator-prompt.md" <<COORDPROMPTEOF
+# Master Coordinator Prompt
+
+You are the coordinator for plan \`${PLAN_SLUG}\`.
+
+## Objective
+
+Drive this plan from draft to execution-ready status with strict checkpoint discipline and no scope drift.
+
+## Source-of-truth artifacts
+
+- \`openspec/plan/${PLAN_SLUG}/summary.md\`
+- \`openspec/plan/${PLAN_SLUG}/checkpoints.md\`
+- \`openspec/plan/${PLAN_SLUG}/planner/plan.md\`
+- role \`tasks.md\` files for planner/architect/critic/executor/writer/verifier
+
+## Coordinator responsibilities
+
+1. Keep checkpoints current in each role \`tasks.md\` and root \`checkpoints.md\`.
+2. Ensure each role has explicit acceptance criteria and verification evidence.
+3. Prevent implementation from starting before planning gates are complete.
+4. Keep handoffs concise: files changed, behavior touched, verification output, risks.
+
+## Wave-splitting decision (optional)
+
+Create wave prompts in \`kickoff-prompts.md\` only when at least one applies:
+
+- 3+ independent implementation lanes can run in parallel.
+- Runtime cutover/rollback sequencing needs explicit lane ownership.
+- Risk is high enough that bounded execution packets reduce coordination mistakes.
+
+If wave splitting is not needed, keep execution under a single owner with normal role checkpoints.
+
+## Exit criteria
+
+- All role checkpoints required for planning are done.
+- Execution lanes (if any) have clear ownership boundaries.
+- Verification plan and rollback expectations are explicit and testable.
+COORDPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/kickoff-prompts.md" ]]; then
+  cat > "$PLAN_DIR/kickoff-prompts.md" <<KICKOFFPROMPTEOF
+# Kickoff Prompts (Copy/Paste)
+
+Use these only when the coordinator decides wave-splitting is needed.
+
+## Prompt A — Wave A (Primary lane)
 
-Durable pre-implementation planning workspace.
+\`\`\`text
+You own Wave-A for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
 
-Each role folder includes a copyable \`prompt.md\` for joined Codex helpers.
-Helpers reuse the owner branch/worktree, claim the role files they touch, and
-leave PR merge + sandbox cleanup to the owner change lane.
+Goal:
+Implement the assigned Wave-A scope and return verification evidence.
 
-Use this command to update checkpoints:
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
 
-\`\`\`bash
-/opsx:checkpoint ${PLAN_SLUG} <role> <checkpoint-id> <state> <note...>
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt B — Wave B (Secondary lane)
+
+\`\`\`text
+You own Wave-B for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-B scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
 \`\`\`
-"
 
-write_if_missing "$PLAN_DIR/planner/plan.md" "# ExecPlan: ${PLAN_SLUG}
+## Prompt C — Wave C (Secondary lane)
+
+\`\`\`text
+You own Wave-C for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Implement the assigned Wave-C scope and return verification evidence.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Stay in your owned files/modules only.
+- Record explicit handoff notes for integration.
+
+Owned scope:
+- <fill owned files/modules>
+
+Verification:
+- <fill commands>
+
+Handoff format:
+- Files changed
+- Behavior touched
+- Verification outputs
+- Risks/follow-ups
+\`\`\`
+
+## Prompt D — Integrator lane
+
+\`\`\`text
+You are the integrator for plan \`${PLAN_SLUG}\` in /home/deadpool/Documents/codex-lb.
+
+Goal:
+Integrate completed waves, resolve conflicts, run final verification, and prepare rollout/cutover notes.
+
+Hard constraints:
+- You are not alone in the codebase; do not revert others' work.
+- Preserve safety-critical behavior unless explicitly planned and tested.
+- Keep final output evidence-first.
+
+Owned scope:
+- integration glue and shared touchpoints
+- final validation + handoff summary
+
+Verification:
+- <fill commands>
+
+Final report:
+- Files changed
+- Integration decisions
+- Verification outputs
+- Remaining risks
+\`\`\`
+KICKOFFPROMPTEOF
+fi
+
+if [[ ! -f "$PLAN_DIR/phases.md" ]]; then
+  cat > "$PLAN_DIR/phases.md" <<PHASESEOF
+# Plan Phases: ${PLAN_SLUG}
 
-This document is a living plan. Keep progress and decisions current.
+One entry per phase. Checkbox marks map to: \`x\` = completed, \`>\` = in progress, space = pending.
+Indented sub-bullets are optional metadata consumed by the Plans UI:
+
+- \`session\`: which agent kind runs the phase (\`codex\` / \`claude\`).
+- \`checkpoints\`: comma-separated role checkpoint ids delivered within the phase.
+- \`summary\`: one short sentence rendered under the phase title.
+
+One phase is intended to fit into a single Codex or Claude session task.
+
+- [ ] [PH01] First milestone title goes here
+  - session: codex
+  - checkpoints: P1, A1
+  - summary: Describe the single session outcome expected for this phase.
+PHASESEOF
+fi
+
+for role in "${ROLES[@]}"; do
+  ROLE_DIR="$PLAN_DIR/$role"
+  mkdir -p "$ROLE_DIR"
+
+  if [[ ! -f "$ROLE_DIR/README.md" ]]; then
+    cat > "$ROLE_DIR/README.md" <<ROLEEOF
+# ${role}
+
+Role workspace for \`${role}\`.
+
+Default artifacts:
+- \`.openspec.yaml\`
+- \`proposal.md\`
+- \`tasks.md\`
+- \`specs/<role>/spec.md\`
+
+Use this folder for role notes, artifacts, and status updates.
+ROLEEOF
+  fi
+
+  ROLE_SPEC_SLUG="$(to_kebab "$role")"
+  if [[ -z "$ROLE_SPEC_SLUG" ]]; then
+    ROLE_SPEC_SLUG="role"
+  fi
+
+  if [[ ! -f "$ROLE_DIR/.openspec.yaml" ]]; then
+    cat > "$ROLE_DIR/.openspec.yaml" <<ROLEYAMLEOF
+schema: 1
+plan: ${PLAN_SLUG}
+role: ${role}
+status: draft
+artifacts:
+  proposal: proposal.md
+  tasks: tasks.md
+  spec: specs/${ROLE_SPEC_SLUG}/spec.md
+ROLEYAMLEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/proposal.md" ]]; then
+    cat > "$ROLE_DIR/proposal.md" <<ROLEPROPOSALEOF
+# Proposal: ${role} (${PLAN_SLUG})
+
+## Why
+
+Summarize why this role's work is required for plan \`${PLAN_SLUG}\`.
+
+## What Changes
+
+- [ ] List the planned role-specific changes
+
+## Impact
+
+- Scope:
+- Risks:
+- Dependencies:
+ROLEPROPOSALEOF
+  fi
+
+  ROLE_SPEC_DIR="$ROLE_DIR/specs/$ROLE_SPEC_SLUG"
+  mkdir -p "$ROLE_SPEC_DIR"
+
+  if [[ ! -f "$ROLE_SPEC_DIR/spec.md" ]]; then
+    cat > "$ROLE_SPEC_DIR/spec.md" <<ROLESPECEOF
+# Capability Spec: ${role}
+
+## ADDED Requirements
+
+### Requirement: ${role} responsibilities for \`${PLAN_SLUG}\`
+This role MUST define and deliver its scoped outputs with evidence.
+
+#### Scenario: Role executes assigned scope
+- **WHEN** the role begins execution for \`${PLAN_SLUG}\`
+- **THEN** it follows \`tasks.md\` and records evidence for completion
+ROLESPECEOF
+  fi
+
+  if [[ "$role" == "planner" && ! -f "$ROLE_DIR/plan.md" ]]; then
+    cat > "$ROLE_DIR/plan.md" <<PLANEOF
+# ExecPlan: ${PLAN_SLUG}
+
+This ExecPlan is a living document. Keep \`Progress\`, \`Surprises & Discoveries\`, \`Decision Log\`, and \`Outcomes & Retrospective\` current as work proceeds.
+
+Follow repository guidance in \`openspec/plan/PLANS.md\`.
 
 ## Purpose / Big Picture
 
+Describe what becomes possible after this plan is executed and how a user/operator can observe it working.
+
 ## Progress
 
-- [ ] Initial draft
-- [ ] Review + iterate
-- [ ] Approved for execution
+- [ ] (YYYY-MM-DD HH:MMZ) Capture initial scope and acceptance criteria.
+- [ ] (YYYY-MM-DD HH:MMZ) Draft architecture/tradeoff plan and verification strategy.
+- [ ] (YYYY-MM-DD HH:MMZ) Finalize execution-ready handoff.
 
 ## Surprises & Discoveries
 
+- Observation: _none yet_
+  Evidence: _n/a_
+
 ## Decision Log
 
+- Decision: Use OpenSpec plan workspace as source of truth for this planning cycle.
+  Rationale: Keeps planning artifacts in-repo and reviewable.
+  Date/Author: YYYY-MM-DD / planner
+
 ## Outcomes & Retrospective
 
+Summarize outcomes, gaps, and lessons learned when a milestone or the full plan is completed.
+
+## Context and Orientation
+
+Describe relevant modules, files, constraints, and assumptions for a newcomer. Use repository-relative paths.
+
+## Plan of Work
+
+Describe the sequence of edits and deliverables in prose. Name target files and expected effects.
+
+## Concrete Steps
+
+List exact commands with working directory and short expected outcomes.
+
+    cd /home/deadpool/Documents/codex-lb
+    openspec validate --specs
+
 ## Validation and Acceptance
-"
 
-for role in "${ROLES[@]}"; do
-  ROLE_DIR="$PLAN_DIR/$role"
-  mkdir -p "$ROLE_DIR"
+State observable behavior and verification evidence required before execution handoff.
 
-  write_if_missing "$ROLE_DIR/README.md" "# ${role}
+## Idempotence and Recovery
 
-Role workspace for \`${role}\`.
-"
+Document safe re-run behavior, rollback strategy, and failure recovery notes.
+
+## Artifacts and Notes
+
+Capture concise command output snippets, evidence pointers, and references.
+
+## Interfaces and Dependencies
 
-  write_if_missing "$ROLE_DIR/prompt.md" "# ${role} prompt
+Name concrete interfaces/modules/dependencies and any required signatures/contracts.
 
-You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
+## Revision Note
 
-## Scope
+- YYYY-MM-DD HH:MMZ: Initial scaffold generated by \`scripts/openspec/init-plan-workspace.sh\`.
+PLANEOF
+  fi
+
+  if [[ "$role" == "executor" && ! -f "$ROLE_DIR/checkpoints.md" ]]; then
+    cat > "$ROLE_DIR/checkpoints.md" <<EXCCPTEOF
+# executor checkpoints
+
+Timestamped execution checkpoints for \`${PLAN_SLUG}\`.
+
+EXCCPTEOF
+  fi
+
+  if [[ ! -f "$ROLE_DIR/tasks.md" ]]; then
+    case "$role" in
+      planner)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# planner tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define planning principles, decision drivers, and viable options for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate that scope, constraints, and acceptance criteria are captured in \`summary.md\`
+
+## 2. Tests
+
+- [ ] 2.1 Define verification approach for plan quality (traceability, testability, evidence expectations)
+- [ ] 2.2 Validate OpenSpec consistency checkpoints (including \`openspec validate --specs\` when applicable)
+
+## 3. Implementation
+
+- [ ] 3.1 Produce the initial RALPLAN-DR plan draft
+- [ ] 3.2 Integrate Architect/Critic feedback into revised plan iterations
+- [ ] 3.3 Publish final planning handoff with explicit execution lanes
+
+## 4. Checkpoints
+
+- [ ] [P1] READY - Initial planning draft checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      architect)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# architect tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ownership boundaries, interfaces, and artifact responsibilities for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate architecture constraints and non-functional requirements coverage
 
-- Work inside \`openspec/plan/${PLAN_SLUG}/${role}/\` plus directly-related shared plan files you explicitly claim.
-- Reuse the owner's branch/worktree instead of creating a separate sandbox unless the owner says otherwise.
+## 2. Tests
 
-## Ownership
+- [ ] 2.1 Define architectural verification checkpoints (integration boundaries, failure modes, compatibility)
+- [ ] 2.2 Validate that acceptance criteria map to concrete architecture decisions
 
-- Before editing, claim this role's files in the shared owner lane:
-  \`python3 scripts/agent-file-locks.py claim --branch <owner-branch> openspec/plan/${PLAN_SLUG}/${role}/README.md openspec/plan/${PLAN_SLUG}/${role}/prompt.md openspec/plan/${PLAN_SLUG}/${role}/tasks.md openspec/plan/${PLAN_SLUG}/checkpoints.md\`
-- Record branch, worktree, and scope in \`tasks.md\`.
-- Do not change another role's files without reassignment.
+## 3. Implementation
 
-## Deliverables
+- [ ] 3.1 Review plan for strongest antithesis/tradeoff tensions
+- [ ] 3.2 Propose synthesis path and guardrails for implementation teams
+- [ ] 3.3 Record architecture sign-off notes for downstream execution
 
-- Complete the role checklist in \`tasks.md\`.
-- Leave a handoff with files changed, verification, and risks.
-- The owner alone runs the change completion flow and sandbox cleanup after change tasks 4.1-4.3 are done.
-"
+## 4. Checkpoints
 
-  write_if_missing "$ROLE_DIR/tasks.md" "# ${role} tasks
+- [ ] [A1] READY - Architecture review checkpoint
 
-## Ownership
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
 
-- [ ] Claim this role's files in the shared owner branch/worktree before editing.
-- [ ] Record branch, worktree, and scope for this role.
-- [ ] Copy or hand off \`prompt.md\` when another agent joins this role.
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      critic)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# critic tasks
 
 ## 1. Spec
 
-- [ ] Define requirements and scope for ${role}
-- [ ] Confirm acceptance criteria are explicit and testable
+- [ ] 1.1 Validate principle-driver-option consistency across the plan
+- [ ] 1.2 Validate risks, consequences, and mitigation clarity (including idempotency expectations)
 
 ## 2. Tests
 
-- [ ] Define verification approach and evidence requirements
-- [ ] List concrete commands for verification
+- [ ] 2.1 Validate testability and measurability of all acceptance criteria
+- [ ] 2.2 Validate verification steps are concrete and reproducible
 
 ## 3. Implementation
 
-- [ ] Execute role-specific deliverables
-- [ ] Capture decisions, risks, and handoff notes
+- [ ] 3.1 Produce verdict (APPROVE / ITERATE / REJECT) with actionable feedback
+- [ ] 3.2 Confirm revised drafts resolve prior findings before approval
+- [ ] 3.3 Publish final quality/risk sign-off notes
 
 ## 4. Checkpoints
 
-- [ ] Publish checkpoint update for this role
+- [ ] [C1] READY - Quality gate checkpoint
 
 ## 5. Collaboration
 
-- [ ] Leave a role handoff with files changed, verification, and risks.
-- [ ] Owner records \`accept\`, \`revise\`, or \`reject\` for joined output, or marks \`N/A\` if no helper joined.
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
 
 ## 6. Cleanup
 
-- [ ] If this role owns finish, run \`gx finish --via-pr --wait-for-merge --cleanup\` or \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base <base-branch> --via-pr --wait-for-merge --cleanup\`.
-- [ ] Record PR URL + final \`MERGED\` state in the role handoff or owner change task.
-- [ ] Confirm sandbox cleanup, or capture a \`BLOCKED:\` handoff if finish is still pending.
-"
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      executor)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# executor tasks
+
+## 1. Spec
+
+- [ ] 1.1 Map approved plan requirements to concrete implementation work items
+- [ ] 1.2 Validate touched components/files are explicitly listed before coding starts
+
+## 2. Tests
+
+- [ ] 2.1 Define test additions/updates required to lock intended behavior
+- [ ] 2.2 Validate regression and smoke verification commands for delivery
+
+## 3. Implementation
+
+- [ ] 3.1 Execute implementation tasks in approved order
+- [ ] 3.2 Keep progress and evidence linked back to plan checkpoints
+- [ ] 3.3 Complete final verification bundle for handoff
+
+## 4. Checkpoints
+
+- [ ] [E1] READY - Execution start checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      writer)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# writer tasks
+
+## 1. Spec
+
+- [ ] 1.1 Validate documentation scope and audience for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate consistency between plan terminology and OpenSpec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define documentation verification checklist (accuracy, completeness, command correctness)
+- [ ] 2.2 Validate command/help text examples against current workflow behavior
+
+## 3. Implementation
+
+- [ ] 3.1 Update workflow docs and command guidance for approved plan behavior
+- [ ] 3.2 Add or refine examples for operator usage and handoff clarity
+- [ ] 3.3 Publish final docs change summary with references
+
+## 4. Checkpoints
+
+- [ ] [W1] READY - Docs update checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      verifier)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# verifier tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define end-to-end validation matrix for \`${PLAN_SLUG}\`
+- [ ] 1.2 Validate success/failure conditions and evidence requirements
+
+## 2. Tests
+
+- [ ] 2.1 Execute verification commands and collect outputs
+- [ ] 2.2 Validate idempotency/re-run behavior and error-path handling
+
+## 3. Implementation
+
+- [ ] 3.1 Verify completed work against acceptance criteria
+- [ ] 3.2 Produce pass/fail findings with concrete evidence links
+- [ ] 3.3 Publish final verification sign-off (or blocker report)
+
+## 4. Checkpoints
+
+- [ ] [V1] READY - Verification checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+      *)
+        cat > "$ROLE_DIR/tasks.md" <<TASKEOF
+# ${role} tasks
+
+## 1. Spec
+
+- [ ] 1.1 Define ${role}-specific requirements and acceptance criteria
+- [ ] 1.2 Validate relevant OpenSpec/spec artifacts
+
+## 2. Tests
+
+- [ ] 2.1 Define verification scope for ${role}
+- [ ] 2.2 Confirm regression coverage expectations
+
+## 3. Implementation
+
+- [ ] 3.1 Execute ${role} deliverables for this plan
+- [ ] 3.2 Record handoff/status notes for downstream roles
+- [ ] 3.3 Mark completion with evidence links
+
+## 4. Checkpoints
+
+- [ ] [${role^^}1] READY - Role checkpoint
+
+## 5. Collaboration
+
+- [ ] 5.1 Owner recorded this lane before edits.
+- [ ] 5.2 Record joined agents / handoffs, or mark \`N/A\` when solo.
+
+## 6. Cleanup
+
+- [ ] 6.1 If this lane owns finalization, run \`bash scripts/agent-branch-finish.sh --branch <agent-branch> --base dev --via-pr --wait-for-merge --cleanup\`.
+- [ ] 6.2 Record PR URL + final \`MERGED\` state in the handoff.
+- [ ] 6.3 Confirm sandbox cleanup (\`git worktree list\`, \`git branch -a\`) or append \`BLOCKED:\` and stop.
+TASKEOF
+        ;;
+    esac
+  fi
 done
 
-echo "[gitguardex] OpenSpec plan workspace ready: ${PLAN_DIR}"
-echo "[gitguardex] Roles: ${ROLES[*]}"
+echo "Plan workspace ready: $PLAN_DIR"
diff --git a/test/install.test.js b/test/install.test.js
index f8d4fa3..5d329dc 100644
--- a/test/install.test.js
+++ b/test/install.test.js
@@ -4098,41 +4098,58 @@ test('OpenSpec plan workspace scaffold creates expected role/task structure', ()
   assert.equal(scaffold.status, 0, scaffold.stderr || scaffold.stdout);
 
   const planDir = path.join(repoDir, 'openspec', 'plan', planSlug);
-  const expected = [
+  const rootExpected = [
+    'README.md',
     'summary.md',
     'checkpoints.md',
-    'planner/plan.md',
-    'planner/prompt.md',
-    'planner/tasks.md',
-    'architect/prompt.md',
-    'architect/tasks.md',
-    'critic/prompt.md',
-    'critic/tasks.md',
-    'executor/prompt.md',
-    'executor/tasks.md',
-    'writer/prompt.md',
-    'writer/tasks.md',
-    'verifier/prompt.md',
-    'verifier/tasks.md',
+    'coordinator-prompt.md',
+    'kickoff-prompts.md',
+    'phases.md',
   ];
-  for (const rel of expected) {
+  for (const rel of rootExpected) {
     assert.equal(fs.existsSync(path.join(planDir, rel)), true, `${rel} missing`);
   }
 
+  for (const role of ['planner', 'architect', 'critic', 'executor', 'writer', 'verifier']) {
+    assert.equal(fs.existsSync(path.join(planDir, role, 'README.md')), true, `${role}/README.md missing`);
+    assert.equal(fs.existsSync(path.join(planDir, role, '.openspec.yaml')), true, `${role}/.openspec.yaml missing`);
+    assert.equal(fs.existsSync(path.join(planDir, role, 'proposal.md')), true, `${role}/proposal.md missing`);
+    assert.equal(fs.existsSync(path.join(planDir, role, 'tasks.md')), true, `${role}/tasks.md missing`);
+    assert.equal(
+      fs.existsSync(path.join(planDir, role, 'specs', role, 'spec.md')),
+      true,
+      `${role}/specs/${role}/spec.md missing`,
+    );
+  }
+  assert.equal(fs.existsSync(path.join(planDir, 'planner', 'plan.md')), true, 'planner/plan.md missing');
+  assert.equal(
+    fs.existsSync(path.join(planDir, 'executor', 'checkpoints.md')),
+    true,
+    'executor/checkpoints.md missing',
+  );
+
+  const coordinatorPrompt = fs.readFileSync(path.join(planDir, 'coordinator-prompt.md'), 'utf8');
+  assert.match(coordinatorPrompt, /Drive this plan from draft to execution-ready status/);
+  assert.match(coordinatorPrompt, /kickoff-prompts\.md/);
+
+  const phasesContent = fs.readFileSync(path.join(planDir, 'phases.md'), 'utf8');
+  assert.match(phasesContent, /\[PH01\]/);
+  assert.match(phasesContent, /session: codex/);
+
   const plannerTasks = fs.readFileSync(path.join(planDir, 'planner', 'tasks.md'), 'utf8');
-  assert.match(plannerTasks, /## Ownership/);
+  assert.match(plannerTasks, /# planner tasks/);
   assert.match(plannerTasks, /## 1\. Spec/);
   assert.match(plannerTasks, /## 2\. Tests/);
   assert.match(plannerTasks, /## 3\. Implementation/);
   assert.match(plannerTasks, /## 4\. Checkpoints/);
   assert.match(plannerTasks, /## 5\. Collaboration/);
   assert.match(plannerTasks, /## 6\. Cleanup/);
-  assert.match(plannerTasks, /gx finish --via-pr --wait-for-merge --cleanup/);
-  assert.match(plannerTasks, /Claim this role's files in the shared owner branch\/worktree before editing/);
+  assert.match(plannerTasks, /\[P1\] READY - Initial planning draft checkpoint/);
+  assert.match(plannerTasks, /bash scripts\/agent-branch-finish\.sh/);
 
-  const plannerPrompt = fs.readFileSync(path.join(planDir, 'planner', 'prompt.md'), 'utf8');
-  assert.match(plannerPrompt, /claim --branch <owner-branch>/);
-  assert.match(plannerPrompt, /change tasks 4\.1-4\.3/);
+  const plannerPlan = fs.readFileSync(path.join(planDir, 'planner', 'plan.md'), 'utf8');
+  assert.match(plannerPlan, /This ExecPlan is a living document/);
+  assert.match(plannerPlan, /## Idempotence and Recovery/);
 });
 
 test('OpenSpec change workspace scaffold creates proposal/tasks/spec defaults', () => {
@@ -4157,10 +4174,42 @@ test('OpenSpec change workspace scaffold creates proposal/tasks/spec defaults',
   assert.equal(fs.existsSync(path.join(changeDir, 'specs', capabilitySlug, 'spec.md')), true, 'spec.md missing');
 
   const tasksContent = fs.readFileSync(path.join(changeDir, 'tasks.md'), 'utf8');
-  assert.match(tasksContent, /## 4\. Cleanup/);
-  assert.match(tasksContent, /gx finish --via-pr --wait-for-merge --cleanup/);
-  assert.match(tasksContent, /Record PR URL \+ final `MERGED` state in the completion handoff\./);
-  assert.match(tasksContent, /Confirm sandbox cleanup/);
+  assert.match(tasksContent, /## Definition of Done/);
+  assert.match(tasksContent, /append a `BLOCKED:` line under section 4/);
+  assert.match(tasksContent, /## 4\. Cleanup \(mandatory; run before claiming completion\)/);
+  assert.match(tasksContent, /Run the cleanup pipeline:/);
+  assert.match(tasksContent, /Record the PR URL and final merge state \(`MERGED`\)/);
+  assert.match(tasksContent, /Confirm the sandbox worktree is gone/);
+});
+
+test('OpenSpec change workspace scaffold supports minimal T1 notes mode', () => {
+  const repoDir = initRepo();
+
+  const setupResult = runNode(['setup', '--target', repoDir, '--no-global-install'], repoDir);
+  assert.equal(setupResult.status, 0, setupResult.stderr || setupResult.stdout);
+
+  const changeSlug = 'change-workspace-minimal';
+  const capabilitySlug = 'runtime-migration';
+  const agentBranch = 'agent/codex/minimal-change';
+  const scaffold = runCmd(
+    'bash',
+    ['scripts/openspec/init-change-workspace.sh', changeSlug, capabilitySlug, agentBranch],
+    repoDir,
+    { GUARDEX_OPENSPEC_MINIMAL: '1' },
+  );
+  assert.equal(scaffold.status, 0, scaffold.stderr || scaffold.stdout);
+
+  const changeDir = path.join(repoDir, 'openspec', 'changes', changeSlug);
+  assert.equal(fs.existsSync(path.join(changeDir, '.openspec.yaml')), true, '.openspec.yaml missing');
+  assert.equal(fs.existsSync(path.join(changeDir, 'notes.md')), true, 'notes.md missing');
+  assert.equal(fs.existsSync(path.join(changeDir, 'proposal.md')), false, 'proposal.md should not exist in minimal mode');
+  assert.equal(fs.existsSync(path.join(changeDir, 'tasks.md')), false, 'tasks.md should not exist in minimal mode');
+
+  const notesContent = fs.readFileSync(path.join(changeDir, 'notes.md'), 'utf8');
+  assert.match(notesContent, /minimal \/ T1/);
+  assert.match(notesContent, new RegExp(agentBranch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
+  assert.match(notesContent, /Commit message is the spec of record/);
+  assert.match(notesContent, /Record PR URL \+ `MERGED` state/);
 });
 
 test('validate blocks unapproved deletions until allow-delete is set', () => {