kairn-cli 2.7.0 → 2.7.2

package/dist/cli.js

@@ -1831,6 +1831,16 @@ async function parseAgents(harnessPath) {
     if (Array.isArray(disallowedTools)) {
       node.disallowedTools = disallowedTools;
     }
+    const knownKeys = /* @__PURE__ */ new Set(["name", "model", "disallowedTools"]);
+    const extra = {};
+    for (const [key, value] of Object.entries(frontmatter)) {
+      if (!knownKeys.has(key)) {
+        extra[key] = value;
+      }
+    }
+    if (Object.keys(extra).length > 0) {
+      node.extraFrontmatter = extra;
+    }
     nodes.push(node);
   }
   return nodes;
@@ -1847,8 +1857,10 @@ async function parseSkills(harnessPath) {
       const name = entry.replace(/\.md$/, "");
       nodes.push({ name, content });
     } else if (await isDirectory(entryPath)) {
-      const skillMdPath = path21.join(entryPath, "skill.md");
-      const content = await readFileSafe2(skillMdPath);
+      let content = await readFileSafe2(path21.join(entryPath, "skill.md"));
+      if (content === null) {
+        content = await readFileSafe2(path21.join(entryPath, "SKILL.md"));
+      }
       if (content === null) continue;
       nodes.push({ name: entry, content });
     }
@@ -2445,7 +2457,8 @@ function renderRuleWithFrontmatter(rule) {
 function renderAgentWithFrontmatter(agent) {
   const hasModel = agent.model !== void 0;
   const hasDisallowed = agent.disallowedTools !== void 0 && agent.disallowedTools.length > 0;
-  if (!hasModel && !hasDisallowed) {
+  const hasExtra = agent.extraFrontmatter !== void 0 && Object.keys(agent.extraFrontmatter).length > 0;
+  if (!hasModel && !hasDisallowed && !hasExtra) {
     return agent.content;
   }
   const yamlLines = ["---"];
@@ -2458,6 +2471,23 @@ function renderAgentWithFrontmatter(agent) {
       yamlLines.push(`  - ${tool}`);
     }
   }
+  if (hasExtra) {
+    for (const [key, value] of Object.entries(agent.extraFrontmatter)) {
+      if (Array.isArray(value)) {
+        yamlLines.push(`${key}:`);
+        for (const item of value) {
+          yamlLines.push(`  - ${String(item)}`);
+        }
+      } else if (typeof value === "object" && value !== null) {
+        yamlLines.push(`${key}:`);
+        for (const [subKey, subVal] of Object.entries(value)) {
+          yamlLines.push(`  ${subKey}: ${String(subVal)}`);
+        }
+      } else {
+        yamlLines.push(`${key}: ${String(value)}`);
+      }
+    }
+  }
   yamlLines.push("---");
   return yamlLines.join("\n") + "\n\n" + agent.content;
 }
@@ -2874,6 +2904,14 @@ async function renderAffectedFiles(ir, targetDir, touchedCategories) {
   if (touchedCategories.has("agents")) {
     await deleteOrphanedFiles(targetDir, "agents", fileMap);
   }
+  if (touchedCategories.has("mcp") && !fileMap.has(".mcp.json")) {
+    await fs22.unlink(path22.join(targetDir, ".mcp.json")).catch(() => {
+    });
+  }
+  if (touchedCategories.has("settings") && !fileMap.has("settings.json")) {
+    await fs22.unlink(path22.join(targetDir, "settings.json")).catch(() => {
+    });
+  }
 }
 function getFileCategory(relativePath) {
   if (relativePath === "CLAUDE.md") return "claude_md";
@@ -3344,7 +3382,7 @@ async function evolve(workspacePath, tasks, kairnConfig, evolveConfig, onProgres
       }
     }
   }
-  let rngState = 42;
+  let rngState = evolveConfig.rngSeed ?? 42;
   const rng = () => {
     rngState = rngState * 1664525 + 1013904223 & 4294967295;
     return (rngState >>> 0) / 4294967296;
@@ -3458,7 +3496,7 @@ async function evolve(workspacePath, tasks, kairnConfig, evolveConfig, onProgres
     }
     if (useThompson) {
       const scoreMap = {};
-      for (const [taskId, score] of Object.entries(results)) {
+      for (const [taskId, score] of Object.entries(evalResults)) {
         scoreMap[taskId] = score.score ?? (score.pass ? 100 : 0);
       }
       beliefs = updateBeliefs(beliefs, scoreMap);
@@ -3981,7 +4019,9 @@ async function runPopulation(workspacePath, tasks, kairnConfig, evolveConfig, nu
     const branchEvolveConfig = {
       ...evolveConfig,
       // Disable principal for individual branches — synthesis replaces it
-      usePrincipal: false
+      usePrincipal: false,
+      // Each branch gets its own RNG seed for Thompson Sampling diversity
+      rngSeed: branchConfig.seed
     };
     const branchProgress = onProgress ? (event) => {
       onProgress({ ...event, branchId: branchConfig.branchId });
@@ -8687,7 +8727,81 @@ async function listFilesRecursive(dir) {
   await walk(dir);
   return results;
 }
-async function applyEvolution(workspacePath, projectRoot, targetIteration) {
+async function findBestPBTHarness(workspacePath) {
+  const branchesDir = path27.join(workspacePath, "branches");
+  let branchEntries;
+  try {
+    branchEntries = await fs27.readdir(branchesDir);
+  } catch {
+    return null;
+  }
+  let bestScore = -Infinity;
+  let bestPath = "";
+  let bestLabel = "";
+  for (const branchId of branchEntries) {
+    const branchPath = path27.join(branchesDir, branchId);
+    const branchIterations = await listIterations(branchPath);
+    if (branchIterations.length === 0) continue;
+    const bestIter = await findBestIteration(branchPath, branchIterations);
+    const log = await loadIterationLog(branchPath, bestIter);
+    const score = log?.score ?? 0;
+    if (score > bestScore) {
+      bestScore = score;
+      bestPath = path27.join(branchPath, "iterations", bestIter.toString(), "harness");
+      bestLabel = `branch ${branchId}, iteration ${bestIter} (${score.toFixed(1)}%)`;
+    }
+  }
+  const synthesisHarness = path27.join(workspacePath, "synthesis", "harness");
+  try {
+    await fs27.access(synthesisHarness);
+    const synthesisLog = await loadIterationLog(workspacePath, 999);
+    const synthScore = synthesisLog?.score ?? 0;
+    if (synthScore > bestScore) {
+      bestScore = synthScore;
+      bestPath = synthesisHarness;
+      bestLabel = `Meta-Principal synthesis (${synthScore.toFixed(1)}%)`;
+    }
+  } catch {
+  }
+  if (!bestPath) return null;
+  return { harnessPath: bestPath, label: bestLabel };
+}
+async function applyEvolution(workspacePath, projectRoot, targetIteration, pbt) {
+  if (pbt) {
+    const pbtResult = await findBestPBTHarness(workspacePath);
+    if (!pbtResult) {
+      throw new Error("No PBT results found. Run `kairn evolve pbt` first.");
+    }
+    const claudeDir2 = path27.join(projectRoot, ".claude");
+    const diffPreview2 = await generateDiff2(claudeDir2, pbtResult.harnessPath);
+    const currentFiles2 = await listFilesRecursive(claudeDir2);
+    const targetFiles2 = await listFilesRecursive(pbtResult.harnessPath);
+    const allPaths2 = /* @__PURE__ */ new Set([...currentFiles2, ...targetFiles2]);
+    const filesChanged2 = [];
+    for (const filePath of allPaths2) {
+      const currentContent = await fs27.readFile(path27.join(claudeDir2, filePath), "utf-8").catch(() => null);
+      const targetContent = await fs27.readFile(path27.join(pbtResult.harnessPath, filePath), "utf-8").catch(() => null);
+      if (currentContent !== targetContent) {
+        filesChanged2.push(filePath);
+      }
+    }
+    await fs27.rm(claudeDir2, { recursive: true, force: true });
+    await copyDir(pbtResult.harnessPath, claudeDir2);
+    const harnessMcpJson2 = path27.join(pbtResult.harnessPath, ".mcp.json");
+    const projectMcpJson2 = path27.join(projectRoot, ".mcp.json");
+    try {
+      await fs27.access(harnessMcpJson2);
+      await fs27.copyFile(harnessMcpJson2, projectMcpJson2);
+      if (!filesChanged2.includes(".mcp.json")) filesChanged2.push(".mcp.json");
+    } catch {
+    }
+    return {
+      iteration: -1,
+      // signals PBT source
+      filesChanged: filesChanged2,
+      diffPreview: diffPreview2
+    };
+  }
   const iterations = await listIterations(workspacePath);
   if (iterations.length === 0) {
     throw new Error("No iterations found in workspace. Run `kairn evolve run` first.");
@@ -9258,7 +9372,7 @@ evolveCommand.command("pbt").description("Run Population-Based Training with par
     process.exit(1);
   }
 });
-evolveCommand.command("apply").description("Apply the best evolved harness to your project").option("--iter <n>", "Apply a specific iteration instead of the best").option("--force", "Apply even if git working tree is dirty").option("--no-commit", "Skip automatic git commit after applying").action(async (options) => {
+evolveCommand.command("apply").description("Apply the best evolved harness to your project").option("--iter <n>", "Apply a specific iteration instead of the best").option("--pbt", "Apply best PBT result (branch winner or synthesis)").option("--force", "Apply even if git working tree is dirty").option("--no-commit", "Skip automatic git commit after applying").action(async (options) => {
   try {
     const projectRoot = process.cwd();
     const workspace = path30.join(projectRoot, ".kairn-evolve");
@@ -9277,7 +9391,7 @@ evolveCommand.command("apply").description("Apply the best evolved harness to yo
         process.exit(1);
       }
     }
-    const result = await applyEvolution(workspace, projectRoot, targetIteration);
+    const result = await applyEvolution(workspace, projectRoot, targetIteration, options.pbt);
     if (result.diffPreview) {
       console.log(ui.section("Changes"));
       for (const line of result.diffPreview.split("\n")) {