@hone-ai/cli 1.11.0 → 1.12.0

package/hone-cli.js

@@ -1087,13 +1087,24 @@ program
       // Write generated skills to disk
       console.log('Writing generated skills...');
       if (result.skills) {
+        let preservedCount = 0;
         for (const [skillName, content] of Object.entries(result.skills)) {
           if (!content || content.length < 50) continue;
           const skillDir  = path.join(repoRoot, '.github', 'skills', skillName);
           const skillFile = path.join(skillDir, 'SKILL.md');
           fs.mkdirSync(skillDir, { recursive: true });
-          fs.writeFileSync(skillFile, content);
-          console.log(`  ✓ .github/skills/${skillName}/SKILL.md`);
+          const { merged, preserved } = splicePreserveRepoSpecific(skillFile, content);
+          fs.writeFileSync(skillFile, merged);
+          if (preserved) {
+            preservedCount++;
+            console.log(`  ✓ .github/skills/${skillName}/SKILL.md (preserved adopter REPO-SPECIFIC content)`);
+          } else {
+            console.log(`  ✓ .github/skills/${skillName}/SKILL.md`);
+          }
+        }
+        if (preservedCount > 0) {
+          console.log(`\n  Preserved adopter REPO-SPECIFIC content in ${preservedCount} skill(s).`);
+          console.log(`  (HC-019y-followup-1: derive no longer overwrites curated REPO-SPECIFIC sections)`);
         }
       }
 
@@ -2599,6 +2610,50 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+/**
+ * HC-019y-followup-1: when `hone derive` writes a SKILL.md, splice the
+ * existing adopter REPO-SPECIFIC content over whatever the LLM produced
+ * for that section. The semantic guarantee: adopter-curated content
+ * (everything below the `<!-- REPO-SPECIFIC -->` marker) is NEVER lost
+ * across derive runs.
+ *
+ * Pre-fix: derive wrote the file blind (fs.writeFileSync(skillFile,
+ * content)). 5 OptionsFlow regression tests broke after a single derive
+ * because 378 lines of E33-A/E34-B-added content disappeared.
+ *
+ * Returns { merged, preserved }:
+ *   - merged:    the bytes to write (always a string)
+ *   - preserved: true if adopter REPO-SPECIFIC content was preserved
+ *                across the splice; false for fresh writes
+ */
+function splicePreserveRepoSpecific(existingPath, newContent) {
+  const MARKER = '<!-- REPO-SPECIFIC';
+  if (!fs.existsSync(existingPath)) {
+    // Fresh adopter — no existing file. Write new content as-is.
+    return { merged: newContent, preserved: false };
+  }
+  const existing = fs.readFileSync(existingPath, 'utf8');
+  const oldIdx = existing.indexOf(MARKER);
+  if (oldIdx < 0) {
+    // Existing file has no REPO-SPECIFIC marker (likely a non-skill or
+    // legacy file). Nothing to preserve.
+    return { merged: newContent, preserved: false };
+  }
+  const newIdx = newContent.indexOf(MARKER);
+  if (newIdx < 0) {
+    // New content has no REPO-SPECIFIC section. Append the existing one.
+    return { merged: newContent.trimEnd() + '\n\n' + existing.slice(oldIdx), preserved: true };
+  }
+  // Both have REPO-SPECIFIC. Take new content up to the marker, then
+  // append everything from existing's marker to EOF. This preserves
+  // adopter-curated content while updating the body before the marker.
+  return {
+    merged: newContent.slice(0, newIdx) + existing.slice(oldIdx),
+    preserved: true,
+  };
+}
+module.exports.splicePreserveRepoSpecific = splicePreserveRepoSpecific;
+
 // ── STATUS command (H-009) ────────────────────────────────────────────────────
 // Show pipeline state for a story (or use --all for every in-flight story).
 // Reads .github/pipeline/<STORY-ID>/metadata.yml + filesystem; uses
@@ -5240,4 +5295,9 @@ program
   .description('Hone AI — Enterprise SDLC Pipeline CLI')
   .version(pkg.version);
 
-program.parse(process.argv);
+// HC-019y-followup-1: gate commander invocation so the file can be
+// require()'d by tests for helpers like splicePreserveRepoSpecific
+// without auto-running the CLI's --help.
+if (require.main === module) {
+  program.parse(process.argv);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hone-ai/cli",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Hone AI — Enterprise SDLC Pipeline CLI",
   "main": "hone-cli.js",
   "bin": {