In cleanupLegacyAgentSkillDirs, re-add the branch that extracts the
final segment after `-ce-` from a compound agent name and seeds
`ce-<final-segment>` as a legacy-cleanup candidate. The branch was
removed in 25f1c8b9 as dead code for compound-engineering itself, but
it's load-bearing for nested-layout third-party plugins passed through
the CLI: their agent names keep the `<category>-ce-<name>` shape, and
without the split a stale `~/.codex/skills/<plugin>/ce-<name>/`
directory from a prior flat-alias install is never swept. For
compound-engineering the branch remains inert (names don't contain
embedded `-ce-`), so this is purely additive coverage for other shapes.
Guard the split on `agent.name.includes("-ce-")` so no-op candidates
are not seeded for flat-only layouts. Add a comment naming the
cross-layout-migration intent so the branch isn't flagged as dead code
again. Regression test in tests/codex-writer.test.ts pins the behavior
against a nested-layout bundle.
Addresses PR #621 review feedback.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Update sourcePath fixtures and expected Codex agent names across the
test suite to reflect agents now living directly under
plugins/compound-engineering/agents/ with no category subfolders:
- tests/codex-converter.test.ts: flip the namespaced-Task test to the
flat layout with bare ce-<agent> expected names. Add a new test that
pins the nested-layout fallback: any third-party plugin still using
agents/<category>/<name>.md passed through convertClaudeToCodex must
continue to produce <category>-ce-<agent> Codex agent names.
- tests/pi-writer.test.ts, tests/review-skill-contract.test.ts,
tests/legacy-cleanup.test.ts, tests/pipeline-review-contract.test.ts,
tests/kiro-writer.test.ts: strip the <category>/ segment from every
hardcoded plugins/compound-engineering/agents/* path. Several of
these (legacy-cleanup.test.ts in particular) perform live filesystem
reads and would throw ENOENT if left pointing at the old nested
locations.
- tests/review-skill-contract.test.ts: update the
stack-specific-reviewers contract test to assert bare ce-<agent>
references in SKILL.md / persona-catalog.md, matching the new
convention.
Also simplify cleanupLegacyAgentSkillDirs: the `agent.name.includes("-ce-")`
branch relied on compound names like review-ce-foo to extract a legacy
ce-<final> variant. Every current agent now starts with ce- with no
embedded -ce-, so that branch produced nonsense entries (ce-ce-<name>)
and swept nothing. Remove the dead branch; keep the primary
legacySkillNames.add(sanitizePathName(agent.name)) which still catches
stale skill directories under ~/.codex/skills/<plugin>/<agent-name>/.
bun test passes with 830 tests green. bun run release:validate reports
no drift: compound-engineering at 50 agents, 45 skills, 0 MCP servers.
Per docs/plans/2026-04-21-001-refactor-flatten-agents-directory-plan.md
Unit 5.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
When writing Codex custom agents, delete any same-basename sibling
directory under agentsRoot if the retained agent declares zero
sidecarDirs. Previously, cleanupRemovedAgents only swept the sibling
directory when the TOML itself was being removed — a same-name agent
that lost its sidecar between plugin versions left an orphan directory
indefinitely.
The new sweep is narrowly scoped: it only runs against base names of
agents in the current install and only when the agent declares no
sidecars, so unrelated directories under agentsRoot are untouched.
Gated by isSafeManagedPath to match the existing cleanup safety
pattern.
Tests cover the three scenarios: orphan removed when agent has no
sidecars, sidecar preserved when agent declares one, unrelated
directory left alone.
Per docs/plans/2026-04-21-001-refactor-flatten-agents-directory-plan.md
Unit 4b.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Root AGENTS.md: rewrite "Agent References in Skills" to mandate bare
ce-<agent-name>. Plugin AGENTS.md: collapse the Directory Structure
tree to a flat agents/ listing; update the Naming Convention paragraph
to state bare ce-<agent-name> as the reference form; update the "New
agent" bullet under Adding Components to drop the <category> path
segment.
Verified plugins/compound-engineering/README.md has no prose implying
agents/<category>/ — the topical agent tables describe conceptual
groupings, not directory paths.
Per docs/plans/2026-04-21-001-refactor-flatten-agents-directory-plan.md
Unit 4.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Convert 117 occurrences of `<category>:ce-<agent-name>` to bare
`ce-<agent-name>` across 16 files in the compound-engineering plugin.
The ce- prefix is sufficient for uniqueness; the `<category>:` segment
was only meaningful because the Codex converter's getAgentCategory()
rebuilt it from the source path, which now returns null for every agent
after Unit 1's flatten.
Applied via a narrow perl regex matching only the six known category
names (review, research, workflow, design, document-review, docs) when
followed directly by `:ce-`. Post-sweep grep for the pattern returns
zero. Insertions and deletions balance exactly (117 each), confirming
the rewrite was surface-only.
Per docs/plans/2026-04-21-001-refactor-flatten-agents-directory-plan.md
Unit 3.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Move all 50 agent files out of category subfolders (review/, research/,
workflow/, design/, document-review/, docs/) into the flat
plugins/compound-engineering/agents/ directory. Filenames and name:
frontmatter values are unchanged; only the parent directory moves.
The subfolder organization was a human-readability aid, not a harness
requirement. The Claude Code parser walks recursively, and every other
target writer (Codex, OpenCode, Gemini, Kiro, Droid, Copilot, Pi) writes
agents to a flat output regardless of input layout. Flattening removes a
coupling point between source structure and Codex agent naming.
Subsequent commits in this series rewrite the 117 category-prefixed
references in skill/agent content, update the AGENTS.md conventions, and
update the test fixtures that hardcoded nested paths.
Per docs/plans/2026-04-21-001-refactor-flatten-agents-directory-plan.md
Unit 1.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Trevin Chow