fix: agent and skill files now smart merged instead of conflicting on…

README.md

@@ -331,7 +331,7 @@ All agents share these rules that cannot be overridden:
 
 ```
 opencode-skills/
-├── package.json             # npm package config (v1.3.4)
+├── package.json             # npm package config (v1.3.5)
 ├── bin/cli.js               # CLI entry point
 ├── src/                     # Source files
 │   ├── init.js
@@ -392,7 +392,7 @@ Usage:
 
 ### Stats showing zeros or MAX LEVEL incorrectly
 
-Make sure you're on v1.3.4 or later:
+Make sure you're on v1.3.5 or later:
 ```bash
 npx ocs-stats update
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocs-stats",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "OpenCode Skills - One-click installer with gamified XP stats",
   "type": "module",
   "bin": {

src/merge.js

@@ -24,7 +24,7 @@ export const FILE_CATEGORY = {
 };
 
 const PROTECTED_CATEGORIES = [FILE_CATEGORY.XP_DATA, FILE_CATEGORY.MEMORIES];
-const SMART_MERGE_CATEGORIES = [FILE_CATEGORY.XP_DATA, FILE_CATEGORY.MEMORIES, FILE_CATEGORY.KNOWLEDGE, FILE_CATEGORY.AGENT];
+const SMART_MERGE_CATEGORIES = [FILE_CATEGORY.XP_DATA, FILE_CATEGORY.MEMORIES, FILE_CATEGORY.KNOWLEDGE, FILE_CATEGORY.AGENT, FILE_CATEGORY.SKILL];
 
 const USER_PRESERVE_FIELDS = ['mode', 'tools', 'model', 'temperature', 'permission', 'hidden', 'color'];
 
@@ -145,10 +145,10 @@ function getCategory(relativePath) {
   if (pathLower.includes('/knowledge.md')) {
     return FILE_CATEGORY.KNOWLEDGE;
   }
-  if (pathLower.includes('/skills/')) {
+  if (pathLower.includes('/skills/') || pathLower.startsWith('skills/')) {
     return FILE_CATEGORY.SKILL;
   }
-  if (pathLower.includes('/agents/')) {
+  if (pathLower.includes('/agents/') || pathLower.startsWith('agents/')) {
     return FILE_CATEGORY.AGENT;
   }
   return FILE_CATEGORY.SKILL;
@@ -561,6 +561,28 @@ export async function performUpdate(targetDir, options = {}) {
         });
         continue;
       }
+
+      if (category === FILE_CATEGORY.SKILL) {
+        const userContent = fs.readFileSync(targetPath, 'utf-8');
+        const templateContent = fs.readFileSync(templatePath, 'utf-8');
+
+        const mergeResult = smartMergeAgent(userContent, templateContent);
+
+        if (!checkOnly) {
+          fs.writeFileSync(targetPath, mergeResult.content, 'utf-8');
+        }
+
+        const preserveInfo = mergeResult.preservedFields.length > 0
+          ? `${mergeResult.preservedFields.join(', ')} preserved`
+          : 'updated';
+
+        results.merged.push({
+          path: relativePath,
+          action: 'smart-merged',
+          preserveInfo
+        });
+        continue;
+      }
     }
 
     if (PROTECTED_CATEGORIES.includes(category)) {

templates/.ocs-version

@@ -1,3 +1,4 @@
+1.3.5: Fix agent and skill files showing as conflicts instead of being smart merged on update
 1.3.4: Re-release to trigger npm publish pipeline
 1.3.3: Fix mandatory level-up reset and XP carry-over rule missing from all agents and skills
 1.3.2: Fix stats display and smart merge to use correct xp.json field names