karajan-code 1.59.1 → 2.0.0

package/src/orchestrator/feedback-enrichment.js

@@ -0,0 +1,140 @@
+// Feedback enrichment: transform vague feedback into actionable instructions.
+// Extracts file hints, line hints, and suggests fixes from feedback text.
+
+/**
+ * Extract file path hints from feedback description.
+ * Matches patterns like: packages/server/auth.js, src/routes/*, auth/middleware.ts
+ */
+export function extractFileHints(description) {
+  if (!description) return [];
+  const hints = new Set();
+
+  // Explicit paths with extensions (supports bare filenames too)
+  const pathRe = /\b([\w./_-]+\.(?:js|ts|jsx|tsx|py|go|rs|java|rb|php|cs|swift|dart|html|css|vue|svelte|astro|json|yml|yaml|md|sql))\b/gi;
+  const paths = description.match(pathRe) || [];
+  for (const p of paths) hints.add(p);
+
+  // Directory references
+  const dirRe = /\b(packages\/[\w-]+|src\/[\w/-]+|tests?\/[\w/-]+|lib\/[\w/-]+)/gi;
+  const dirs = description.match(dirRe) || [];
+  for (const d of dirs) hints.add(d);
+
+  return [...hints];
+}
+
+/**
+ * Detect the category of feedback from description keywords.
+ */
+export function detectCategory(description) {
+  const text = (description || "").toLowerCase();
+  if (/\b(injection|xss|csrf|httponly|sql\s*injection|exposed\s*secret|auth(?:entication)?\s*bypass|authoriza(?:tion)?\s*bypass|cryptograph|token\s*expos)/i.test(text)) return "security";
+  if (/\btest|coverage|assert|spec|mock\b/.test(text)) return "tests";
+  if (/\bperf(ormance)?|slow|optimize|bottleneck|latency\b/.test(text)) return "performance";
+  if (/\b(style|format(?:ting)?|naming|rename|indent|whitespace|comment|jsdoc|cosmetic)\b/.test(text)) return "style";
+  if (/\b(bug|incorrect|wrong|fails?|error|crash|broken)\b/.test(text)) return "correctness";
+  return "other";
+}
+
+/**
+ * Detect severity from description keywords and existing severity field.
+ */
+export function detectSeverity(description, existingSeverity) {
+  if (existingSeverity) return existingSeverity;
+  const text = (description || "").toLowerCase();
+  if (/\bcritical|blocker|severe|production\s*risk\b/.test(text)) return "critical";
+  if (/\b(high|security|vulnerab|breaking|regression|injection|xss|csrf)\b/.test(text)) return "high";
+  if (/\blow|minor|cosmetic|nitpick\b/.test(text)) return "low";
+  return "medium";
+}
+
+/**
+ * Generate actionable instructions from a feedback entry.
+ * Adds concrete steps the coder can follow.
+ */
+export function generateActionPlan(entry) {
+  const steps = [];
+  const cat = entry.category || detectCategory(entry.description);
+
+  // Always start with locating the problem
+  if (entry.file) {
+    steps.push(`Open ${entry.file}${entry.line ? ` at line ${entry.line}` : ""}`);
+  } else {
+    const hints = extractFileHints(entry.description);
+    if (hints.length > 0) {
+      steps.push(`Look in: ${hints.join(", ")}`);
+    } else {
+      steps.push("Identify the relevant file(s) using grep/search");
+    }
+  }
+
+  // Category-specific actions
+  if (cat === "security") {
+    steps.push("Apply the security fix (validate input, escape output, use parameterized queries, etc.)");
+  } else if (cat === "tests") {
+    steps.push("Write the missing test cases covering the scenario described");
+    steps.push("Run tests to verify they pass: npm test or equivalent");
+  } else if (cat === "correctness") {
+    steps.push("Fix the bug described");
+    steps.push("Add a regression test");
+  } else if (cat === "performance") {
+    steps.push("Optimize the identified bottleneck");
+    steps.push("Verify improvement with measurements");
+  } else if (cat === "style") {
+    steps.push("Apply the style fix (run linter if available)");
+  }
+
+  // Include suggested fix if provided
+  if (entry.suggestedFix) {
+    steps.push(`Suggested approach: ${entry.suggestedFix}`);
+  }
+
+  return steps;
+}
+
+/**
+ * Enrich a single feedback entry with file hints, category, severity, and action plan.
+ */
+export function enrichEntry(entry) {
+  const description = entry.description || "";
+  // Re-detect category when missing or set to default "other"
+  const category = (!entry.category || entry.category === "other")
+    ? detectCategory(description)
+    : entry.category;
+  const severity = detectSeverity(description, entry.severity);
+  const fileHints = entry.file ? [entry.file] : extractFileHints(description);
+
+  return {
+    ...entry,
+    category,
+    severity,
+    fileHints,
+    actionPlan: generateActionPlan({ ...entry, category })
+  };
+}
+
+/**
+ * Enrich all entries in a queue in-place.
+ */
+export function enrichQueue(queue) {
+  queue.entries = queue.entries.map(enrichEntry);
+  return queue;
+}
+
+/**
+ * Format enriched entries as actionable coder prompt sections.
+ */
+export function formatEnrichedForCoder(enrichedEntries) {
+  if (!enrichedEntries?.length) return "";
+
+  const sections = [];
+  enrichedEntries.forEach((e, i) => {
+    const header = `### Issue ${i + 1}: [${e.severity}] ${e.category} — ${e.description}`;
+    const location = e.fileHints?.length
+      ? `**Location hints:** ${e.fileHints.join(", ")}`
+      : "**Location:** search the project for relevant files";
+    const plan = `**Action plan:**\n${e.actionPlan.map(s => `- ${s}`).join("\n")}`;
+    sections.push([header, location, plan].join("\n"));
+  });
+
+  return sections.join("\n\n");
+}

package/src/orchestrator/feedback-queue.js

@@ -0,0 +1,152 @@
+// Structured feedback queue for inter-role communication.
+// Replaces the flat session.last_reviewer_feedback string with typed messages.
+
+/**
+ * @typedef {Object} FeedbackEntry
+ * @property {string} source - "reviewer" | "tester" | "security" | "sonar" | "audit" | "brain"
+ * @property {string} severity - "critical" | "high" | "medium" | "low"
+ * @property {string} category - "security" | "correctness" | "tests" | "style" | "performance" | "other"
+ * @property {string} description
+ * @property {string} [file]
+ * @property {number} [line]
+ * @property {string} [suggestedFix]
+ * @property {string} [id]
+ * @property {number} [iteration] - when this feedback was added
+ */
+
+const SEVERITY_ORDER = { critical: 0, high: 1, medium: 2, low: 3 };
+const CATEGORY_ORDER = { security: 0, correctness: 1, tests: 2, performance: 3, style: 4, other: 5 };
+
+/**
+ * Create a new empty feedback queue.
+ */
+export function createQueue() {
+  return { entries: [] };
+}
+
+/**
+ * Add a feedback entry to the queue.
+ */
+export function addEntry(queue, entry) {
+  if (!entry || !entry.description) return queue;
+  const normalized = {
+    source: entry.source || "unknown",
+    severity: entry.severity || "medium",
+    category: entry.category || "other",
+    description: entry.description,
+    file: entry.file || null,
+    line: entry.line || null,
+    suggestedFix: entry.suggestedFix || null,
+    id: entry.id || null,
+    iteration: entry.iteration || 0
+  };
+  queue.entries.push(normalized);
+  return queue;
+}
+
+/**
+ * Add multiple entries at once.
+ */
+export function addEntries(queue, entries) {
+  for (const e of entries || []) addEntry(queue, e);
+  return queue;
+}
+
+/**
+ * Deduplicate entries with the same description + source (keep the most severe).
+ */
+export function deduplicate(queue) {
+  const seen = new Map();
+  for (const e of queue.entries) {
+    const key = `${e.source}::${e.description}`;
+    const existing = seen.get(key);
+    if (!existing || SEVERITY_ORDER[e.severity] < SEVERITY_ORDER[existing.severity]) {
+      seen.set(key, e);
+    }
+  }
+  queue.entries = [...seen.values()];
+  return queue;
+}
+
+/**
+ * Sort entries by priority: category first (security > correctness > ...), then severity.
+ */
+export function prioritize(queue) {
+  queue.entries.sort((a, b) => {
+    const catDiff = (CATEGORY_ORDER[a.category] ?? 5) - (CATEGORY_ORDER[b.category] ?? 5);
+    if (catDiff !== 0) return catDiff;
+    return (SEVERITY_ORDER[a.severity] ?? 2) - (SEVERITY_ORDER[b.severity] ?? 2);
+  });
+  return queue;
+}
+
+/**
+ * Format queue as a numbered list for the coder prompt.
+ */
+export function formatForCoder(queue) {
+  if (!queue.entries.length) return "";
+
+  const lines = [];
+  queue.entries.forEach((e, i) => {
+    const loc = e.file ? ` (${e.file}${e.line ? `:${e.line}` : ""})` : "";
+    const tag = `[${e.source}:${e.severity}:${e.category}]`;
+    lines.push(`${i + 1}. ${tag}${loc} ${e.description}`);
+    if (e.suggestedFix) lines.push(`   Fix: ${e.suggestedFix}`);
+  });
+  return lines.join("\n");
+}
+
+/**
+ * Filter entries by category.
+ */
+export function filterByCategory(queue, category) {
+  return { entries: queue.entries.filter(e => e.category === category) };
+}
+
+/**
+ * Check if queue has any critical/high severity entries.
+ */
+export function hasBlockingIssues(queue) {
+  return queue.entries.some(e => e.severity === "critical" || e.severity === "high");
+}
+
+/**
+ * Get count of entries by category.
+ */
+export function countByCategory(queue) {
+  const counts = {};
+  for (const e of queue.entries) {
+    counts[e.category] = (counts[e.category] || 0) + 1;
+  }
+  return counts;
+}
+
+/**
+ * Clear the queue (after coder addresses the feedback).
+ */
+export function clear(queue) {
+  queue.entries = [];
+  return queue;
+}
+
+/**
+ * Serialize queue for persistence in session.
+ */
+export function serialize(queue) {
+  return JSON.stringify(queue);
+}
+
+/**
+ * Deserialize queue from session.
+ */
+export function deserialize(str) {
+  if (!str) return createQueue();
+  try {
+    const parsed = JSON.parse(str);
+    return { entries: Array.isArray(parsed.entries) ? parsed.entries : [] };
+  } catch {
+    return createQueue();
+  }
+}
+
+export { SEVERITY_ORDER, CATEGORY_ORDER };

package/src/orchestrator/flow-control.js

@@ -0,0 +1,159 @@
+/**
+ * Session flow control — checkpoints, timeouts, budget checks.
+ * Extracted from orchestrator.js — session management, not orchestration.
+ */
+import { markSessionStatus, addCheckpoint } from "../session-store.js";
+import { emitProgress, makeEvent } from "../utils/events.js";
+import { msg, getLang } from "../utils/messages.js";
+
+function detectCheckpointProgress(session, lastCheckpointSnapshot) {
+  if (!lastCheckpointSnapshot) return true; // First checkpoint — assume progress
+  const currentIteration = session.reviewer_retry_count ?? 0;
+  const currentStages = Object.keys(session.resolved_policies || {}).length;
+  const currentCheckpoints = (session.checkpoints || []).length;
+
+  const iterationAdvanced = currentIteration !== lastCheckpointSnapshot.iteration;
+  const stagesChanged = currentStages !== lastCheckpointSnapshot.stagesCount;
+  const checkpointsChanged = currentCheckpoints !== lastCheckpointSnapshot.checkpointsCount;
+
+  return iterationAdvanced || stagesChanged || checkpointsChanged;
+}
+
+export function takeCheckpointSnapshot(session) {
+  return {
+    iteration: session.reviewer_retry_count ?? 0,
+    stagesCount: Object.keys(session.resolved_policies || {}).length,
+    checkpointsCount: (session.checkpoints || []).length
+  };
+}
+
+/**
+ * Determine if checkpoint should auto-continue without asking the user.
+ * Exported for testing.
+ */
+export function shouldAutoContinueCheckpoint(session, hasProgress) {
+  if (hasProgress) {
+    session._checkpoint_stall_count = 0;
+    return { autoContinue: true, reason: "progress_detected" };
+  }
+  const wasRateLimited = (session.standby_retry_count || 0) > 0;
+  const consecutiveStalls = (session._checkpoint_stall_count || 0) + 1;
+  session._checkpoint_stall_count = consecutiveStalls;
+  if (wasRateLimited && consecutiveStalls < 3) {
+    return { autoContinue: true, reason: "recoverable_stall" };
+  }
+  return { autoContinue: false, reason: consecutiveStalls >= 3 ? "max_stalls_reached" : "no_progress" };
+}
+
+export async function handleCheckpoint({ checkpointDisabled, askQuestion, lastCheckpointAt, checkpointIntervalMs, elapsedMinutes, i, config, budgetTracker, stageResults, emitter, eventBase, session, budgetSummary, lastCheckpointSnapshot }) {
+  if (checkpointDisabled || !askQuestion || (Date.now() - lastCheckpointAt) < checkpointIntervalMs) {
+    return { action: "continue_loop", checkpointDisabled, lastCheckpointAt, lastCheckpointSnapshot };
+  }
+
+  const elapsedStr = elapsedMinutes.toFixed(1);
+  const stagesCompleted = Object.keys(stageResults).join(", ") || "none";
+
+  const hasProgress = detectCheckpointProgress(session, lastCheckpointSnapshot);
+  const newSnapshot = takeCheckpointSnapshot(session);
+  const decision = shouldAutoContinueCheckpoint(session, hasProgress);
+
+  if (decision.autoContinue) {
+    emitProgress(
+      emitter,
+      makeEvent("session:checkpoint", { ...eventBase, iteration: i, stage: "checkpoint" }, {
+        message: `Checkpoint: ${decision.reason === "progress_detected" ? "progress detected" : "stall caused by rate limit/cooldown"}, auto-continuing (${elapsedStr} min elapsed)`,
+        detail: { elapsed_minutes: Number(elapsedStr), iterations_done: i - 1, stages: stagesCompleted, auto_continued: true, reason: decision.reason }
+      })
+    );
+    return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now(), lastCheckpointSnapshot: newSnapshot };
+  }
+
+  const iterInfo = `${i - 1}/${config.max_iterations} iterations completed`;
+  const budgetInfo = budgetTracker.total().cost_usd > 0 ? ` | Budget: $${budgetTracker.total().cost_usd.toFixed(2)}` : "";
+  const checkpointMsg = `Checkpoint — ${elapsedStr} min elapsed | ${iterInfo}${budgetInfo} | Stages completed: ${stagesCompleted}. No progress since last checkpoint. What would you like to do?`;
+
+  emitProgress(
+    emitter,
+    makeEvent("session:checkpoint", { ...eventBase, iteration: i, stage: "checkpoint" }, {
+      message: `Interactive checkpoint at ${elapsedStr} min (stalled)`,
+      detail: { elapsed_minutes: Number(elapsedStr), iterations_done: i - 1, stages: stagesCompleted, auto_continued: false }
+    })
+  );
+
+  const lang = getLang(config);
+  const answer = await askQuestion(
+    `${checkpointMsg}\n\n${msg("checkpoint_options", lang)}`
+  );
+
+  await addCheckpoint(session, { stage: "interactive-checkpoint", elapsed_minutes: Number(elapsedStr), answer });
+
+  const trimmedAnswer = (answer || "").trim();
+  const isExplicitStop = trimmedAnswer === "4" || trimmedAnswer.toLowerCase().startsWith("stop");
+
+  if (isExplicitStop) {
+    await markSessionStatus(session, "stopped");
+    emitProgress(
+      emitter,
+      makeEvent("session:end", { ...eventBase, iteration: i, stage: "user-stop" }, {
+        status: "stopped",
+        message: "Session stopped by user at checkpoint",
+        detail: { approved: false, reason: "user_stopped", elapsed_minutes: Number(elapsedStr), budget: budgetSummary() }
+      })
+    );
+    return { action: "stop", result: { approved: false, sessionId: session.id, reason: "user_stopped", elapsed_minutes: Number(elapsedStr) } };
+  }
+
+  const parsed = parseCheckpointAnswer({ trimmedAnswer, checkpointDisabled, config });
+  parsed.lastCheckpointSnapshot = newSnapshot;
+  return parsed;
+}
+
+export function parseCheckpointAnswer({ trimmedAnswer, checkpointDisabled, config }) {
+  if (!trimmedAnswer) {
+    return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now() };
+  }
+  if (trimmedAnswer === "2" || trimmedAnswer.toLowerCase().startsWith("continue until")) {
+    return { action: "continue_loop", checkpointDisabled: true, lastCheckpointAt: Date.now() };
+  }
+  if (trimmedAnswer === "1" || trimmedAnswer.toLowerCase().includes("5 m")) {
+    return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now() };
+  }
+  const customMinutes = Number.parseInt(trimmedAnswer.replaceAll(/\D/g, ""), 10);
+  if (customMinutes > 0) {
+    config.session.checkpoint_interval_minutes = customMinutes;
+    return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now() };
+  }
+  return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now() };
+}
+
+export async function checkSessionTimeout({ askQuestion, elapsedMinutes, config, session, emitter, eventBase, i, budgetSummary }) {
+  if (askQuestion || elapsedMinutes <= config.session.max_total_minutes) return;
+
+  await markSessionStatus(session, "failed");
+  emitProgress(
+    emitter,
+    makeEvent("session:end", { ...eventBase, iteration: i, stage: "timeout" }, {
+      status: "fail",
+      message: "Session timed out",
+      detail: { approved: false, reason: "timeout", budget: budgetSummary() }
+    })
+  );
+  throw new Error("Session timed out");
+}
+
+export async function checkBudgetExceeded({ budgetTracker, config, session, emitter, eventBase, i, budgetLimit, budgetSummary }) {
+  if (!budgetTracker.isOverBudget(config?.max_budget_usd)) return;
+
+  await markSessionStatus(session, "failed");
+  const totalCost = budgetTracker.total().cost_usd;
+  const message = `Budget exceeded: $${totalCost.toFixed(2)} > $${budgetLimit.toFixed(2)}`;
+  emitProgress(
+    emitter,
+    makeEvent("session:end", { ...eventBase, iteration: i, stage: "budget" }, {
+      status: "fail",
+      message,
+      detail: { approved: false, reason: "budget_exceeded", budget: budgetSummary(), max_budget_usd: budgetLimit }
+    })
+  );
+  throw new Error(message);
+}

package/src/orchestrator/post-loop-stages.js

@@ -138,18 +138,20 @@ export async function runTesterStage({ config, logger, emitter, eventBase, sessi
   );
 
   if (!testerOutput.ok) {
-    // Tester findings are advisory when reviewer already approved.
-    // Auto-continue with a warning — no human escalation needed.
-    logger.warn(`Tester failed (advisory): ${testerOutput.summary}`);
+    // Tester failed — blocking, return to coder for correction
+    logger.warn(`Tester failed (blocking): ${testerOutput.summary}`);
     emitProgress(
       emitter,
-      makeEvent("tester:auto-continue", { ...eventBase, stage: "tester" }, {
-        status: "warn",
-        message: `Tester issues are advisory (reviewer approved), continuing: ${testerOutput.summary}`,
-        detail: { summary: testerOutput.summary, auto_continued: true, provider: testerProvider, executorType: "agent" }
+      makeEvent("tester:blocking", { ...eventBase, stage: "tester" }, {
+        status: "fail",
+        message: `Tester failed — sending back to coder for correction: ${testerOutput.summary}`,
+        detail: { summary: testerOutput.summary, blocking: true, provider: testerProvider, executorType: "agent" }
       })
     );
-    return { action: "ok", stageResult: { ok: false, summary: testerOutput.summary || "Tester issues (advisory)", auto_continued: true } };
+    return {
+      action: "continue",
+      stageResult: { ...testerOutput.result, summary: testerOutput.summary, provider: testerProvider }
+    };
   }
 
   session.tester_retry_count = 0;
@@ -230,17 +232,20 @@ export async function runSecurityStage({ config, logger, emitter, eventBase, ses
       return { action: "ok" };
     }
 
-    // Non-critical security findings are advisory when reviewer already approved.
-    logger.warn(`Security failed (advisory): ${securityOutput.summary}`);
+    // Non-critical security findings — blocking, return to coder for correction
+    logger.warn(`Security failed (blocking): ${securityOutput.summary}`);
     emitProgress(
       emitter,
-      makeEvent("security:auto-continue", { ...eventBase, stage: "security" }, {
-        status: "warn",
-        message: `Security issues are advisory (reviewer approved), continuing: ${securityOutput.summary}`,
-        detail: { summary: securityOutput.summary, auto_continued: true }
+      makeEvent("security:blocking", { ...eventBase, stage: "security" }, {
+        status: "fail",
+        message: `Security failed — sending back to coder for correction: ${securityOutput.summary}`,
+        detail: { summary: securityOutput.summary, blocking: true, provider: securityProvider, executorType: "agent" }
       })
     );
-    return { action: "ok", stageResult: { ok: false, summary: securityOutput.summary || "Security issues (advisory)", auto_continued: true } };
+    return {
+      action: "continue",
+      stageResult: { ...securityOutput.result, summary: securityOutput.summary, provider: securityProvider }
+    };
   }
 
   session.security_retry_count = 0;

package/src/orchestrator/preflight-checks.js

@@ -17,8 +17,10 @@ import { msg, getLang } from "../utils/messages.js";
 import {
   resolveSonarHost,
   resolveSonarToken,
+  resolveSonarTokenAsync,
   resolveSonarCredentials,
 } from "../sonar/config-resolver.js";
+import { saveSonarToken } from "../sonar/credentials.js";
 import { withDocLink } from "../utils/doc-links.js";
 
 function parseJsonSafe(text) {
@@ -75,8 +77,8 @@ async function checkSonarReachable(host) {
 async function checkSonarAuth(config) {
   const host = resolveSonarHost(config.sonarqube?.host);
 
-  // Check explicit token first
-  const explicitToken = resolveSonarToken(config);
+  // Check explicit token first (including persisted tokens from credentials file)
+  const explicitToken = await resolveSonarTokenAsync(config);
   if (explicitToken) {
     // Validate the token works
     const res = await runCommand("curl", [
@@ -117,7 +119,9 @@ async function checkSonarAuth(config) {
     if (tokenRes.exitCode !== 0) continue;
     const tokenParsed = parseJsonSafe(tokenRes.stdout);
     if (tokenParsed?.token) {
-      return { name: "sonar-auth", ok: true, detail: "Sonar token generated", token: tokenParsed.token };
+      // Persist the generated token for future sessions
+      try { await saveSonarToken(tokenParsed.token); } catch { /* non-blocking */ }
+      return { name: "sonar-auth", ok: true, detail: "Sonar token generated and saved", token: tokenParsed.token };
     }
   }