karajan-code 1.15.0 → 1.17.0

package/src/commands/init.js

@@ -85,18 +85,7 @@ async function runWizard(config, logger) {
   return config;
 }
 
-export async function initCommand({ logger, flags = {} }) {
-  const karajanHome = getKarajanHome();
-  await ensureDir(karajanHome);
-  logger.info(`Ensured ${karajanHome} exists`);
-
-  const configPath = getConfigPath();
-  const reviewRulesPath = path.resolve(process.cwd(), "review-rules.md");
-  const coderRulesPath = path.resolve(process.cwd(), "coder-rules.md");
-
-  const { config, exists: configExists } = await loadConfig();
-  const interactive = flags.noInteractive !== true && isTTY();
-
+async function handleConfigSetup({ config, configExists, interactive, configPath, logger }) {
   if (configExists && interactive) {
     const wizard = createWizard();
     try {
@@ -119,95 +108,117 @@ export async function initCommand({ logger, flags = {} }) {
     await writeConfig(configPath, config);
     logger.info(`Created ${configPath}`);
   }
+}
 
-  if (!(await exists(reviewRulesPath))) {
-    await fs.writeFile(
-      reviewRulesPath,
-      "# Review Rules\n\n- Focus on security, correctness, and test coverage.\n",
-      "utf8"
-    );
-    logger.info("Created review-rules.md");
+async function ensureReviewRules(reviewRulesPath, logger) {
+  if (await exists(reviewRulesPath)) return;
+  await fs.writeFile(
+    reviewRulesPath,
+    "# Review Rules\n\n- Focus on security, correctness, and test coverage.\n",
+    "utf8"
+  );
+  logger.info("Created review-rules.md");
+}
+
+async function ensureCoderRules(coderRulesPath, logger) {
+  if (await exists(coderRulesPath)) return;
+  const templatePath = path.resolve(import.meta.dirname, "../../templates/coder-rules.md");
+  let content;
+  try {
+    content = await fs.readFile(templatePath, "utf8");
+  } catch {
+    content = [
+      "# Coder Rules",
+      "",
+      "## File modification safety",
+      "",
+      "- NEVER overwrite existing files entirely. Always make targeted, minimal edits.",
+      "- After each edit, verify with `git diff` that ONLY the intended lines changed.",
+      "- Do not modify code unrelated to the task.",
+      ""
+    ].join("\n");
   }
+  await fs.writeFile(coderRulesPath, content, "utf8");
+  logger.info("Created coder-rules.md");
+}
 
-  if (!(await exists(coderRulesPath))) {
-    const templatePath = path.resolve(import.meta.dirname, "../../templates/coder-rules.md");
-    let content;
-    try {
-      content = await fs.readFile(templatePath, "utf8");
-    } catch {
-      content = [
-        "# Coder Rules",
-        "",
-        "## File modification safety",
-        "",
-        "- NEVER overwrite existing files entirely. Always make targeted, minimal edits.",
-        "- After each edit, verify with `git diff` that ONLY the intended lines changed.",
-        "- Do not modify code unrelated to the task.",
-        ""
-      ].join("\n");
+async function setupSonarQube(config, logger) {
+  if (config.sonarqube?.enabled === false) {
+    logger.info("SonarQube disabled — skipping container setup.");
+    return;
+  }
+  const vmCheck = await checkVmMaxMapCount(os.platform());
+  if (!vmCheck.ok) {
+    logger.warn(`vm.max_map_count check failed: ${vmCheck.reason}`);
+    if (vmCheck.fix) {
+      logger.warn(`Fix: ${vmCheck.fix}`);
     }
-    await fs.writeFile(coderRulesPath, content, "utf8");
-    logger.info("Created coder-rules.md");
   }
 
-  if (config.sonarqube?.enabled !== false) {
-    const vmCheck = await checkVmMaxMapCount(os.platform());
-    if (!vmCheck.ok) {
-      logger.warn(`vm.max_map_count check failed: ${vmCheck.reason}`);
-      if (vmCheck.fix) {
-        logger.warn(`Fix: ${vmCheck.fix}`);
-      }
-    }
+  const sonar = await sonarUp();
+  if (sonar.exitCode !== 0) {
+    throw new Error(`Failed to start SonarQube: ${sonar.stderr || sonar.stdout}`);
+  }
 
-    const sonar = await sonarUp();
-    if (sonar.exitCode !== 0) {
-      throw new Error(`Failed to start SonarQube: ${sonar.stderr || sonar.stdout}`);
-    }
+  logger.info("SonarQube container started");
+  logger.info("");
+  logger.info("To configure the SonarQube token:");
+  logger.info("  1. Open http://localhost:9000");
+  logger.info("  2. Log in (default credentials: admin / admin)");
+  logger.info("  3. Go to: My Account > Security > Generate Token");
+  logger.info("  4. Name: karajan-cli, Type: Global Analysis Token");
+  logger.info("  5. Set the token in ~/.karajan/kj.config.yml under sonarqube.token");
+  logger.info('     or export KJ_SONAR_TOKEN="<your-token>"');
+}
 
-    logger.info("SonarQube container started");
+async function scaffoldBecariaGateway(config, flags, logger) {
+  if (!config.becaria?.enabled && !flags.scaffoldBecaria) return;
+  const projectDir = process.cwd();
+  const workflowDir = path.join(projectDir, ".github", "workflows");
+  await ensureDir(workflowDir);
 
-    logger.info("");
-    logger.info("To configure the SonarQube token:");
-    logger.info("  1. Open http://localhost:9000");
-    logger.info("  2. Log in (default credentials: admin / admin)");
-    logger.info("  3. Go to: My Account > Security > Generate Token");
-    logger.info("  4. Name: karajan-cli, Type: Global Analysis Token");
-    logger.info("  5. Set the token in ~/.karajan/kj.config.yml under sonarqube.token");
-    logger.info('     or export KJ_SONAR_TOKEN="<your-token>"');
-  } else {
-    logger.info("SonarQube disabled — skipping container setup.");
-  }
+  const templatesDir = path.resolve(import.meta.dirname, "../../templates/workflows");
+  const workflows = ["becaria-gateway.yml", "automerge.yml", "houston-override.yml"];
 
-  // --- BecarIA Gateway scaffolding ---
-  if (config.becaria?.enabled || flags.scaffoldBecaria) {
-    const projectDir = process.cwd();
-    const workflowDir = path.join(projectDir, ".github", "workflows");
-    await ensureDir(workflowDir);
-
-    const templatesDir = path.resolve(import.meta.dirname, "../../templates/workflows");
-    const workflows = ["becaria-gateway.yml", "automerge.yml", "houston-override.yml"];
-
-    for (const wf of workflows) {
-      const destPath = path.join(workflowDir, wf);
-      if (!(await exists(destPath))) {
-        const srcPath = path.join(templatesDir, wf);
-        try {
-          const content = await fs.readFile(srcPath, "utf8");
-          await fs.writeFile(destPath, content, "utf8");
-          logger.info(`Created ${path.relative(projectDir, destPath)}`);
-        } catch (err) {
-          logger.warn(`Could not scaffold ${wf}: ${err.message}`);
-        }
-      } else {
-        logger.info(`${wf} already exists — skipping`);
+  for (const wf of workflows) {
+    const destPath = path.join(workflowDir, wf);
+    if (await exists(destPath)) {
+      logger.info(`${wf} already exists — skipping`);
+    } else {
+      const srcPath = path.join(templatesDir, wf);
+      try {
+        const content = await fs.readFile(srcPath, "utf8");
+        await fs.writeFile(destPath, content, "utf8");
+        logger.info(`Created ${path.relative(projectDir, destPath)}`);
+      } catch (err) {
+        logger.warn(`Could not scaffold ${wf}: ${err.message}`);
       }
     }
-
-    logger.info("");
-    logger.info("BecarIA Gateway scaffolded. Next steps:");
-    logger.info("  1. Create a GitHub App named 'becaria-reviewer' with pull_request write permissions");
-    logger.info("  2. Install the App on your repository");
-    logger.info("  3. Add secrets: BECARIA_APP_ID and BECARIA_APP_PRIVATE_KEY");
-    logger.info("  4. Push the workflow files and enable 'kj run --enable-becaria'");
   }
+
+  logger.info("");
+  logger.info("BecarIA Gateway scaffolded. Next steps:");
+  logger.info("  1. Create a GitHub App named 'becaria-reviewer' with pull_request write permissions");
+  logger.info("  2. Install the App on your repository");
+  logger.info("  3. Add secrets: BECARIA_APP_ID and BECARIA_APP_PRIVATE_KEY");
+  logger.info("  4. Push the workflow files and enable 'kj run --enable-becaria'");
+}
+
+export async function initCommand({ logger, flags = {} }) {
+  const karajanHome = getKarajanHome();
+  await ensureDir(karajanHome);
+  logger.info(`Ensured ${karajanHome} exists`);
+
+  const configPath = getConfigPath();
+  const reviewRulesPath = path.resolve(process.cwd(), "review-rules.md");
+  const coderRulesPath = path.resolve(process.cwd(), "coder-rules.md");
+
+  const { config, exists: configExists } = await loadConfig();
+  const interactive = flags.noInteractive !== true && isTTY();
+
+  await handleConfigSetup({ config, configExists, interactive, configPath, logger });
+  await ensureReviewRules(reviewRulesPath, logger);
+  await ensureCoderRules(coderRulesPath, logger);
+  await setupSonarQube(config, logger);
+  await scaffoldBecariaGateway(config, flags, logger);
 }

package/src/commands/plan.js

@@ -65,7 +65,7 @@ export async function planCommand({ task, config, logger, json, context }) {
     return;
   }
 
-  if (parsed && parsed.approach) {
+  if (parsed?.approach) {
     console.log(formatPlan(parsed));
   } else {
     console.log(result.output);

package/src/commands/report.js

@@ -9,7 +9,7 @@ function parseBudgetFromActivityLog(logText) {
     return { consumed_usd: null, limit_usd: null };
   }
 
-  const regex = /Budget:\s*\$([0-9]+(?:\.[0-9]+)?)\s*\/\s*\$([0-9]+(?:\.[0-9]+)?)/g;
+  const regex = /Budget:\s*\$(\d+(?:\.\d+)?)\s*\/\s*\$(\d+(?:\.\d+)?)/g;
   let match;
   let last = null;
   while ((match = regex.exec(logText)) !== null) {
@@ -61,7 +61,7 @@ function summarizePlan(checkpoints = []) {
 
   const uniqueOrdered = [];
   for (const stage of stages) {
-    if (uniqueOrdered[uniqueOrdered.length - 1] !== stage) {
+    if (uniqueOrdered.at(-1) !== stage) {
       uniqueOrdered.push(stage);
     }
   }
@@ -79,7 +79,7 @@ function summarizeSonar(checkpoints = []) {
   }
 
   const initial = sonarPoints[0];
-  const final = sonarPoints[sonarPoints.length - 1];
+  const final = sonarPoints.at(-1);
   return {
     initial,
     final,
@@ -156,14 +156,13 @@ async function buildReport(dir, sessionId) {
 }
 
 function printTextReport(report) {
-  const budgetText =
-    typeof report.budget_consumed?.consumed_usd === "number"
-      ? `$${report.budget_consumed.consumed_usd.toFixed(2)}${
-          typeof report.budget_consumed?.limit_usd === "number"
-            ? ` / $${report.budget_consumed.limit_usd.toFixed(2)}`
-            : ""
-        }`
-      : "N/A";
+  let budgetText = "N/A";
+  if (typeof report.budget_consumed?.consumed_usd === "number") {
+    const limitSuffix = typeof report.budget_consumed?.limit_usd === "number"
+      ? ` / $${report.budget_consumed.limit_usd.toFixed(2)}`
+      : "";
+    budgetText = `$${report.budget_consumed.consumed_usd.toFixed(2)}${limitSuffix}`;
+  }
 
   const planText = report.plan_executed.length > 0 ? report.plan_executed.join(" -> ") : "N/A";
   const iterationText =
@@ -318,62 +317,60 @@ async function findSessionsByPgTask(dir, pgTask) {
       // skip malformed sessions
     }
   }
-  return matches.sort();
+  return matches.sort((a, b) => a.localeCompare(b));
 }
 
-export async function reportCommand({ list = false, sessionId = null, format = "text", trace = false, currency = "usd", pgTask = null }) {
-  const dir = getSessionRoot();
-  if (!(await exists(dir))) {
-    console.log("No reports yet");
-    return;
-  }
+async function resolveTraceOptions(currency) {
+  const { config } = await loadConfig();
+  const cur = currency?.toLowerCase() || config?.budget?.currency || "usd";
+  const rate = config?.budget?.exchange_rate_eur ?? 0.92;
+  return { cur, rate };
+}
 
-  const entries = await fs.readdir(dir);
+function printTraceReport(report, currency, exchangeRate) {
+  console.log(`Session: ${report.session_id}`);
+  if (report.pg_task_id) {
+    const projectLabel = report.pg_project_id ? ` (${report.pg_project_id})` : "";
+    console.log(`Planning Game Card: ${report.pg_task_id}${projectLabel}`);
+  }
+  console.log(`Status: ${report.status}`);
+  console.log(`Task: ${report.task_description || "N/A"}`);
+  console.log("");
+  printTraceTable(report.budget_trace, { currency, exchangeRate });
+}
 
-  if (pgTask) {
-    const matches = await findSessionsByPgTask(dir, pgTask);
-    if (matches.length === 0) {
-      console.log(`No sessions found for card: ${pgTask}`);
-      return;
-    }
-    if (list) {
-      for (const item of matches) console.log(item);
-      return;
-    }
-    // Show all reports for this card, or the latest if no list flag
-    const targetId = sessionId || matches.at(-1);
-    const report = await buildReport(dir, targetId);
-    if (format === "json") {
-      console.log(JSON.stringify({ card: pgTask, sessions: matches, report }, null, 2));
-      return;
-    }
-    console.log(`Card ${pgTask}: ${matches.length} session${matches.length === 1 ? "" : "s"}`);
-    for (const m of matches) {
-      const marker = m === targetId ? " <--" : "";
-      console.log(`  ${m}${marker}`);
-    }
-    console.log("");
-    if (trace) {
-      const { config } = await loadConfig();
-      const cur = currency?.toLowerCase() || config?.budget?.currency || "usd";
-      const rate = config?.budget?.exchange_rate_eur ?? 0.92;
-      console.log(`Session: ${report.session_id}`);
-      console.log(`Status: ${report.status}`);
-      console.log(`Task: ${report.task_description || "N/A"}`);
-      console.log("");
-      printTraceTable(report.budget_trace, { currency: cur, exchangeRate: rate });
-    } else {
-      printTextReport(report);
-    }
+async function handlePgTaskReport({ dir, pgTask, list, sessionId, format, trace, currency }) {
+  const matches = await findSessionsByPgTask(dir, pgTask);
+  if (matches.length === 0) {
+    console.log(`No sessions found for card: ${pgTask}`);
     return;
   }
-
   if (list) {
-    for (const item of entries) console.log(item);
+    for (const item of matches) console.log(item);
+    return;
+  }
+  const targetId = sessionId || matches.at(-1);
+  const report = await buildReport(dir, targetId);
+  if (format === "json") {
+    console.log(JSON.stringify({ card: pgTask, sessions: matches, report }, null, 2));
     return;
   }
+  console.log(`Card ${pgTask}: ${matches.length} session${matches.length === 1 ? "" : "s"}`);
+  for (const m of matches) {
+    const marker = m === targetId ? " <--" : "";
+    console.log(`  ${m}${marker}`);
+  }
+  console.log("");
+  if (trace) {
+    const { cur, rate } = await resolveTraceOptions(currency);
+    printTraceReport(report, cur, rate);
+  } else {
+    printTextReport(report);
+  }
+}
 
-  const ids = [...entries].sort();
+async function handleSingleSessionReport({ dir, entries, sessionId, format, trace, currency }) {
+  const ids = [...entries].sort((a, b) => a.localeCompare(b));
   const selectedSessionId = sessionId || ids.at(-1);
   if (!selectedSessionId) {
     console.log("No reports yet");
@@ -388,24 +385,33 @@ export async function reportCommand({ list = false, sessionId = null, format = "
     console.log(JSON.stringify(report, null, 2));
     return;
   }
-
   if (trace) {
-    const { config } = await loadConfig();
-    const cur = currency?.toLowerCase() || config?.budget?.currency || "usd";
-    const rate = config?.budget?.exchange_rate_eur ?? 0.92;
-    console.log(`Session: ${report.session_id}`);
-    if (report.pg_task_id) {
-      const projectLabel = report.pg_project_id ? ` (${report.pg_project_id})` : "";
-      console.log(`Planning Game Card: ${report.pg_task_id}${projectLabel}`);
-    }
-    console.log(`Status: ${report.status}`);
-    console.log(`Task: ${report.task_description || "N/A"}`);
-    console.log("");
-    printTraceTable(report.budget_trace, { currency: cur, exchangeRate: rate });
+    const { cur, rate } = await resolveTraceOptions(currency);
+    printTraceReport(report, cur, rate);
     return;
   }
-
   printTextReport(report);
 }
 
+export async function reportCommand({ list = false, sessionId = null, format = "text", trace = false, currency = "usd", pgTask = null }) {
+  const dir = getSessionRoot();
+  if (!(await exists(dir))) {
+    console.log("No reports yet");
+    return;
+  }
+
+  const entries = await fs.readdir(dir);
+
+  if (pgTask) {
+    return handlePgTaskReport({ dir, pgTask, list, sessionId, format, trace, currency });
+  }
+
+  if (list) {
+    for (const item of entries) console.log(item);
+    return;
+  }
+
+  return handleSingleSessionReport({ dir, entries, sessionId, format, trace, currency });
+}
+
 export { formatDuration, convertCost, formatCost, printTraceTable, buildReport, findSessionsByPgTask };

package/src/commands/roles.js

@@ -1,5 +1,4 @@
 import fs from "node:fs/promises";
-import path from "node:path";
 import { resolveRoleMdPath, loadFirstExisting } from "../roles/base-role.js";
 import { resolveRole } from "../config.js";
 import { exists } from "../utils/fs.js";

package/src/commands/run.js

@@ -25,7 +25,6 @@ export async function runCommandHandler({ task, config, logger, flags }) {
   // --- Planning Game: resolve card ID ---
   const pgCardId = flags?.pgTask || parseCardId(task);
   const pgProject = flags?.pgProject || config.planning_game?.project_id || null;
-  const enrichedTask = task;
 
   const jsonMode = flags?.json;
 
@@ -48,10 +47,10 @@ export async function runCommandHandler({ task, config, logger, flags }) {
   });
 
   if (!jsonMode) {
-    printHeader({ task: enrichedTask, config });
+    printHeader({ task: task, config });
   }
 
-  const result = await runFlow({ task: enrichedTask, config, logger, flags, emitter, pgTaskId: pgCardId || null, pgProject: pgProject || null });
+  const result = await runFlow({ task: task, config, logger, flags, emitter, pgTaskId: pgCardId || null, pgProject: pgProject || null });
 
   if (jsonMode) {
     console.log(JSON.stringify(result, null, 2));