kairn-cli 2.15.0 → 2.16.1

package/dist/cli.js

@@ -3892,14 +3892,56 @@ function detectFramework(deps) {
   }
   return detected.length > 0 ? detected.join(" + ") : null;
 }
-function detectLanguage(dir, keyFiles) {
-  if (keyFiles.some((f) => f === "tsconfig.json")) return "TypeScript";
-  if (keyFiles.some((f) => f === "package.json")) return "JavaScript";
-  if (keyFiles.some((f) => f === "pyproject.toml" || f === "setup.py" || f === "requirements.txt")) return "Python";
-  if (keyFiles.some((f) => f === "Cargo.toml")) return "Rust";
-  if (keyFiles.some((f) => f === "go.mod")) return "Go";
-  if (keyFiles.some((f) => f === "Gemfile")) return "Ruby";
-  return null;
+function detectLanguagesFromFiles(files) {
+  const matched = [];
+  for (const signal of LANGUAGE_SIGNALS) {
+    if (files.some((f) => signal.files.includes(f))) {
+      matched.push(signal.language);
+    }
+  }
+  return matched;
+}
+async function detectLanguageLocations(dir, keyFiles) {
+  const rootHits = detectLanguagesFromFiles(keyFiles);
+  if (rootHits.length > 0) {
+    return rootHits.map((language) => ({ language, subdirs: [] }));
+  }
+  const entries = await listDirSafe(dir);
+  const langSubdirs = /* @__PURE__ */ new Map();
+  const counts = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const subPath = path10.join(dir, entry);
+    try {
+      const stat = await fs10.stat(subPath);
+      if (!stat.isDirectory()) continue;
+    } catch {
+      continue;
+    }
+    const subFiles = await listDirSafe(subPath);
+    const subLangs = detectLanguagesFromFiles(subFiles);
+    for (const lang of subLangs) {
+      counts.set(lang, (counts.get(lang) ?? 0) + 1);
+      const existing = langSubdirs.get(lang);
+      if (existing) {
+        existing.push(entry);
+      } else {
+        langSubdirs.set(lang, [entry]);
+      }
+    }
+  }
+  if (counts.size === 0) return [];
+  const precedence = /* @__PURE__ */ new Map();
+  for (let i = 0; i < LANGUAGE_SIGNALS.length; i++) {
+    precedence.set(LANGUAGE_SIGNALS[i].language, i);
+  }
+  return [...counts.entries()].sort((a, b) => {
+    const freqDiff = b[1] - a[1];
+    if (freqDiff !== 0) return freqDiff;
+    return (precedence.get(a[0]) ?? 999) - (precedence.get(b[0]) ?? 999);
+  }).map(([lang]) => ({
+    language: lang,
+    subdirs: langSubdirs.get(lang) ?? []
+  }));
 }
 function extractEnvKeys(content) {
   const keys = [];
@@ -3934,7 +3976,9 @@ async function scanProject(dir) {
       "CLAUDE.md"
     ].includes(f)
   );
-  const language = detectLanguage(dir, keyFiles);
+  const languageLocations = await detectLanguageLocations(dir, keyFiles);
+  const detectedLanguages = languageLocations.map((d) => d.language);
+  const language = detectedLanguages[0] ?? null;
   const framework = detectFramework(allDeps);
   const typescript = keyFiles.includes("tsconfig.json") || allDeps.includes("typescript");
   const testCommand = scripts.test && scripts.test !== 'echo "Error: no test specified" && exit 1' ? scripts.test : null;
@@ -3983,6 +4027,8 @@ async function scanProject(dir) {
     description,
     directory: dir,
     language,
+    languages: detectedLanguages,
+    languageLocations,
     framework,
     typescript,
     dependencies: deps,
@@ -4010,9 +4056,18 @@ async function scanProject(dir) {
     keyFiles
   };
 }
+var LANGUAGE_SIGNALS;
 var init_scan = __esm({
   "src/scanner/scan.ts"() {
     "use strict";
+    LANGUAGE_SIGNALS = [
+      { files: ["tsconfig.json"], language: "TypeScript" },
+      { files: ["package.json"], language: "JavaScript" },
+      { files: ["pyproject.toml", "setup.py", "requirements.txt"], language: "Python" },
+      { files: ["Cargo.toml"], language: "Rust" },
+      { files: ["go.mod"], language: "Go" },
+      { files: ["Gemfile"], language: "Ruby" }
+    ];
   }
 });
 
@@ -4040,6 +4095,7 @@ function getStrategy(language) {
     return null;
   }
   const key = language.toLowerCase();
+  if (key === "javascript") return STRATEGIES["typescript"] ?? null;
   return STRATEGIES[key] ?? null;
 }
 function getAlwaysInclude() {
@@ -4070,6 +4126,26 @@ function classifyFilePriority(filePath, strategy) {
   }
   return 3 /* OTHER */;
 }
+function dedupe(arr) {
+  return Array.from(new Set(arr));
+}
+function mergeStrategies(strategies) {
+  if (strategies.length === 0) {
+    throw new Error("mergeStrategies requires at least one strategy");
+  }
+  if (strategies.length === 1) {
+    return strategies[0];
+  }
+  return {
+    language: strategies.map((s) => s.language).join("/"),
+    extensions: dedupe(strategies.flatMap((s) => s.extensions)),
+    entryPoints: dedupe(strategies.flatMap((s) => s.entryPoints)),
+    domainPatterns: dedupe(strategies.flatMap((s) => s.domainPatterns)),
+    configPatterns: dedupe(strategies.flatMap((s) => s.configPatterns)),
+    excludePatterns: dedupe(strategies.flatMap((s) => s.excludePatterns)),
+    maxFilesPerCategory: Math.max(...strategies.map((s) => s.maxFilesPerCategory))
+  };
+}
 function extractPathsFromScripts(scripts) {
   const paths = [];
   const interestingScripts = ["start", "dev", "serve", "main", "server"];
@@ -4541,6 +4617,39 @@ function validateArray(raw, guard) {
   if (!Array.isArray(raw)) return [];
   return raw.filter(guard);
 }
+function scopeStrategyToSubdirs(strategy, subdirs) {
+  if (subdirs.length === 0) return strategy;
+  return {
+    ...strategy,
+    entryPoints: subdirs.flatMap(
+      (dir) => strategy.entryPoints.map((ep) => `${dir}/${ep}`)
+    ),
+    domainPatterns: subdirs.flatMap(
+      (dir) => strategy.domainPatterns.map((dp) => `${dir}/${dp}`)
+    ),
+    configPatterns: subdirs.flatMap(
+      (dir) => strategy.configPatterns.map((cp) => `${dir}/${cp}`)
+    )
+    // excludePatterns: keep global (they use ** globs)
+  };
+}
+function getLanguageWeight(filePath, languageLocations) {
+  if (languageLocations.length <= 1) return 0;
+  const subdirToRank = /* @__PURE__ */ new Map();
+  for (let rank2 = 0; rank2 < languageLocations.length; rank2++) {
+    for (const subdir of languageLocations[rank2].subdirs) {
+      subdirToRank.set(subdir, rank2);
+    }
+  }
+  if (subdirToRank.size === 0) return 0;
+  const firstSlash = filePath.indexOf("/");
+  if (firstSlash === -1) {
+    return 0;
+  }
+  const firstSegment = filePath.slice(0, firstSlash);
+  const rank = subdirToRank.get(firstSegment);
+  return rank ?? 0;
+}
 async function analyzeProject(dir, profile, config, options) {
   if (!options?.refresh) {
     const cache = await readCache(dir);
@@ -4557,20 +4666,24 @@ async function analyzeProject(dir, profile, config, options) {
       }
     }
   }
-  const baseStrategy = getStrategy(profile.language);
-  if (!baseStrategy) {
+  const languageLocations = profile.languageLocations ?? profile.languages.map((lang) => ({ language: lang, subdirs: [] }));
+  const resolvedStrategies = await Promise.all(
+    languageLocations.map(async ({ language, subdirs }) => {
+      const base = getStrategy(language);
+      if (!base) return null;
+      const enriched = await resolveStrategy(dir, base, profile.framework, profile.scripts);
+      return scopeStrategyToSubdirs(enriched, subdirs);
+    })
+  );
+  const validStrategies = resolvedStrategies.filter((s) => s !== null);
+  if (validStrategies.length === 0) {
     throw new AnalysisError(
-      `No sampling strategy for language: ${profile.language ?? "unknown"}`,
+      `No sampling strategy for languages: ${profile.languages.join(", ") || "none detected"}`,
       "no_entry_point",
       "Supported: Python, TypeScript, Go, Rust"
     );
   }
-  const strategy = await resolveStrategy(
-    dir,
-    baseStrategy,
-    profile.framework,
-    profile.scripts
-  );
+  const strategy = mergeStrategies(validStrategies);
   const include = [
     ...strategy.entryPoints,
     ...strategy.domainPatterns.map((p) => p + "**/*"),
@@ -4581,7 +4694,11 @@ async function analyzeProject(dir, profile, config, options) {
     include,
     exclude: strategy.excludePatterns,
     maxTokens: options?.tokenBudget ?? DEFAULT_TOKEN_BUDGET,
-    prioritize: (filePath) => classifyFilePriority(filePath, strategy)
+    prioritize: (filePath) => {
+      const baseTier = classifyFilePriority(filePath, strategy);
+      const langWeight = getLanguageWeight(filePath, languageLocations);
+      return baseTier + langWeight * 0.1;
+    }
   });
   if (packed.fileCount === 0) {
     throw new AnalysisError(
@@ -4751,7 +4868,7 @@ function buildProfileSummary(profile) {
   const lines = [];
   lines.push(`Project: ${profile.name}`);
   if (profile.description) lines.push(`Description: ${profile.description}`);
-  if (profile.language) lines.push(`Language: ${profile.language}`);
+  if (profile.languages.length > 0) lines.push(`Languages: ${profile.languages.join(", ")}`);
   if (profile.framework) lines.push(`Framework: ${profile.framework}`);
   if (profile.dependencies.length > 0) {
     lines.push(`Dependencies: ${profile.dependencies.join(", ")}`);
@@ -4900,7 +5017,7 @@ var init_optimize = __esm({
       const scanSpinner = ora({ text: "Scanning project...", indent: 2 }).start();
       const profile = await scanProject(targetDir);
       scanSpinner.stop();
-      if (profile.language) console.log(ui.kv("Language:", profile.language));
+      if (profile.languages.length > 0) console.log(ui.kv("Languages:", profile.languages.join(", ")));
       if (profile.framework) console.log(ui.kv("Framework:", profile.framework));
       console.log(ui.kv("Dependencies:", String(profile.dependencies.length)));
       if (profile.testCommand) console.log(ui.kv("Tests:", profile.testCommand));
@@ -9308,12 +9425,6 @@ async function evolve(workspacePath, tasks, kairnConfig, evolveConfig, onProgres
         evolveConfig.proposerModel,
         principalProjectCtx
       );
-      if (principalProposal.mutations.length > evolveConfig.maxMutationsPerIteration) {
-        principalProposal = {
-          ...principalProposal,
-          mutations: principalProposal.mutations.slice(0, evolveConfig.maxMutationsPerIteration)
-        };
-      }
       const principalIterNum = history.length;
       const principalIterDir = path31.join(workspacePath, "iterations", principalIterNum.toString());
       const mutResult = await applyMutations(baselineHarnessPath, principalIterDir, principalProposal.mutations);
@@ -11392,7 +11503,7 @@ function buildAnalysisContext(analysis) {
 }
 function buildTaskGenerationMessage(claudeMd, projectProfile, templates, analysis) {
   const profileLines = [
-    `Language: ${projectProfile.language ?? "unknown"}`,
+    `Languages: ${projectProfile.languages.length > 0 ? projectProfile.languages.join(", ") : "unknown"}`,
     `Framework: ${projectProfile.framework ?? "none"}`,
     `Scripts: ${Object.entries(projectProfile.scripts).map(([k, v]) => `${k}=${v}`).join(", ") || "none"}`,
     `Key files: ${projectProfile.keyFiles.join(", ") || "none"}`
@@ -11489,6 +11600,7 @@ async function writeTasksFile(workspacePath, tasks) {
 async function buildProjectProfile(projectRoot) {
   const profile = {
     language: null,
+    languages: [],
     framework: null,
     scripts: {},
     keyFiles: []
@@ -11500,6 +11612,7 @@ async function buildProjectProfile(projectRoot) {
     );
     const pkg2 = JSON.parse(pkgStr);
     profile.language = "typescript";
+    profile.languages = ["typescript"];
     if (pkg2.scripts && typeof pkg2.scripts === "object") {
       profile.scripts = pkg2.scripts;
     }
@@ -11524,10 +11637,12 @@ async function buildProjectProfile(projectRoot) {
     try {
       await fs20.access(path20.join(projectRoot, "pyproject.toml"));
       profile.language = "python";
+      profile.languages = ["python"];
     } catch {
       try {
         await fs20.access(path20.join(projectRoot, "requirements.txt"));
         profile.language = "python";
+        profile.languages = ["python"];
       } catch {
       }
     }
@@ -12910,8 +13025,8 @@ async function analyzeAction(options) {
   const profile = await scanProject(targetDir);
   scanSpinner?.succeed("Project scanned");
   if (!options.json) {
-    if (profile.language)
-      console.log(ui.kv("Language:", profile.language));
+    if (profile.languages.length > 0)
+      console.log(ui.kv("Languages:", profile.languages.join(", ")));
     if (profile.framework)
       console.log(ui.kv("Framework:", profile.framework));
   }