karajan-code 1.6.1 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karajan-code",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Local multi-agent coding orchestrator with TDD, SonarQube, and code review pipeline",
   "type": "module",
   "license": "AGPL-3.0",

package/src/cli.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import path from "node:path";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import { applyRunOverrides, loadConfig, validateConfig } from "./config.js";
 import { createLogger } from "./utils/logger.js";
@@ -15,6 +18,9 @@ import { resumeCommand } from "./commands/resume.js";
 import { sonarCommand, sonarOpenCommand } from "./commands/sonar.js";
 import { rolesCommand } from "./commands/roles.js";
 
+const PKG_PATH = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../package.json");
+const PKG_VERSION = JSON.parse(readFileSync(PKG_PATH, "utf8")).version;
+
 async function withConfig(commandName, flags, fn) {
   const { config } = await loadConfig();
   const merged = applyRunOverrides(config, flags || {});
@@ -24,7 +30,7 @@ async function withConfig(commandName, flags, fn) {
 }
 
 const program = new Command();
-program.name("kj").description("Karajan Code CLI").version("1.6.1");
+program.name("kj").description("Karajan Code CLI").version(PKG_VERSION);
 
 program
   .command("init")

package/src/commands/init.js

@@ -33,33 +33,32 @@ async function runWizard(config, logger) {
   }
   logger.info("");
 
-  if (available.length === 1) {
-    const only = available[0].name;
-    logger.info(`Only one agent available: ${only}. Using it for all roles.\n`);
-    config.coder = only;
-    config.reviewer = only;
-    config.roles.coder.provider = only;
-    config.roles.reviewer.provider = only;
-    return config;
-  }
-
   const wizard = createWizard();
   try {
-    const agentOptions = available.map((a) => ({
-      label: `${a.name} (${a.version})`,
-      value: a.name,
-      available: true
-    }));
-
-    const coder = await wizard.select("Select default CODER agent:", agentOptions);
-    config.coder = coder;
-    config.roles.coder.provider = coder;
-    logger.info(`  -> Coder: ${coder}`);
-
-    const reviewer = await wizard.select("Select default REVIEWER agent:", agentOptions);
-    config.reviewer = reviewer;
-    config.roles.reviewer.provider = reviewer;
-    logger.info(`  -> Reviewer: ${reviewer}`);
+    if (available.length === 1) {
+      const only = available[0].name;
+      logger.info(`Only one agent available: ${only}. Using it for all roles.\n`);
+      config.coder = only;
+      config.reviewer = only;
+      config.roles.coder.provider = only;
+      config.roles.reviewer.provider = only;
+    } else {
+      const agentOptions = available.map((a) => ({
+        label: `${a.name} (${a.version})`,
+        value: a.name,
+        available: true
+      }));
+
+      const coder = await wizard.select("Select default CODER agent:", agentOptions);
+      config.coder = coder;
+      config.roles.coder.provider = coder;
+      logger.info(`  -> Coder: ${coder}`);
+
+      const reviewer = await wizard.select("Select default REVIEWER agent:", agentOptions);
+      config.reviewer = reviewer;
+      config.roles.reviewer.provider = reviewer;
+      logger.info(`  -> Reviewer: ${reviewer}`);
+    }
 
     const enableTriage = await wizard.confirm("Enable triage (auto-classify task complexity)?", false);
     config.pipeline.triage = config.pipeline.triage || {};

package/src/mcp/orphan-guard.js

@@ -1,3 +1,6 @@
+import { readFileSync } from "node:fs";
+import { watch } from "node:fs";
+
 const DEFAULT_INTERVAL_MS = 5000;
 
 export function setupOrphanGuard({ intervalMs = DEFAULT_INTERVAL_MS, exitFn = () => process.exit(0) } = {}) {
@@ -19,3 +22,27 @@ export function setupOrphanGuard({ intervalMs = DEFAULT_INTERVAL_MS, exitFn = ()
 
   return { timer, parentPid };
 }
+
+export function setupVersionWatcher({ pkgPath, currentVersion, exitFn = () => process.exit(0) } = {}) {
+  if (!pkgPath) return null;
+
+  function checkVersion() {
+    try {
+      const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+      if (pkg.version !== currentVersion) {
+        exitFn();
+        return true;
+      }
+    } catch { /* ignore read errors */ }
+    return false;
+  }
+
+  let watcher = null;
+  try {
+    watcher = watch(pkgPath, { persistent: false }, () => {
+      checkVersion();
+    });
+  } catch { /* ignore watch errors */ }
+
+  return { watcher, checkVersion };
+}

package/src/mcp/server-handlers.js

@@ -4,6 +4,7 @@
  */
 
 import { EventEmitter } from "node:events";
+import fs from "node:fs/promises";
 import { runKjCommand } from "./run-kj.js";
 import { normalizePlanArgs } from "./tool-arg-normalizers.js";
 import { buildProgressHandler, buildProgressNotifier } from "./progress.js";
@@ -11,6 +12,13 @@ import { runFlow, resumeFlow } from "../orchestrator.js";
 import { loadConfig, applyRunOverrides, validateConfig, resolveRole } from "../config.js";
 import { createLogger } from "../utils/logger.js";
 import { assertAgentsAvailable } from "../agents/availability.js";
+import { createAgent } from "../agents/index.js";
+import { buildPlannerPrompt } from "../prompts/planner.js";
+import { buildCoderPrompt } from "../prompts/coder.js";
+import { buildReviewerPrompt } from "../prompts/reviewer.js";
+import { parseMaybeJsonString } from "../review/parser.js";
+import { computeBaseRef, generateDiff } from "../review/diff-generator.js";
+import { resolveReviewProfile } from "../review/profiles.js";
 
 export function asObject(value) {
   if (value && typeof value === "object") return value;
@@ -93,10 +101,10 @@ export function enrichedFailPayload(error, toolName) {
   return payload;
 }
 
-export async function buildConfig(options) {
+export async function buildConfig(options, commandName = "run") {
   const { config } = await loadConfig();
   const merged = applyRunOverrides(config, options || {});
-  validateConfig(merged, "run");
+  validateConfig(merged, commandName);
   return merged;
 }
 
@@ -173,6 +181,73 @@ export async function handleResumeDirect(a, server, extra) {
   return { ok: true, ...result };
 }
 
+export async function handlePlanDirect(a, server, extra) {
+  const options = normalizePlanArgs(a);
+  const config = await buildConfig(options, "plan");
+  const logger = createLogger(config.output.log_level, "mcp");
+
+  const plannerRole = resolveRole(config, "planner");
+  await assertAgentsAvailable([plannerRole.provider]);
+
+  const planner = createAgent(plannerRole.provider, config, logger);
+  const prompt = buildPlannerPrompt({ task: a.task, context: a.context });
+  const result = await planner.runTask({ prompt, role: "planner" });
+
+  if (!result.ok) {
+    throw new Error(result.error || result.output || "Planner failed");
+  }
+
+  const parsed = parseMaybeJsonString(result.output);
+  return { ok: true, plan: parsed || result.output, raw: result.output };
+}
+
+export async function handleCodeDirect(a, server, extra) {
+  const config = await buildConfig(a, "code");
+  const logger = createLogger(config.output.log_level, "mcp");
+
+  const coderRole = resolveRole(config, "coder");
+  await assertAgentsAvailable([coderRole.provider]);
+
+  const coder = createAgent(coderRole.provider, config, logger);
+  let coderRules = null;
+  if (config.coder_rules) {
+    try {
+      coderRules = await fs.readFile(config.coder_rules, "utf8");
+    } catch { /* no coder rules file */ }
+  }
+  const prompt = buildCoderPrompt({ task: a.task, coderRules, methodology: config.development?.methodology || "tdd" });
+  const result = await coder.runTask({ prompt, role: "coder" });
+
+  if (!result.ok) {
+    throw new Error(result.error || result.output || `Coder failed (exit ${result.exitCode})`);
+  }
+
+  return { ok: true, output: result.output, exitCode: result.exitCode };
+}
+
+export async function handleReviewDirect(a, server, extra) {
+  const config = await buildConfig(a, "review");
+  const logger = createLogger(config.output.log_level, "mcp");
+
+  const reviewerRole = resolveRole(config, "reviewer");
+  await assertAgentsAvailable([reviewerRole.provider, config.reviewer_options?.fallback_reviewer]);
+
+  const reviewer = createAgent(reviewerRole.provider, config, logger);
+  const resolvedBase = await computeBaseRef({ baseBranch: config.base_branch, baseRef: a.baseRef });
+  const diff = await generateDiff({ baseRef: resolvedBase });
+  const { rules } = await resolveReviewProfile({ mode: config.review_mode, projectDir: process.cwd() });
+
+  const prompt = buildReviewerPrompt({ task: a.task, diff, reviewRules: rules, mode: config.review_mode });
+  const result = await reviewer.reviewTask({ prompt, role: "reviewer" });
+
+  if (!result.ok) {
+    throw new Error(result.error || result.output || `Reviewer failed (exit ${result.exitCode})`);
+  }
+
+  const parsed = parseMaybeJsonString(result.output);
+  return { ok: true, review: parsed || result.output, raw: result.output };
+}
+
 export async function handleToolCall(name, args, server, extra) {
   const a = asObject(args);
 
@@ -240,22 +315,21 @@ export async function handleToolCall(name, args, server, extra) {
     if (!a.task) {
       return failPayload("Missing required field: task");
     }
-    return runKjCommand({ command: "code", commandArgs: [a.task], options: a });
+    return handleCodeDirect(a, server, extra);
   }
 
   if (name === "kj_review") {
     if (!a.task) {
       return failPayload("Missing required field: task");
     }
-    return runKjCommand({ command: "review", commandArgs: [a.task], options: a });
+    return handleReviewDirect(a, server, extra);
   }
 
   if (name === "kj_plan") {
     if (!a.task) {
       return failPayload("Missing required field: task");
     }
-    const options = normalizePlanArgs(a);
-    return runKjCommand({ command: "plan", commandArgs: [a.task], options });
+    return handlePlanDirect(a, server, extra);
   }
 
   return failPayload(`Unknown tool: ${name}`);

package/src/mcp/server.js

@@ -1,14 +1,26 @@
 #!/usr/bin/env node
+import path from "node:path";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { tools } from "./tools.js";
 import { handleToolCall, responseText, enrichedFailPayload } from "./server-handlers.js";
 
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+const PKG_PATH = path.resolve(MODULE_DIR, "../../package.json");
+
+function readVersion() {
+  return JSON.parse(readFileSync(PKG_PATH, "utf8")).version;
+}
+
+const LOADED_VERSION = readVersion();
+
 const server = new Server(
   {
     name: "karajan-mcp",
-    version: "1.0.0"
+    version: LOADED_VERSION
   },
   {
     capabilities: {
@@ -22,6 +34,9 @@ const server = new Server(
 server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
 
 server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
+  // Auto-exit if package version changed (stale process)
+  if (readVersion() !== LOADED_VERSION) process.exit(0);
+
   const name = request.params?.name;
   const args = request.params?.arguments || {};
 
@@ -33,9 +48,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
   }
 });
 
-// --- Orphan process protection ---
-import { setupOrphanGuard } from "./orphan-guard.js";
+// --- Orphan process protection + version watcher ---
+import { setupOrphanGuard, setupVersionWatcher } from "./orphan-guard.js";
 setupOrphanGuard();
+setupVersionWatcher({ pkgPath: PKG_PATH, currentVersion: LOADED_VERSION });
 
 const transport = new StdioServerTransport();
 await server.connect(transport);

package/src/mcp/tools.js

@@ -146,8 +146,7 @@ export const tools = [
         task: { type: "string" },
         coder: { type: "string" },
         coderModel: { type: "string" },
-        kjHome: { type: "string" },
-        timeoutMs: { type: "number" }
+        kjHome: { type: "string" }
       }
     }
   },
@@ -162,8 +161,7 @@ export const tools = [
         reviewer: { type: "string" },
         reviewerModel: { type: "string" },
         baseRef: { type: "string" },
-        kjHome: { type: "string" },
-        timeoutMs: { type: "number" }
+        kjHome: { type: "string" }
       }
     }
   },
@@ -179,8 +177,7 @@ export const tools = [
         plannerModel: { type: "string" },
         coder: { type: "string", description: "Legacy alias for planner" },
         coderModel: { type: "string", description: "Legacy alias for plannerModel" },
-        kjHome: { type: "string" },
-        timeoutMs: { type: "number" }
+        kjHome: { type: "string" }
       }
     }
   }

package/src/utils/display.js

@@ -1,3 +1,10 @@
+import path from "node:path";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+const DISPLAY_PKG_PATH = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../package.json");
+const DISPLAY_VERSION = JSON.parse(readFileSync(DISPLAY_PKG_PATH, "utf8")).version;
+
 const ANSI = {
   reset: "\x1b[0m",
   bold: "\x1b[1m",
@@ -57,7 +64,7 @@ export function formatElapsed(ms) {
 const BAR = `${ANSI.dim}\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500${ANSI.reset}`;
 
 export function printHeader({ task, config }) {
-  const version = "0.1.0";
+  const version = DISPLAY_VERSION;
   console.log(BAR);
   console.log(`${ANSI.bold}${ANSI.cyan}\u25b6 Karajan Code v${version}${ANSI.reset}`);
   console.log(BAR);