devlyn-cli 4.3.8 → 4.3.10

package/bin/devlyn.js

@@ -1344,10 +1344,10 @@ function showHelp() {
 // ---------------------------------------------------------------------------
 // Legacy cleanup for the built-in harness: Devlyn delivers devlyn-cli per session, so every copy an
 // earlier install left in a skill root, and the files those installs added, become legacy. A plan
-// is read-only and lists each item with its proof. Apply plans again from what is on disk now and
-// acts only on items both plans name the same way, so a plan file can narrow a cleanup but never
-// widen it: untracked copies go in place, tracked ones through the project's delivery policy.
-// Every removal needs shipped-content proof; names only identify candidates.
+// takes the remote base by fast-forward when possible, then lists each item with its proof. Apply
+// plans again from disk and acts only on items both plans name the same way. A plan can narrow
+// cleanup but never widen it: untracked copies go in place, tracked ones through the project's delivery policy.
+// Removals need shipped-content proof or an explicit choice of a reviewed modified copy.
 // ---------------------------------------------------------------------------
 
 const CLEANUP_CORE = ['devlyn-ideate', 'devlyn-engines'];
@@ -1355,12 +1355,17 @@ const CLEANUP_CORE = ['devlyn-ideate', 'devlyn-engines'];
 function cleanupReason(code, params = {}) { return { code, params }; }
 
 // What a path is now, so apply can refuse an item that changed after it was reviewed.
-function cleanupPreimage(file) {
+function cleanupPreimage(file, exact = false) {
   const stat = fs.lstatSync(file, { throwIfNoEntry: false });
   if (!stat) return { type: 'missing', sha256: null };
   if (stat.isSymbolicLink()) return { type: 'link', sha256: null };
   if (stat.isDirectory()) {
-    try { return { type: 'directory', sha256: fingerprint(file) }; }
+    try {
+      if (!exact) return { type: 'directory', sha256: fingerprint(file) };
+      const entries = fs.readdirSync(file).sort().map((name) => [name, cleanupPreimage(path.join(file, name), true)]);
+      return { type: 'directory', sha256: entries.some(([, before]) => before.sha256 === null) ? null
+        : crypto.createHash('sha256').update(JSON.stringify(entries)).digest('hex') };
+    }
     catch { return { type: 'directory', sha256: null }; }
   }
   if (stat.isFile()) return { type: 'file', sha256: crypto.createHash('sha256').update(fs.readFileSync(file)).digest('hex') };
@@ -1414,6 +1419,46 @@ function cleanupMarkerOwned(file, current) {
   return text === JSON.stringify({ schemaVersion: 1, package: PKG.name, version: marker.version, skills: marker.skills }, null, 2) + '\n';
 }
 
+function cleanupSkillRoots(roots, current, includeModified = false) {
+  const resolved = new Map();
+  const linked = new Set();
+  const active = new Set();
+  for (const [base, root] of roots) {
+    let target = root;
+    const stat = fs.lstatSync(root, { throwIfNoEntry: false });
+    const parents = cleanupRealParents(base, root);
+    if (parents && stat?.isSymbolicLink()) {
+      const link = fs.readlinkSync(root);
+      let dir = path.isAbsolute(link) ? path.parse(link).root : path.dirname(root);
+      // Check each hop before normalizing `..`, so even a link followed by `..` is refused.
+      for (const part of link.slice(path.parse(link).root.length).split(path.sep).filter(Boolean)) {
+        dir = path.join(dir, part);
+        if (!fs.lstatSync(dir, { throwIfNoEntry: false })?.isDirectory()) { dir = null; break; }
+      }
+      if (dir && cleanupRealParents(base, dir)) {
+        target = fs.realpathSync.native(dir);
+        linked.add(target);
+      }
+    } else if (parents && stat?.isDirectory()) target = fs.realpathSync.native(root);
+    if (!resolved.has(target)) resolved.set(target, base);
+    if (cleanupInUse(root) || cleanupInUse(target)) active.add(target);
+  }
+  return [...resolved].flatMap(([root, base]) => {
+    const items = cleanupSkillRoot(base, root, current);
+    const occupied = includeModified && items.some((item) => item.kind === 'install-lock');
+    const protectedCopies = new Set(items.filter((item) => [...linked].some((target) => target === item.path || target.startsWith(item.path + path.sep))));
+    for (const item of items) {
+      if ((protectedCopies.size && cleanupSupport(item)) || protectedCopies.has(item)) {
+        Object.assign(item, { action: 'skip', reasons: [cleanupReason('dependent-copy')] });
+      }
+      if (cleanupAction(item, includeModified) === 'remove' && (active.has(root) || occupied)) {
+        Object.assign(item, { action: 'skip', reasons: [cleanupReason(occupied ? 'occupied-lock' : 'in-use')] });
+      }
+    }
+    return items.map((item) => linked.has(root) ? { ...item, keepRoot: true } : item);
+  });
+}
+
 // The legacy items of one skill root, each with its proof and the base its parents are checked from.
 // `_shared` and the install marker go only when every copy beside them goes too: a kept, edited
 // devlyn-ideate needs both.
@@ -1496,9 +1541,6 @@ function cleanupSkillRoot(base, root, current) {
         reasons: proven ? [] : [cleanupReason('modified-copy')] });
     }
   }
-  if (cleanupInUse(root)) {
-    for (const item of items) if (item.action === 'remove') Object.assign(item, { action: 'skip', reasons: [cleanupReason('in-use')] });
-  }
   return items;
 }
 
@@ -1565,7 +1607,8 @@ function cleanupCurrentFingerprints() {
 }
 
 function cleanupGit(root, args, options = {}) {
-  return spawnSync('git', ['-C', root, ...args], { env: { ...gitEnvironment(), GIT_OPTIONAL_LOCKS: '0' }, encoding: 'utf8', ...options });
+  return spawnSync('git', ['-C', root, ...args], { encoding: 'utf8', ...options,
+    env: { ...gitEnvironment(), GIT_OPTIONAL_LOCKS: '0', ...options.env } });
 }
 
 let cleanupPythonBinary;
@@ -1647,7 +1690,7 @@ function cleanupRetainSupport(items) {
   return items;
 }
 
-function cleanupProjectScope(project, current) {
+function cleanupProjectScope(project, current, includeModified = false) {
   const { repositoryIdentity } = require('./harness-status');
   const { physicalRoot } = require('./release');
   const root = physicalRoot(project);
@@ -1659,12 +1702,12 @@ function cleanupProjectScope(project, current) {
   // The home folder's roots are this machine's: the machine scope cleans them under the user-root locks.
   if (cleanupSameFile(base, os.homedir())) return { ...scope, items: whole('home-folder') };
   const items = [
-    ...['.agents', '.claude'].flatMap((dir) => cleanupSkillRoot(base, path.join(base, dir, 'skills'), current)),
+    ...cleanupSkillRoots(['.agents', '.claude'].map((dir) => [base, path.join(base, dir, 'skills')]), current, includeModified),
     ...cleanupCommands(base), ...cleanupProjectFiles(base), ...cleanupInstructions(base),
   ];
-  const busy = identity && items.some((item) => item.action !== 'skip') ? cleanupQueueBusy(base) : null;
+  const busy = identity && items.some((item) => cleanupAction(item, includeModified) !== 'skip') ? cleanupQueueBusy(base) : null;
   for (const item of items) {
-    if (busy && item.action !== 'skip') Object.assign(item, { action: 'skip', reasons: [busy] });
+    if (busy && cleanupAction(item, includeModified) !== 'skip') Object.assign(item, { action: 'skip', reasons: [busy] });
     const relative = path.relative(base, item.path).split(path.sep).join('/');
     let tracked = false;
     try { tracked = cleanupTracked(item.path); }
@@ -1673,23 +1716,17 @@ function cleanupProjectScope(project, current) {
   }
   if (!scope.remote) {
     for (const item of scope.items) {
-      if (item.route === 'delivery' && item.action !== 'skip') Object.assign(item, { action: 'skip', reasons: [cleanupReason('no-remote')] });
+      if (item.route === 'delivery' && cleanupAction(item, includeModified) !== 'skip') Object.assign(item, { action: 'skip', reasons: [cleanupReason('no-remote')] });
     }
   }
   cleanupRetainSupport(scope.items);
   return scope;
 }
 
-function cleanupMachineScope(home, accountHomes, current) {
+function cleanupMachineScope(home, accountHomes, current, includeModified = false) {
   const roots = [...['.agents', '.codex', '.claude', '.grok'].map((dir) => [home, path.join(home, dir, 'skills')]),
     ...accountHomes.map((account) => [path.dirname(account), path.join(account, 'skills')])];
-  const seen = new Set();
-  const items = [];
-  for (const [base, root] of roots) {
-    if (seen.has(root)) continue;
-    seen.add(root);
-    items.push(...cleanupSkillRoot(base, root, current));
-  }
+  const items = cleanupSkillRoots(roots, current, includeModified);
   items.push(...cleanupCommands(home));
   for (const item of items) {
     try {
@@ -1702,13 +1739,13 @@ function cleanupMachineScope(home, accountHomes, current) {
   return { kind: 'machine', root: home, name: null, remote: null, items: cleanupRetainSupport(items) };
 }
 
-function cleanupScopes(inputs, current) {
+function cleanupScopes(inputs, current, includeModified = false) {
   const { sha256 } = require('./release');
   const scopes = [];
-  if (inputs.machine) scopes.push({ id: 'machine', ...cleanupMachineScope(os.homedir(), inputs.accountHomes, current) });
+  if (inputs.machine) scopes.push({ id: 'machine', ...cleanupMachineScope(os.homedir(), inputs.accountHomes, current, includeModified) });
   for (const project of inputs.projects) {
     let scope;
-    try { scope = cleanupProjectScope(project, current); }
+    try { scope = cleanupProjectScope(project, current, includeModified); }
     catch (error) {
       scope = { kind: 'project', root: project, name: path.basename(project), remote: null, items: [{ kind: 'project', path: project, base: project,
         relative: '', route: 'local', action: 'skip', reasons: [cleanupReason(error.reason?.code === 'repository-unreadable' ? 'repository-unreadable' : 'project-unreadable', { detail: error.message })] }] };
@@ -1716,13 +1753,24 @@ function cleanupScopes(inputs, current) {
     scopes.push({ id: `project:${sha256(Buffer.from(project)).slice(0, 12)}`, ...scope });
   }
   for (const scope of scopes) {
-    scope.items = scope.items.map((item, index) => ({ id: `${scope.id}:${index}`, ...item, before: cleanupPreimage(item.path) }));
+    scope.items = scope.items.map((item, index) => ({ id: `${scope.id}:${index}`, ...item, before: cleanupPreimage(item.path, cleanupCanInclude(item)) }));
   }
   return scopes;
 }
 
 function cleanupPlan(inputs) {
-  const plan = { schemaVersion: 1, version: PKG.version, inputs, scopes: cleanupScopes(inputs, cleanupCurrentFingerprints()) };
+  const current = cleanupCurrentFingerprints();
+  let scopes = cleanupScopes(inputs, current);
+  let changed = false;
+  for (const scope of scopes) {
+    if (scope.kind === 'project' && scope.remote && scope.items.some((item) => item.route === 'delivery' && ['remove', 'edit'].includes(item.action))) {
+      const updated = cleanupUpdateCheckout(scope);
+      if (updated.changed) changed = true;
+    }
+  }
+  // The review covers the bytes delivery acts on, including scopes sharing a checkout.
+  if (changed) scopes = cleanupScopes(inputs, current);
+  const plan = { schemaVersion: 1, version: PKG.version, inputs, scopes };
   return { ...plan, digest: cleanupDigest(plan) };
 }
 
@@ -1742,10 +1790,10 @@ function cleanupDigest(plan) {
 
 // Apply one item a fresh plan proves right now; returns a reason when it is not what was proven.
 function cleanupApplyItem(item) {
-  const now = cleanupPreimage(item.path);
+  const now = cleanupPreimage(item.path, Boolean(item.included));
   if (now.type !== item.before.type || now.sha256 !== item.before.sha256) return cleanupReason('stale-plan');
   if (!cleanupRealParents(item.base, item.path)) return cleanupReason('outside-link');
-  if (item.action === 'remove') {
+  if (cleanupAction(item) === 'remove') {
     fs.rmSync(item.path, { recursive: true }); // lstat/realParents never follow a link; rm removes the entry itself.
     return null;
   }
@@ -1765,16 +1813,17 @@ function cleanupApplyItem(item) {
 function cleanupProven(reviewed, fresh) {
   const key = (item) => `${item.kind}\u0000${item.path}`;
   const now = new Map(fresh.items.map((item) => [key(item), item]));
-  const asked = new Set(reviewed.items.filter((item) => item.action === 'remove' || item.action === 'edit').map(key));
+  const asked = new Set(reviewed.items.filter((item) => ['remove', 'edit'].includes(cleanupAction(item))).map(key));
   // A copy left out of the review stays, so the `_shared` and marker beside it stay too.
   const narrowed = new Set(fresh.items.filter((item) => item.action === 'remove' && !cleanupSupport(item) && !asked.has(key(item)))
     .map((item) => path.dirname(item.path)));
-  return reviewed.items.filter((item) => item.action === 'remove' || item.action === 'edit').map((item) => {
+  return reviewed.items.filter((item) => ['remove', 'edit'].includes(cleanupAction(item))).map((item) => {
     const match = now.get(key(item));
-    const same = match && match.action === item.action && match.route === item.route
+    const same = match && match.action === item.action && (!item.included || (cleanupCanInclude(match) && item.before.sha256 !== null))
+      && match.relative === item.relative && match.route === item.route
       && match.before.type === item.before.type && match.before.sha256 === item.before.sha256
       && !(cleanupSupport(item) && narrowed.has(path.dirname(item.path)));
-    return { reviewed: item, fresh: same ? match : null };
+    return { reviewed: item, fresh: same ? { ...match, included: item.included } : null };
   });
 }
 
@@ -1783,10 +1832,19 @@ function cleanupSupport(item) {
   return path.basename(item.path) === '_shared' || item.kind === 'install-marker';
 }
 
+function cleanupCanInclude(item) {
+  return !cleanupSupport(item) && item.action === 'skip'
+    && item.reasons.length === 1 && item.reasons[0].code === 'modified-copy';
+}
+
+function cleanupAction(item, includeModified = false) {
+  return item.included || (includeModified && cleanupCanInclude(item)) ? 'remove' : item.action;
+}
+
 function cleanupLocal(scope, items) {
   const results = new Map();
-  const roots = [...new Set(items.map((item) => path.dirname(item.path)).filter((dir) => path.basename(dir) === 'skills'
-    && fs.lstatSync(dir, { throwIfNoEntry: false })?.isDirectory()))];
+  const roots = [...new Set(items.filter((item) => item.keepRoot || path.basename(path.dirname(item.path)) === 'skills')
+    .map((item) => path.dirname(item.path)).filter((dir) => fs.lstatSync(dir, { throwIfNoEntry: false })?.isDirectory()))];
   const act = (item) => {
     try {
       if (cleanupTracked(item.path)) { results.set(item.id, cleanupReason('tracked-copy')); return; }
@@ -1812,7 +1870,7 @@ function cleanupLocal(scope, items) {
   // After the locks are released, so a root holds nothing but what stayed.
   for (const root of new Set(items.filter((item) => results.get(item.id) === null && item.kind !== 'instructions')
     .map((item) => path.dirname(item.path)))) {
-    if (path.basename(root) !== 'skills') continue;
+    if (path.basename(root) !== 'skills' || scope.items.some((item) => item.keepRoot && path.dirname(item.path) === root)) continue;
     try { if (fs.lstatSync(root).isDirectory() && fs.readdirSync(root).length === 0) fs.rmdirSync(root); } catch {}
   }
   return results;
@@ -1920,7 +1978,8 @@ function cleanupUpdateCheckout(scope) {
   if (branch !== scope.remote.base || !head) return failed(`${branch || 'a detached HEAD'} is checked out`);
   const ref = `refs/devlyn/cleanup/${crypto.randomBytes(8).toString('hex')}`;
   try {
-    const fetched = cleanupGit(scope.root, ['fetch', '--quiet', '--no-write-fetch-head', 'origin', `+refs/heads/${scope.remote.base}:${ref}`]);
+    const fetched = cleanupGit(scope.root, ['fetch', '--quiet', '--no-write-fetch-head', 'origin', `+refs/heads/${scope.remote.base}:${ref}`],
+      { timeout: 30000, env: { GIT_TERMINAL_PROMPT: '0' } });
     if (fetched.error || fetched.status !== 0) return failed(fetched.error?.message || fetched.stderr.trim());
     const target = read(['rev-parse', '--verify', `${ref}^{commit}`]);
     const [now, at] = checkout();
@@ -1930,7 +1989,8 @@ function cleanupUpdateCheckout(scope) {
       'merge', '--ff-only', '--no-squash', '--no-autostash', '--no-overwrite-ignore', '--quiet', target]);
     if (merged.error || merged.status !== 0) return failed(merged.error?.message || merged.stderr.trim());
     const [after, landed] = checkout();
-    return after === branch && landed === target ? {} : failed('the fast-forward did not land on the base');
+    if (after !== branch || landed !== target) return failed('the fast-forward did not land on the base');
+    return { changed: landed !== head };
   } finally {
     cleanupGit(scope.root, ['update-ref', '-d', ref]);
   }
@@ -1941,14 +2001,15 @@ function cleanupUpdateCheckout(scope) {
 // With every reviewed item already settled by the remote base, the worktree is released with
 // nothing to deliver.
 function cleanupDeliveryCommit(worktree, items, current, release, settledUpstream) {
-  const fresh = cleanupProjectScope(worktree, current);
+  const fresh = cleanupProjectScope(worktree, current, items.some((item) => item.included));
   const available = new Map(fresh.items.map((item) => [`${item.kind}\u0000${item.relative}`, item]));
   const pairs = items.map((reviewed) => {
     const fresh = available.get(`${reviewed.kind}\u0000${reviewed.relative}`);
-    return { reviewed, fresh, before: fresh && cleanupPreimage(fresh.path) };
+    return { reviewed, fresh, before: fresh && cleanupPreimage(fresh.path, Boolean(reviewed.included)) };
   });
   const stale = pairs.filter(({ reviewed, fresh, before }) => (fresh
     ? fresh.action !== reviewed.action || fresh.route !== 'delivery'
+      || (reviewed.included && (!cleanupCanInclude(fresh) || before.sha256 === null))
       || before.type !== reviewed.before.type || before.sha256 !== reviewed.before.sha256
     : !settledUpstream(reviewed.relative)));
   // Check the entire batch before mutating even one item; the remote base cannot replace the reviewed preimage.
@@ -1957,12 +2018,14 @@ function cleanupDeliveryCommit(worktree, items, current, release, settledUpstrea
   if (!present.length) return release();
   const applied = [];
   for (const { reviewed, fresh } of present) {
-    const error = cleanupApplyItem({ ...fresh, before: reviewed.before });
+    const error = cleanupApplyItem({ ...fresh, before: reviewed.before, included: reviewed.included });
     if (error) return release(cleanupReason(error.code, { ...error.params, detail: reviewed.relative }));
     applied.push(fresh.relative);
   }
   for (const dir of ['.agents/skills', '.claude/skills']) {
-    try { const full = path.join(worktree, dir); if (fs.readdirSync(full).length === 0) fs.rmdirSync(full); } catch {}
+    const full = path.join(worktree, dir);
+    if (fresh.items.some((item) => item.keepRoot && cleanupSameFile(path.dirname(item.path), full))) continue;
+    try { if (fs.lstatSync(full).isDirectory() && fs.readdirSync(full).length === 0) fs.rmdirSync(full); } catch {}
   }
   const add = cleanupGit(worktree, ['add', '-A', '--', ...applied]);
   const commit = add.status === 0 && cleanupGit(worktree, ['-c', 'user.useConfigOnly=true', 'commit', '-q', '-m',
@@ -1973,7 +2036,8 @@ function cleanupDeliveryCommit(worktree, items, current, release, settledUpstrea
   fs.mkdirSync(path.dirname(evidence), { recursive: true });
   fs.writeFileSync(evidence, check.stdout);
   let left = [];
-  try { left = JSON.parse(check.stdout.trim().split('\n').at(-1)).data.scopes[0].items.filter((item) => item.action !== 'skip' && applied.includes(item.relative)); }
+  try { left = JSON.parse(check.stdout.trim().split('\n').at(-1)).data.scopes[0].items.filter((item) =>
+    cleanupAction({ ...item, included: items.find((reviewed) => reviewed.relative === item.relative)?.included }) !== 'skip' && applied.includes(item.relative)); }
   catch { return release(cleanupReason('delivery-failed', { detail: 'the check after cleanup could not run' })); }
   if (left.length) return release(cleanupReason('delivery-failed', { detail: 'items remain after cleanup' }));
   const head = cleanupGit(worktree, ['rev-parse', 'HEAD']);
@@ -1987,7 +2051,8 @@ function cleanupDeliveryCommit(worktree, items, current, release, settledUpstrea
 
 function cleanupApply(plan, { events = false } = {}) {
   const current = cleanupCurrentFingerprints();
-  const fresh = new Map(cleanupScopes(plan.inputs, current).map((scope) => [scope.id, scope]));
+  const includeModified = plan.scopes.some((scope) => scope.items.some((item) => item.included));
+  const fresh = new Map(cleanupScopes(plan.inputs, current, includeModified).map((scope) => [scope.id, scope]));
   let seq = 0;
   const emit = (scope) => { if (events) process.stdout.write(JSON.stringify({ schemaVersion: 1, event: 'scope', seq: ++seq, scope }) + '\n'); };
   const scopes = [];
@@ -2035,9 +2100,10 @@ function cleanupCommand(args) {
   const opts = options(args, {
     plan: { type: 'boolean' }, apply: { type: 'boolean' }, machine: { type: 'boolean' }, events: { type: 'boolean' },
     project: { type: 'string', multiple: true }, 'account-home': { type: 'string', multiple: true },
-    'plan-file': { type: 'string' }, digest: { type: 'string' },
+    'plan-file': { type: 'string' }, digest: { type: 'string' }, include: { type: 'string', multiple: true },
   });
   if (opts.plan === opts.apply) fail('invalid-arguments', { argument: 'exactly one of --plan or --apply' }, 2);
+  if (opts.plan && opts.include) fail('invalid-arguments', { argument: '--include requires --apply' }, 2);
   for (const dir of [...(opts.project || []), ...(opts['account-home'] || [])]) {
     if (!path.isAbsolute(dir)) fail('invalid-arguments', { argument: 'absolute paths required' }, 2);
   }
@@ -2055,6 +2121,16 @@ function cleanupCommand(args) {
     fail('stale-plan', {}, 3);
   }
   if (plan.version !== PKG.version) fail('stale-plan', { version: plan.version }, 3);
+  const reviewed = plan.scopes.flatMap((scope) => scope.items);
+  for (const item of reviewed) delete item.included;
+  const items = new Map(reviewed.map((item) => [item.id, item]));
+  for (const id of opts.include || []) {
+    const item = items.get(id);
+    if (!item || !cleanupCanInclude(item) || reviewed.filter((item) => item.id === id).length !== 1) {
+      fail('invalid-arguments', { argument: `--include ${id}` }, 2);
+    }
+    item.included = true;
+  }
   return cleanupApply(plan, { events: Boolean(opts.events) });
 }
 

package/bin/harness-activation.js

@@ -160,6 +160,33 @@ function discoveryRoots(context, env, config) {
   return [...new Set(roots)];
 }
 
+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)) {
@@ -420,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

@@ -763,12 +763,14 @@
     "4.2.9",
     "4.3.0",
     "4.3.1",
+    "4.3.10",
     "4.3.2",
     "4.3.3",
     "4.3.4",
     "4.3.5",
     "4.3.6",
     "4.3.7",
-    "4.3.8"
+    "4.3.8",
+    "4.3.9"
   ]
 }

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn-cli",
-  "version": "4.3.8",
+  "version": "4.3.10",
   "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.8",
+  "version": "4.3.10",
   "principles": {
     "defaults": "config/skills/_shared/runtime-principles.md",
     "memory": {
@@ -129,7 +129,7 @@
     },
     {
       "path": "bin/devlyn.js",
-      "sha256": "5841ad32184de3095edffc5d05ae78dded34dc0ce829e8f805218de8b0085b1f",
+      "sha256": "ae93be603c8a7511a40c82a7cfa337be05345f0876b83204027cec1ffeafd2ba",
       "executable": true
     },
     {
@@ -139,7 +139,7 @@
     },
     {
       "path": "bin/harness-activation.js",
-      "sha256": "980f251957d9093b47ba2c5229b77145233a7253938220b69069468f7b4f8979",
+      "sha256": "fecb47b04e7f6e72735a9ea50b6aa524eca611d42c6db1b03c1260ddf2259bbc",
       "executable": false
     },
     {
@@ -164,7 +164,7 @@
     },
     {
       "path": "bin/skill-history.json",
-      "sha256": "9012124a107faba4ee1a0719462920590ff04bcdf82d5bc40d178ef8f182ea82",
+      "sha256": "56d9ff1ce32f33e82806864a305bf2bbff35babe9952d46e3f434f88dabc3a2d",
       "executable": false
     },
     {
@@ -309,7 +309,7 @@
     },
     {
       "path": "native/claude/.claude-plugin/plugin.json",
-      "sha256": "54f89d39a32c9d822321ae2a2805c8fe071c2b78c6b84f1c29ac85e4ae59667f",
+      "sha256": "1f9fdd6fc824ceba8f7baac7ef900f17a7bc46f48089606b563297da52bd2070",
       "executable": false
     },
     {
@@ -439,12 +439,12 @@
     },
     {
       "path": "native/codex/.agents/plugins/marketplace.json",
-      "sha256": "6c507f8668ee2df5322e6bc0a7f1f7303410d2566b24709eaf4a9a581a25755c",
+      "sha256": "03d5b28a6f058d46f14fdae526a71021ff1bc5248ece0a473a94ca830b321bcf",
       "executable": false
     },
     {
       "path": "native/codex/plugins/devlyn/.codex-plugin/plugin.json",
-      "sha256": "54f89d39a32c9d822321ae2a2805c8fe071c2b78c6b84f1c29ac85e4ae59667f",
+      "sha256": "1f9fdd6fc824ceba8f7baac7ef900f17a7bc46f48089606b563297da52bd2070",
       "executable": false
     },
     {
@@ -1619,12 +1619,12 @@
     },
     {
       "path": "package.json",
-      "sha256": "42de8c1332266cae7209808646f51e3b97f3c8e2dc2e4775e0e0ab9daa52bfd1",
+      "sha256": "66f0ad6c0d8c86ce76b5c68a54412f0e398cba4ebc0f19d3257c3597e9ba490f",
       "executable": false
     }
   ],
   "digest": {
     "algorithm": "sha256",
-    "value": "cac9f8a9d305a77ecff9139fe06bad8a9932a47dc1f800c20520c5a79b969070"
+    "value": "f4e978a00a488c4dd8274e1344285c6d8dfaa8201589bb46dd1f7d2588a5e2b1"
   }
 }