devlyn-cli 4.3.6 → 4.3.8

package/bin/devlyn.js

@@ -1843,11 +1843,25 @@ function cleanupDeliver(scope, items, current) {
     fs.rmSync(path.dirname(allocated.receipt), { recursive: true, force: true });
     return error ? { error } : {};
   };
+  const baseHead = cleanupGit(worktree, ['rev-parse', 'HEAD']);
+  if (baseHead.error || baseHead.status !== 0) return release(cleanupReason('repository-unreadable', { detail: baseHead.error?.message || baseHead.stderr.trim() }));
+  const base = baseHead.stdout.trim();
   let prepared;
-  try { prepared = cleanupDeliveryCommit(worktree, items, current, release, cleanupRemovedUpstream(scope.root, worktree)); }
+  try { prepared = cleanupDeliveryCommit(worktree, items, current, release, cleanupSettledUpstream(scope.root, base)); }
   catch (error) { return release(cleanupReason('apply-failed', { detail: error.message })); }
+  if (prepared.error?.code === 'stale-plan') {
+    const head = cleanupGit(scope.root, ['rev-parse', 'HEAD']);
+    // A stale review must see the base's bytes next time. Local commits keep today's refusal.
+    if (!head.error && head.status === 0 && head.stdout.trim() !== base) {
+      const ancestor = cleanupGit(scope.root, ['merge-base', '--is-ancestor', head.stdout.trim(), base]);
+      if (!ancestor.error && ancestor.status === 0) {
+        const updated = cleanupUpdateCheckout(scope);
+        if (updated.error) return updated;
+      }
+    }
+  }
   if (prepared.error) return prepared;
-  // Every reviewed copy is already gone from the remote base: the checkout only has to take it.
+  // The remote base already settled every reviewed item: the checkout only has to take it.
   if (!prepared.acceptance) return cleanupUpdateCheckout(scope);
   const completed = lastJson(run(['complete', '--receipt', allocated.receipt, '--acceptance', prepared.acceptance, '--writers-stopped'], scope.root).stdout);
   const status = completed?.delivery_status || completed?.status;
@@ -1858,18 +1872,16 @@ function cleanupDeliver(scope, items, current) {
   return { error: cleanupReason(auth ? 'auth-failed' : 'delivery-failed', { detail: reason, ...(completed?.resume ? { resume: completed.resume } : {}) }) };
 }
 
-// Whether the remote base (the allocated worktree's HEAD) removed a copy this checkout tracks: the
-// base holds no path of that name in any spelling, and the checkout holds the copy, under its
-// tracked spelling, as it was where the two histories meet. A copy committed only here, or changed
-// here since, is not one the base removed.
-function cleanupRemovedUpstream(root, worktree) {
+// With no fresh counterpart, the base settled an item only if it changed the path's content or
+// removed it in every spelling, while the checkout holds it under its tracked spelling unchanged
+// since the fork point. A copy committed or changed only here is not one the base settled.
+function cleanupSettledUpstream(root, base) {
   const read = (cwd, args, options) => {
     const result = cleanupGit(cwd, args, options);
     return !result.error && result.status === 0 ? result.stdout : null;
   };
   const object = (spec) => read(root, ['rev-parse', '--verify', '--quiet', spec])?.trim() || null;
-  const base = read(worktree, ['rev-parse', 'HEAD'])?.trim();
-  const fork = base ? read(root, ['merge-base', 'HEAD', base])?.trim() : null;
+  const fork = read(root, ['merge-base', 'HEAD', base])?.trim();
   let upstream; // the base's paths, folded to lower case, read once and only when needed
   return (relative) => {
     if (!fork) return false;
@@ -1878,17 +1890,20 @@ function cleanupRemovedUpstream(root, worktree) {
         ?.split('\0').filter(Boolean).map((name) => name.toLowerCase()) ?? null;
     }
     const lower = relative.toLowerCase();
-    if (!upstream || upstream.some((name) => name === lower || name.startsWith(`${lower}/`))) return false;
+    if (!upstream) return false;
     // The tracked spelling, which a case-insensitive file system lets differ from the one on disk.
     const tracked = read(root, ['ls-files', '-z', '--', `:(icase,literal)${relative}`])?.split('\0').find(Boolean);
     const spelled = tracked?.slice(0, relative.length);
     if (!spelled || spelled.toLowerCase() !== lower) return false;
     const before = object(`${fork}:${spelled}`);
-    return before !== null && before === object(`HEAD:${spelled}`);
+    if (before === null || before !== object(`HEAD:${spelled}`)) return false;
+    const after = object(`${base}:${spelled}`);
+    return after !== null ? after !== before
+      : !upstream.some((name) => name === lower || name.startsWith(`${lower}/`));
   };
 }
 
-// The copies the remote base dropped stay in this checkout until it takes that base: a checkout on
+// The remote base's cleanup or changed copies reach this checkout only when it takes that base: a checkout on
 // the base branch is fast-forwarded to it, as a task's owner reconciles after delivery. The base is
 // fetched into a ref this call owns (FETCH_HEAD can be rewritten by another fetch meanwhile) and
 // merged by its commit, only while the checkout is still the one checked before the fetch, and the
@@ -1923,9 +1938,9 @@ function cleanupUpdateCheckout(scope) {
 
 // Inside the allocated worktree: prove every reviewed item, remove them, commit, and write the
 // acceptance completion binds. A failure releases the worktree; so does a throw, in the caller.
-// With every reviewed copy already removed by the remote base, the worktree is released with
+// With every reviewed item already settled by the remote base, the worktree is released with
 // nothing to deliver.
-function cleanupDeliveryCommit(worktree, items, current, release, removedUpstream) {
+function cleanupDeliveryCommit(worktree, items, current, release, settledUpstream) {
   const fresh = cleanupProjectScope(worktree, current);
   const available = new Map(fresh.items.map((item) => [`${item.kind}\u0000${item.relative}`, item]));
   const pairs = items.map((reviewed) => {
@@ -1935,7 +1950,7 @@ function cleanupDeliveryCommit(worktree, items, current, release, removedUpstrea
   const stale = pairs.filter(({ reviewed, fresh, before }) => (fresh
     ? fresh.action !== reviewed.action || fresh.route !== 'delivery'
       || before.type !== reviewed.before.type || before.sha256 !== reviewed.before.sha256
-    : !removedUpstream(reviewed.relative)));
+    : !settledUpstream(reviewed.relative)));
   // Check the entire batch before mutating even one item; the remote base cannot replace the reviewed preimage.
   if (stale.length) return release(cleanupReason('stale-plan', { detail: stale.map(({ reviewed }) => reviewed.relative).join(', ') }));
   const present = pairs.filter(({ fresh }) => fresh);

package/bin/harness-activation.js

@@ -89,14 +89,15 @@ function effectiveConfig(context) {
   const keys = {
     claude: ['appendSystemPrompt', 'pluginDirs'], codex: ['developer_instructions', 'skills', 'marketplaces', 'plugins'],
     grok: ['rules'], omp: ['appendSystemPrompt', 'skills'], antigravity: [], cursor: [],
-    opencode: ['inlineConfig'], kimi: ['ownerAgent'], copilot: ['skillsDirs'], qwen: ['appendSystemPrompt'],
+    opencode: ['inlineConfig', 'skillsPaths'], kimi: ['ownerAgent'], copilot: ['skillsDirs', 'instructionsDirs'], qwen: ['appendSystemPrompt'],
   }[context.engine];
   if (!object(config) || Object.keys(config).some((key) => !keys.includes(key))) return null;
-  for (const field of ['appendSystemPrompt', 'developer_instructions', 'rules', 'inlineConfig', 'skillsDirs']) {
+  for (const field of ['appendSystemPrompt', 'developer_instructions', 'rules', 'inlineConfig', 'skillsDirs', 'instructionsDirs']) {
     if (config[field] !== undefined && config[field] !== null && !textValue(config[field])) return null;
   }
   if (context.engine === 'kimi' && typeof config.ownerAgent !== 'boolean') return null;
   if (config.pluginDirs !== undefined && (!strings(config.pluginDirs) || !config.pluginDirs.every(path.isAbsolute))) return null;
+  if (config.skillsPaths != null && !strings(config.skillsPaths)) return null;
   if (context.engine === 'codex') {
     for (const key of ['marketplaces', 'plugins', 'skills']) if (config[key] != null && !object(config[key])) return null;
     if (config.skills?.config !== undefined && (!Array.isArray(config.skills.config)
@@ -144,7 +145,10 @@ function discoveryRoots(context, env, config) {
     for (const dir of config?.skills?.customDirectories || []) add(context.cwd, dir);
   }
   if (engine === 'codex' && process.platform !== 'win32') add('/etc/codex', 'skills');
-  if (engine === 'opencode') add(env.OPENCODE_CONFIG_DIR, 'skills');
+  if (engine === 'opencode') {
+    add(env.OPENCODE_CONFIG_DIR, 'skills');
+    for (const dir of config?.skillsPaths || []) add(context.cwd, dir);
+  }
   if (engine === 'copilot') for (const dir of (config?.skillsDirs ?? env.COPILOT_SKILLS_DIRS ?? '').split(',').filter(Boolean)) add(context.cwd, dir);
   for (let dir = path.resolve(context.cwd); ; dir = path.dirname(dir)) {
     if (native[1]) add(dir, native[1], 'skills');
@@ -156,9 +160,11 @@ function discoveryRoots(context, env, config) {
   return [...new Set(roots)];
 }
 
-function inspectSkills(context, release, env, config) {
+function inspectSkills(context, release, env, config, active) {
   const found = [], errors = [], hashes = new Map();
   for (const root of discoveryRoots(context, env, config)) {
+    // Reusing the selected, verified release is not a competing OpenCode source.
+    if (active && context.engine === 'opencode' && config?.skillsPaths && root === path.join(release.root, 'config/skills')) continue;
     for (const name of SKILLS) {
       const dir = path.join(root, name);
       try {
@@ -227,7 +233,7 @@ function planActivation(releaseRoot, input, env = process.env) {
     fail('release-version-conflict', { version: context.recordedRelease.version }, 3);
   }
   const config = effectiveConfig(context);
-  const { found, errors } = inspectSkills(context, release, env, config);
+  const { found, errors } = inspectSkills(context, release, env, config, !off);
   if (errors.length) status.hide = channel('partial', null, errors);
   status.inheritedDevlyn = found.filter((entry) => entry.owned).map((entry) => entry.path);
   const supported = supportedVersion(context.engine, context.version);
@@ -368,19 +374,35 @@ function planActivation(releaseRoot, input, env = process.env) {
       let inline;
       try { inline = config.inlineConfig == null ? {} : JSON.parse(config.inlineConfig); }
       catch (error) { if (!(error instanceof SyntaxError)) throw error; inline = null; }
-      if (!object(inline) || (inline.instructions !== undefined && !strings(inline.instructions))) {
-        status.principles = channel('partial', null, [reason('config-unreadable', { field: 'inlineConfig.instructions' })]);
-        status.skills = channel('partial', null, [reason('config-unreadable', { field: 'inlineConfig.instructions' })]);
+      const invalidField = !object(inline) || (inline.instructions !== undefined && !strings(inline.instructions))
+        ? 'inlineConfig.instructions'
+        : config.skillsPaths != null && inline.skills !== undefined && !object(inline.skills) ? 'inlineConfig.skills' : null;
+      if (invalidField) {
+        status.principles = channel('partial', null, [reason('config-unreadable', { field: invalidField })]);
+        status.skills = channel('partial', null, [reason('config-unreadable', { field: invalidField })]);
         break;
       }
+      if (Array.isArray(config.skillsPaths) && !collisions.length && !errors.length) {
+        inline.skills = { ...inline.skills, paths: [...new Set([...config.skillsPaths, path.join(release.root, 'config/skills')])] };
+        native('skills.paths', 'read-file', `Read ${path.join(release.root, 'config/skills/devlyn-ideate/SKILL.md')}`);
+      } else fallback(config.skillsPaths == null ? [] : [...collisions, ...errors]);
       plan.envPatch.OPENCODE_CONFIG_CONTENT = JSON.stringify({ ...inline,
         instructions: [...(inline.instructions || []), file('devlyn-instructions.md', instructions)] });
-      principles('OPENCODE_CONFIG_CONTENT.instructions'); fallback();
+      principles('OPENCODE_CONFIG_CONTENT.instructions');
       break;
     }
     case 'copilot': {
-      status.principles = context.committedBlockApplies ? channel('configured', 'native-project')
-        : channel('unavailable', null, [reason('principles-unavailable')]);
+      if (!context.committedBlockApplies) {
+        const directory = path.join(context.runDir, 'copilot');
+        if (directory.includes(',')) {
+          status.principles = channel('unavailable', null, [reason('principles-unavailable', { detail: 'comma-in-path' })]);
+        } else {
+          file('copilot/devlyn.instructions.md', '---\napplyTo: "**"\n---\n' + instructions);
+          const dirs = config.instructionsDirs ?? env.COPILOT_CUSTOM_INSTRUCTIONS_DIRS ?? '';
+          plan.envPatch.COPILOT_CUSTOM_INSTRUCTIONS_DIRS = dirs.split(',').includes(directory) ? dirs : (dirs ? `${dirs},${directory}` : directory);
+          principles('COPILOT_CUSTOM_INSTRUCTIONS_DIRS');
+        }
+      }
       const root = path.join(release.root, 'config/skills');
       if (root.includes(',') || collisions.length || errors.length) {
         status.skills = channel('partial', null, root.includes(',') ? [reason('skills-unavailable', { detail: 'comma-in-path' })] : [...collisions, ...errors]);

package/bin/skill-history.json

@@ -767,6 +767,8 @@
     "4.3.3",
     "4.3.4",
     "4.3.5",
-    "4.3.6"
+    "4.3.6",
+    "4.3.7",
+    "4.3.8"
   ]
 }

package/native/claude/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "Devlyn harness skills",
   "skills": "./skills/"
 }

package/native/codex/.agents/plugins/marketplace.json

@@ -1,5 +1,5 @@
 {
-  "name": "devlyn-harness-v4-3-6",
+  "name": "devlyn-harness-v4-3-8",
   "plugins": [
     {
       "name": "devlyn",

package/native/codex/plugins/devlyn/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "Devlyn harness skills",
   "skills": "./skills/"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn-cli",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "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": {

package/release.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "package": "devlyn-cli",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "principles": {
     "defaults": "config/skills/_shared/runtime-principles.md",
     "memory": {
@@ -129,7 +129,7 @@
     },
     {
       "path": "bin/devlyn.js",
-      "sha256": "6eb4d078cc4fe235517b7a08e8d6965462cd6c91ab1853cc2f8a9f0b829f6191",
+      "sha256": "5841ad32184de3095edffc5d05ae78dded34dc0ce829e8f805218de8b0085b1f",
       "executable": true
     },
     {
@@ -139,7 +139,7 @@
     },
     {
       "path": "bin/harness-activation.js",
-      "sha256": "94adca93876fd0d8a39b5dddd1e017296b9ff7d1cf6037871df3d32250ea83ba",
+      "sha256": "980f251957d9093b47ba2c5229b77145233a7253938220b69069468f7b4f8979",
       "executable": false
     },
     {
@@ -164,7 +164,7 @@
     },
     {
       "path": "bin/skill-history.json",
-      "sha256": "c0aa4b8a25ec6873011859bc5c76cad58d1cd468e13018ea85761b8db51b81e9",
+      "sha256": "9012124a107faba4ee1a0719462920590ff04bcdf82d5bc40d178ef8f182ea82",
       "executable": false
     },
     {
@@ -309,7 +309,7 @@
     },
     {
       "path": "native/claude/.claude-plugin/plugin.json",
-      "sha256": "4ca0474d48fdbee91769be02bd6a0b612313a390b0b0fe244679df0a43bc2e37",
+      "sha256": "54f89d39a32c9d822321ae2a2805c8fe071c2b78c6b84f1c29ac85e4ae59667f",
       "executable": false
     },
     {
@@ -439,12 +439,12 @@
     },
     {
       "path": "native/codex/.agents/plugins/marketplace.json",
-      "sha256": "f8189a7e93f4e5ff3334d8ad884fffa679a2729f10fff815d24c4f0067534c73",
+      "sha256": "6c507f8668ee2df5322e6bc0a7f1f7303410d2566b24709eaf4a9a581a25755c",
       "executable": false
     },
     {
       "path": "native/codex/plugins/devlyn/.codex-plugin/plugin.json",
-      "sha256": "4ca0474d48fdbee91769be02bd6a0b612313a390b0b0fe244679df0a43bc2e37",
+      "sha256": "54f89d39a32c9d822321ae2a2805c8fe071c2b78c6b84f1c29ac85e4ae59667f",
       "executable": false
     },
     {
@@ -1619,12 +1619,12 @@
     },
     {
       "path": "package.json",
-      "sha256": "4d754dc7026976c1e37d7d74b6733459fcd07b6a498bc3e8b4c4d575b02a7700",
+      "sha256": "42de8c1332266cae7209808646f51e3b97f3c8e2dc2e4775e0e0ab9daa52bfd1",
       "executable": false
     }
   ],
   "digest": {
     "algorithm": "sha256",
-    "value": "f4ee05e55111300285e2ec7b435934786fee40501365c8a2a2706b7ee168bc20"
+    "value": "cac9f8a9d305a77ecff9139fe06bad8a9932a47dc1f800c20520c5a79b969070"
   }
 }