Pre-existing Skills Scaffold Grill Status

Branch Dashboard

Branch	Completion	Locked direction	Still open
Agent-owned skill reconciliation	100%	Agent checks skill overlap after `dp scaffold init`, `dp scaffold setup`, or `dp update`; commands do not check overlap. Commands may snapshot pre-existing skill homes without classifying them. Exact-name overlaps are archived under `.devpunks/replaced-skills`, active local copies/mirrors are removed, and HI baseline stays active.	None.
Post-command handoff guidance	100%	Command output, `.devpunks/AGENT-HANDOFF.md`, `dp update` summary, and `$dp-cli` guidance tell agents to inspect pre-existing skills, apply HI precedence, preserve non-overlaps, and suggest `dp report`.	None.
Lifecycle command coverage	100%	`dp scaffold init`, `dp scaffold setup`, and `dp update` share one agent-owned post-command skill reconciliation policy. Commands do not detect skill overlap.	None.

HI baseline skill: A skill selected from the resolved Harness Intelligence scaffold baseline for the current command.
Local skill: A pre-existing repo-authored skill found in repo skill homes before or after an HI scaffold/update command.
Overlapping local skill: A local skill whose canonical directory id/name matches a scaffolded HI baseline skill.
Non-overlapping local skill: A local skill whose canonical directory id/name does not match scaffolded HI baseline skills.
Harness mirror: Tool-specific compatibility surface generated from neutral .agents sources, such as .claude, .codex, .cursor, or .opencode.

Avoid:

HI baseline skills have precedence over overlapping local skills.
Commands do not detect overlapping skills.
Commands may snapshot pre-existing skill homes without classifying them.
Agents following .devpunks and $dp-cli guidance own overlap checks and reconciliation.
Agents inspect .agents/skills, .claude/skills, .codex/skills, .cursor/skills, and .opencode/skills.
Agents archive overlapping local skill evidence and remove active local copies/mirrors.
Dynamic or semantic skill overlap belongs to model-guided dp report work, not command runtime.
Non-overlapping local skills are repo knowledge and should survive scaffold/update.
dp report is the escalation path for local skill knowledge that belongs in HI baseline.

"do not keep overlapping local skills" could mean archive them under .devpunks, remove them from active mirrors, or both. Resolution: agent archives evidence under .devpunks/replaced-skills and removes active local copies/mirrors.
"we symlink through harnesses" could mean all harness mirrors or only mirrors enabled by existing tool surfaces. Recommended resolution: agent uses existing sync-subagents mirror generation, not bespoke symlink logic.
"snapshot" is not overlap detection. Resolution: command can copy pre-existing skill homes to .devpunks/pre-existing-skills/ before writes, but must not classify or decide overlap.

apps/cli/src/scaffold/output.ts computes selected baseline skills from final packs, migrates legacy skill dirs, writes baseline skill directories, then runs .agents/scripts/sync-subagents.mjs.
apps/cli/src/scaffold/run.test.ts currently proves a colliding .codex/skills/debug-agent becomes .agents/skills/debug-agent-local, while baseline debug-agent is written.
apps/cli/src/scaffold/stage.ts writes init staged skills directly to .agents/skills/<skillId>.
apps/cli/src/content/stage-scaffold.ts owns dp scaffold init post-command guidance.
apps/cli/src/content/scaffold-copy.ts owns dp scaffold setup handoff guidance.
$dp-cli currently requires agents to read .devpunks/ output, follow handoff/specs, reconcile generated assets, and ask before resolving conflicts between existing repo guidance and scaffold specs.