karajan-code 1.33.0 → 1.34.0

package/package.json

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

package/src/config.js

@@ -420,6 +420,34 @@ export function applyRunOverrides(config, flags) {
   return out;
 }
 
+/**
+ * Check if a model string is compatible with an agent provider.
+ * Only returns false when the model clearly belongs to a DIFFERENT provider.
+ * Returns true if we can't determine or if the model is ambiguous.
+ */
+const AGENT_MODEL_SIGNATURES = {
+  claude: ["claude", "sonnet", "opus", "haiku"],
+  codex: ["o4-", "o3-", "gpt-", "codex"],
+  gemini: ["gemini", "flash-"]
+};
+
+export function isModelCompatible(agent, model) {
+  if (!model || !agent) return true;
+  const lower = model.toLowerCase();
+
+  // Check if model clearly belongs to a different provider
+  for (const [provider, signatures] of Object.entries(AGENT_MODEL_SIGNATURES)) {
+    if (provider === agent) continue;
+    if (signatures.some(s => lower.includes(s))) {
+      // Model belongs to a different provider — incompatible
+      return false;
+    }
+  }
+
+  // Model doesn't clearly belong to any other provider — allow it
+  return true;
+}
+
 export function resolveRole(config, role) {
   const roles = config?.roles || {};
   const roleConfig = roles[role] || {};
@@ -434,10 +462,17 @@ export function resolveRole(config, role) {
   }
 
   let model = roleConfig.model ?? null;
+  let modelIsInherited = false;
   if (!model && role === "coder") model = config?.coder_options?.model ?? null;
   if (!model && role === "reviewer") model = config?.reviewer_options?.model ?? null;
   if (!model && (role === "planner" || role === "refactorer" || role === "solomon" || role === "researcher" || role === "tester" || role === "security" || role === "impeccable" || role === "triage" || role === "discover" || role === "architect" || role === "hu_reviewer" || role === "hu-reviewer")) {
     model = config?.coder_options?.model ?? null;
+    modelIsInherited = !!model;
+  }
+
+  // Drop inherited model if incompatible with the resolved provider
+  if (modelIsInherited && provider && model && !isModelCompatible(provider, model)) {
+    model = null;
   }
 
   return { provider, model };

package/src/mcp/server-handlers.js

@@ -790,7 +790,10 @@ async function handleRun(a, server, extra) {
     }
   }
   if (!isPreflightAcked()) {
-    return buildPreflightRequiredResponse("kj_run");
+    // Auto-acknowledge with defaults for autonomous operation
+    ackPreflight({});
+    const logger = createLogger("info", "mcp");
+    logger.info("Preflight auto-acknowledged with default agent config");
   }
   applySessionOverrides(a, ["coder", "reviewer", "tester", "security", "solomon", "enableTester", "enableSecurity", "enableImpeccable"]);
   return handleRunDirect(a, server, extra);
@@ -801,7 +804,10 @@ async function handleCode(a, server, extra) {
     return failPayload("Missing required field: task");
   }
   if (!isPreflightAcked()) {
-    return buildPreflightRequiredResponse("kj_code");
+    // Auto-acknowledge with defaults for autonomous operation
+    ackPreflight({});
+    const logger = createLogger("info", "mcp");
+    logger.info("Preflight auto-acknowledged with default agent config");
   }
   applySessionOverrides(a, ["coder"]);
   return handleCodeDirect(a, server, extra);

package/src/prompts/audit.js

@@ -1,3 +1,5 @@
+import { extractFirstJson } from "../utils/json-extract.js";
+
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
   "Do NOT ask about using Karajan, do NOT mention Karajan, do NOT suggest orchestration.",
@@ -154,16 +156,8 @@ function parseRecommendation(raw) {
 }
 
 export function parseAuditOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-
-  let parsed;
-  try {
-    parsed = JSON.parse(jsonMatch[0]);
-  } catch {
-    return null;
-  }
+  const parsed = extractFirstJson(raw);
+  if (!parsed) return null;
 
   // Handle both wrapped (result.summary) and flat structures
   const resultObj = parsed.result || parsed;

package/src/prompts/coder.js

@@ -31,7 +31,7 @@ const SERENA_INSTRUCTIONS = [
   "Fall back to reading files only when Serena tools are not sufficient."
 ].join("\n");
 
-export function buildCoderPrompt({ task, reviewerFeedback = null, sonarSummary = null, coderRules = null, methodology = "tdd", serenaEnabled = false, rtkAvailable = false, deferredContext = null, productContext = null }) {
+export function buildCoderPrompt({ task, reviewerFeedback = null, sonarSummary = null, coderRules = null, methodology = "tdd", serenaEnabled = false, rtkAvailable = false, deferredContext = null, productContext = null, plan = null }) {
   const sections = [
     serenaEnabled ? SUBAGENT_PREAMBLE_SERENA : SUBAGENT_PREAMBLE,
     `Task:\n${task}`,
@@ -52,6 +52,10 @@ export function buildCoderPrompt({ task, reviewerFeedback = null, sonarSummary =
     sections.push(`## Product Context\n${productContext}`);
   }
 
+  if (plan) {
+    sections.push(`## Implementation Plan (from planner)\nFollow these steps:\n${plan}`);
+  }
+
   if (coderRules) {
     sections.push(`Coder rules (MUST follow):\n${coderRules}`);
   }

package/src/prompts/discover.js

@@ -1,3 +1,5 @@
+import { extractFirstJson } from "../utils/json-extract.js";
+
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
   "Do NOT ask about using Karajan, do NOT mention Karajan, do NOT suggest orchestration.",
@@ -205,16 +207,8 @@ function parseJtbds(rawJtbds) {
 }
 
 export function parseDiscoverOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-
-  let parsed;
-  try {
-    parsed = JSON.parse(jsonMatch[0]);
-  } catch {
-    return null;
-  }
+  const parsed = extractFirstJson(raw);
+  if (!parsed) return null;
 
   return {
     verdict: VALID_VERDICTS.has(parsed.verdict) ? parsed.verdict : "ready",

package/src/prompts/hu-reviewer.js

@@ -1,3 +1,5 @@
+import { extractFirstJson } from "../utils/json-extract.js";
+
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
   "Do NOT ask about using Karajan, do NOT mention Karajan, do NOT suggest orchestration.",
@@ -135,16 +137,8 @@ export function normalizeAcceptanceCriteria(criteria) {
  * @returns {object|null} Parsed result with evaluations and batch_summary, or null.
  */
 export function parseHuReviewerOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-
-  let parsed;
-  try {
-    parsed = JSON.parse(jsonMatch[0]);
-  } catch {
-    return null;
-  }
+  const parsed = extractFirstJson(raw);
+  if (!parsed) return null;
 
   if (!Array.isArray(parsed.evaluations)) return null;
 

package/src/review/parser.js

@@ -3,23 +3,11 @@
  * Extracted from orchestrator.js to improve testability and reduce complexity.
  */
 
+import { extractFirstJson } from "../utils/json-extract.js";
+
 export function parseMaybeJsonString(value) {
   if (typeof value !== "string") return null;
-  try {
-    return JSON.parse(value);
-  } catch {
-    const start = value.indexOf("{");
-    const end = value.lastIndexOf("}");
-    if (start >= 0 && end > start) {
-      const candidate = value.slice(start, end + 1);
-      try {
-        return JSON.parse(candidate);
-      } catch {
-        return null;
-      }
-    }
-    return null;
-  }
+  return extractFirstJson(value);
 }
 
 function isReviewPayload(obj) {

package/src/roles/security-role.js

@@ -1,5 +1,6 @@
 import { BaseRole } from "./base-role.js";
 import { createAgent as defaultCreateAgent } from "../agents/index.js";
+import { extractFirstJson } from "../utils/json-extract.js";
 
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
@@ -38,10 +39,7 @@ function buildPrompt({ task, diff, instructions }) {
 }
 
 function parseSecurityOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-  return JSON.parse(jsonMatch[0]);
+  return extractFirstJson(raw);
 }
 
 function buildSummary(parsed) {

package/src/roles/tester-role.js

@@ -1,5 +1,6 @@
 import { BaseRole } from "./base-role.js";
 import { createAgent as defaultCreateAgent } from "../agents/index.js";
+import { extractFirstJson } from "../utils/json-extract.js";
 
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
@@ -42,10 +43,7 @@ function buildPrompt({ task, diff, sonarIssues, instructions }) {
 }
 
 function parseTesterOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-  return JSON.parse(jsonMatch[0]);
+  return extractFirstJson(raw);
 }
 
 export class TesterRole extends BaseRole {

package/src/roles/triage-role.js

@@ -2,6 +2,7 @@ import { BaseRole } from "./base-role.js";
 import { createAgent as defaultCreateAgent } from "../agents/index.js";
 import { buildTriagePrompt } from "../prompts/triage.js";
 import { VALID_TASK_TYPES } from "../guards/policy-resolver.js";
+import { extractFirstJson } from "../utils/json-extract.js";
 
 const VALID_LEVELS = new Set(["trivial", "simple", "medium", "complex"]);
 const VALID_ROLES = new Set(["planner", "researcher", "refactorer", "reviewer", "tester", "security", "impeccable"]);
@@ -16,10 +17,7 @@ function resolveProvider(config) {
 }
 
 function parseTriageOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-  return JSON.parse(jsonMatch[0]);
+  return extractFirstJson(raw);
 }
 
 function normalizeRoles(roles) {

package/src/utils/budget.js

@@ -1,5 +1,17 @@
 import { calculateUsageCostUsd, DEFAULT_MODEL_PRICING, mergePricing } from "./pricing.js";
 
+/**
+ * Estimate token counts from character lengths when CLIs don't report usage.
+ * Rough heuristic: ~4 characters per token for English text.
+ */
+export function estimateTokens(promptLength, responseLength) {
+  return {
+    tokens_in: Math.ceil((promptLength || 0) / 4),
+    tokens_out: Math.ceil((responseLength || 0) / 4),
+    estimated: true
+  };
+}
+
 export function extractUsageMetrics(result, defaultModel = null) {
   const usage = result?.usage || result?.metrics || {};
   const tokens_in =
@@ -27,7 +39,22 @@ export function extractUsageMetrics(result, defaultModel = null) {
     defaultModel ??
     null;
 
-  return { tokens_in, tokens_out, cost_usd, model };
+  // If no real token data AND no explicit cost, estimate from prompt/output sizes.
+  // Estimation is opt-in: only triggered when result.promptSize is explicitly provided.
+  let estimated = false;
+  let finalTokensIn = tokens_in;
+  let finalTokensOut = tokens_out;
+  const hasExplicitCost = cost_usd !== undefined && cost_usd !== null && cost_usd !== "";
+  if (!tokens_in && !tokens_out && !hasExplicitCost && result?.promptSize > 0) {
+    const promptSize = result.promptSize;
+    const outputSize = (result?.output || result?.summary || "").length;
+    const est = estimateTokens(promptSize, outputSize);
+    finalTokensIn = est.tokens_in;
+    finalTokensOut = est.tokens_out;
+    estimated = true;
+  }
+
+  return { tokens_in: finalTokensIn, tokens_out: finalTokensOut, cost_usd, model, estimated };
 }
 
 function toSafeNumber(value) {
@@ -63,7 +90,7 @@ export class BudgetTracker {
     this.pricing = mergePricing(DEFAULT_MODEL_PRICING, options.pricing || {});
   }
 
-  record({ role, provider, model, tokens_in, tokens_out, cost_usd, duration_ms, stage_index } = {}) {
+  record({ role, provider, model, tokens_in, tokens_out, cost_usd, duration_ms, stage_index, estimated } = {}) {
     const safeTokensIn = toSafeNumber(tokens_in);
     const safeTokensOut = toSafeNumber(tokens_out);
     const hasExplicitCost = cost_usd !== undefined && cost_usd !== null && cost_usd !== "";
@@ -89,6 +116,9 @@ export class BudgetTracker {
     if (stage_index !== undefined && stage_index !== null) {
       entry.stage_index = Number(stage_index);
     }
+    if (estimated) {
+      entry.estimated = true;
+    }
     this.entries.push(entry);
     return entry;
   }
@@ -133,26 +163,33 @@ export class BudgetTracker {
       addToBreakdown(byRole, entry.role, entry);
     }
 
-    return {
+    const hasEstimates = this.entries.some(e => e.estimated);
+    const result = {
       total_tokens: totals.tokens_in + totals.tokens_out,
       total_cost_usd: totals.cost_usd,
       breakdown_by_role: byRole,
       entries: [...this.entries],
       usage_available: this.hasUsageData()
     };
+    if (hasEstimates) result.includes_estimates = true;
+    return result;
   }
 
   trace() {
-    return this.entries.map((entry, index) => ({
-      index: entry.stage_index ?? index,
-      role: entry.role,
-      provider: entry.provider,
-      model: entry.model,
-      timestamp: entry.timestamp,
-      duration_ms: entry.duration_ms ?? null,
-      tokens_in: entry.tokens_in,
-      tokens_out: entry.tokens_out,
-      cost_usd: entry.cost_usd
-    }));
+    return this.entries.map((entry, index) => {
+      const item = {
+        index: entry.stage_index ?? index,
+        role: entry.role,
+        provider: entry.provider,
+        model: entry.model,
+        timestamp: entry.timestamp,
+        duration_ms: entry.duration_ms ?? null,
+        tokens_in: entry.tokens_in,
+        tokens_out: entry.tokens_out,
+        cost_usd: entry.cost_usd
+      };
+      if (entry.estimated) item.estimated = true;
+      return item;
+    });
   }
 }

package/src/utils/display.js

@@ -225,11 +225,13 @@ function printSessionBudget(budget) {
     console.log(`  ${ANSI.dim}\ud83d\udcb0 Budget: N/A (provider does not report usage)${ANSI.reset}`);
     return;
   }
-  console.log(`  ${ANSI.dim}\ud83d\udcb0 Total tokens: ${budget.total_tokens ?? 0}${ANSI.reset}`);
-  console.log(`  ${ANSI.dim}\ud83d\udcb0 Total cost: $${Number(budget.total_cost_usd || 0).toFixed(2)}${ANSI.reset}`);
+  const estPrefix = budget.includes_estimates ? "~" : "";
+  const estNote = budget.includes_estimates ? " (includes estimates)" : "";
+  console.log(`  ${ANSI.dim}\ud83d\udcb0 Total tokens: ${estPrefix}${budget.total_tokens ?? 0}${estNote}${ANSI.reset}`);
+  console.log(`  ${ANSI.dim}\ud83d\udcb0 Total cost: ${estPrefix}$${Number(budget.total_cost_usd || 0).toFixed(2)}${ANSI.reset}`);
   for (const [role, metrics] of Object.entries(budget.breakdown_by_role || {})) {
     console.log(
-      `  ${ANSI.dim}   - ${role}: ${metrics.total_tokens ?? 0} tokens, $${Number(metrics.total_cost_usd || 0).toFixed(2)}${ANSI.reset}`
+      `  ${ANSI.dim}   - ${role}: ${estPrefix}${metrics.total_tokens ?? 0} tokens, ${estPrefix}$${Number(metrics.total_cost_usd || 0).toFixed(2)}${ANSI.reset}`
     );
   }
 }

package/src/utils/json-extract.js

@@ -0,0 +1,64 @@
+/**
+ * Robust JSON extraction from agent output.
+ * Extracts the first complete JSON object from a string,
+ * ignoring any trailing text that would cause parse errors.
+ */
+
+/**
+ * Extract the first valid JSON object from a raw string.
+ * Handles cases where agents output valid JSON followed by extra text.
+ * @param {string} raw - Raw agent output.
+ * @returns {object|null} Parsed JSON object, or null if no valid JSON found.
+ */
+export function extractFirstJson(raw) {
+  if (!raw) return null;
+  const str = typeof raw === "string" ? raw.trim() : String(raw).trim();
+  if (!str) return null;
+
+  // Fast path: try parsing the whole string first
+  try {
+    return JSON.parse(str);
+  } catch { /* fall through to extraction */ }
+
+  // Find the first '{' and match to its closing '}'
+  const start = str.indexOf("{");
+  if (start === -1) return null;
+
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+
+  for (let i = start; i < str.length; i++) {
+    const ch = str[i];
+
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+
+    if (ch === "\\") {
+      escaped = true;
+      continue;
+    }
+
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+
+    if (inString) continue;
+
+    if (ch === "{") depth++;
+    if (ch === "}") depth--;
+
+    if (depth === 0) {
+      try {
+        return JSON.parse(str.substring(start, i + 1));
+      } catch {
+        return null;
+      }
+    }
+  }
+
+  return null;
+}

package/templates/roles/coder.md

@@ -21,6 +21,13 @@ Before reporting done, verify that ALL parts of the task are addressed:
 - Run the test suite after implementation to verify nothing is broken.
 - An incomplete implementation is worse than an error — never report success if parts are missing.
 
+## Implementation Rules
+- NEVER generate placeholder, stub, or TODO code. Every function must be fully implemented.
+- If the task says "create X", create the complete working implementation, not a skeleton.
+- If tests exist, the implementation MUST make all tests pass.
+- If you write tests first (TDD), the implementation MUST make those tests pass.
+- Do NOT commit code that doesn't compile or doesn't pass tests.
+
 ## File modification safety
 
 - NEVER overwrite existing files entirely. Always make targeted, minimal edits.