diff --git a/codev-skeleton/resources/risk-triage.md b/codev-skeleton/resources/risk-triage.md
index 1a54377af..ccf5ab135 100644
--- a/codev-skeleton/resources/risk-triage.md
+++ b/codev-skeleton/resources/risk-triage.md
@@ -41,7 +41,7 @@ gh pr view <N> --json files | jq '.files[].path'
 | `packages/codev/src/state/` | State management | High |
 | `codev/protocols/` | Protocol definitions | High |
 | `codev-skeleton/protocols/` | Protocol templates | High |
-| `packages/codev/src/commands/af/` | Agent Farm commands | Medium |
+| `packages/codev/src/agent-farm/commands/` | Agent Farm commands | Medium |
 | `packages/codev/src/commands/consult/` | Consultation system | Medium |
 | `packages/codev/src/lib/` | Shared libraries | Medium |
 | `packages/codev/src/commands/` (other) | CLI commands | Medium |
diff --git a/codev/projects/bugfix-712-stale-af-cli-references-in-res/status.yaml b/codev/projects/bugfix-712-stale-af-cli-references-in-res/status.yaml
new file mode 100644
index 000000000..fbdfadd64
--- /dev/null
+++ b/codev/projects/bugfix-712-stale-af-cli-references-in-res/status.yaml
@@ -0,0 +1,12 @@
+id: bugfix-712
+title: stale-af-cli-references-in-res
+protocol: bugfix
+phase: pr
+plan_phases: []
+current_plan_phase: null
+gates: {}
+iteration: 1
+build_complete: false
+history: []
+started_at: '2026-04-30T20:57:47.917Z'
+updated_at: '2026-04-30T21:08:35.302Z'
diff --git a/codev/resources/arch.md b/codev/resources/arch.md
index 32adf5cf8..af3701bc4 100644
--- a/codev/resources/arch.md
+++ b/codev/resources/arch.md
@@ -271,7 +271,6 @@ Each session has a unique name based on its purpose:
 | Architect | `architect` | `architect` |
 | Builder | `builder-{protocol}-{id}` | `builder-spir-126` |
 | Shell | `shell-{id}` | `shell-U1A2B3C4` |
-| Utility | `af-shell-{id}` | `af-shell-U5D6E7F8` |
 
 #### node-pty Terminal Manager (Spec 0085, extended by Spec 0104)
 
@@ -999,7 +998,7 @@ This is the `@cluesmith/codev` npm package containing all CLI tools:
   - `src/agent-farm/` - Agent Farm orchestration (afx command)
   - `src/commands/` - codev subcommands (init, adopt, doctor, update, eject, tower)
   - `src/commands/consult/` - Multi-agent consultation (consult command)
-  - `bin/` - CLI entry points (codev.js, af.js, consult.js, team.js, porch.js)
+  - `bin/` - CLI entry points (codev.js, afx.js, af.js (deprecated alias), consult.js, team.js, porch.js)
   - `skeleton/` - Embedded copy of codev-skeleton (built during `npm run build`)
   - `templates/` - HTML templates for Agent Farm (`afx`) dashboard and annotator
   - `dist/` - Compiled JavaScript
diff --git a/codev/resources/claude_vs_codev_task.md b/codev/resources/claude_vs_codev_task.md
index f987fa220..697a98ac8 100644
--- a/codev/resources/claude_vs_codev_task.md
+++ b/codev/resources/claude_vs_codev_task.md
@@ -76,7 +76,7 @@ Commit the settings in both repos:
 
 ```bash
 cd /tmp/todo-vibe-2026 && git add .claude/settings.json && git commit -m "Initial" && git push
-cd /tmp/todo-spir-2026 && git add .claude/settings.json af-config.json codev/ CLAUDE.md AGENTS.md && git commit -m "Initial" && git push
+cd /tmp/todo-spir-2026 && git add .claude/settings.json .codev/config.json codev/ CLAUDE.md AGENTS.md && git commit -m "Initial" && git push
 ```
 
 ### 1.4 Write Prompt Files
diff --git a/codev/resources/risk-triage.md b/codev/resources/risk-triage.md
index 1a54377af..ccf5ab135 100644
--- a/codev/resources/risk-triage.md
+++ b/codev/resources/risk-triage.md
@@ -41,7 +41,7 @@ gh pr view <N> --json files | jq '.files[].path'
 | `packages/codev/src/state/` | State management | High |
 | `codev/protocols/` | Protocol definitions | High |
 | `codev-skeleton/protocols/` | Protocol templates | High |
-| `packages/codev/src/commands/af/` | Agent Farm commands | Medium |
+| `packages/codev/src/agent-farm/commands/` | Agent Farm commands | Medium |
 | `packages/codev/src/commands/consult/` | Consultation system | Medium |
 | `packages/codev/src/lib/` | Shared libraries | Medium |
 | `packages/codev/src/commands/` (other) | CLI commands | Medium |
diff --git a/codev/resources/test-infrastructure.md b/codev/resources/test-infrastructure.md
index a12bc408e..cc00b7125 100644
--- a/codev/resources/test-infrastructure.md
+++ b/codev/resources/test-infrastructure.md
@@ -114,7 +114,7 @@ These are the most expensive tests and are NOT run in CI.
 | `tests/e2e/init.bats` | `codev init` creates correct files and directories |
 | `tests/e2e/adopt.bats` | `codev adopt` for existing projects |
 | `tests/e2e/doctor.bats` | `codev doctor` diagnostics |
-| `tests/e2e/af.bats` | `afx` subcommands (status, help, etc.) |
+| `tests/e2e/afx.bats` | `afx` subcommands (status, help, etc.) |
 | `tests/e2e/consult.bats` | `consult` subcommands |
 
 ### Legacy/framework tests