karajan-code 1.35.0 → 1.36.1

package/src/orchestrator/solomon-escalation.js

@@ -30,10 +30,17 @@ export async function invokeSolomon({ config, logger, emitter, eventBase, stage,
     });
   }
 
+  const solomonError = ruling.result?.error;
+  if (!ruling.ok && solomonError) {
+    logger.warn(`Solomon execution failed: ${solomonError}`);
+  }
+
   emitProgress(
     emitter,
     makeEvent("solomon:end", { ...eventBase, stage: "solomon" }, {
-      message: `Solomon ruling: ${ruling.result?.ruling || "unknown"}`,
+      message: ruling.ok
+        ? `Solomon ruling: ${ruling.result?.ruling || "unknown"}`
+        : `Solomon failed: ${(solomonError || ruling.summary || "unknown error").slice(0, 200)}`,
       detail: ruling.result
     })
   );
@@ -43,13 +50,15 @@ export async function invokeSolomon({ config, logger, emitter, eventBase, stage,
     iteration,
     ruling: ruling.result?.ruling,
     escalate: ruling.result?.escalate,
+    error: solomonError ? solomonError.slice(0, 500) : undefined,
     subtask: ruling.result?.subtask?.title || null
   });
 
   if (!ruling.ok) {
+    const reason = ruling.result?.escalate_reason || solomonError || ruling.summary;
     return escalateToHuman({
       askQuestion, session, emitter, eventBase, stage, iteration,
-      conflict: { ...conflict, solomonReason: ruling.result?.escalate_reason }
+      conflict: { ...conflict, solomonReason: reason }
     });
   }
 

package/src/roles/solomon-role.js

@@ -62,12 +62,28 @@ function buildPrompt({ conflict, task, instructions }) {
   const iterationCount = conflict?.iterationCount ?? "?";
   const maxIterations = conflict?.maxIterations ?? "?";
 
+  const isFirstRejection = conflict?.isFirstRejection ?? false;
+  const isRepeat = conflict?.isRepeat ?? false;
+
   sections.push(
     `## Conflict context`,
     `Stage: ${stage}`,
-    `Iterations exhausted: ${iterationCount}/${maxIterations}`
+    `Iterations exhausted: ${iterationCount}/${maxIterations}`,
+    `isFirstRejection: ${isFirstRejection}`,
+    `isRepeat: ${isRepeat}`
   );
 
+  if (conflict?.issueCategories) {
+    sections.push(`## Issue categories\n${JSON.stringify(conflict.issueCategories, null, 2)}`);
+  }
+
+  if (conflict?.blockingIssues?.length) {
+    const issueList = conflict.blockingIssues
+      .map((issue, i) => `${i + 1}. [${issue.severity || "unknown"}] ${issue.description || issue}`)
+      .join("\n");
+    sections.push(`## Blocking issues\n${issueList}`);
+  }
+
   if (task) {
     sections.push(`## Original task\n${task}`);
   }

package/src/utils/budget.js

@@ -40,18 +40,22 @@ export function extractUsageMetrics(result, defaultModel = null) {
     null;
 
   // 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.
+  // Primary: uses result.promptSize when explicitly provided.
+  // Fallback: estimates from result.output or result.error text length.
   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;
+  if (!tokens_in && !tokens_out && !hasExplicitCost) {
+    const outputText = result?.output || result?.error || result?.summary || "";
+    const promptSize = result?.promptSize || 0;
+    const MIN_TEXT_FOR_ESTIMATION = 40;
+    if (promptSize > 0 || outputText.length >= MIN_TEXT_FOR_ESTIMATION) {
+      const est = estimateTokens(promptSize, outputText.length);
+      finalTokensIn = est.tokens_in;
+      finalTokensOut = est.tokens_out;
+      estimated = true;
+    }
   }
 
   return { tokens_in: finalTokensIn, tokens_out: finalTokensOut, cost_usd, model, estimated };

package/src/utils/model-selector.js

@@ -1,7 +1,7 @@
 const DEFAULT_MODEL_TIERS = {
-  claude: { trivial: "claude/haiku", simple: "claude/haiku", medium: "claude/sonnet", complex: "claude/opus" },
-  codex: { trivial: "codex/o4-mini", simple: "codex/o4-mini", medium: "codex/o4-mini", complex: "codex/o3" },
-  gemini: { trivial: "gemini/flash", simple: "gemini/flash", medium: "gemini/pro", complex: "gemini/pro" },
+  claude: { trivial: "haiku", simple: "haiku", medium: "sonnet", complex: "opus" },
+  codex: { trivial: "o4-mini", simple: "o4-mini", medium: "o4-mini", complex: "o3" },
+  gemini: { trivial: "gemini-2.0-flash", simple: "gemini-2.0-flash", medium: "gemini-2.5-pro", complex: "gemini-2.5-pro" },
   aider: { trivial: null, simple: null, medium: null, complex: null }
 };
 

package/src/utils/stall-detector.js

@@ -51,7 +51,7 @@ export function createStallDetector({
       lastCriticalWarnAt = now;
       emitProgress(emitter, makeEvent("agent:stall", { ...eventBase, stage }, {
         status: "critical",
-        message: `Agent ${provider} unresponsive for ${Math.round(silenceMs / 1000)}s — may be hung`,
+        message: `[${stage}] Agent ${provider} unresponsive for ${Math.round(silenceMs / 1000)}s — may be hung`,
         detail: {
           provider,
           silenceMs,
@@ -65,7 +65,7 @@ export function createStallDetector({
       lastStallWarnAt = now;
       emitProgress(emitter, makeEvent("agent:stall", { ...eventBase, stage }, {
         status: "warning",
-        message: `Agent ${provider} silent for ${Math.round(silenceMs / 1000)}s — still waiting`,
+        message: `[${stage}] Agent ${provider} silent for ${Math.round(silenceMs / 1000)}s — still waiting`,
         detail: {
           provider,
           silenceMs,
@@ -79,8 +79,8 @@ export function createStallDetector({
 
     emitProgress(emitter, makeEvent("agent:heartbeat", { ...eventBase, stage }, {
       message: silenceMs < stallTimeoutMs
-        ? `Agent ${provider} active — ${lineCount} lines, ${Math.round(elapsedMs / 1000)}s elapsed`
-        : `Agent ${provider} waiting — silent ${Math.round(silenceMs / 1000)}s, ${Math.round(elapsedMs / 1000)}s elapsed`,
+        ? `[${stage}] Agent ${provider} active — ${lineCount} lines, ${Math.round(elapsedMs / 1000)}s elapsed`
+        : `[${stage}] Agent ${provider} waiting — silent ${Math.round(silenceMs / 1000)}s, ${Math.round(elapsedMs / 1000)}s elapsed`,
       detail: {
         provider,
         elapsedMs,
@@ -96,7 +96,7 @@ export function createStallDetector({
       maxSilenceTriggered = true;
       emitProgress(emitter, makeEvent("agent:stall", { ...eventBase, stage }, {
         status: "fail",
-        message: `Agent ${provider} exceeded max silence (${Math.round(hardLimit / 1000)}s)`,
+        message: `[${stage}] Agent ${provider} exceeded max silence (${Math.round(hardLimit / 1000)}s)`,
         detail: {
           provider,
           silenceMs,

package/templates/kj.config.yml

@@ -34,6 +34,9 @@ development:
     - .spec.
 
 # SonarQube settings
+# Authentication: set token below, or KJ_SONAR_TOKEN env var,
+# or save admin credentials in ~/.karajan/sonar-credentials.json:
+#   {"user": "admin", "password": "your-password"}
 sonarqube:
   enabled: true
   host: http://localhost:9000