devlyn-cli 4.3.7 → 4.3.9

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,38 @@ function discoveryRoots(context, env, config) {
   return [...new Set(roots)];
 }
 
-function inspectSkills(context, release, env, config) {
+function kimiSkillRoots(context, env) {
+  const home = env.HOME || env.USERPROFILE || os.homedir();
+  let project = path.resolve(context.cwd);
+  const roots = new Set(), errors = [];
+  for (let dir = project; ; dir = path.dirname(dir)) {
+    const git = path.join(dir, '.git');
+    try {
+      if (fs.statSync(git, { throwIfNoEntry: false })) { project = dir; break; }
+    } catch (error) {
+      errors.push(reason('config-unreadable', { path: git, detail: error.message }));
+      break;
+    }
+    if (dir === path.dirname(dir)) break;
+  }
+  // --skills-dir replaces auto discovery and makes every root user-priority:
+  // first-name wins, so preserve workspace precedence by putting it first.
+  for (const root of [path.join(project, '.kimi-code/skills'), path.join(project, '.agents/skills'),
+    path.resolve(env.KIMI_CODE_HOME || path.join(home, '.kimi-code'), 'skills'), path.resolve(home, '.agents/skills')]) {
+    try {
+      if (fs.statSync(root, { throwIfNoEntry: false })?.isDirectory()) roots.add(fs.realpathSync(root));
+    } catch (error) {
+      errors.push(reason('config-unreadable', { path: root, detail: error.message }));
+    }
+  }
+  return { roots: [...roots], errors };
+}
+
+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 +260,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 +401,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]);
@@ -398,7 +447,12 @@ function planActivation(releaseRoot, input, env = process.env) {
         status.skills = channel('partial', null, [reason('skills-unavailable', { launchMode: context.launchMode, ownerAgent: config.ownerAgent })]);
       } else {
         plan.engineArgs.push('--agent-file', file('devlyn-kimi.md', joinText('${base_prompt}', instructions)));
-        principles('agent-file'); fallback();
+        principles('agent-file');
+        const kimi = kimiSkillRoots(context, env);
+        if (!collisions.length && !errors.length && !kimi.errors.length) {
+          for (const root of [...kimi.roots, path.join(release.root, 'config/skills')]) plan.engineArgs.push('--skills-dir', root);
+          native('--skills-dir', 'read-file', `Read ${path.join(release.root, 'config/skills/devlyn-ideate/SKILL.md')}`);
+        } else fallback([...collisions, ...errors, ...kimi.errors]);
       }
       break;
     case 'antigravity':

package/bin/skill-history.json

@@ -768,6 +768,8 @@
     "4.3.4",
     "4.3.5",
     "4.3.6",
-    "4.3.7"
+    "4.3.7",
+    "4.3.8",
+    "4.3.9"
   ]
 }

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn-cli",
-  "version": "4.3.7",
+  "version": "4.3.9",
   "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.7",
+  "version": "4.3.9",
   "principles": {
     "defaults": "config/skills/_shared/runtime-principles.md",
     "memory": {
@@ -139,7 +139,7 @@
     },
     {
       "path": "bin/harness-activation.js",
-      "sha256": "94adca93876fd0d8a39b5dddd1e017296b9ff7d1cf6037871df3d32250ea83ba",
+      "sha256": "fecb47b04e7f6e72735a9ea50b6aa524eca611d42c6db1b03c1260ddf2259bbc",
       "executable": false
     },
     {
@@ -164,7 +164,7 @@
     },
     {
       "path": "bin/skill-history.json",
-      "sha256": "8272d3975ef06e1108c16c0d56b2178a4de73e2020f82f1f10a50c2a3d5ddb46",
+      "sha256": "947ec7e9dead4b4e9ebb234219c7aaea76b0561fde997c95d53c67f6babbdb3a",
       "executable": false
     },
     {
@@ -309,7 +309,7 @@
     },
     {
       "path": "native/claude/.claude-plugin/plugin.json",
-      "sha256": "c582e887aaad4322678e85ba02997ff51ef8f30d2fa50458024787884422117b",
+      "sha256": "5aa927b9eb784e0a246571e8c747607390c7dc89207a66b9bc8759281429b259",
       "executable": false
     },
     {
@@ -439,12 +439,12 @@
     },
     {
       "path": "native/codex/.agents/plugins/marketplace.json",
-      "sha256": "74699fb150844bc39ebd1cf11696c993d22c7f9add43b21e8656efd8af3f70de",
+      "sha256": "39a9e1bcfd87ffca63ce3e6a7b38d280b8bf4db725a28683c2f1f60cdb792730",
       "executable": false
     },
     {
       "path": "native/codex/plugins/devlyn/.codex-plugin/plugin.json",
-      "sha256": "c582e887aaad4322678e85ba02997ff51ef8f30d2fa50458024787884422117b",
+      "sha256": "5aa927b9eb784e0a246571e8c747607390c7dc89207a66b9bc8759281429b259",
       "executable": false
     },
     {
@@ -1619,12 +1619,12 @@
     },
     {
       "path": "package.json",
-      "sha256": "0450b10c13cf6b932b441138368a46060b2a2278bfde57474bb73b4ceb160de9",
+      "sha256": "9c67dfff676ecd8d7597146398ab5304c6ecac12d870b1ff1924478060614acc",
       "executable": false
     }
   ],
   "digest": {
     "algorithm": "sha256",
-    "value": "05823285e84ce3fc21e7003776b7216cbdbb78b7f4cc0f5029d2976736326f59"
+    "value": "de2c9dba7a92d6c9844f3434fbdb21c8236e58b5e64e5f475fcca0dfb4b11c3f"
   }
 }