new

Author: NagyVikt

AGENTS.md

@@ -238,7 +238,7 @@ Use `openspec/plan/README.md` as the operational runbook and `openspec/plan/PLAN
 Default quick flow:
 1. Create/maintain `openspec/plan/<plan-slug>/`.
 2. Keep role `tasks.md` files current (`planner`, `architect`, `critic`, `executor`, `writer`, `verifier`).
-3. Keep checklist headings visible: `## 1. Spec`, `## 2. Tests`, `## 3. Implementation`, `## 4. Checkpoints`.
+3. Keep checklist headings visible: `## 1. Spec`, `## 2. Tests`, `## 3. Implementation`, `## 4. Checkpoints`, plus a final cleanup section (`## 5. Cleanup` or `## 6. Cleanup`).
 4. Update checkboxes continuously while work progresses.
 5. Execute from approved `planner/plan.md` with role ownership.
 6. Verify with evidence before archive/finish.

frontend/scripts/openspec/init-change-workspace.sh

@@ -67,7 +67,7 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Completion
+## 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.

frontend/scripts/openspec/init-plan-workspace.sh

@@ -150,9 +150,11 @@ You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
 - [ ] 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.
 
-## 6. Completion
+## 6. Cleanup
 
-- [ ] Keep sandbox cleanup blocked until change tasks 4.1-4.3 are complete.
+- [ ] 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.
 "
 done
 

scripts/openspec/init-change-workspace.sh

@@ -67,7 +67,7 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Completion
+## 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.

scripts/openspec/init-plan-workspace.sh

@@ -150,9 +150,11 @@ You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
 - [ ] 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.
 
-## 6. Completion
+## 6. Cleanup
 
-- [ ] Keep sandbox cleanup blocked until change tasks 4.1-4.3 are complete.
+- [ ] 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.
 "
 done
 

templates/scripts/openspec/init-change-workspace.sh

@@ -67,7 +67,7 @@ if [[ ! -f "${CHANGE_DIR}/tasks.md" ]]; then
 - [ ] 3.2 Run \`openspec validate ${CHANGE_SLUG} --type change --strict\`.
 - [ ] 3.3 Run \`openspec validate --specs\`.
 
-## 4. Completion
+## 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.

templates/scripts/openspec/init-plan-workspace.sh

@@ -150,9 +150,11 @@ You are the \`${role}\` lane for shared plan \`${PLAN_SLUG}\`.
 - [ ] 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.
 
-## 6. Completion
+## 6. Cleanup
 
-- [ ] Keep sandbox cleanup blocked until change tasks 4.1-4.3 are complete.
+- [ ] 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.
 "
 done
 

test/install.test.js

@@ -4126,7 +4126,8 @@ test('OpenSpec plan workspace scaffold creates expected role/task structure', ()
   assert.match(plannerTasks, /## 3\. Implementation/);
   assert.match(plannerTasks, /## 4\. Checkpoints/);
   assert.match(plannerTasks, /## 5\. Collaboration/);
-  assert.match(plannerTasks, /## 6\. Completion/);
+  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/);
 
   const plannerPrompt = fs.readFileSync(path.join(planDir, 'planner', 'prompt.md'), 'utf8');
@@ -4156,7 +4157,7 @@ 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\. Completion/);
+  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/);