Repository navigation
[1.3.5] - 2026-03-12
Bug Fix
Agent and skill files were showing as conflicts on every update
When running npx ocs-stats update, all 4 agent files and all 4 skill files always appeared under Conflicts even if the user had never modified them. The smart merge was silently skipping them and the latest instructions (including the level-up fix from v1.3.3) were never applied.
Root cause — two bugs in src/merge.js:
FILE_CATEGORY.SKILLwas missing fromSMART_MERGE_CATEGORIES— so skill files always fell through to the conflict handler instead of being smart merged- Path matching for
agents/andskills/usedincludes('/agents/')andincludes('/skills/')— the leading/never matched relative paths likeagents/security.md, so agent files were also mis-categorised and fell through to conflicts
What was fixed:
- Added
FILE_CATEGORY.SKILLtoSMART_MERGE_CATEGORIES - Fixed path matching to also handle paths starting with
agents/orskills/(no leading slash) - Added a dedicated
SKILLhandler in the smart merge block — skill files now update their body from the template while preserving any user frontmatter fields, identical to how agent files are handled
Result: Running npx ocs-stats update now correctly shows agent and skill files under Smart Merged instead of Conflicts, and users automatically receive the latest instructions on every update.