devlyn-cli 4.2.19 → 4.2.21

package/bin/instructions.js

@@ -3,6 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { Lexer } = require('marked');
 const legacyTemplates = require('./instruction-templates.json');
+const cleanupHistory = require('./cleanup-history.json');
 
 const BEGIN = '<!-- devlyn:instructions:begin';
 const END = '<!-- devlyn:instructions:end -->';
@@ -147,7 +148,7 @@ function importsAgentsMd(text) {
 
 function customInstructions(text, name, template, managed = false) {
   const known = new Set([
-    ...legacyTemplates.paragraphs[name],
+    ...(legacyTemplates.paragraphs[name] || []),
     ...instructionParagraphs(template).map((p) => p.key),
   ]);
   const bom = text.startsWith('\uFEFF') ? '\uFEFF' : '';
@@ -169,6 +170,22 @@ function customInstructions(text, name, template, managed = false) {
   return bom + paragraphs.filter((_, index) => keep.has(index)).map((p) => p.text).join('');
 }
 
+// Only the complete appended bytes are owned, including the separator added by old installers.
+// A heading inside a fenced example is not an installed instruction block.
+function removeEvaluatorBlocks(text) {
+  const headings = new Set(instructionParagraphs(text).filter((p) => p.level === 1).map((p) => p.start));
+  const ranges = [];
+  for (const match of text.matchAll(/\r?\n\r?\n---\r?\n\r?\n(?=# Devlyn Agent Instructions\r?\n)/g)) {
+    if (!headings.has(match.index + match[0].length)) continue;
+    for (const template of cleanupHistory.evaluators) {
+      const end = matchedEnd(text, match.index, template);
+      if (end !== null) { ranges.push({ start: match.index, end }); break; }
+    }
+  }
+  for (const { start, end } of ranges.reverse()) text = text.slice(0, start) + text.slice(end);
+  return text;
+}
+
 // Devlyn defaults in an instruction file: a managed block, or stock paragraphs of a template
 // that a release before managed blocks copied in whole (the evidence migration replaces).
 function holdsDevlynDefaults(name, text) {
@@ -196,22 +213,23 @@ function retainFile(file, bytes) {
 
 // `withBlock` false removes the devlyn defaults the file holds, keeping everything else. `write` false writes nothing
 // and returns whether the file needs an update, a merge included.
-function updateInstructions(name, initial = '', withBlock = true, write = true) {
-  const projectPackage = path.join(process.cwd(), 'package.json');
-  if (fs.existsSync(path.join(process.cwd(), 'bin', 'devlyn.js')) && fs.existsSync(projectPackage)
+function updateInstructions(name, initial = '', withBlock = true, write = true, directory = process.cwd(), evaluatorOnly = false) {
+  const projectPackage = path.join(directory, 'package.json');
+  if (fs.existsSync(path.join(directory, 'bin', 'devlyn.js')) && fs.existsSync(projectPackage)
       && JSON.parse(fs.readFileSync(projectPackage, 'utf8'))?.name === 'devlyn-cli') {
     console.log(`  → Skipping ${name}; shipped instruction template in devlyn-cli source checkout`);
     return false;
   }
-  const templatePath = path.join(__dirname, '..', name);
-  const template = fs.readFileSync(templatePath, 'utf8');
+  const templateName = path.basename(name);
+  const templatePath = path.join(__dirname, '..', templateName);
+  const template = ['CLAUDE.md', 'AGENTS.md'].includes(templateName) ? fs.readFileSync(templatePath, 'utf8') : '';
   if (template.includes(BEGIN) || template.includes(END)) {
     throw new Error(`Packaged instruction template contains managed markers: ${templatePath}`);
   }
-  const dest = path.join(process.cwd(), name);
+  const dest = path.join(directory, name);
   const stat = fs.lstatSync(dest, { throwIfNoEntry: false });
-  const sourceStat = fs.statSync(templatePath);
-  if (stat?.isFile() && stat.dev === sourceStat.dev && stat.ino === sourceStat.ino) {
+  const sourceStat = template ? fs.statSync(templatePath) : null;
+  if (stat?.isFile() && stat.dev === sourceStat?.dev && stat.ino === sourceStat?.ino) {
     console.log(`  → Using source ${name}; packaged template left unchanged`);
     return false;
   }
@@ -227,15 +245,16 @@ function updateInstructions(name, initial = '', withBlock = true, write = true)
   } catch (cause) {
     throw new InstructionError(`${name} must be UTF-8; original preserved. Convert its encoding and rerun installation.`, { cause });
   }
+  current = removeEvaluatorBlocks(current);
   const eol = current.match(/\r?\n/)?.[0] || '\n';
   const block = managedBlock(template, eol);
   const inserted = withBlock ? block : '';
-  const recovery = path.join(process.cwd(), '.devlyn', 'instructions');
+  const recovery = path.join(directory, '.devlyn', 'instructions');
   const conflict = (reason) => {
     if (!write) return true;
-    const incoming = path.join(recovery, `${name}.${digest(block)}.incoming`);
-    const backup = path.join(recovery, `${name}.${digest(before)}.backup`);
-    const guide = path.join(recovery, `${name}.${digest(before)}.${digest(block)}.merge.md`);
+    const incoming = path.join(recovery, `${encodeURIComponent(name)}.${digest(block)}.incoming`);
+    const backup = path.join(recovery, `${encodeURIComponent(name)}.${digest(before)}.backup`);
+    const guide = path.join(recovery, `${encodeURIComponent(name)}.${digest(before)}.${digest(block)}.merge.md`);
     retainFile(backup, before);
     retainFile(incoming, Buffer.from(block));
     retainFile(guide, Buffer.from(`# Merge ${name}\n\n`
@@ -252,7 +271,9 @@ function updateInstructions(name, initial = '', withBlock = true, write = true)
       + `Installation is incomplete; earlier selected agents may already have been updated.`);
   };
   let content;
-  if (current.includes(BEGIN) || current.includes(END)) {
+  if (evaluatorOnly) {
+    content = current;
+  } else if (current.includes(BEGIN) || current.includes(END)) {
     const starts = [...current.matchAll(/^\uFEFF?<!-- devlyn:instructions:begin sha256=([a-f0-9]{64}) -->\r?\n/gm)];
     const ends = [...current.matchAll(/^<!-- devlyn:instructions:end -->(?:\r?\n|$)/gm)];
     if (starts.length !== 1 || ends.length !== 1
@@ -265,29 +286,27 @@ function updateInstructions(name, initial = '', withBlock = true, write = true)
     if (end.index < bodyStart) return conflict('reversed managed markers');
     const previous = current.slice(bodyStart, end.index);
     const custom = digest(normalize(previous)) === start[1] ? ''
-      : customInstructions(previous, name,
+      : customInstructions(previous, templateName,
         'Project-specific instructions outside this managed block take precedence over these defaults.\n\n' + template, true);
     const after = current.slice(end.index + end[0].length);
     content = current.slice(0, start.index + (start[0].startsWith('\uFEFF') ? 1 : 0))
       + custom + (custom ? eol : '') + inserted + after;
-    // A block removed from the end takes along the blank lines that set it apart.
-    if (!inserted && !after) content = content.replace(/(\r?\n)(?:\r?\n)+$/, '$1');
   } else {
     const normalized = normalize(template);
     const bodyStart = normalized.indexOf('## North Star\n');
     const preamble = normalized.slice(0, bodyStart);
     const body = normalized.slice(bodyStart);
     const ranges = legacyRanges(current, [
-      { length: normalized.length, sha256: digest(normalized),
-        ...(bodyStart > 0 ? { preamble, body: { length: body.length, sha256: digest(body) } } : {}) },
-      ...(legacyTemplates[name] || []),
+      ...(normalized ? [{ length: normalized.length, sha256: digest(normalized),
+        ...(bodyStart > 0 ? { preamble, body: { length: body.length, sha256: digest(body) } } : {}) }] : []),
+      ...(legacyTemplates[templateName] || []),
     ]);
     if (ranges.length === 1 && !LEGACY.test(current.slice(0, ranges[0].start)
         + ranges[0].custom + current.slice(ranges[0].end))) {
       const { start, end, custom } = ranges[0];
       content = current.slice(0, start) + custom + inserted + current.slice(end);
     } else {
-      const custom = customInstructions(current, name, template);
+      const custom = customInstructions(current, templateName, template);
       content = custom + (custom && inserted ? eol + eol : '') + inserted;
     }
   }
@@ -295,7 +314,7 @@ function updateInstructions(name, initial = '', withBlock = true, write = true)
   if (bytes.equals(before)) return false;
   if (!write) return true;
   if (exists) {
-    const backup = path.join(recovery, `${name}.${digest(before)}.backup`);
+    const backup = path.join(recovery, `${encodeURIComponent(name)}.${digest(before)}.backup`);
     retainFile(backup, before);
     console.log(`  → Saved previous ${name}: ${backup}`);
   }
@@ -306,11 +325,12 @@ function updateInstructions(name, initial = '', withBlock = true, write = true)
     if (fs.existsSync(dest) !== exists || (exists && !fs.readFileSync(dest).equals(before))) {
       throw new InstructionError(`${name} changed during installation; preserved it. Rerun installation.`);
     }
-    fs.renameSync(temp, dest);
+    if (!withBlock && content === '') fs.unlinkSync(dest);
+    else fs.renameSync(temp, dest);
   } finally {
     if (fs.existsSync(temp)) fs.unlinkSync(temp);
   }
-  console.log(!exists ? `  → Created ${name}`
+  console.log(!withBlock && content === '' ? `  ✕ ${name} (removed)` : !exists ? `  → Created ${name}`
     : `  → ${withBlock ? 'Updated Devlyn defaults in' : 'Removed Devlyn defaults from'} ${name}; project-specific instructions preserved`);
   return true;
 }

package/bin/skill-history.json

@@ -1,5 +1,5 @@
 {
-  "source": "skills: config/skills/* and optional-skills/* trees from every first-parent HEAD commit touching those paths and every local tag, derived by scripts/update-skill-history.js using bin/skill-ownership.js normalization (LF, install-path stamps, OS metadata and Python bytecode); deprecated commands: commands/ and optional-commands/*/ files of devlyn-cli 0.0.1-0.5.8 (every published version that shipped them), LF-normalized SHA-256",
+  "source": "skills: config/skills/* and optional-skills/* trees from every first-parent HEAD commit touching those paths and every local tag, derived by scripts/update-skill-history.js using bin/skill-ownership.js normalization (LF, install-path stamps, OS metadata and Python bytecode)",
   "skills": {
     "_shared": [
       "015eea12cc07cfb9eb318c30855f6deacb5bf43bd508a511dffd2e48c9d82964",
@@ -619,74 +619,5 @@
       "711cd2633df2062104f12d50037a07a1012a90ab18c422cb5fdf665fcb9dc987",
       "d6a98c105a0d1952de90c39ca0734cb70cbdd116e6b4a4d45507d796bd2a9e88"
     ]
-  },
-  "commands": {
-    "commands/devlyn.handoff.md": [
-      "91d143c6305e95e4af6992eda0d127e94a394c2e91a2d409b4d41ca03c23f470"
-    ],
-    "commands/devlyn.clean.md": [
-      "918c6ae867c57a4d9748237adae0df8c78a1447c7c028a0af988b59a5fbb0d9a"
-    ],
-    "commands/devlyn.design-system.md": [
-      "f81166b5ba08d9ee1f5cff33c911ea387e5cb50141a9712a96fc4434c60a673f"
-    ],
-    "commands/devlyn.design-ui.md": [
-      "0496a6b2dd8c6bb0474b71ef9a319a6b95bb76972d0f07a01c33f8860fe83dfb",
-      "4e2aafcc0de6ce7f3022a353aaa9fb4330e76a50a91ab970b9b9a0f192f9f1f2"
-    ],
-    "commands/devlyn.discover-product.md": [
-      "a609401d29cd2bdad7a48c7c8f096b442fe03a17c6b2c3151936c47b4a16e6c6",
-      "1e66aa35bf300ec6167e1b888f43a92ebd9e60d501397ff0334c9a7809d433f5"
-    ],
-    "commands/devlyn.evaluate.md": [
-      "8f17ccc639d54adab24c49dcf471376bab97511675d00554056a4c1f67a14115"
-    ],
-    "commands/devlyn.feature-spec.md": [
-      "d442ed7ae8d14a255c37f1b120b758f69794be88e2970a8a0c0e51519344b6c7"
-    ],
-    "commands/devlyn.implement-ui.md": [
-      "a8d0813781b2f7a3df5a4751c92755bf7c84c53428cf63cea34c965939b8c478"
-    ],
-    "commands/devlyn.product-spec.md": [
-      "7a92d2df2586b44e2c4d9182eeb3d61f7adc2a13bed4d2cd26abcfe086585895"
-    ],
-    "commands/devlyn.recommend-features.md": [
-      "2b92523017e1da10c299dafb19d84736de5084b5b46693de7fd2d6df51dc56b4"
-    ],
-    "commands/devlyn.resolve.md": [
-      "48c0c3ee553f87f1f0733190effc7220c01c82837a5300ef68c9ffdf30c5d3a1",
-      "24595766e1a81a1fcacb78261b03c3665bc686bcac8b1805d1c4db379584879f",
-      "eaad5354cfc20ed378ffd2a2e1ca6bade1310bd2a47ab93e5942e9599c3ba9a8"
-    ],
-    "commands/devlyn.review.md": [
-      "55888e08bf31ead1d359f218277cfa7efc3c6cb0f96fadc665d5a2406ff115d3",
-      "22f532f587f6d2fbf2662e38d5073b85a030141573f86d92ad40b9d292836fb7",
-      "7f9ce1db4ffd3cdaf9fd949e4b07de04e0931c91cd846d4ab220ff6114a45b17",
-      "3a511fc678e599ff4b4c37fd9191399a599e1ba9ea9c40fc4afcbe29cb188d2b"
-    ],
-    "commands/devlyn.team-design-ui.md": [
-      "02485911588e9f52afb5a5082fd7804ee7a41bad44323960a2afe1a16a49d628"
-    ],
-    "commands/devlyn.team-resolve.md": [
-      "8f11fa0c3203c0dd5bf09b5243dcff5968a36275682c54b3a012262fc545859a",
-      "09fc163d34dfe8906dd8d22501a028bfbbad639499acab01e5e60f06fc520382",
-      "ccfc5083813ee50d407109616ccbc2509aa7526316cebbf7a271537abdfff3b7",
-      "72f66be3c4c27a46e76d56d13a0d381880c054a03243188f98da2faf6dc77295",
-      "54c52c3f27998998ed55cc648d071bbb10444761b819c59ed118b795596a4aee"
-    ],
-    "commands/devlyn.team-review.md": [
-      "58b36cfe2749968d697d486a104a1b139e4312730b0ac2933550634f6ece48db",
-      "7e5c2d93a23d51af7939dae29c70095dbd8a4a681cc06d4d578f2de29df346a3",
-      "c8e145955a303141af4082dae174e3b3f1681e4c9698e25ae337eadd31fb883b"
-    ],
-    "commands/devlyn.update-docs.md": [
-      "86945afccf24762a88d26eef3703fbf6c5a90a3343fd3de72a9cb26b6f62d3b5"
-    ],
-    "commands/devlyn.pencil-pull.md": [
-      "dfdd3d19ca676558bfa2bb3ce398181b0a081ab88d1feaf69c54c706a9671631"
-    ],
-    "commands/devlyn.pencil-push.md": [
-      "5f2e8b29609cbb2af72941579823bec598265ebf29cd3a375d6aa47d95b74354"
-    ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn-cli",
-  "version": "4.2.19",
+  "version": "4.2.21",
   "description": "Loop & harness engineering for AI coding agents (Claude Code, Codex, and any AGENTS.md-driven agent) — core engineering principles for CLAUDE.md/AGENTS.md and a loop designer that splits one intent into tasks agents drain hands-free",
   "homepage": "https://github.com/fysoul17/devlyn-cli#readme",
   "bin": {