diff --git a/openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/.openspec.yaml b/openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/.openspec.yaml
similarity index 100%
rename from openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/.openspec.yaml
rename to openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/.openspec.yaml
diff --git a/openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/notes.md b/openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/notes.md
new file mode 100644
index 0000000..590c004
--- /dev/null
+++ b/openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/notes.md
@@ -0,0 +1,16 @@
+# agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28 (minimal / T1)
+
+Branch: `agent/<your-name>/<branch-slug>`
+
+Describe the change in a sentence or two. Commit message is the spec of record.
+
+## Handoff
+
+- Handoff: change=`agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28`; branch=`agent/<your-name>/<branch-slug>`; scope=`TODO`; action=`continue this sandbox or finish cleanup after a usage-limit/manual takeover`.
+- Copy prompt: Continue `agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28` on branch `agent/<your-name>/<branch-slug>`. Work inside the existing sandbox, review `openspec/changes/agent-claude-archive-merged-openspec-changes-batch-1-2026-05-11-12-28/notes.md`, continue from the current state instead of creating a new sandbox, and when the work is done run `gx branch finish --branch agent/<your-name>/<branch-slug> --base dev --via-pr --wait-for-merge --cleanup`.
+
+## Cleanup
+
+- [ ] Run: `gx branch finish --branch agent/<your-name>/<branch-slug> --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`).
diff --git a/openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/proposal.md b/openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/proposal.md
similarity index 100%
rename from openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/proposal.md
rename to openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/proposal.md
diff --git a/openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/specs/gitguardex-agent-lifecycle/spec.md b/openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/specs/gitguardex-agent-lifecycle/spec.md
similarity index 100%
rename from openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/specs/gitguardex-agent-lifecycle/spec.md
rename to openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/specs/gitguardex-agent-lifecycle/spec.md
diff --git a/openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/tasks.md b/openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/tasks.md
similarity index 100%
rename from openspec/changes/agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/tasks.md
rename to openspec/changes/archive/2026-05-11-agent-claude-canonicalize-templates-scripts-2026-05-11-11-06/tasks.md
diff --git a/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/.openspec.yaml b/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/.openspec.yaml
new file mode 100644
index 0000000..81cd71f
--- /dev/null
+++ b/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-05-11
diff --git a/openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/proposal.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/proposal.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/proposal.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/proposal.md
diff --git a/openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/specs/fix-cleanup-orphan-worktree-prune/spec.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/specs/fix-cleanup-orphan-worktree-prune/spec.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/specs/fix-cleanup-orphan-worktree-prune/spec.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/specs/fix-cleanup-orphan-worktree-prune/spec.md
diff --git a/openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/tasks.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/tasks.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/tasks.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-cleanup-orphan-worktree-prune-2026-05-11-12-19/tasks.md
diff --git a/openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/proposal.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/proposal.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/proposal.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/proposal.md
diff --git a/openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/specs/gitguardex-agent-lifecycle/spec.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/specs/gitguardex-agent-lifecycle/spec.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/specs/gitguardex-agent-lifecycle/spec.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/specs/gitguardex-agent-lifecycle/spec.md
diff --git a/openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/tasks.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/tasks.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/tasks.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-guardex-dirty-tree-sweep-leak-2026-05-11-10-12/tasks.md
diff --git a/openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/proposal.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/proposal.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/proposal.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/proposal.md
diff --git a/openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/specs/gitguardex-agent-lifecycle/spec.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/specs/gitguardex-agent-lifecycle/spec.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/specs/gitguardex-agent-lifecycle/spec.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/specs/gitguardex-agent-lifecycle/spec.md
diff --git a/openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/tasks.md b/openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/tasks.md
similarity index 100%
rename from openspec/changes/agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/tasks.md
rename to openspec/changes/archive/2026-05-11-agent-claude-fix-openspec-scaffold-silent-failure-2026-05-11-12-12/tasks.md
diff --git a/openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/proposal.md b/openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/proposal.md
similarity index 100%
rename from openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/proposal.md
rename to openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/proposal.md
diff --git a/openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/specs/gitguardex-agent-lifecycle/spec.md b/openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/specs/gitguardex-agent-lifecycle/spec.md
similarity index 100%
rename from openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/specs/gitguardex-agent-lifecycle/spec.md
rename to openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/specs/gitguardex-agent-lifecycle/spec.md
diff --git a/openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/tasks.md b/openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/tasks.md
similarity index 100%
rename from openspec/changes/agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/tasks.md
rename to openspec/changes/archive/2026-05-11-agent-claude-submodule-pointer-conflict-resolver-2026-05-11-10-34/tasks.md