karajan-code 1.59.0 → 2.0.0

package/src/roles/refactorer-role.js

@@ -1,72 +1,30 @@
-import { BaseRole } from "./base-role.js";
-import { createAgent as defaultCreateAgent } from "../agents/index.js";
+import { AgentRole } from "./agent-role.js";
 
-function resolveProvider(config) {
-  return (
-    config?.roles?.refactorer?.provider ||
-    config?.roles?.coder?.provider ||
-    "claude"
-  );
-}
-
-function buildPrompt({ task, instructions }) {
-  const sections = [];
-
-  if (instructions) {
-    sections.push(instructions, "");
+export class RefactorerRole extends AgentRole {
+  constructor(opts) {
+    super({ ...opts, name: "refactorer" });
   }
 
-  sections.push(
-    "Refactor the current changes for clarity and maintainability without changing behavior.",
-    "Do not expand scope and keep tests green.",
-    "",
-    "## Task context",
-    task
-  );
-
-  return sections.join("\n");
-}
-
-export class RefactorerRole extends BaseRole {
-  constructor({ config, logger, emitter = null, createAgentFn = null }) {
-    super({ name: "refactorer", config, logger, emitter });
-    this._createAgent = createAgentFn || defaultCreateAgent;
+  resolveProvider() {
+    return this.config?.roles?.refactorer?.provider || this.config?.roles?.coder?.provider || "claude";
   }
 
-  async execute(input) {
-    const task = typeof input === "string"
-      ? input
-      : input?.task || this.context?.task || "";
-    const onOutput = typeof input === "string" ? null : input?.onOutput || null;
-
-    const provider = resolveProvider(this.config);
-    const agent = this._createAgent(provider, this.config, this.logger);
-
-    const prompt = buildPrompt({ task, instructions: this.instructions });
-    const runArgs = { prompt, role: "refactorer" };
-    if (onOutput) runArgs.onOutput = onOutput;
-    const result = await agent.runTask(runArgs);
-
-    if (!result.ok) {
-      return {
-        ok: false,
-        result: {
-          ...result,
-          error: result.error || result.output || "Refactorer failed",
-          provider
-        },
-        summary: `Refactorer failed: ${result.error || "unknown error"}`
-      };
-    }
+  async buildPrompt({ task }) {
+    const sections = [];
+    if (this.instructions) sections.push(this.instructions, "");
+    sections.push(
+      "Refactor the current changes for clarity and maintainability without changing behavior.",
+      "Do not expand scope and keep tests green.",
+      "",
+      "## Task context",
+      task
+    );
+    return { prompt: sections.join("\n") };
+  }
 
-    return {
-      ok: true,
-      result: {
-        ...result,
-        output: result.output?.trim() || "",
-        provider
-      },
-      summary: "Refactoring applied"
-    };
+  buildSuccessResult(parsed, provider, agentResult) {
+    return { ...agentResult, output: (agentResult.output || "").trim(), provider };
   }
+
+  buildSummary() { return "Refactoring applied"; }
 }

package/src/roles/researcher-role.js

@@ -1,5 +1,5 @@
-import { BaseRole } from "./base-role.js";
-import { createAgent as defaultCreateAgent } from "../agents/index.js";
+import { AgentRole } from "./agent-role.js";
+import { extractFirstJson } from "../utils/json-extract.js";
 
 const SUBAGENT_PREAMBLE = [
   "IMPORTANT: You are running as a Karajan sub-agent.",
@@ -7,130 +7,64 @@ const SUBAGENT_PREAMBLE = [
   "Do NOT use any MCP tools. Focus only on researching the codebase."
 ].join(" ");
 
-function resolveProvider(config) {
-  return (
-    config?.roles?.researcher?.provider ||
-    config?.roles?.coder?.provider ||
-    "claude"
-  );
-}
-
-function buildPrompt({ task, instructions }) {
-  const sections = [SUBAGENT_PREAMBLE];
+const EMPTY_RESEARCH = {
+  affected_files: [], patterns: [], constraints: [],
+  prior_decisions: [], risks: [], test_coverage: ""
+};
 
-  if (instructions) {
-    sections.push(instructions);
+export class ResearcherRole extends AgentRole {
+  constructor(opts) {
+    super({ ...opts, name: "researcher" });
   }
 
-  sections.push(
-    "Investigate the codebase for the following task.",
-    "Identify affected files, patterns, constraints, prior decisions, risks, and test coverage.",
-    "Return a single valid JSON object with your findings and nothing else.",
-    'JSON schema: {"affected_files":[string],"patterns":[string],"constraints":[string],"prior_decisions":[string],"risks":[string],"test_coverage":string}',
-    `## Task\n${task}`
-  );
-
-  return sections.join("\n\n");
-}
-
-function parseResearchOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) return null;
-  return JSON.parse(jsonMatch[0]);
-}
-
-function buildSummary(parsed) {
-  const files = parsed.affected_files?.length || 0;
-  const risks = parsed.risks?.length || 0;
-  const patterns = parsed.patterns?.length || 0;
-  const parts = [];
-  if (files) parts.push(`${files} file${files === 1 ? "" : "s"}`);
-  if (risks) parts.push(`${risks} risk${risks === 1 ? "" : "s"}`);
-  if (patterns) parts.push(`${patterns} pattern${patterns === 1 ? "" : "s"}`);
-  return parts.length
-    ? `Research complete: ${parts.join(", ")} identified`
-    : "Research complete";
-}
-
-export class ResearcherRole extends BaseRole {
-  constructor({ config, logger, emitter = null, createAgentFn = null }) {
-    super({ name: "researcher", config, logger, emitter });
-    this._createAgent = createAgentFn || defaultCreateAgent;
+  async buildPrompt({ task }) {
+    const sections = [SUBAGENT_PREAMBLE];
+    if (this.instructions) sections.push(this.instructions);
+    sections.push(
+      "Investigate the codebase for the following task.",
+      "Identify affected files, patterns, constraints, prior decisions, risks, and test coverage.",
+      "Return a single valid JSON object with your findings and nothing else.",
+      '{"affected_files":[string],"patterns":[string],"constraints":[string],"prior_decisions":[string],"risks":[string],"test_coverage":string}',
+      `## Task\n${task}`
+    );
+    return { prompt: sections.join("\n\n") };
   }
 
-  async execute(input) {
-    const task = typeof input === "string"
-      ? input
-      : input?.task || this.context?.task || "";
-    const onOutput = typeof input === "string" ? null : input?.onOutput || null;
-
-    const provider = resolveProvider(this.config);
-    const agent = this._createAgent(provider, this.config, this.logger);
+  parseOutput(raw) { return extractFirstJson(raw); }
 
-    const prompt = buildPrompt({ task, instructions: this.instructions });
-    const runArgs = { prompt, role: "researcher" };
-    if (onOutput) runArgs.onOutput = onOutput;
-    const result = await agent.runTask(runArgs);
+  buildSuccessResult(parsed, provider) {
+    return {
+      affected_files: parsed.affected_files || [],
+      patterns: parsed.patterns || [],
+      constraints: parsed.constraints || [],
+      prior_decisions: parsed.prior_decisions || [],
+      risks: parsed.risks || [],
+      test_coverage: parsed.test_coverage || "",
+      provider
+    };
+  }
 
-    if (!result.ok) {
-      return {
-        ok: false,
-        result: {
-          error: result.error || result.output || "Researcher failed",
-          provider
-        },
-        summary: `Researcher failed: ${result.error || "unknown error"}`
-      };
-    }
+  buildSummary(parsed) {
+    const files = parsed.affected_files?.length || 0;
+    const risks = parsed.risks?.length || 0;
+    const patterns = parsed.patterns?.length || 0;
+    const parts = [];
+    if (files) parts.push(`${files} file${files === 1 ? "" : "s"}`);
+    if (risks) parts.push(`${risks} risk${risks === 1 ? "" : "s"}`);
+    if (patterns) parts.push(`${patterns} pattern${patterns === 1 ? "" : "s"}`);
+    return parts.length ? `Research complete: ${parts.join(", ")} identified` : "Research complete";
+  }
 
-    try {
-      const parsed = parseResearchOutput(result.output);
-      if (!parsed) {
-        return {
-          ok: true,
-          result: {
-            affected_files: [],
-            patterns: [],
-            constraints: [],
-            prior_decisions: [],
-            risks: [],
-            test_coverage: "",
-            raw: result.output,
-            provider
-          },
-          summary: "Research complete (unstructured output)"
-        };
-      }
+  handleParseNull(agentResult, provider) {
+    return {
+      ok: true,
+      result: { ...EMPTY_RESEARCH, raw: agentResult.output, provider },
+      summary: "Research complete (unstructured output)",
+      usage: agentResult.usage
+    };
+  }
 
-      return {
-        ok: true,
-        result: {
-          affected_files: parsed.affected_files || [],
-          patterns: parsed.patterns || [],
-          constraints: parsed.constraints || [],
-          prior_decisions: parsed.prior_decisions || [],
-          risks: parsed.risks || [],
-          test_coverage: parsed.test_coverage || "",
-          provider
-        },
-        summary: buildSummary(parsed)
-      };
-    } catch { /* agent output is not structured JSON */
-      return {
-        ok: true,
-        result: {
-          affected_files: [],
-          patterns: [],
-          constraints: [],
-          prior_decisions: [],
-          risks: [],
-          test_coverage: "",
-          raw: result.output,
-          provider
-        },
-        summary: "Research complete (unstructured output)"
-      };
-    }
+  handleParseError(_err, agentResult, provider) {
+    return this.handleParseNull(agentResult, provider);
   }
 }

package/src/roles/reviewer-role.js

@@ -1,6 +1,6 @@
-import { BaseRole } from "./base-role.js";
-import { createAgent as defaultCreateAgent } from "../agents/index.js";
+import { AgentRole } from "./agent-role.js";
 import { buildRtkInstructions } from "../prompts/rtk-snippet.js";
+import { extractFirstJson } from "../utils/json-extract.js";
 
 const MAX_DIFF_LENGTH = 12000;
 
@@ -10,147 +10,90 @@ const SUBAGENT_PREAMBLE = [
   "Do NOT use any MCP tools. Focus only on reviewing the code."
 ].join(" ");
 
-function resolveProvider(config) {
-  return (
-    config?.roles?.reviewer?.provider ||
-    config?.roles?.coder?.provider ||
-    "claude"
-  );
-}
-
 function truncateDiff(diff) {
   if (!diff) return "";
-  return diff.length > MAX_DIFF_LENGTH
-    ? `${diff.slice(0, MAX_DIFF_LENGTH)}\n\n[TRUNCATED]`
-    : diff;
+  return diff.length > MAX_DIFF_LENGTH ? `${diff.slice(0, MAX_DIFF_LENGTH)}\n\n[TRUNCATED]` : diff;
 }
 
-function buildPrompt({ task, diff, reviewRules, reviewMode, instructions, rtkAvailable = false, proxyEnabled = false, productContext = null, domainContext = null }) {
-  const sections = [];
-
-  sections.push(SUBAGENT_PREAMBLE);
-
-  if (instructions) {
-    sections.push(instructions);
+export class ReviewerRole extends AgentRole {
+  constructor(opts) {
+    super({ ...opts, name: "reviewer" });
   }
 
-  sections.push(
-    `You are a code reviewer in ${reviewMode || "standard"} mode.`,
-    "Return only one valid JSON object and nothing else.",
-    'JSON schema:',
-    '{"approved":boolean,"blocking_issues":[{"id":string,"severity":"critical|high|medium|low","file":string,"line":number,"description":string,"suggested_fix":string}],"non_blocking_suggestions":[string],"summary":string,"confidence":number}',
-    `Task context:\n${task}`
-  );
+  get agentMethod() { return "reviewTask"; }
 
-  if (productContext) {
-    sections.push(`## Product Context\n${productContext}`);
+  extractInput(input) {
+    if (typeof input === "string") return { task: input, diff: "", reviewRules: null, onOutput: null };
+    return {
+      task: input?.task || this.context?.task || "",
+      diff: input?.diff || "",
+      reviewRules: input?.reviewRules || null,
+      onOutput: input?.onOutput || null
+    };
   }
 
-  if (domainContext) {
-    sections.push(`## Domain Context\n${domainContext}`);
-  }
+  async buildPrompt({ task, diff, reviewRules }) {
+    const sections = [SUBAGENT_PREAMBLE];
+    if (this.instructions) sections.push(this.instructions);
+    sections.push(
+      `You are a code reviewer in ${this.config?.review_mode || "standard"} mode.`,
+      "Return only one valid JSON object and nothing else.",
+      "JSON schema:",
+      '{"approved":boolean,"blocking_issues":[{"id":string,"severity":"critical|high|medium|low","file":string,"line":number,"description":string,"suggested_fix":string}],"non_blocking_suggestions":[string],"summary":string,"confidence":number}',
+      `Task context:\n${task}`
+    );
+
+    const pc = this.config?.productContext;
+    if (pc) sections.push(`## Product Context\n${pc}`);
+    const dc = this.config?.domainContext;
+    if (dc) sections.push(`## Domain Context\n${dc}`);
+
+    const rtkSnippet = buildRtkInstructions({
+      rtkAvailable: Boolean(this.config?.rtk?.available)
+    });
+    if (rtkSnippet) sections.push(rtkSnippet);
+    if (reviewRules) sections.push(`Review rules:\n${reviewRules}`);
+    sections.push(`Git diff:\n${truncateDiff(diff)}`);
 
-  const rtkSnippet = buildRtkInstructions({ rtkAvailable, proxyEnabled });
-  if (rtkSnippet) {
-    sections.push(rtkSnippet);
+    return { prompt: sections.join("\n\n") };
   }
 
-  if (reviewRules) {
-    sections.push(`Review rules:\n${reviewRules}`);
+  parseOutput(raw) {
+    const parsed = extractFirstJson(raw);
+    if (!parsed) throw new Error("Failed to parse reviewer output: no JSON found");
+    return parsed;
   }
 
-  sections.push(`Git diff:\n${truncateDiff(diff)}`);
-
-  return sections.join("\n\n");
-}
-
-function parseReviewOutput(raw) {
-  const text = raw?.trim() || "";
-  const jsonMatch = /\{[\s\S]*\}/.exec(text);
-  if (!jsonMatch) {
-    throw new Error(`Failed to parse reviewer output: no JSON found`);
+  buildSuccessResult(parsed, provider, agentResult) {
+    return {
+      ...agentResult,
+      approved: parsed.approved,
+      blocking_issues: parsed.blocking_issues || [],
+      non_blocking_suggestions: parsed.non_blocking_suggestions || [],
+      confidence: parsed.confidence ?? null,
+      raw_summary: parsed.summary || ""
+    };
   }
-  return JSON.parse(jsonMatch[0]);
-}
 
-export class ReviewerRole extends BaseRole {
-  constructor({ config, logger, emitter = null, createAgentFn = null }) {
-    super({ name: "reviewer", config, logger, emitter });
-    this._createAgent = createAgentFn || defaultCreateAgent;
+  buildSummary(parsed) {
+    const blockingIssues = parsed.blocking_issues || [];
+    return parsed.approved
+      ? `Approved: ${parsed.summary || "no issues found"}`
+      : `Rejected: ${blockingIssues.length} blocking issue(s) — ${parsed.summary || ""}`;
   }
 
-  async execute(input) {
-    const { task, diff, reviewRules, onOutput } = typeof input === "string"
-      ? { task: input, diff: "", reviewRules: null, onOutput: null }
-      : input;
-
-    const provider = resolveProvider(this.config);
-    const agent = this._createAgent(provider, this.config, this.logger);
-
-    const prompt = buildPrompt({
-      task: task || this.context?.task || "",
-      diff: diff || "",
-      reviewRules: reviewRules || null,
-      reviewMode: this.config?.review_mode || "standard",
-      instructions: this.instructions,
-      rtkAvailable: Boolean(this.config?.rtk?.available),
-      proxyEnabled: Boolean(this.config?.proxy?.enabled),
-      productContext: this.config?.productContext || null,
-      domainContext: this.config?.domainContext || null
-    });
-
-    const reviewArgs = { prompt, role: "reviewer" };
-    if (onOutput) reviewArgs.onOutput = onOutput;
-
-    const result = await agent.reviewTask(reviewArgs);
-
-    if (!result.ok) {
-      return {
-        ok: false,
-        result: {
-          error: result.error || result.output || "Reviewer agent failed",
-          approved: false,
-          blocking_issues: []
-        },
-        summary: `Reviewer failed: ${result.error || "unknown error"}`
-      };
-    }
-
-    try {
-      const parsed = parseReviewOutput(result.output);
-      const blockingIssues = parsed.blocking_issues || [];
-
-      return {
-        ok: true,
-        result: {
-          ...result,
-          approved: parsed.approved,
-          blocking_issues: blockingIssues,
-          non_blocking_suggestions: parsed.non_blocking_suggestions || [],
-          confidence: parsed.confidence ?? null,
-          raw_summary: parsed.summary || ""
-        },
-        summary: parsed.approved
-          ? `Approved: ${parsed.summary || "no issues found"}`
-          : `Rejected: ${blockingIssues.length} blocking issue(s) — ${parsed.summary || ""}`
-      };
-    } catch (err) {
-      return {
-        ok: true,
-        result: {
-          ...result,
-          approved: false,
-          blocking_issues: [{
-            id: "PARSE_ERROR",
-            severity: "high",
-            description: `Reviewer output could not be parsed: ${err.message}`
-          }],
-          non_blocking_suggestions: [],
-          confidence: 0,
-          raw_summary: `Parse error: ${err.message}`
-        },
-        summary: `Reviewer output parse error: ${err.message}`
-      };
-    }
+  handleParseError(err, agentResult, _provider) {
+    return {
+      ok: true,
+      result: {
+        ...agentResult,
+        approved: false,
+        blocking_issues: [{ id: "PARSE_ERROR", severity: "high", description: `Reviewer output could not be parsed: ${err.message}` }],
+        non_blocking_suggestions: [],
+        confidence: 0,
+        raw_summary: `Parse error: ${err.message}`
+      },
+      summary: `Reviewer output parse error: ${err.message}`
+    };
   }
 }