@kody-ade/kody-engine 0.2.1 → 0.2.2

package/dist/bin/kody2.js

@@ -1,5 +1,54 @@
 #!/usr/bin/env node
 
+// package.json
+var package_default = {
+  name: "@kody-ade/kody-engine",
+  version: "0.2.2",
+  description: "kody2 \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
+  license: "MIT",
+  type: "module",
+  bin: {
+    kody2: "dist/bin/kody2.js"
+  },
+  files: [
+    "dist",
+    "templates",
+    "kody.config.schema.json"
+  ],
+  scripts: {
+    kody2: "tsx bin/kody2.ts",
+    build: `tsup && node -e "require('fs').cpSync('src/executables', 'dist/executables', { recursive: true })"`,
+    test: "vitest run tests/unit tests/int --no-coverage",
+    "test:e2e": "vitest run tests/e2e --no-coverage",
+    "test:all": "vitest run tests --no-coverage",
+    typecheck: "tsc --noEmit",
+    lint: "biome check",
+    "lint:fix": "biome check --write",
+    format: "biome format --write",
+    prepublishOnly: "pnpm build"
+  },
+  dependencies: {
+    "@anthropic-ai/claude-agent-sdk": "0.2.92"
+  },
+  devDependencies: {
+    "@biomejs/biome": "^2.4.12",
+    "@types/node": "^22.5.4",
+    tsup: "^8.5.1",
+    tsx: "^4.21.0",
+    typescript: "~5.7.0",
+    vitest: "^4.1.1"
+  },
+  engines: {
+    node: ">=22"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/aharonyaircohen/kody-engine.git"
+  },
+  homepage: "https://github.com/aharonyaircohen/kody-engine",
+  bugs: "https://github.com/aharonyaircohen/kody-engine/issues"
+};
+
 // src/config.ts
 import * as fs from "fs";
 import * as path from "path";
@@ -8,9 +57,7 @@ var LITELLM_DEFAULT_URL = `http://localhost:${LITELLM_DEFAULT_PORT}`;
 function parseProviderModel(s) {
   const slash = s.indexOf("/");
   if (slash <= 0 || slash === s.length - 1) {
-    throw new Error(
-      `Invalid model spec '${s}' \u2014 expected 'provider/model' (e.g. 'minimax/MiniMax-M2.7-highspeed')`
-    );
+    throw new Error(`Invalid model spec '${s}' \u2014 expected 'provider/model' (e.g. 'minimax/MiniMax-M2.7-highspeed')`);
   }
   return { provider: s.slice(0, slash), model: s.slice(slash + 1) };
 }
@@ -68,7 +115,8 @@ function parseIssueContext(raw) {
   const r = raw;
   const out = {};
   if (typeof r.commentLimit === "number" && r.commentLimit > 0) out.commentLimit = Math.floor(r.commentLimit);
-  if (typeof r.commentMaxBytes === "number" && r.commentMaxBytes > 0) out.commentMaxBytes = Math.floor(r.commentMaxBytes);
+  if (typeof r.commentMaxBytes === "number" && r.commentMaxBytes > 0)
+    out.commentMaxBytes = Math.floor(r.commentMaxBytes);
   return Object.keys(out).length > 0 ? out : void 0;
 }
 function parseTestRequirements(raw) {
@@ -89,12 +137,293 @@ function getAnthropicApiKeyOrDummy() {
 }
 
 // src/executor.ts
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 import * as path8 from "path";
 
-// src/profile.ts
+// src/agent.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+
+// src/format.ts
+function renderEvent(msg, opts = {}) {
+  if (opts.quiet) {
+    if (msg.type === "result") return formatResult(msg);
+    return null;
+  }
+  switch (msg.type) {
+    case "system":
+      return null;
+    case "assistant":
+      return formatAssistant(msg, opts);
+    case "user":
+      return formatUserToolResult(msg, opts);
+    case "result":
+      return formatResult(msg);
+    default:
+      return null;
+  }
+}
+function formatAssistant(msg, _opts) {
+  const content = msg.message?.content ?? [];
+  const lines = [];
+  for (const block of content) {
+    if (block.type === "text") {
+      const text = block.text.trim();
+      if (text) lines.push(text);
+    } else if (block.type === "tool_use") {
+      const tu = block;
+      lines.push(`\u2192 ${tu.name}${summarizeToolInput(tu.name, tu.input)}`);
+    }
+  }
+  return lines.length > 0 ? lines.join("\n") : null;
+}
+function formatUserToolResult(msg, opts) {
+  const content = msg.message?.content ?? [];
+  const lines = [];
+  for (const block of content) {
+    if (block.type === "tool_result") {
+      const tr = block;
+      const text = stringifyToolContent(tr.content);
+      const lineCount = text.split("\n").length;
+      const sizeBytes = text.length;
+      const flag = tr.is_error ? " ERROR" : "";
+      const summary = `  \u21B3${flag} ${lineCount} lines, ${formatBytes(sizeBytes)}`;
+      if (opts.verbose) {
+        lines.push(`${summary}
+${truncate(text, 4e3)}`);
+      } else {
+        lines.push(summary);
+      }
+    }
+  }
+  return lines.length > 0 ? lines.join("\n") : null;
+}
+function formatResult(msg) {
+  const ok = msg.subtype === "success";
+  const tag = ok ? "DONE" : `FAILED (${msg.subtype ?? "unknown"})`;
+  const dur = msg.duration_ms ? ` ${(msg.duration_ms / 1e3).toFixed(1)}s` : "";
+  const turns = msg.num_turns ? ` ${msg.num_turns} turns` : "";
+  const cost = typeof msg.total_cost_usd === "number" ? ` $${msg.total_cost_usd.toFixed(4)}` : "";
+  return `
+=== ${tag}${dur}${turns}${cost} ===`;
+}
+function summarizeToolInput(toolName, input = {}) {
+  if (toolName === "Bash" && typeof input.command === "string") {
+    const cmd = input.command.split("\n")[0];
+    return `: ${truncate(cmd, 120)}`;
+  }
+  if ((toolName === "Read" || toolName === "Edit" || toolName === "Write") && typeof input.file_path === "string") {
+    return ` ${input.file_path}`;
+  }
+  if ((toolName === "Glob" || toolName === "Grep") && typeof input.pattern === "string") {
+    return `: ${truncate(input.pattern, 80)}`;
+  }
+  return "";
+}
+function stringifyToolContent(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.map((b) => {
+      if (b && typeof b === "object" && "text" in b && typeof b.text === "string") {
+        return b.text;
+      }
+      return JSON.stringify(b);
+    }).join("\n");
+  }
+  return JSON.stringify(content);
+}
+function truncate(s, max) {
+  if (s.length <= max) return s;
+  return `${s.slice(0, max)}\u2026 (+${s.length - max} chars)`;
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
+  return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
+}
+
+// src/agent.ts
+var DEFAULT_ALLOWED_TOOLS = ["Bash", "Edit", "Read", "Write", "Glob", "Grep"];
+async function runAgent(opts) {
+  const ndjsonDir = opts.ndjsonDir ?? path2.join(opts.cwd, ".kody2");
+  fs2.mkdirSync(ndjsonDir, { recursive: true });
+  const ndjsonPath = path2.join(ndjsonDir, "last-run.jsonl");
+  const fullLog = fs2.createWriteStream(ndjsonPath, { flags: "w" });
+  const env = {
+    ...process.env,
+    SKIP_HOOKS: "1",
+    HUSKY: "0",
+    CI: process.env.CI ?? "1"
+  };
+  if (opts.litellmUrl) {
+    env.ANTHROPIC_BASE_URL = opts.litellmUrl;
+    env.ANTHROPIC_API_KEY = getAnthropicApiKeyOrDummy();
+  }
+  let finalText = "";
+  let outcome = "failed";
+  let errorMessage;
+  try {
+    const queryOptions = {
+      model: opts.model.model,
+      cwd: opts.cwd,
+      allowedTools: opts.allowedToolsOverride ?? DEFAULT_ALLOWED_TOOLS,
+      permissionMode: opts.permissionModeOverride ?? "acceptEdits",
+      env
+    };
+    if (opts.mcpServers && opts.mcpServers.length > 0) {
+      queryOptions.mcpServers = opts.mcpServers;
+    }
+    const result = query({
+      prompt: opts.prompt,
+      // biome-ignore lint/suspicious/noExplicitAny: SDK options type is narrow; mcpServers is runtime-passthrough.
+      options: queryOptions
+    });
+    for await (const msg of result) {
+      try {
+        fullLog.write(`${JSON.stringify(msg)}
+`);
+      } catch {
+      }
+      const line = renderEvent(msg, { verbose: opts.verbose, quiet: opts.quiet });
+      if (line) process.stdout.write(`${line}
+`);
+      const m = msg;
+      if (m.type === "result") {
+        if (m.subtype === "success") {
+          outcome = "completed";
+          finalText = (typeof m.result === "string" ? m.result : "").trim();
+        } else {
+          outcome = "failed";
+          errorMessage = `result subtype: ${m.subtype ?? "unknown"}`;
+        }
+      }
+    }
+  } catch (e) {
+    outcome = "failed";
+    errorMessage = e instanceof Error ? e.message : String(e);
+  } finally {
+    try {
+      fullLog.end();
+    } catch {
+    }
+  }
+  return { outcome, finalText, error: errorMessage, ndjsonPath };
+}
+
+// src/litellm.ts
+import { execFileSync, spawn } from "child_process";
+import * as fs3 from "fs";
+import * as os from "os";
+import * as path3 from "path";
+async function checkLitellmHealth(url) {
+  try {
+    const response = await fetch(`${url}/health`, { signal: AbortSignal.timeout(3e3) });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+function generateLitellmConfigYaml(model) {
+  const apiKeyVar = providerApiKeyEnvVar(model.provider);
+  return [
+    "model_list:",
+    `  - model_name: ${model.model}`,
+    `    litellm_params:`,
+    `      model: ${model.provider}/${model.model}`,
+    `      api_key: os.environ/${apiKeyVar}`,
+    "",
+    "litellm_settings:",
+    "  drop_params: true",
+    ""
+  ].join("\n");
+}
+async function startLitellmIfNeeded(model, projectDir, url = LITELLM_DEFAULT_URL) {
+  if (!needsLitellmProxy(model)) return null;
+  if (await checkLitellmHealth(url)) {
+    return { url, kill: () => {
+    } };
+  }
+  let cmd = "litellm";
+  try {
+    execFileSync("which", ["litellm"], { timeout: 3e3, stdio: "pipe" });
+  } catch {
+    try {
+      execFileSync("python3", ["-c", "import litellm"], { timeout: 1e4, stdio: "pipe" });
+      cmd = "python3";
+    } catch {
+      throw new Error("litellm not installed \u2014 run: pip install 'litellm[proxy]'");
+    }
+  }
+  const configPath = path3.join(os.tmpdir(), `kody2-litellm-${Date.now()}.yaml`);
+  fs3.writeFileSync(configPath, generateLitellmConfigYaml(model));
+  const portMatch = url.match(/:(\d+)/);
+  const port = portMatch ? portMatch[1] : "4000";
+  const args = cmd === "litellm" ? ["--config", configPath, "--port", port] : ["-m", "litellm", "--config", configPath, "--port", port];
+  const dotenvVars = readDotenvApiKeys(projectDir);
+  const logPath = path3.join(os.tmpdir(), `kody2-litellm-${Date.now()}.log`);
+  const outFd = fs3.openSync(logPath, "w");
+  const child = spawn(cmd, args, {
+    stdio: ["ignore", outFd, outFd],
+    detached: true,
+    env: stripBlockingEnv({ ...process.env, ...dotenvVars })
+  });
+  fs3.closeSync(outFd);
+  for (let i = 0; i < 30; i++) {
+    await new Promise((r) => setTimeout(r, 2e3));
+    if (await checkLitellmHealth(url)) {
+      return {
+        url,
+        kill: () => {
+          try {
+            child.kill();
+          } catch {
+          }
+        }
+      };
+    }
+  }
+  let logTail = "";
+  try {
+    logTail = fs3.readFileSync(logPath, "utf-8").slice(-2e3);
+  } catch {
+  }
+  try {
+    child.kill();
+  } catch {
+  }
+  throw new Error(`LiteLLM proxy failed to start within 60s. Log tail:
+${logTail}`);
+}
+function readDotenvApiKeys(projectDir) {
+  const dotenvPath = path3.join(projectDir, ".env");
+  if (!fs3.existsSync(dotenvPath)) return {};
+  const result = {};
+  for (const rawLine of fs3.readFileSync(dotenvPath, "utf-8").split("\n")) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const match = line.match(/^([A-Z_][A-Z0-9_]*_API_KEY)=(.*)$/);
+    if (!match) continue;
+    let value = match[2].trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    const commentIdx = value.indexOf(" #");
+    if (commentIdx !== -1) value = value.slice(0, commentIdx).trim();
+    if (value) result[match[1]] = value;
+  }
+  return result;
+}
+function stripBlockingEnv(env) {
+  const out = { ...env };
+  delete out.DATABASE_URL;
+  delete out.AI_BASE_URL;
+  return out;
+}
+
+// src/profile.ts
+import * as fs4 from "fs";
+import * as path4 from "path";
 var VALID_INPUT_TYPES = /* @__PURE__ */ new Set(["int", "string", "bool", "enum"]);
 var VALID_PERMISSION_MODES = /* @__PURE__ */ new Set(["default", "acceptEdits", "plan", "bypassPermissions"]);
 var ProfileError = class extends Error {
@@ -107,12 +436,12 @@ var ProfileError = class extends Error {
   profilePath;
 };
 function loadProfile(profilePath) {
-  if (!fs2.existsSync(profilePath)) {
+  if (!fs4.existsSync(profilePath)) {
     throw new ProfileError(profilePath, "file not found");
   }
   let raw;
   try {
-    raw = JSON.parse(fs2.readFileSync(profilePath, "utf-8"));
+    raw = JSON.parse(fs4.readFileSync(profilePath, "utf-8"));
   } catch (err) {
     throw new ProfileError(profilePath, `invalid JSON: ${err instanceof Error ? err.message : String(err)}`);
   }
@@ -128,7 +457,7 @@ function loadProfile(profilePath) {
     cliTools: parseCliTools(profilePath, r.cliTools),
     scripts: parseScripts(profilePath, r.scripts),
     outputContract: r.outputContract,
-    dir: path2.dirname(profilePath)
+    dir: path4.dirname(profilePath)
   };
   return profile;
 }
@@ -270,637 +599,368 @@ function parseScriptList(p, key, raw) {
   return out;
 }
 
-// src/issue.ts
-import { execFileSync } from "child_process";
-var API_TIMEOUT_MS = 3e4;
-function ghToken() {
-  return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
+// src/coverage.ts
+import { execFileSync as execFileSync2 } from "child_process";
+function patternToRegex(pattern) {
+  let s = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+  s = s.replace(/\*\*\//g, "\xA7S").replace(/\*\*/g, "\xA7A").replace(/\*/g, "[^/]*");
+  s = s.replace(/§S/g, "(?:.*/)?").replace(/§A/g, ".*");
+  return new RegExp(`^${s}$`);
 }
-function gh(args, options) {
-  const token = ghToken();
-  const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-  return execFileSync("gh", args, {
-    encoding: "utf-8",
-    timeout: API_TIMEOUT_MS,
-    cwd: options?.cwd,
-    env,
-    input: options?.input,
-    stdio: options?.input ? ["pipe", "pipe", "pipe"] : ["inherit", "pipe", "pipe"]
-  }).trim();
-}
-function getIssue(issueNumber, cwd) {
-  const output = gh(
-    ["issue", "view", String(issueNumber), "--json", "number,title,body,comments"],
-    { cwd }
-  );
-  const parsed = JSON.parse(output);
-  if (typeof parsed?.title !== "string") {
-    throw new Error(`Issue #${issueNumber}: unexpected response shape`);
-  }
-  return {
-    number: parsed.number ?? issueNumber,
-    title: parsed.title,
-    body: parsed.body ?? "",
-    comments: (parsed.comments ?? []).map((c) => ({
-      body: c.body ?? "",
-      author: c.author?.login ?? "unknown",
-      createdAt: c.createdAt ?? ""
-    }))
-  };
-}
-function postIssueComment(issueNumber, body, cwd) {
-  try {
-    gh(
-      ["issue", "comment", String(issueNumber), "--body-file", "-"],
-      { input: body, cwd }
-    );
-  } catch (err) {
-    process.stderr.write(`[kody2] failed to post comment on #${issueNumber}: ${err instanceof Error ? err.message : String(err)}
-`);
-  }
-}
-function truncate(s, maxBytes) {
-  if (s.length <= maxBytes) return s;
-  return s.slice(0, maxBytes) + `\u2026 (+${s.length - maxBytes} chars)`;
-}
-function getPr(prNumber, cwd) {
-  const output = gh(
-    ["pr", "view", String(prNumber), "--json", "number,title,body,headRefName,baseRefName,state"],
-    { cwd }
-  );
-  const parsed = JSON.parse(output);
-  if (typeof parsed?.title !== "string") {
-    throw new Error(`PR #${prNumber}: unexpected response shape`);
-  }
-  return {
-    number: parsed.number ?? prNumber,
-    title: parsed.title,
-    body: parsed.body ?? "",
-    headRefName: String(parsed.headRefName ?? ""),
-    baseRefName: String(parsed.baseRefName ?? ""),
-    state: String(parsed.state ?? "")
-  };
+function renderSiblingPath(file, requireSibling) {
+  const lastSlash = file.lastIndexOf("/");
+  const dir = lastSlash === -1 ? "" : file.slice(0, lastSlash + 1);
+  const base = lastSlash === -1 ? file : file.slice(lastSlash + 1);
+  const name = base.replace(/\.[^.]+$/, "");
+  const ext = base.match(/\.[^.]+$/)?.[0] ?? "";
+  const sibling = requireSibling.replace(/\{name\}/g, name).replace(/\{ext\}/g, ext);
+  return dir + sibling;
 }
-function getPrDiff(prNumber, cwd) {
+function safeGit(args, cwd) {
   try {
-    return gh(["pr", "diff", String(prNumber)], { cwd });
-  } catch (err) {
-    process.stderr.write(`[kody2] failed to fetch diff for PR #${prNumber}: ${err instanceof Error ? err.message : String(err)}
-`);
+    return execFileSync2("git", args, { encoding: "utf-8", cwd, env: { ...process.env, HUSKY: "0" } }).trim();
+  } catch {
     return "";
   }
 }
-function getPrReviews(prNumber, cwd) {
-  try {
-    const output = gh(
-      ["pr", "view", String(prNumber), "--json", "reviews"],
-      { cwd }
-    );
-    const parsed = JSON.parse(output);
-    if (!Array.isArray(parsed?.reviews)) return [];
-    return parsed.reviews.map((r) => ({
-      body: r.body ?? "",
-      state: r.state ?? "",
-      author: r.author?.login ?? "unknown",
-      submittedAt: r.submittedAt ?? ""
-    }));
-  } catch {
-    return [];
-  }
+function getAddedFiles(baseBranch, cwd) {
+  const committed = safeGit(["diff", "--name-only", "--diff-filter=A", `origin/${baseBranch}...HEAD`], cwd);
+  const untracked = safeGit(["ls-files", "--others", "--exclude-standard"], cwd);
+  const set = /* @__PURE__ */ new Set();
+  for (const f of committed.split("\n")) if (f) set.add(f);
+  for (const f of untracked.split("\n")) if (f) set.add(f);
+  return [...set];
 }
-function getPrComments(prNumber, cwd) {
-  try {
-    const output = gh(["pr", "view", String(prNumber), "--json", "comments"], { cwd });
-    const parsed = JSON.parse(output);
-    if (!Array.isArray(parsed?.comments)) return [];
-    return parsed.comments.map((c) => ({
-      body: c.body ?? "",
-      author: c.author?.login ?? "unknown",
-      createdAt: c.createdAt ?? ""
-    })).filter((c) => c.body.trim().length > 0);
-  } catch {
-    return [];
+function checkCoverage(addedFiles, requirements) {
+  if (requirements.length === 0) return [];
+  const addedSet = new Set(addedFiles);
+  const misses = [];
+  for (const file of addedFiles) {
+    if (/\.(test|spec)\./.test(file)) continue;
+    for (const req of requirements) {
+      const re = patternToRegex(req.pattern);
+      if (!re.test(file)) continue;
+      const expected = renderSiblingPath(file, req.requireSibling);
+      if (!addedSet.has(expected)) {
+        misses.push({ file, expectedTest: expected });
+      }
+      break;
+    }
   }
+  return misses;
 }
-var KODY_COMMENT_PREFIXES = ["\u2699\uFE0F kody2", "\u2705 kody2", "\u26A0\uFE0F kody2", "\u2139\uFE0F kody2", "\u2192 kody2"];
-function getPrLatestReviewBody(prNumber, cwd) {
-  const reviews = getPrReviews(prNumber, cwd).filter((r) => r.body.trim().length > 0).map((r) => ({ body: r.body, at: r.submittedAt }));
-  const comments = getPrComments(prNumber, cwd).filter((c) => !KODY_COMMENT_PREFIXES.some((p) => c.body.startsWith(p))).map((c) => ({ body: c.body, at: c.createdAt }));
-  const all = [...reviews, ...comments].sort((a, b) => (b.at || "").localeCompare(a.at || ""));
-  if (all.length > 0) return all[0].body;
-  const pr = getPr(prNumber, cwd);
-  return pr.body;
-}
-function postPrReviewComment(prNumber, body, cwd) {
-  try {
-    gh(["pr", "comment", String(prNumber), "--body-file", "-"], { input: body, cwd });
-  } catch (err) {
-    process.stderr.write(`[kody2] failed to post review comment on PR #${prNumber}: ${err instanceof Error ? err.message : String(err)}
-`);
-  }
+function formatMissesForFeedback(misses) {
+  if (misses.length === 0) return "";
+  const lines = ["The following files were added without a sibling test file:"];
+  for (const m of misses) lines.push(`- \`${m.file}\` \u2192 expected \`${m.expectedTest}\``);
+  lines.push("");
+  lines.push(
+    "Add the missing test files. Each should cover the new file's public API with at least a happy path and one failure path. Then re-emit DONE / COMMIT_MSG / PR_SUMMARY."
+  );
+  return lines.join("\n");
 }
 
-// src/branch.ts
-import { execFileSync as execFileSync2 } from "child_process";
-var UncommittedChangesError = class extends Error {
-  constructor(branch) {
-    super(`Uncommitted changes on branch '${branch}' \u2014 refusing to run to protect work in progress`);
-    this.branch = branch;
-    this.name = "UncommittedChangesError";
-  }
-  branch;
-};
-function git(args, cwd) {
-  return execFileSync2("git", args, {
-    encoding: "utf-8",
-    timeout: 3e4,
-    cwd,
-    env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
-    stdio: ["pipe", "pipe", "pipe"]
-  }).trim();
-}
-function deriveBranchName(issueNumber, title) {
-  const slug = title.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").slice(0, 50).replace(/-$/, "");
-  return slug ? `${issueNumber}-${slug}` : `${issueNumber}`;
-}
-function getCurrentBranch(cwd) {
-  return git(["branch", "--show-current"], cwd);
-}
-function hasUncommittedChanges(cwd) {
-  return git(["status", "--porcelain", "--untracked-files=no"], cwd).length > 0;
-}
-function checkoutPrBranch(prNumber, cwd) {
-  const env = {
-    ...process.env,
-    HUSKY: "0",
-    SKIP_HOOKS: "1",
-    GH_TOKEN: process.env.GH_PAT?.trim() || process.env.GH_TOKEN || ""
-  };
-  execFileSync2("gh", ["pr", "checkout", String(prNumber)], {
-    cwd,
-    env,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: 6e4
-  });
-  return getCurrentBranch(cwd);
-}
-function mergeBase(baseBranch, cwd) {
-  try {
-    git(["fetch", "origin", baseBranch], cwd);
-  } catch {
-    return "error";
-  }
-  try {
-    git(["merge", `origin/${baseBranch}`, "--no-edit", "--no-ff"], cwd);
-    return "clean";
-  } catch {
-    try {
-      const unmerged = git(["diff", "--name-only", "--diff-filter=U"], cwd);
-      if (unmerged.length > 0) return "conflict";
-    } catch {
-    }
+// src/prompt.ts
+import * as fs5 from "fs";
+import * as path5 from "path";
+var CONVENTIONS_PER_FILE_MAX_BYTES = 3e4;
+var CONVENTION_FILES = ["CLAUDE.md", "AGENTS.md"];
+function loadProjectConventions(projectDir) {
+  const out = [];
+  for (const rel of CONVENTION_FILES) {
+    const abs = path5.join(projectDir, rel);
+    if (!fs5.existsSync(abs)) continue;
+    let content;
     try {
-      git(["merge", "--abort"], cwd);
+      content = fs5.readFileSync(abs, "utf-8");
     } catch {
+      continue;
     }
-    return "error";
+    const truncated = content.length > CONVENTIONS_PER_FILE_MAX_BYTES;
+    if (truncated) content = `${content.slice(0, CONVENTIONS_PER_FILE_MAX_BYTES)}
+
+\u2026 (truncated)`;
+    out.push({ path: rel, content, truncated });
   }
+  return out;
 }
-function ensureFeatureBranch(issueNumber, title, defaultBranch, cwd) {
-  const branchName = deriveBranchName(issueNumber, title);
-  const current = getCurrentBranch(cwd);
-  if (current === branchName) {
-    if (hasUncommittedChanges(cwd)) throw new UncommittedChangesError(branchName);
-    return { branch: branchName, created: false };
-  }
-  if (hasUncommittedChanges(cwd)) throw new UncommittedChangesError(current || "(detached)");
-  try {
-    git(["fetch", "origin"], cwd);
-  } catch {
-  }
-  try {
-    git(["rev-parse", "--verify", `origin/${branchName}`], cwd);
-    git(["checkout", branchName], cwd);
-    try {
-      git(["pull", "origin", branchName], cwd);
-    } catch {
-    }
-    return { branch: branchName, created: false };
-  } catch {
+function parseAgentResult(finalText) {
+  const text = (finalText || "").trim();
+  if (!text) return { done: false, commitMessage: "", prSummary: "", failureReason: "agent produced no final message" };
+  const failedMatch = text.match(/(?:^|\n)\s*FAILED\s*:\s*(.+?)\s*$/s);
+  if (failedMatch) {
+    return { done: false, commitMessage: "", prSummary: "", failureReason: failedMatch[1].trim() };
   }
-  try {
-    git(["rev-parse", "--verify", branchName], cwd);
-    git(["checkout", branchName], cwd);
-    return { branch: branchName, created: false };
-  } catch {
+  if (!/(^|\n)\s*DONE\b/i.test(text)) {
+    return { done: false, commitMessage: "", prSummary: "", failureReason: "no DONE or FAILED marker in agent output" };
   }
-  try {
-    git(["checkout", "-b", branchName, `origin/${defaultBranch}`], cwd);
-  } catch {
-    git(["checkout", "-b", branchName], cwd);
+  const commitMatch = text.match(/^[ \t]*COMMIT_MSG\s*:\s*(.+)$/im);
+  const commitMessage = commitMatch ? commitMatch[1].trim() : "";
+  const summaryStart = text.search(/(^|\n)[ \t]*PR_SUMMARY\s*:[ \t]*\n/i);
+  let prSummary = "";
+  if (summaryStart !== -1) {
+    const afterMarker = text.slice(summaryStart).replace(/^[\s\S]*?PR_SUMMARY\s*:[ \t]*\n/i, "");
+    prSummary = afterMarker.replace(/\n\s*```\s*$/g, "").replace(/```\s*$/g, "").trim();
   }
-  return { branch: branchName, created: true };
+  return { done: true, commitMessage, prSummary, failureReason: "" };
 }
 
-// src/gha.ts
-import * as fs3 from "fs";
-import { execFileSync as execFileSync3 } from "child_process";
-function getRunUrl() {
-  const server = process.env.GITHUB_SERVER_URL;
-  const repo = process.env.GITHUB_REPOSITORY;
-  const runId = process.env.GITHUB_RUN_ID;
-  if (!server || !repo || !runId) return "";
-  return `${server}/${repo}/actions/runs/${runId}`;
-}
-function reactToTriggerComment(cwd) {
-  if (process.env.GITHUB_EVENT_NAME !== "issue_comment") return;
-  const eventPath = process.env.GITHUB_EVENT_PATH;
-  if (!eventPath || !fs3.existsSync(eventPath)) return;
-  let event = null;
-  try {
-    event = JSON.parse(fs3.readFileSync(eventPath, "utf-8"));
-  } catch {
+// src/scripts/checkCoverageWithRetry.ts
+var checkCoverageWithRetry = async (ctx) => {
+  const reqs = ctx.data.coverageRules ?? [];
+  if (reqs.length === 0) {
+    ctx.data.coverageMisses = [];
     return;
   }
-  const commentId = event?.comment?.id;
-  const repo = process.env.GITHUB_REPOSITORY;
-  if (!commentId || !repo) return;
-  const token = process.env.KODY_TOKEN?.trim() || process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
-  try {
-    execFileSync3(
-      "gh",
-      [
-        "api",
-        "-X",
-        "POST",
-        "-H",
-        "Accept: application/vnd.github+json",
-        `/repos/${repo}/issues/comments/${commentId}/reactions`,
-        "-f",
-        "content=eyes"
-      ],
-      {
-        cwd,
-        env: { ...process.env, GH_TOKEN: token ?? process.env.GH_TOKEN ?? "" },
-        stdio: "pipe",
-        timeout: 15e3
-      }
-    );
-  } catch {
+  if (!ctx.data.agentDone) {
+    ctx.data.coverageMisses = [];
+    return;
   }
-}
+  const misses = checkCoverage(getAddedFiles(ctx.config.git.defaultBranch, ctx.cwd), reqs);
+  if (misses.length === 0) {
+    ctx.data.coverageMisses = [];
+    return;
+  }
+  const invoker = ctx.data.__invokeAgent;
+  const basePrompt = ctx.data.prompt;
+  if (!invoker || !basePrompt) {
+    ctx.data.coverageMisses = misses;
+    return;
+  }
+  process.stderr.write(`[kody2] coverage check found ${misses.length} missing test(s); retrying agent once
+`);
+  const retryPrompt = `${basePrompt}
 
-// src/scripts/runFlow.ts
-var runFlow = async (ctx) => {
-  const issueNumber = ctx.args.issue;
-  const issue = getIssue(issueNumber, ctx.cwd);
-  ctx.data.issue = issue;
-  ctx.data.commentTargetType = "issue";
-  ctx.data.commentTargetNumber = issueNumber;
+# Coverage failure (retry)
+${formatMissesForFeedback(misses)}`;
+  const retry = await invoker(retryPrompt);
+  const retryParsed = parseAgentResult(retry.finalText);
+  if (retry.outcome === "completed" && retryParsed.done) {
+    ctx.data.agentDone = true;
+    ctx.data.commitMessage = retryParsed.commitMessage || ctx.data.commitMessage;
+    ctx.data.prSummary = retryParsed.prSummary || ctx.data.prSummary;
+  }
+  const finalMisses = checkCoverage(getAddedFiles(ctx.config.git.defaultBranch, ctx.cwd), reqs);
+  ctx.data.coverageMisses = finalMisses;
+};
+
+// src/scripts/commitAndPush.ts
+import { execFileSync as execFileSync4 } from "child_process";
+
+// src/commit.ts
+import { execFileSync as execFileSync3 } from "child_process";
+import * as fs6 from "fs";
+import * as path6 from "path";
+var FORBIDDEN_PATH_PREFIXES = [
+  ".kody/",
+  ".kody-engine/",
+  ".kody2/",
+  ".kody-lean/",
+  // back-compat: stale runtime dir from kody-lean v0.5.x
+  "node_modules/",
+  "dist/",
+  "build/"
+];
+var FORBIDDEN_PATH_EXACT = /* @__PURE__ */ new Set([".env"]);
+var FORBIDDEN_PATH_SUFFIXES = [".log"];
+var CONVENTIONAL_PREFIXES = [
+  "feat:",
+  "fix:",
+  "chore:",
+  "docs:",
+  "refactor:",
+  "test:",
+  "perf:",
+  "ci:",
+  "style:",
+  "build:",
+  "revert:"
+];
+function git(args, cwd) {
   try {
-    const branchInfo = ensureFeatureBranch(issueNumber, issue.title, ctx.config.git.defaultBranch, ctx.cwd);
-    ctx.data.branch = branchInfo.branch;
+    return execFileSync3("git", args, {
+      encoding: "utf-8",
+      timeout: 12e4,
+      cwd,
+      env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
   } catch (err) {
-    if (err instanceof UncommittedChangesError) {
-      ctx.output.exitCode = 5;
-      ctx.output.reason = err.message;
-      ctx.skipAgent = true;
-      tryPost(issueNumber, `\u26A0\uFE0F kody2 refused to start: ${err.message}`, ctx.cwd);
-      return;
-    }
-    throw err;
+    const e = err;
+    const stderr = e.stderr?.toString().trim() ?? "";
+    const stdout = e.stdout?.toString().trim() ?? "";
+    const status = e.status ?? "?";
+    const detail = stderr || stdout || e.message || "(no output)";
+    throw new Error(`git ${args.join(" ")} (exit ${status}):
+${detail}`);
   }
-  const runUrl = getRunUrl();
-  const startMsg = runUrl ? `\u2699\uFE0F kody2 started \u2014 branch \`${ctx.data.branch}\`, run ${runUrl}` : `\u2699\uFE0F kody2 started \u2014 branch \`${ctx.data.branch}\``;
-  tryPost(issueNumber, startMsg, ctx.cwd);
-};
-function tryPost(issueNumber, body, cwd) {
+}
+function tryGit(args, cwd) {
   try {
-    postIssueComment(issueNumber, body, cwd);
+    git(args, cwd);
+    return true;
   } catch {
+    return false;
   }
 }
-
-// src/scripts/fixFlow.ts
-var fixFlow = async (ctx) => {
-  const prNumber = ctx.args.pr;
-  const pr = getPr(prNumber, ctx.cwd);
-  if (pr.state !== "OPEN") {
-    ctx.output.exitCode = 1;
-    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
-    ctx.skipAgent = true;
-    return;
+function abortUnfinishedGitOps(cwd) {
+  const aborted = [];
+  const gitDir = path6.join(cwd ?? process.cwd(), ".git");
+  if (!fs6.existsSync(gitDir)) return aborted;
+  if (fs6.existsSync(path6.join(gitDir, "MERGE_HEAD"))) {
+    if (tryGit(["merge", "--abort"], cwd)) aborted.push("merge");
   }
-  ctx.data.pr = pr;
-  ctx.data.commentTargetType = "pr";
-  ctx.data.commentTargetNumber = prNumber;
-  checkoutPrBranch(prNumber, ctx.cwd);
-  ctx.data.branch = getCurrentBranch(ctx.cwd);
-  const inlineFeedback = ctx.args.feedback?.trim();
-  const feedback = inlineFeedback || getPrLatestReviewBody(prNumber, ctx.cwd);
-  if (!feedback.trim()) {
-    ctx.output.exitCode = 1;
-    ctx.output.reason = "no --feedback provided and no review/body text found on PR";
-    ctx.skipAgent = true;
-    return;
+  if (fs6.existsSync(path6.join(gitDir, "CHERRY_PICK_HEAD"))) {
+    if (tryGit(["cherry-pick", "--abort"], cwd)) aborted.push("cherry-pick");
+  }
+  if (fs6.existsSync(path6.join(gitDir, "REVERT_HEAD"))) {
+    if (tryGit(["revert", "--abort"], cwd)) aborted.push("revert");
+  }
+  if (fs6.existsSync(path6.join(gitDir, "rebase-merge")) || fs6.existsSync(path6.join(gitDir, "rebase-apply"))) {
+    if (tryGit(["rebase", "--abort"], cwd)) aborted.push("rebase");
   }
-  ctx.data.feedback = feedback;
-  ctx.data.prDiff = getPrDiff(prNumber, ctx.cwd);
-  const runUrl = getRunUrl();
-  const runSuffix = runUrl ? `, run ${runUrl}` : "";
-  tryPostPr(
-    prNumber,
-    `\u2699\uFE0F kody2 fix started on \`${ctx.data.branch}\`${runSuffix} \u2014 applying feedback (${truncate(feedback.replace(/\n/g, " "), 200)})`,
-    ctx.cwd
-  );
-};
-function tryPostPr(prNumber, body, cwd) {
   try {
-    postPrReviewComment(prNumber, body, cwd);
+    const unmerged = git(["diff", "--name-only", "--diff-filter=U"], cwd);
+    if (unmerged) {
+      tryGit(["reset", "--mixed", "HEAD"], cwd);
+      aborted.push("unmerged-paths-reset");
+    }
   } catch {
   }
+  return aborted;
 }
-
-// src/workflow.ts
-import { execFileSync as execFileSync4 } from "child_process";
-var GH_TIMEOUT_MS = 3e4;
-function ghToken2() {
-  return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
+function isForbiddenPath(p) {
+  if (FORBIDDEN_PATH_EXACT.has(p)) return true;
+  for (const pre of FORBIDDEN_PATH_PREFIXES) if (p.startsWith(pre)) return true;
+  for (const suf of FORBIDDEN_PATH_SUFFIXES) if (p.endsWith(suf)) return true;
+  return false;
 }
-function gh2(args, cwd) {
-  const token = ghToken2();
-  const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-  return execFileSync4("gh", args, {
+function listChangedFiles(cwd) {
+  const raw = execFileSync3("git", ["status", "--porcelain=v1", "-z"], {
     encoding: "utf-8",
-    timeout: GH_TIMEOUT_MS,
     cwd,
-    env,
-    stdio: ["ignore", "pipe", "pipe"]
-  }).trim();
+    env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
+    stdio: ["pipe", "pipe", "pipe"]
+  });
+  if (!raw) return [];
+  const entries = raw.split("\0").filter((e) => e.length > 0);
+  return entries.map((e) => e.slice(3)).filter(Boolean);
 }
-function getLatestFailedRunForPr(prNumber, cwd) {
-  let headBranch;
+function normalizeCommitMessage(raw) {
+  const trimmed = raw.trim().replace(/^['"]|['"]$/g, "").trim();
+  if (!trimmed) return "chore: kody2 update";
+  const firstLine2 = trimmed.split("\n")[0];
+  for (const prefix of CONVENTIONAL_PREFIXES) {
+    if (firstLine2.toLowerCase().startsWith(prefix)) return trimmed;
+  }
+  return `chore: ${trimmed}`;
+}
+function commitAndPush(branch, agentMessage, cwd) {
+  const allChanged = listChangedFiles(cwd);
+  const allowedFiles = allChanged.filter((f) => !isForbiddenPath(f));
+  const mergeHeadExists = fs6.existsSync(path6.join(cwd ?? process.cwd(), ".git", "MERGE_HEAD"));
+  if (allowedFiles.length === 0 && !mergeHeadExists) {
+    return { committed: false, pushed: false, sha: "", message: "" };
+  }
+  for (const f of allowedFiles) {
+    try {
+      git(["add", "--", f], cwd);
+    } catch {
+    }
+  }
+  const message = normalizeCommitMessage(agentMessage);
   try {
-    const out = gh2(["pr", "view", String(prNumber), "--json", "headRefName"], cwd);
-    headBranch = JSON.parse(out).headRefName;
+    git(["commit", "--no-gpg-sign", "-m", message], cwd);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (/nothing to commit/i.test(msg)) {
+      return { committed: false, pushed: false, sha: "", message };
+    }
+    throw err;
+  }
+  const sha = git(["rev-parse", "HEAD"], cwd).slice(0, 7);
+  try {
+    git(["push", "-u", "origin", branch], cwd);
   } catch {
-    return null;
+    git(["push", "--force-with-lease", "-u", "origin", branch], cwd);
   }
-  if (!headBranch) return null;
+  return { committed: true, pushed: true, sha, message };
+}
+function hasCommitsAhead(branch, defaultBranch, cwd) {
   try {
-    const out = gh2(
-      [
-        "run",
-        "list",
-        "--branch",
-        headBranch,
-        "--status",
-        "failure",
-        "--limit",
-        "1",
-        "--json",
-        "databaseId,workflowName,headBranch,conclusion,url,createdAt"
-      ],
-      cwd
-    );
-    const parsed = JSON.parse(out);
-    if (!Array.isArray(parsed) || parsed.length === 0) return null;
-    const r = parsed[0];
-    return {
-      id: String(r.databaseId ?? ""),
-      workflowName: r.workflowName ?? "",
-      headBranch: r.headBranch ?? headBranch,
-      conclusion: r.conclusion ?? "failure",
-      url: r.url ?? "",
-      createdAt: r.createdAt ?? ""
-    };
-  } catch {
-    return null;
-  }
-}
-function getFailedRunLogTail(runId, maxBytes, cwd) {
-  try {
-    const raw = gh2(["run", "view", String(runId), "--log-failed"], cwd);
-    if (raw.length <= maxBytes) return raw;
-    return raw.slice(-maxBytes);
+    const out = git(["rev-list", "--count", `origin/${defaultBranch}..${branch}`], cwd);
+    return parseInt(out, 10) > 0;
   } catch {
-    return "";
-  }
-}
-
-// src/scripts/fixCiFlow.ts
-var LOG_MAX_BYTES = 3e4;
-var fixCiFlow = async (ctx) => {
-  const prNumber = ctx.args.pr;
-  const pr = getPr(prNumber, ctx.cwd);
-  if (pr.state !== "OPEN") {
-    ctx.output.exitCode = 1;
-    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
-    ctx.skipAgent = true;
-    return;
-  }
-  ctx.data.pr = pr;
-  ctx.data.commentTargetType = "pr";
-  ctx.data.commentTargetNumber = prNumber;
-  checkoutPrBranch(prNumber, ctx.cwd);
-  ctx.data.branch = getCurrentBranch(ctx.cwd);
-  let runId = ctx.args.runId;
-  let workflowName = "";
-  let failedRunUrl = "";
-  if (!runId) {
-    const run = getLatestFailedRunForPr(prNumber, ctx.cwd);
-    if (!run) {
-      ctx.output.exitCode = 1;
-      ctx.output.reason = `no failed workflow run found on PR #${prNumber}'s branch`;
-      ctx.skipAgent = true;
-      return;
+    try {
+      const out = git(["rev-list", "--count", `${defaultBranch}..${branch}`], cwd);
+      return parseInt(out, 10) > 0;
+    } catch {
+      return false;
     }
-    runId = run.id;
-    workflowName = run.workflowName;
-    failedRunUrl = run.url;
-  }
-  const logTail = getFailedRunLogTail(runId, LOG_MAX_BYTES, ctx.cwd);
-  if (!logTail) {
-    ctx.output.exitCode = 1;
-    ctx.output.reason = `failed to fetch log tail for run ${runId}`;
-    ctx.skipAgent = true;
-    return;
-  }
-  ctx.data.failedRunId = runId;
-  ctx.data.failedWorkflowName = workflowName;
-  ctx.data.failedRunUrl = failedRunUrl;
-  ctx.data.failedLogTail = logTail;
-  ctx.data.prDiff = getPrDiff(prNumber, ctx.cwd);
-  const runUrl = getRunUrl();
-  const runSuffix = runUrl ? `, kody2 run ${runUrl}` : "";
-  tryPostPr2(prNumber, `\u2699\uFE0F kody2 fix-ci started on \`${ctx.data.branch}\`${runSuffix} \u2014 analyzing workflow run ${runId}`, ctx.cwd);
-};
-function tryPostPr2(prNumber, body, cwd) {
-  try {
-    postPrReviewComment(prNumber, body, cwd);
-  } catch {
   }
 }
 
-// src/scripts/resolveFlow.ts
-import { execFileSync as execFileSync5 } from "child_process";
-var CONFLICT_DIFF_MAX_BYTES = 4e4;
-var resolveFlow = async (ctx) => {
-  const prNumber = ctx.args.pr;
-  const pr = getPr(prNumber, ctx.cwd);
-  if (pr.state !== "OPEN") {
-    ctx.output.exitCode = 1;
-    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
-    ctx.skipAgent = true;
-    return;
-  }
-  ctx.data.pr = pr;
-  ctx.data.commentTargetType = "pr";
-  ctx.data.commentTargetNumber = prNumber;
-  checkoutPrBranch(prNumber, ctx.cwd);
-  ctx.data.branch = getCurrentBranch(ctx.cwd);
-  const baseBranch = pr.baseRefName || ctx.config.git.defaultBranch;
-  ctx.data.baseBranch = baseBranch;
-  const mergeStatus = mergeBase(baseBranch, ctx.cwd);
-  if (mergeStatus === "clean") {
-    ctx.output.exitCode = 0;
-    ctx.output.reason = `already up to date with origin/${baseBranch} \u2014 nothing to resolve`;
-    ctx.skipAgent = true;
-    tryPostPr3(prNumber, `\u2139\uFE0F kody2 resolve: ${ctx.output.reason}`, ctx.cwd);
-    return;
-  }
-  if (mergeStatus === "error") {
-    ctx.output.exitCode = 99;
-    ctx.output.reason = `failed to merge origin/${baseBranch} (non-conflict error); see runner log`;
-    ctx.skipAgent = true;
-    tryPostPr3(prNumber, `\u26A0\uFE0F kody2 resolve FAILED: ${ctx.output.reason}`, ctx.cwd);
-    return;
-  }
-  const conflictedFiles = getConflictedFiles(ctx.cwd);
-  if (conflictedFiles.length === 0) {
-    ctx.output.exitCode = 99;
-    ctx.output.reason = "merge reported conflict but no unmerged paths detected";
-    ctx.skipAgent = true;
+// src/scripts/commitAndPush.ts
+var commitAndPush2 = async (ctx) => {
+  const branch = ctx.data.branch;
+  if (!branch) {
+    ctx.data.commitResult = { committed: false, pushed: false };
     return;
   }
-  ctx.data.conflictedFiles = conflictedFiles;
-  ctx.data.conflictMarkersPreview = getConflictMarkersPreview(conflictedFiles, ctx.cwd);
-  const runUrl = getRunUrl();
-  const runSuffix = runUrl ? `, run ${runUrl}` : "";
-  tryPostPr3(prNumber, `\u2699\uFE0F kody2 resolve started on \`${ctx.data.branch}\`${runSuffix} \u2014 ${conflictedFiles.length} conflicted file(s)`, ctx.cwd);
-};
-function getConflictedFiles(cwd) {
-  try {
-    const out = execFileSync5("git", ["diff", "--name-only", "--diff-filter=U"], {
-      encoding: "utf-8",
-      cwd,
-      env: { ...process.env, HUSKY: "0" }
-    }).trim();
-    return out ? out.split("\n").filter(Boolean) : [];
-  } catch {
-    return [];
-  }
-}
-function getConflictMarkersPreview(files, cwd, maxBytes = CONFLICT_DIFF_MAX_BYTES) {
-  const chunks = [];
-  let total = 0;
-  for (const f of files) {
+  if (ctx.args.mode === "resolve") {
     try {
-      const content = execFileSync5("cat", [f], { encoding: "utf-8", cwd }).toString();
-      const snippet = `### ${f}
-
-\`\`\`
-${content.slice(0, 6e3)}
-\`\`\`
-`;
-      total += snippet.length;
-      chunks.push(snippet);
-      if (total >= maxBytes) break;
+      execFileSync4("git", ["add", "-A"], { cwd: ctx.cwd, env: { ...process.env, HUSKY: "0" }, stdio: "pipe" });
     } catch {
     }
-  }
-  return chunks.join("\n");
-}
-function tryPostPr3(prNumber, body, cwd) {
-  try {
-    postPrReviewComment(prNumber, body, cwd);
-  } catch {
-  }
-}
-
-// src/prompt.ts
-import * as fs4 from "fs";
-import * as path3 from "path";
-var CONVENTIONS_PER_FILE_MAX_BYTES = 3e4;
-var CONVENTION_FILES = ["CLAUDE.md", "AGENTS.md"];
-function loadProjectConventions(projectDir) {
-  const out = [];
-  for (const rel of CONVENTION_FILES) {
-    const abs = path3.join(projectDir, rel);
-    if (!fs4.existsSync(abs)) continue;
-    let content;
-    try {
-      content = fs4.readFileSync(abs, "utf-8");
-    } catch {
-      continue;
+  } else {
+    const aborted = abortUnfinishedGitOps(ctx.cwd);
+    if (aborted.length > 0) {
+      process.stderr.write(`[kody2] cleaned up unfinished git ops: ${aborted.join(", ")}
+`);
     }
-    const truncated = content.length > CONVENTIONS_PER_FILE_MAX_BYTES;
-    if (truncated) content = content.slice(0, CONVENTIONS_PER_FILE_MAX_BYTES) + "\n\n\u2026 (truncated)";
-    out.push({ path: rel, content, truncated });
-  }
-  return out;
-}
-function parseAgentResult(finalText) {
-  const text = (finalText || "").trim();
-  if (!text) return { done: false, commitMessage: "", prSummary: "", failureReason: "agent produced no final message" };
-  const failedMatch = text.match(/(?:^|\n)\s*FAILED\s*:\s*(.+?)\s*$/s);
-  if (failedMatch) {
-    return { done: false, commitMessage: "", prSummary: "", failureReason: failedMatch[1].trim() };
   }
-  if (!/(^|\n)\s*DONE\b/i.test(text)) {
-    return { done: false, commitMessage: "", prSummary: "", failureReason: "no DONE or FAILED marker in agent output" };
+  const fallbackMsg = defaultCommitMessage(ctx.args.mode, ctx.data);
+  const message = ctx.data.commitMessage || fallbackMsg;
+  try {
+    const result = commitAndPush(branch, message, ctx.cwd);
+    ctx.data.commitResult = result;
+    ctx.data.changedFiles = listChangedFiles(ctx.cwd).filter((f) => !isForbiddenPath(f));
+  } catch (err) {
+    ctx.data.commitCrash = err instanceof Error ? err.message : String(err);
+    ctx.data.commitResult = { committed: false, pushed: false };
   }
-  const commitMatch = text.match(/^[ \t]*COMMIT_MSG\s*:\s*(.+)$/im);
-  const commitMessage = commitMatch ? commitMatch[1].trim() : "";
-  const summaryStart = text.search(/(^|\n)[ \t]*PR_SUMMARY\s*:[ \t]*\n/i);
-  let prSummary = "";
-  if (summaryStart !== -1) {
-    const afterMarker = text.slice(summaryStart).replace(/^[\s\S]*?PR_SUMMARY\s*:[ \t]*\n/i, "");
-    prSummary = afterMarker.replace(/\n\s*```\s*$/g, "").replace(/```\s*$/g, "").trim();
+  ctx.data.hasCommitsAhead = hasCommitsAhead(branch, ctx.config.git.defaultBranch, ctx.cwd);
+};
+function defaultCommitMessage(mode, data) {
+  switch (mode) {
+    case "run":
+      return `chore: kody2 changes for #${data.commentTargetNumber}`;
+    case "fix":
+      return `chore(fix): kody2 fix for PR #${data.commentTargetNumber}`;
+    case "fix-ci":
+      return `fix(ci): kody2 fix-ci for PR #${data.commentTargetNumber}`;
+    case "resolve":
+      return `fix: resolve merge conflicts with ${data.baseBranch}`;
+    default:
+      return `chore: kody2 changes`;
   }
-  return { done: true, commitMessage, prSummary, failureReason: "" };
 }
 
-// src/scripts/loadConventions.ts
-var loadConventions = async (ctx) => {
-  const conventions = loadProjectConventions(ctx.cwd);
-  ctx.data.conventions = conventions;
-  if (conventions.length > 0) {
-    process.stderr.write(`[kody2] loaded conventions: ${conventions.map((c) => c.path).join(", ")}
-`);
-  }
-};
-
-// src/scripts/loadCoverageRules.ts
-var loadCoverageRules = async (ctx) => {
-  ctx.data.coverageRules = ctx.config.testRequirements ?? [];
-};
-
 // src/scripts/composePrompt.ts
-import * as fs5 from "fs";
-import * as path4 from "path";
+import * as fs7 from "fs";
+import * as path7 from "path";
 var MUSTACHE = /\{\{\s*([a-zA-Z0-9_.-]+)\s*\}\}/g;
 var composePrompt = async (ctx, profile) => {
   const explicit = ctx.data.promptTemplate;
   const mode = ctx.args.mode;
   const candidates = [
-    explicit ? path4.join(profile.dir, explicit) : null,
-    mode ? path4.join(profile.dir, "prompts", `${mode}.md`) : null,
-    path4.join(profile.dir, "prompt.md")
+    explicit ? path7.join(profile.dir, explicit) : null,
+    mode ? path7.join(profile.dir, "prompts", `${mode}.md`) : null,
+    path7.join(profile.dir, "prompt.md")
   ].filter(Boolean);
   let templatePath = "";
   for (const c of candidates) {
-    if (fs5.existsSync(c)) {
+    if (fs7.existsSync(c)) {
       templatePath = c;
       break;
     }
@@ -908,18 +968,20 @@ var composePrompt = async (ctx, profile) => {
   if (!templatePath) {
     throw new Error(`profile at ${profile.dir}: no prompt template found (tried ${candidates.join(", ")})`);
   }
-  const template = fs5.readFileSync(templatePath, "utf-8");
+  const template = fs7.readFileSync(templatePath, "utf-8");
   const tokens = {
     ...stringifyAll(ctx.args, "args."),
     ...stringifyAll(ctx.data, ""),
-    "conventionsBlock": formatConventions(ctx.data.conventions),
-    "coverageBlock": formatCoverageBlock(ctx.data.coverageRules),
-    "toolsUsage": formatToolsUsage(profile),
-    "systemPromptAppend": profile.claudeCode.systemPromptAppend ?? "",
-    "repoOwner": ctx.config.github.owner,
-    "repoName": ctx.config.github.repo,
-    "defaultBranch": ctx.config.git.defaultBranch,
-    "branch": ctx.data.branch ?? ""
+    conventionsBlock: formatConventions(ctx.data.conventions),
+    coverageBlock: formatCoverageBlock(
+      ctx.data.coverageRules
+    ),
+    toolsUsage: formatToolsUsage(profile),
+    systemPromptAppend: profile.claudeCode.systemPromptAppend ?? "",
+    repoOwner: ctx.config.github.owner,
+    repoName: ctx.config.github.repo,
+    defaultBranch: ctx.config.git.defaultBranch,
+    branch: ctx.data.branch ?? ""
   };
   ctx.data.prompt = template.replace(MUSTACHE, (_, key) => tokens[key] ?? "");
 };
@@ -944,10 +1006,7 @@ function stringifyAll(source, prefix) {
 }
 function formatConventions(conventions) {
   if (!conventions || conventions.length === 0) return "";
-  const lines = [
-    "# Project conventions (AUTHORITATIVE \u2014 follow these over patterns you infer from code)",
-    ""
-  ];
+  const lines = ["# Project conventions (AUTHORITATIVE \u2014 follow these over patterns you infer from code)", ""];
   for (const c of conventions) {
     lines.push(`## ${c.path}${c.truncated ? " (truncated)" : ""}`);
     lines.push("");
@@ -973,452 +1032,188 @@ function formatCoverageBlock(reqs) {
 function formatToolsUsage(profile) {
   const entries = (profile.cliTools ?? []).filter((t) => t.usage.trim().length > 0);
   if (entries.length === 0) return "";
-  const lines = [
-    "# Available CLI tools",
-    ""
-  ];
+  const lines = ["# Available CLI tools", ""];
   for (const t of entries) {
     lines.push(`## \`${t.name}\``);
     lines.push(t.usage);
     if (t.allowedUses.length > 0) {
-      lines.push(`Allowed sub-commands: ${t.allowedUses.map((u) => "`" + u + "`").join(", ")}`);
+      lines.push(`Allowed sub-commands: ${t.allowedUses.map((u) => `\`${u}\``).join(", ")}`);
     }
     lines.push("");
   }
   return lines.join("\n");
 }
 
-// src/scripts/parseAgentResult.ts
-var parseAgentResult2 = async (ctx, _profile, agentResult) => {
-  if (!agentResult) {
-    ctx.data.agentDone = false;
-    return;
-  }
-  const parsed = parseAgentResult(agentResult.finalText);
-  ctx.data.agentDone = parsed.done;
-  ctx.data.commitMessage = parsed.commitMessage;
-  ctx.data.prSummary = parsed.prSummary;
-  ctx.data.agentFailureReason = parsed.failureReason;
-  ctx.data.agentOutcome = agentResult.outcome;
-  ctx.data.agentError = agentResult.error;
-};
-
-// src/verify.ts
-import { spawn } from "child_process";
-var TAIL_CHARS = 4e3;
-var COMMAND_TIMEOUT_MS = 10 * 60 * 1e3;
-function runCommand(command, cwd) {
-  return new Promise((resolve2) => {
-    const start = Date.now();
-    const child = spawn(command, {
-      cwd,
-      shell: true,
-      env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1", CI: process.env.CI ?? "1" },
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    const buffers = [];
-    let totalSize = 0;
-    const collect = (chunk) => {
-      buffers.push(chunk);
-      totalSize += chunk.length;
-      while (totalSize > TAIL_CHARS * 4 && buffers.length > 1) {
-        totalSize -= buffers[0].length;
-        buffers.shift();
-      }
-    };
-    child.stdout?.on("data", collect);
-    child.stderr?.on("data", collect);
-    const timer = setTimeout(() => {
-      child.kill("SIGTERM");
-      setTimeout(() => {
-        if (!child.killed) child.kill("SIGKILL");
-      }, 5e3);
-    }, COMMAND_TIMEOUT_MS);
-    child.on("exit", (code) => {
-      clearTimeout(timer);
-      const tail = Buffer.concat(buffers).toString("utf-8").slice(-TAIL_CHARS);
-      resolve2({ exitCode: code ?? -1, durationMs: Date.now() - start, tail });
-    });
-    child.on("error", (err) => {
-      clearTimeout(timer);
-      resolve2({ exitCode: -1, durationMs: Date.now() - start, tail: err.message });
-    });
-  });
+// src/issue.ts
+import { execFileSync as execFileSync5 } from "child_process";
+var API_TIMEOUT_MS = 3e4;
+function ghToken() {
+  return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
 }
-async function verifyAll(config, cwd) {
-  const commands = [];
-  if (config.quality.typecheck) commands.push({ name: "typecheck", cmd: config.quality.typecheck });
-  if (config.quality.testUnit) commands.push({ name: "test", cmd: config.quality.testUnit });
-  if (config.quality.lint) commands.push({ name: "lint", cmd: config.quality.lint });
-  const failed = [];
-  const details = {};
-  for (const { name, cmd } of commands) {
-    const result = await runCommand(cmd, cwd);
-    details[name] = result;
-    if (result.exitCode !== 0) failed.push(name);
+function gh(args, options) {
+  const token = ghToken();
+  const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
+  return execFileSync5("gh", args, {
+    encoding: "utf-8",
+    timeout: API_TIMEOUT_MS,
+    cwd: options?.cwd,
+    env,
+    input: options?.input,
+    stdio: options?.input ? ["pipe", "pipe", "pipe"] : ["inherit", "pipe", "pipe"]
+  }).trim();
+}
+function getIssue(issueNumber, cwd) {
+  const output = gh(["issue", "view", String(issueNumber), "--json", "number,title,body,comments"], { cwd });
+  const parsed = JSON.parse(output);
+  if (typeof parsed?.title !== "string") {
+    throw new Error(`Issue #${issueNumber}: unexpected response shape`);
   }
-  return { ok: failed.length === 0, failed, details };
+  return {
+    number: parsed.number ?? issueNumber,
+    title: parsed.title,
+    body: parsed.body ?? "",
+    comments: (parsed.comments ?? []).map((c) => ({
+      body: c.body ?? "",
+      author: c.author?.login ?? "unknown",
+      createdAt: c.createdAt ?? ""
+    }))
+  };
 }
-var ANSI_RE = /\x1B\[[0-?]*[ -/]*[@-~]/g;
-function stripAnsi(s) {
-  return s.replace(ANSI_RE, "");
+function postIssueComment(issueNumber, body, cwd) {
+  try {
+    gh(["issue", "comment", String(issueNumber), "--body-file", "-"], { input: body, cwd });
+  } catch (err) {
+    process.stderr.write(
+      `[kody2] failed to post comment on #${issueNumber}: ${err instanceof Error ? err.message : String(err)}
+`
+    );
+  }
 }
-function summarizeFailure(result) {
-  const lines = [`verify failed: ${result.failed.join(", ")}`];
-  for (const name of result.failed) {
-    const d = result.details[name];
-    if (!d) continue;
-    lines.push(`
---- ${name} (exit ${d.exitCode}, ${(d.durationMs / 1e3).toFixed(1)}s) ---`);
-    lines.push(stripAnsi(d.tail));
+function truncate2(s, maxBytes) {
+  if (s.length <= maxBytes) return s;
+  return `${s.slice(0, maxBytes)}\u2026 (+${s.length - maxBytes} chars)`;
+}
+function getPr(prNumber, cwd) {
+  const output = gh(["pr", "view", String(prNumber), "--json", "number,title,body,headRefName,baseRefName,state"], {
+    cwd
+  });
+  const parsed = JSON.parse(output);
+  if (typeof parsed?.title !== "string") {
+    throw new Error(`PR #${prNumber}: unexpected response shape`);
   }
-  return lines.join("\n");
+  return {
+    number: parsed.number ?? prNumber,
+    title: parsed.title,
+    body: parsed.body ?? "",
+    headRefName: String(parsed.headRefName ?? ""),
+    baseRefName: String(parsed.baseRefName ?? ""),
+    state: String(parsed.state ?? "")
+  };
 }
-
-// src/scripts/verify.ts
-var verify = async (ctx) => {
+function getPrDiff(prNumber, cwd) {
   try {
-    const result = await verifyAll(ctx.config, ctx.cwd);
-    ctx.data.verifyOk = result.ok;
-    ctx.data.verifyReason = result.ok ? "" : summarizeFailure(result);
+    return gh(["pr", "diff", String(prNumber)], { cwd });
   } catch (err) {
-    ctx.data.verifyOk = false;
-    ctx.data.verifyReason = `verify crashed: ${err instanceof Error ? err.message : String(err)}`;
+    process.stderr.write(
+      `[kody2] failed to fetch diff for PR #${prNumber}: ${err instanceof Error ? err.message : String(err)}
+`
+    );
+    return "";
   }
-};
-
-// src/coverage.ts
-import { execFileSync as execFileSync6 } from "child_process";
-function patternToRegex(pattern) {
-  let s = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
-  s = s.replace(/\*\*\//g, "\xA7S").replace(/\*\*/g, "\xA7A").replace(/\*/g, "[^/]*");
-  s = s.replace(/§S/g, "(?:.*/)?").replace(/§A/g, ".*");
-  return new RegExp(`^${s}$`);
 }
-function renderSiblingPath(file, requireSibling) {
-  const lastSlash = file.lastIndexOf("/");
-  const dir = lastSlash === -1 ? "" : file.slice(0, lastSlash + 1);
-  const base = lastSlash === -1 ? file : file.slice(lastSlash + 1);
-  const name = base.replace(/\.[^.]+$/, "");
-  const ext = base.match(/\.[^.]+$/)?.[0] ?? "";
-  const sibling = requireSibling.replace(/\{name\}/g, name).replace(/\{ext\}/g, ext);
-  return dir + sibling;
+function getPrReviews(prNumber, cwd) {
+  try {
+    const output = gh(["pr", "view", String(prNumber), "--json", "reviews"], { cwd });
+    const parsed = JSON.parse(output);
+    if (!Array.isArray(parsed?.reviews)) return [];
+    return parsed.reviews.map(
+      (r) => ({
+        body: r.body ?? "",
+        state: r.state ?? "",
+        author: r.author?.login ?? "unknown",
+        submittedAt: r.submittedAt ?? ""
+      })
+    );
+  } catch {
+    return [];
+  }
 }
-function safeGit(args, cwd) {
+function getPrComments(prNumber, cwd) {
   try {
-    return execFileSync6("git", args, { encoding: "utf-8", cwd, env: { ...process.env, HUSKY: "0" } }).trim();
+    const output = gh(["pr", "view", String(prNumber), "--json", "comments"], { cwd });
+    const parsed = JSON.parse(output);
+    if (!Array.isArray(parsed?.comments)) return [];
+    return parsed.comments.map((c) => ({
+      body: c.body ?? "",
+      author: c.author?.login ?? "unknown",
+      createdAt: c.createdAt ?? ""
+    })).filter((c) => c.body.trim().length > 0);
   } catch {
-    return "";
+    return [];
   }
 }
-function getAddedFiles(baseBranch, cwd) {
-  const committed = safeGit(["diff", "--name-only", "--diff-filter=A", `origin/${baseBranch}...HEAD`], cwd);
-  const untracked = safeGit(["ls-files", "--others", "--exclude-standard"], cwd);
-  const set = /* @__PURE__ */ new Set();
-  for (const f of committed.split("\n")) if (f) set.add(f);
-  for (const f of untracked.split("\n")) if (f) set.add(f);
-  return [...set];
+var KODY_COMMENT_PREFIXES = ["\u2699\uFE0F kody2", "\u2705 kody2", "\u26A0\uFE0F kody2", "\u2139\uFE0F kody2", "\u2192 kody2"];
+function getPrLatestReviewBody(prNumber, cwd) {
+  const reviews = getPrReviews(prNumber, cwd).filter((r) => r.body.trim().length > 0).map((r) => ({ body: r.body, at: r.submittedAt }));
+  const comments = getPrComments(prNumber, cwd).filter((c) => !KODY_COMMENT_PREFIXES.some((p) => c.body.startsWith(p))).map((c) => ({ body: c.body, at: c.createdAt }));
+  const all = [...reviews, ...comments].sort((a, b) => (b.at || "").localeCompare(a.at || ""));
+  if (all.length > 0) return all[0].body;
+  const pr = getPr(prNumber, cwd);
+  return pr.body;
 }
-function checkCoverage(addedFiles, requirements) {
-  if (requirements.length === 0) return [];
-  const addedSet = new Set(addedFiles);
-  const misses = [];
-  for (const file of addedFiles) {
-    if (/\.(test|spec)\./.test(file)) continue;
-    for (const req of requirements) {
-      const re = patternToRegex(req.pattern);
-      if (!re.test(file)) continue;
-      const expected = renderSiblingPath(file, req.requireSibling);
-      if (!addedSet.has(expected)) {
-        misses.push({ file, expectedTest: expected });
-      }
-      break;
-    }
+function postPrReviewComment(prNumber, body, cwd) {
+  try {
+    gh(["pr", "comment", String(prNumber), "--body-file", "-"], { input: body, cwd });
+  } catch (err) {
+    process.stderr.write(
+      `[kody2] failed to post review comment on PR #${prNumber}: ${err instanceof Error ? err.message : String(err)}
+`
+    );
   }
-  return misses;
-}
-function formatMissesForFeedback(misses) {
-  if (misses.length === 0) return "";
-  const lines = ["The following files were added without a sibling test file:"];
-  for (const m of misses) lines.push(`- \`${m.file}\` \u2192 expected \`${m.expectedTest}\``);
-  lines.push("");
-  lines.push("Add the missing test files. Each should cover the new file's public API with at least a happy path and one failure path. Then re-emit DONE / COMMIT_MSG / PR_SUMMARY.");
-  return lines.join("\n");
 }
 
-// src/scripts/checkCoverageWithRetry.ts
-var checkCoverageWithRetry = async (ctx) => {
-  const reqs = ctx.data.coverageRules ?? [];
-  if (reqs.length === 0) {
-    ctx.data.coverageMisses = [];
-    return;
+// src/pr.ts
+var TITLE_MAX = 72;
+function stripTitlePrefixes(raw) {
+  let s = raw.trim();
+  while (true) {
+    const next = s.replace(/^(\[WIP\]\s*)?#\d+:\s*/, "");
+    if (next === s) break;
+    s = next;
   }
-  if (!ctx.data.agentDone) {
-    ctx.data.coverageMisses = [];
-    return;
+  return s;
+}
+function buildPrTitle(issueNumber, issueTitle, draft) {
+  const prefix = draft ? "[WIP] " : "";
+  const clean = stripTitlePrefixes(issueTitle);
+  const base = `${prefix}#${issueNumber}: ${clean}`;
+  if (base.length <= TITLE_MAX) return base;
+  return `${base.slice(0, TITLE_MAX - 1)}\u2026`;
+}
+function buildPrBody(opts) {
+  const lines = [];
+  if (opts.draft && opts.failureReason) {
+    const headline = firstLine(opts.failureReason);
+    lines.push(`> \u26A0\uFE0F Draft: ${headline}`);
+    lines.push(`> The failures below may be **pre-existing in the repo** \u2014 verify before treating as PR-blocking.`);
+    lines.push("");
   }
-  const misses = checkCoverage(getAddedFiles(ctx.config.git.defaultBranch, ctx.cwd), reqs);
-  if (misses.length === 0) {
-    ctx.data.coverageMisses = [];
-    return;
+  lines.push("## Summary");
+  lines.push("");
+  if (opts.agentSummary?.trim()) {
+    lines.push(opts.agentSummary.trim());
+  } else {
+    lines.push(`Implementation of issue #${opts.issueNumber} \u2014 ${opts.issueTitle}`);
+    lines.push("");
+    lines.push("_(agent did not supply PR_SUMMARY)_");
   }
-  const invoker = ctx.data.__invokeAgent;
-  const basePrompt = ctx.data.prompt;
-  if (!invoker || !basePrompt) {
-    ctx.data.coverageMisses = misses;
-    return;
-  }
-  process.stderr.write(`[kody2] coverage check found ${misses.length} missing test(s); retrying agent once
-`);
-  const retryPrompt = `${basePrompt}
-
-# Coverage failure (retry)
-${formatMissesForFeedback(misses)}`;
-  const retry = await invoker(retryPrompt);
-  const retryParsed = parseAgentResult(retry.finalText);
-  if (retry.outcome === "completed" && retryParsed.done) {
-    ctx.data.agentDone = true;
-    ctx.data.commitMessage = retryParsed.commitMessage || ctx.data.commitMessage;
-    ctx.data.prSummary = retryParsed.prSummary || ctx.data.prSummary;
-  }
-  const finalMisses = checkCoverage(getAddedFiles(ctx.config.git.defaultBranch, ctx.cwd), reqs);
-  ctx.data.coverageMisses = finalMisses;
-};
-
-// src/scripts/commitAndPush.ts
-import { execFileSync as execFileSync8 } from "child_process";
-
-// src/commit.ts
-import { execFileSync as execFileSync7 } from "child_process";
-import * as fs6 from "fs";
-import * as path5 from "path";
-var FORBIDDEN_PATH_PREFIXES = [
-  ".kody/",
-  ".kody-engine/",
-  ".kody2/",
-  ".kody-lean/",
-  // back-compat: stale runtime dir from kody-lean v0.5.x
-  "node_modules/",
-  "dist/",
-  "build/"
-];
-var FORBIDDEN_PATH_EXACT = /* @__PURE__ */ new Set([".env"]);
-var FORBIDDEN_PATH_SUFFIXES = [".log"];
-var CONVENTIONAL_PREFIXES = [
-  "feat:",
-  "fix:",
-  "chore:",
-  "docs:",
-  "refactor:",
-  "test:",
-  "perf:",
-  "ci:",
-  "style:",
-  "build:",
-  "revert:"
-];
-function git2(args, cwd) {
-  try {
-    return execFileSync7("git", args, {
-      encoding: "utf-8",
-      timeout: 12e4,
-      cwd,
-      env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-  } catch (err) {
-    const e = err;
-    const stderr = e.stderr?.toString().trim() ?? "";
-    const stdout = e.stdout?.toString().trim() ?? "";
-    const status = e.status ?? "?";
-    const detail = stderr || stdout || e.message || "(no output)";
-    throw new Error(`git ${args.join(" ")} (exit ${status}):
-${detail}`);
-  }
-}
-function tryGit(args, cwd) {
-  try {
-    git2(args, cwd);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function abortUnfinishedGitOps(cwd) {
-  const aborted = [];
-  const gitDir = path5.join(cwd ?? process.cwd(), ".git");
-  if (!fs6.existsSync(gitDir)) return aborted;
-  if (fs6.existsSync(path5.join(gitDir, "MERGE_HEAD"))) {
-    if (tryGit(["merge", "--abort"], cwd)) aborted.push("merge");
-  }
-  if (fs6.existsSync(path5.join(gitDir, "CHERRY_PICK_HEAD"))) {
-    if (tryGit(["cherry-pick", "--abort"], cwd)) aborted.push("cherry-pick");
-  }
-  if (fs6.existsSync(path5.join(gitDir, "REVERT_HEAD"))) {
-    if (tryGit(["revert", "--abort"], cwd)) aborted.push("revert");
-  }
-  if (fs6.existsSync(path5.join(gitDir, "rebase-merge")) || fs6.existsSync(path5.join(gitDir, "rebase-apply"))) {
-    if (tryGit(["rebase", "--abort"], cwd)) aborted.push("rebase");
-  }
-  try {
-    const unmerged = git2(["diff", "--name-only", "--diff-filter=U"], cwd);
-    if (unmerged) {
-      tryGit(["reset", "--mixed", "HEAD"], cwd);
-      aborted.push("unmerged-paths-reset");
-    }
-  } catch {
-  }
-  return aborted;
-}
-function isForbiddenPath(p) {
-  if (FORBIDDEN_PATH_EXACT.has(p)) return true;
-  for (const pre of FORBIDDEN_PATH_PREFIXES) if (p.startsWith(pre)) return true;
-  for (const suf of FORBIDDEN_PATH_SUFFIXES) if (p.endsWith(suf)) return true;
-  return false;
-}
-function listChangedFiles(cwd) {
-  const raw = execFileSync7("git", ["status", "--porcelain=v1", "-z"], {
-    encoding: "utf-8",
-    cwd,
-    env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
-    stdio: ["pipe", "pipe", "pipe"]
-  });
-  if (!raw) return [];
-  const entries = raw.split("\0").filter((e) => e.length > 0);
-  return entries.map((e) => e.slice(3)).filter(Boolean);
-}
-function normalizeCommitMessage(raw) {
-  const trimmed = raw.trim().replace(/^['"]|['"]$/g, "").trim();
-  if (!trimmed) return "chore: kody2 update";
-  const firstLine2 = trimmed.split("\n")[0];
-  for (const prefix of CONVENTIONAL_PREFIXES) {
-    if (firstLine2.toLowerCase().startsWith(prefix)) return trimmed;
-  }
-  return `chore: ${trimmed}`;
-}
-function commitAndPush(branch, agentMessage, cwd) {
-  const allChanged = listChangedFiles(cwd);
-  const allowedFiles = allChanged.filter((f) => !isForbiddenPath(f));
-  const mergeHeadExists = fs6.existsSync(path5.join(cwd ?? process.cwd(), ".git", "MERGE_HEAD"));
-  if (allowedFiles.length === 0 && !mergeHeadExists) {
-    return { committed: false, pushed: false, sha: "", message: "" };
-  }
-  for (const f of allowedFiles) {
-    try {
-      git2(["add", "--", f], cwd);
-    } catch {
-    }
-  }
-  const message = normalizeCommitMessage(agentMessage);
-  try {
-    git2(["commit", "--no-gpg-sign", "-m", message], cwd);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (/nothing to commit/i.test(msg)) {
-      return { committed: false, pushed: false, sha: "", message };
-    }
-    throw err;
-  }
-  const sha = git2(["rev-parse", "HEAD"], cwd).slice(0, 7);
-  try {
-    git2(["push", "-u", "origin", branch], cwd);
-  } catch {
-    git2(["push", "--force-with-lease", "-u", "origin", branch], cwd);
-  }
-  return { committed: true, pushed: true, sha, message };
-}
-function hasCommitsAhead(branch, defaultBranch, cwd) {
-  try {
-    const out = git2(["rev-list", "--count", `origin/${defaultBranch}..${branch}`], cwd);
-    return parseInt(out, 10) > 0;
-  } catch {
-    try {
-      const out = git2(["rev-list", "--count", `${defaultBranch}..${branch}`], cwd);
-      return parseInt(out, 10) > 0;
-    } catch {
-      return false;
-    }
-  }
-}
-
-// src/scripts/commitAndPush.ts
-var commitAndPush2 = async (ctx) => {
-  const branch = ctx.data.branch;
-  if (!branch) {
-    ctx.data.commitResult = { committed: false, pushed: false };
-    return;
-  }
-  if (ctx.args.mode === "resolve") {
-    try {
-      execFileSync8("git", ["add", "-A"], { cwd: ctx.cwd, env: { ...process.env, HUSKY: "0" }, stdio: "pipe" });
-    } catch {
-    }
-  } else {
-    const aborted = abortUnfinishedGitOps(ctx.cwd);
-    if (aborted.length > 0) {
-      process.stderr.write(`[kody2] cleaned up unfinished git ops: ${aborted.join(", ")}
-`);
-    }
-  }
-  const fallbackMsg = defaultCommitMessage(ctx.args.mode, ctx.data);
-  const message = ctx.data.commitMessage || fallbackMsg;
-  try {
-    const result = commitAndPush(branch, message, ctx.cwd);
-    ctx.data.commitResult = result;
-    ctx.data.changedFiles = listChangedFiles(ctx.cwd).filter((f) => !isForbiddenPath(f));
-  } catch (err) {
-    ctx.data.commitCrash = err instanceof Error ? err.message : String(err);
-    ctx.data.commitResult = { committed: false, pushed: false };
-  }
-  ctx.data.hasCommitsAhead = hasCommitsAhead(branch, ctx.config.git.defaultBranch, ctx.cwd);
-};
-function defaultCommitMessage(mode, data) {
-  switch (mode) {
-    case "run":
-      return `chore: kody2 changes for #${data.commentTargetNumber}`;
-    case "fix":
-      return `chore(fix): kody2 fix for PR #${data.commentTargetNumber}`;
-    case "fix-ci":
-      return `fix(ci): kody2 fix-ci for PR #${data.commentTargetNumber}`;
-    case "resolve":
-      return `fix: resolve merge conflicts with ${data.baseBranch}`;
-    default:
-      return `chore: kody2 changes`;
-  }
-}
-
-// src/pr.ts
-var TITLE_MAX = 72;
-function buildPrTitle(issueNumber, issueTitle, draft) {
-  const prefix = draft ? "[WIP] " : "";
-  const base = `${prefix}#${issueNumber}: ${issueTitle}`;
-  if (base.length <= TITLE_MAX) return base;
-  return base.slice(0, TITLE_MAX - 1) + "\u2026";
-}
-function buildPrBody(opts) {
-  const lines = [];
-  if (opts.draft && opts.failureReason) {
-    const headline = firstLine(opts.failureReason);
-    lines.push(`> \u26A0\uFE0F Draft: ${headline}`);
-    lines.push(`> The failures below may be **pre-existing in the repo** \u2014 verify before treating as PR-blocking.`);
-    lines.push("");
-  }
-  lines.push("## Summary");
-  lines.push("");
-  if (opts.agentSummary && opts.agentSummary.trim()) {
-    lines.push(opts.agentSummary.trim());
-  } else {
-    lines.push(`Implementation of issue #${opts.issueNumber} \u2014 ${opts.issueTitle}`);
-    lines.push("");
-    lines.push("_(agent did not supply PR_SUMMARY)_");
-  }
-  lines.push("");
-  if (opts.changedFiles.length > 0) {
-    lines.push("## Changes");
-    lines.push("");
-    for (const f of opts.changedFiles.slice(0, 50)) lines.push(`- \`${f}\``);
-    if (opts.changedFiles.length > 50) lines.push(`- \u2026 and ${opts.changedFiles.length - 50} more`);
-    lines.push("");
+  lines.push("");
+  if (opts.changedFiles.length > 0) {
+    lines.push("## Changes");
+    lines.push("");
+    for (const f of opts.changedFiles.slice(0, 50)) lines.push(`- \`${f}\``);
+    if (opts.changedFiles.length > 50) lines.push(`- \u2026 and ${opts.changedFiles.length - 50} more`);
+    lines.push("");
   }
   lines.push(`Closes #${opts.issueNumber}`);
   lines.push("");
@@ -1427,7 +1222,7 @@ function buildPrBody(opts) {
     lines.push("<summary>Verify output (click to expand)</summary>");
     lines.push("");
     lines.push("```");
-    lines.push(truncate(opts.failureReason, 6e3));
+    lines.push(truncate2(opts.failureReason, 6e3));
     lines.push("```");
     lines.push("");
     lines.push("</details>");
@@ -1441,7 +1236,7 @@ function firstLine(s) {
   const trimmed = s.trim();
   const nl = trimmed.indexOf("\n");
   const head = nl === -1 ? trimmed : trimmed.slice(0, nl);
-  return head.length > 200 ? head.slice(0, 197) + "\u2026" : head;
+  return head.length > 200 ? `${head.slice(0, 197)}\u2026` : head;
 }
 function findExistingPr(branch, cwd) {
   try {
@@ -1461,13 +1256,12 @@ function ensurePr(opts) {
   const existing = findExistingPr(opts.branch, opts.cwd);
   if (existing) {
     try {
-      gh(
-        ["pr", "edit", String(existing.number), "--body-file", "-"],
-        { input: body, cwd: opts.cwd }
-      );
+      gh(["pr", "edit", String(existing.number), "--body-file", "-"], { input: body, cwd: opts.cwd });
     } catch (err) {
-      process.stderr.write(`[kody2] failed to update PR #${existing.number}: ${err instanceof Error ? err.message : String(err)}
-`);
+      process.stderr.write(
+        `[kody2] failed to update PR #${existing.number}: ${err instanceof Error ? err.message : String(err)}
+`
+      );
     }
     return { url: existing.url, number: existing.number, draft: opts.draft, action: "updated" };
   }
@@ -1538,9 +1332,354 @@ function computeFailureReason(ctx) {
   if (!agentDone) {
     return ctx.data.agentFailureReason || ctx.data.agentError || ctx.data.commitCrash || "agent did not emit DONE";
   }
-  if (ctx.data.verifyOk === false) return ctx.data.verifyReason || "verify failed";
-  return "";
-}
+  if (ctx.data.verifyOk === false) return ctx.data.verifyReason || "verify failed";
+  return "";
+}
+
+// src/branch.ts
+import { execFileSync as execFileSync6 } from "child_process";
+var UncommittedChangesError = class extends Error {
+  constructor(branch) {
+    super(`Uncommitted changes on branch '${branch}' \u2014 refusing to run to protect work in progress`);
+    this.branch = branch;
+    this.name = "UncommittedChangesError";
+  }
+  branch;
+};
+function git2(args, cwd) {
+  return execFileSync6("git", args, {
+    encoding: "utf-8",
+    timeout: 3e4,
+    cwd,
+    env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
+    stdio: ["pipe", "pipe", "pipe"]
+  }).trim();
+}
+function deriveBranchName(issueNumber, title) {
+  const slug = title.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").slice(0, 50).replace(/-$/, "");
+  return slug ? `${issueNumber}-${slug}` : `${issueNumber}`;
+}
+function getCurrentBranch(cwd) {
+  return git2(["branch", "--show-current"], cwd);
+}
+function hasUncommittedChanges(cwd) {
+  return git2(["status", "--porcelain", "--untracked-files=no"], cwd).length > 0;
+}
+function checkoutPrBranch(prNumber, cwd) {
+  const env = {
+    ...process.env,
+    HUSKY: "0",
+    SKIP_HOOKS: "1",
+    GH_TOKEN: process.env.GH_PAT?.trim() || process.env.GH_TOKEN || ""
+  };
+  execFileSync6("gh", ["pr", "checkout", String(prNumber)], {
+    cwd,
+    env,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: 6e4
+  });
+  return getCurrentBranch(cwd);
+}
+function mergeBase(baseBranch, cwd) {
+  try {
+    git2(["fetch", "origin", baseBranch], cwd);
+  } catch {
+    return "error";
+  }
+  try {
+    git2(["merge", `origin/${baseBranch}`, "--no-edit", "--no-ff"], cwd);
+    return "clean";
+  } catch {
+    try {
+      const unmerged = git2(["diff", "--name-only", "--diff-filter=U"], cwd);
+      if (unmerged.length > 0) return "conflict";
+    } catch {
+    }
+    try {
+      git2(["merge", "--abort"], cwd);
+    } catch {
+    }
+    return "error";
+  }
+}
+function ensureFeatureBranch(issueNumber, title, defaultBranch, cwd) {
+  const branchName = deriveBranchName(issueNumber, title);
+  const current = getCurrentBranch(cwd);
+  if (current === branchName) {
+    if (hasUncommittedChanges(cwd)) throw new UncommittedChangesError(branchName);
+    return { branch: branchName, created: false };
+  }
+  if (hasUncommittedChanges(cwd)) throw new UncommittedChangesError(current || "(detached)");
+  try {
+    git2(["fetch", "origin"], cwd);
+  } catch {
+  }
+  try {
+    git2(["rev-parse", "--verify", `origin/${branchName}`], cwd);
+    git2(["checkout", branchName], cwd);
+    try {
+      git2(["pull", "origin", branchName], cwd);
+    } catch {
+    }
+    return { branch: branchName, created: false };
+  } catch {
+  }
+  try {
+    git2(["rev-parse", "--verify", branchName], cwd);
+    git2(["checkout", branchName], cwd);
+    return { branch: branchName, created: false };
+  } catch {
+  }
+  try {
+    git2(["checkout", "-b", branchName, `origin/${defaultBranch}`], cwd);
+  } catch {
+    git2(["checkout", "-b", branchName], cwd);
+  }
+  return { branch: branchName, created: true };
+}
+
+// src/gha.ts
+import { execFileSync as execFileSync7 } from "child_process";
+import * as fs8 from "fs";
+function getRunUrl() {
+  const server = process.env.GITHUB_SERVER_URL;
+  const repo = process.env.GITHUB_REPOSITORY;
+  const runId = process.env.GITHUB_RUN_ID;
+  if (!server || !repo || !runId) return "";
+  return `${server}/${repo}/actions/runs/${runId}`;
+}
+function reactToTriggerComment(cwd) {
+  if (process.env.GITHUB_EVENT_NAME !== "issue_comment") return;
+  const eventPath = process.env.GITHUB_EVENT_PATH;
+  if (!eventPath || !fs8.existsSync(eventPath)) return;
+  let event = null;
+  try {
+    event = JSON.parse(fs8.readFileSync(eventPath, "utf-8"));
+  } catch {
+    return;
+  }
+  const commentId = event?.comment?.id;
+  const repo = process.env.GITHUB_REPOSITORY;
+  if (!commentId || !repo) return;
+  const token = process.env.KODY_TOKEN?.trim() || process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
+  try {
+    execFileSync7(
+      "gh",
+      [
+        "api",
+        "-X",
+        "POST",
+        "-H",
+        "Accept: application/vnd.github+json",
+        `/repos/${repo}/issues/comments/${commentId}/reactions`,
+        "-f",
+        "content=eyes"
+      ],
+      {
+        cwd,
+        env: { ...process.env, GH_TOKEN: token ?? process.env.GH_TOKEN ?? "" },
+        stdio: "pipe",
+        timeout: 15e3
+      }
+    );
+  } catch {
+  }
+}
+
+// src/workflow.ts
+import { execFileSync as execFileSync8 } from "child_process";
+var GH_TIMEOUT_MS = 3e4;
+function ghToken2() {
+  return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
+}
+function gh2(args, cwd) {
+  const token = ghToken2();
+  const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
+  return execFileSync8("gh", args, {
+    encoding: "utf-8",
+    timeout: GH_TIMEOUT_MS,
+    cwd,
+    env,
+    stdio: ["ignore", "pipe", "pipe"]
+  }).trim();
+}
+function getLatestFailedRunForPr(prNumber, cwd) {
+  let headBranch;
+  try {
+    const out = gh2(["pr", "view", String(prNumber), "--json", "headRefName"], cwd);
+    headBranch = JSON.parse(out).headRefName;
+  } catch {
+    return null;
+  }
+  if (!headBranch) return null;
+  try {
+    const out = gh2(
+      [
+        "run",
+        "list",
+        "--branch",
+        headBranch,
+        "--status",
+        "failure",
+        "--limit",
+        "1",
+        "--json",
+        "databaseId,workflowName,headBranch,conclusion,url,createdAt"
+      ],
+      cwd
+    );
+    const parsed = JSON.parse(out);
+    if (!Array.isArray(parsed) || parsed.length === 0) return null;
+    const r = parsed[0];
+    return {
+      id: String(r.databaseId ?? ""),
+      workflowName: r.workflowName ?? "",
+      headBranch: r.headBranch ?? headBranch,
+      conclusion: r.conclusion ?? "failure",
+      url: r.url ?? "",
+      createdAt: r.createdAt ?? ""
+    };
+  } catch {
+    return null;
+  }
+}
+function getFailedRunLogTail(runId, maxBytes, cwd) {
+  try {
+    const raw = gh2(["run", "view", String(runId), "--log-failed"], cwd);
+    if (raw.length <= maxBytes) return raw;
+    return raw.slice(-maxBytes);
+  } catch {
+    return "";
+  }
+}
+
+// src/scripts/fixCiFlow.ts
+var LOG_MAX_BYTES = 3e4;
+var fixCiFlow = async (ctx) => {
+  const prNumber = ctx.args.pr;
+  const pr = getPr(prNumber, ctx.cwd);
+  if (pr.state !== "OPEN") {
+    ctx.output.exitCode = 1;
+    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
+    ctx.skipAgent = true;
+    return;
+  }
+  ctx.data.pr = pr;
+  ctx.data.commentTargetType = "pr";
+  ctx.data.commentTargetNumber = prNumber;
+  checkoutPrBranch(prNumber, ctx.cwd);
+  ctx.data.branch = getCurrentBranch(ctx.cwd);
+  let runId = ctx.args.runId;
+  let workflowName = "";
+  let failedRunUrl = "";
+  if (!runId) {
+    const run = getLatestFailedRunForPr(prNumber, ctx.cwd);
+    if (!run) {
+      ctx.output.exitCode = 1;
+      ctx.output.reason = `no failed workflow run found on PR #${prNumber}'s branch`;
+      ctx.skipAgent = true;
+      return;
+    }
+    runId = run.id;
+    workflowName = run.workflowName;
+    failedRunUrl = run.url;
+  }
+  const logTail = getFailedRunLogTail(runId, LOG_MAX_BYTES, ctx.cwd);
+  if (!logTail) {
+    ctx.output.exitCode = 1;
+    ctx.output.reason = `failed to fetch log tail for run ${runId}`;
+    ctx.skipAgent = true;
+    return;
+  }
+  ctx.data.failedRunId = runId;
+  ctx.data.failedWorkflowName = workflowName;
+  ctx.data.failedRunUrl = failedRunUrl;
+  ctx.data.failedLogTail = logTail;
+  ctx.data.prDiff = getPrDiff(prNumber, ctx.cwd);
+  const runUrl = getRunUrl();
+  const runSuffix = runUrl ? `, kody2 run ${runUrl}` : "";
+  tryPostPr(
+    prNumber,
+    `\u2699\uFE0F kody2 fix-ci started on \`${ctx.data.branch}\`${runSuffix} \u2014 analyzing workflow run ${runId}`,
+    ctx.cwd
+  );
+};
+function tryPostPr(prNumber, body, cwd) {
+  try {
+    postPrReviewComment(prNumber, body, cwd);
+  } catch {
+  }
+}
+
+// src/scripts/fixFlow.ts
+var fixFlow = async (ctx) => {
+  const prNumber = ctx.args.pr;
+  const pr = getPr(prNumber, ctx.cwd);
+  if (pr.state !== "OPEN") {
+    ctx.output.exitCode = 1;
+    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
+    ctx.skipAgent = true;
+    return;
+  }
+  ctx.data.pr = pr;
+  ctx.data.commentTargetType = "pr";
+  ctx.data.commentTargetNumber = prNumber;
+  checkoutPrBranch(prNumber, ctx.cwd);
+  ctx.data.branch = getCurrentBranch(ctx.cwd);
+  const inlineFeedback = ctx.args.feedback?.trim();
+  const feedback = inlineFeedback || getPrLatestReviewBody(prNumber, ctx.cwd);
+  if (!feedback.trim()) {
+    ctx.output.exitCode = 1;
+    ctx.output.reason = "no --feedback provided and no review/body text found on PR";
+    ctx.skipAgent = true;
+    return;
+  }
+  ctx.data.feedback = feedback;
+  ctx.data.prDiff = getPrDiff(prNumber, ctx.cwd);
+  const runUrl = getRunUrl();
+  const runSuffix = runUrl ? `, run ${runUrl}` : "";
+  tryPostPr2(
+    prNumber,
+    `\u2699\uFE0F kody2 fix started on \`${ctx.data.branch}\`${runSuffix} \u2014 applying feedback (${truncate2(feedback.replace(/\n/g, " "), 200)})`,
+    ctx.cwd
+  );
+};
+function tryPostPr2(prNumber, body, cwd) {
+  try {
+    postPrReviewComment(prNumber, body, cwd);
+  } catch {
+  }
+}
+
+// src/scripts/loadConventions.ts
+var loadConventions = async (ctx) => {
+  const conventions = loadProjectConventions(ctx.cwd);
+  ctx.data.conventions = conventions;
+  if (conventions.length > 0) {
+    process.stderr.write(`[kody2] loaded conventions: ${conventions.map((c) => c.path).join(", ")}
+`);
+  }
+};
+
+// src/scripts/loadCoverageRules.ts
+var loadCoverageRules = async (ctx) => {
+  ctx.data.coverageRules = ctx.config.testRequirements ?? [];
+};
+
+// src/scripts/parseAgentResult.ts
+var parseAgentResult2 = async (ctx, _profile, agentResult) => {
+  if (!agentResult) {
+    ctx.data.agentDone = false;
+    return;
+  }
+  const parsed = parseAgentResult(agentResult.finalText);
+  ctx.data.agentDone = parsed.done;
+  ctx.data.commitMessage = parsed.commitMessage;
+  ctx.data.prSummary = parsed.prSummary;
+  ctx.data.agentFailureReason = parsed.failureReason;
+  ctx.data.agentOutcome = agentResult.outcome;
+  ctx.data.agentError = agentResult.error;
+};
 
 // src/scripts/postIssueComment.ts
 var postIssueComment2 = async (ctx) => {
@@ -1559,13 +1698,13 @@ var postIssueComment2 = async (ctx) => {
     return;
   }
   if (ctx.output.exitCode === 4 && ctx.data.prCrashReason) {
-    postWith(targetType, targetNumber, `\u26A0\uFE0F kody2 FAILED: ${truncate(ctx.data.prCrashReason, 1500)}`, ctx.cwd);
+    postWith(targetType, targetNumber, `\u26A0\uFE0F kody2 FAILED: ${truncate2(ctx.data.prCrashReason, 1500)}`, ctx.cwd);
     ctx.output.reason = ctx.data.prCrashReason;
     return;
   }
   const failureReason = computeFailureReason2(ctx);
   const isFailure = failureReason.length > 0;
-  const msg = isFailure ? `\u26A0\uFE0F kody2 FAILED: ${truncate(failureReason, 1500)}${prUrl ? ` \u2014 draft PR: ${prUrl}` : ""}` : `\u2705 kody2 PR opened: ${prUrl}`;
+  const msg = isFailure ? `\u26A0\uFE0F kody2 FAILED: ${truncate2(failureReason, 1500)}${prUrl ? ` \u2014 draft PR: ${prUrl}` : ""}` : `\u2705 kody2 PR opened: ${prUrl}`;
   postWith(targetType, targetNumber, msg, ctx.cwd);
   let exitCode = 0;
   const agentDone = Boolean(ctx.data.agentDone);
@@ -1594,195 +1733,266 @@ function postWith(type, n, body, cwd) {
   }
 }
 
-// src/scripts/index.ts
-var preflightScripts = {
-  runFlow,
-  fixFlow,
-  fixCiFlow,
-  resolveFlow,
-  loadConventions,
-  loadCoverageRules,
-  composePrompt
-};
-var postflightScripts = {
-  parseAgentResult: parseAgentResult2,
-  verify,
-  checkCoverageWithRetry,
-  commitAndPush: commitAndPush2,
-  ensurePr: ensurePr2,
-  postIssueComment: postIssueComment2
-};
-var allScriptNames = /* @__PURE__ */ new Set([
-  ...Object.keys(preflightScripts),
-  ...Object.keys(postflightScripts)
-]);
-
-// src/agent.ts
-import { query } from "@anthropic-ai/claude-agent-sdk";
-import * as fs7 from "fs";
-import * as path6 from "path";
-
-// src/format.ts
-function renderEvent(msg, opts = {}) {
-  if (opts.quiet) {
-    if (msg.type === "result") return formatResult(msg);
-    return null;
+// src/scripts/resolveFlow.ts
+import { execFileSync as execFileSync9 } from "child_process";
+var CONFLICT_DIFF_MAX_BYTES = 4e4;
+var resolveFlow = async (ctx) => {
+  const prNumber = ctx.args.pr;
+  const pr = getPr(prNumber, ctx.cwd);
+  if (pr.state !== "OPEN") {
+    ctx.output.exitCode = 1;
+    ctx.output.reason = `PR #${prNumber} is not OPEN (state: ${pr.state})`;
+    ctx.skipAgent = true;
+    return;
   }
-  switch (msg.type) {
-    case "system":
-      return null;
-    case "assistant":
-      return formatAssistant(msg, opts);
-    case "user":
-      return formatUserToolResult(msg, opts);
-    case "result":
-      return formatResult(msg);
-    default:
-      return null;
+  ctx.data.pr = pr;
+  ctx.data.commentTargetType = "pr";
+  ctx.data.commentTargetNumber = prNumber;
+  checkoutPrBranch(prNumber, ctx.cwd);
+  ctx.data.branch = getCurrentBranch(ctx.cwd);
+  const baseBranch = pr.baseRefName || ctx.config.git.defaultBranch;
+  ctx.data.baseBranch = baseBranch;
+  const mergeStatus = mergeBase(baseBranch, ctx.cwd);
+  if (mergeStatus === "clean") {
+    ctx.output.exitCode = 0;
+    ctx.output.reason = `already up to date with origin/${baseBranch} \u2014 nothing to resolve`;
+    ctx.skipAgent = true;
+    tryPostPr3(prNumber, `\u2139\uFE0F kody2 resolve: ${ctx.output.reason}`, ctx.cwd);
+    return;
   }
-}
-function formatAssistant(msg, opts) {
-  const content = msg.message?.content ?? [];
-  const lines = [];
-  for (const block of content) {
-    if (block.type === "text") {
-      const text = block.text.trim();
-      if (text) lines.push(text);
-    } else if (block.type === "tool_use") {
-      const tu = block;
-      lines.push(`\u2192 ${tu.name}${summarizeToolInput(tu.name, tu.input)}`);
-    }
+  if (mergeStatus === "error") {
+    ctx.output.exitCode = 99;
+    ctx.output.reason = `failed to merge origin/${baseBranch} (non-conflict error); see runner log`;
+    ctx.skipAgent = true;
+    tryPostPr3(prNumber, `\u26A0\uFE0F kody2 resolve FAILED: ${ctx.output.reason}`, ctx.cwd);
+    return;
+  }
+  const conflictedFiles = getConflictedFiles(ctx.cwd);
+  if (conflictedFiles.length === 0) {
+    ctx.output.exitCode = 99;
+    ctx.output.reason = "merge reported conflict but no unmerged paths detected";
+    ctx.skipAgent = true;
+    return;
+  }
+  ctx.data.conflictedFiles = conflictedFiles;
+  ctx.data.conflictMarkersPreview = getConflictMarkersPreview(conflictedFiles, ctx.cwd);
+  const runUrl = getRunUrl();
+  const runSuffix = runUrl ? `, run ${runUrl}` : "";
+  tryPostPr3(
+    prNumber,
+    `\u2699\uFE0F kody2 resolve started on \`${ctx.data.branch}\`${runSuffix} \u2014 ${conflictedFiles.length} conflicted file(s)`,
+    ctx.cwd
+  );
+};
+function getConflictedFiles(cwd) {
+  try {
+    const out = execFileSync9("git", ["diff", "--name-only", "--diff-filter=U"], {
+      encoding: "utf-8",
+      cwd,
+      env: { ...process.env, HUSKY: "0" }
+    }).trim();
+    return out ? out.split("\n").filter(Boolean) : [];
+  } catch {
+    return [];
   }
-  return lines.length > 0 ? lines.join("\n") : null;
 }
-function formatUserToolResult(msg, opts) {
-  const content = msg.message?.content ?? [];
-  const lines = [];
-  for (const block of content) {
-    if (block.type === "tool_result") {
-      const tr = block;
-      const text = stringifyToolContent(tr.content);
-      const lineCount = text.split("\n").length;
-      const sizeBytes = text.length;
-      const flag = tr.is_error ? " ERROR" : "";
-      const summary = `  \u21B3${flag} ${lineCount} lines, ${formatBytes(sizeBytes)}`;
-      if (opts.verbose) {
-        lines.push(`${summary}
-${truncate2(text, 4e3)}`);
-      } else {
-        lines.push(summary);
-      }
+function getConflictMarkersPreview(files, cwd, maxBytes = CONFLICT_DIFF_MAX_BYTES) {
+  const chunks = [];
+  let total = 0;
+  for (const f of files) {
+    try {
+      const content = execFileSync9("cat", [f], { encoding: "utf-8", cwd }).toString();
+      const snippet = `### ${f}
+
+\`\`\`
+${content.slice(0, 6e3)}
+\`\`\`
+`;
+      total += snippet.length;
+      chunks.push(snippet);
+      if (total >= maxBytes) break;
+    } catch {
     }
   }
-  return lines.length > 0 ? lines.join("\n") : null;
-}
-function formatResult(msg) {
-  const ok = msg.subtype === "success";
-  const tag = ok ? "DONE" : `FAILED (${msg.subtype ?? "unknown"})`;
-  const dur = msg.duration_ms ? ` ${(msg.duration_ms / 1e3).toFixed(1)}s` : "";
-  const turns = msg.num_turns ? ` ${msg.num_turns} turns` : "";
-  const cost = typeof msg.total_cost_usd === "number" ? ` $${msg.total_cost_usd.toFixed(4)}` : "";
-  return `
-=== ${tag}${dur}${turns}${cost} ===`;
+  return chunks.join("\n");
 }
-function summarizeToolInput(toolName, input = {}) {
-  if (toolName === "Bash" && typeof input.command === "string") {
-    const cmd = input.command.split("\n")[0];
-    return `: ${truncate2(cmd, 120)}`;
+function tryPostPr3(prNumber, body, cwd) {
+  try {
+    postPrReviewComment(prNumber, body, cwd);
+  } catch {
   }
-  if ((toolName === "Read" || toolName === "Edit" || toolName === "Write") && typeof input.file_path === "string") {
-    return ` ${input.file_path}`;
+}
+
+// src/scripts/runFlow.ts
+var runFlow = async (ctx) => {
+  const issueNumber = ctx.args.issue;
+  const issue = getIssue(issueNumber, ctx.cwd);
+  ctx.data.issue = issue;
+  ctx.data.commentTargetType = "issue";
+  ctx.data.commentTargetNumber = issueNumber;
+  try {
+    const branchInfo = ensureFeatureBranch(issueNumber, issue.title, ctx.config.git.defaultBranch, ctx.cwd);
+    ctx.data.branch = branchInfo.branch;
+  } catch (err) {
+    if (err instanceof UncommittedChangesError) {
+      ctx.output.exitCode = 5;
+      ctx.output.reason = err.message;
+      ctx.skipAgent = true;
+      tryPost(issueNumber, `\u26A0\uFE0F kody2 refused to start: ${err.message}`, ctx.cwd);
+      return;
+    }
+    throw err;
   }
-  if ((toolName === "Glob" || toolName === "Grep") && typeof input.pattern === "string") {
-    return `: ${truncate2(input.pattern, 80)}`;
+  const runUrl = getRunUrl();
+  const startMsg = runUrl ? `\u2699\uFE0F kody2 started \u2014 branch \`${ctx.data.branch}\`, run ${runUrl}` : `\u2699\uFE0F kody2 started \u2014 branch \`${ctx.data.branch}\``;
+  tryPost(issueNumber, startMsg, ctx.cwd);
+};
+function tryPost(issueNumber, body, cwd) {
+  try {
+    postIssueComment(issueNumber, body, cwd);
+  } catch {
   }
-  return "";
 }
-function stringifyToolContent(content) {
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.map((b) => {
-      if (b && typeof b === "object" && "text" in b && typeof b.text === "string") {
-        return b.text;
+
+// src/verify.ts
+import { spawn as spawn2 } from "child_process";
+var TAIL_CHARS = 4e3;
+var COMMAND_TIMEOUT_MS = 10 * 60 * 1e3;
+function runCommand(command, cwd) {
+  return new Promise((resolve2) => {
+    const start = Date.now();
+    const child = spawn2(command, {
+      cwd,
+      shell: true,
+      env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1", CI: process.env.CI ?? "1" },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const buffers = [];
+    let totalSize = 0;
+    const collect = (chunk) => {
+      buffers.push(chunk);
+      totalSize += chunk.length;
+      while (totalSize > TAIL_CHARS * 4 && buffers.length > 1) {
+        totalSize -= buffers[0].length;
+        buffers.shift();
       }
-      return JSON.stringify(b);
-    }).join("\n");
+    };
+    child.stdout?.on("data", collect);
+    child.stderr?.on("data", collect);
+    const timer = setTimeout(() => {
+      child.kill("SIGTERM");
+      setTimeout(() => {
+        if (!child.killed) child.kill("SIGKILL");
+      }, 5e3);
+    }, COMMAND_TIMEOUT_MS);
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      const tail = Buffer.concat(buffers).toString("utf-8").slice(-TAIL_CHARS);
+      resolve2({ exitCode: code ?? -1, durationMs: Date.now() - start, tail });
+    });
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      resolve2({ exitCode: -1, durationMs: Date.now() - start, tail: err.message });
+    });
+  });
+}
+async function verifyAll(config, cwd) {
+  const commands = [];
+  if (config.quality.typecheck) commands.push({ name: "typecheck", cmd: config.quality.typecheck });
+  if (config.quality.testUnit) commands.push({ name: "test", cmd: config.quality.testUnit });
+  if (config.quality.lint) commands.push({ name: "lint", cmd: config.quality.lint });
+  const failed = [];
+  const details = {};
+  for (const { name, cmd } of commands) {
+    const result = await runCommand(cmd, cwd);
+    details[name] = result;
+    if (result.exitCode !== 0) failed.push(name);
   }
-  return JSON.stringify(content);
+  return { ok: failed.length === 0, failed, details };
 }
-function truncate2(s, max) {
-  if (s.length <= max) return s;
-  return s.slice(0, max) + `\u2026 (+${s.length - max} chars)`;
+var ANSI_RE = /\x1B\[[0-?]*[ -/]*[@-~]/g;
+function stripAnsi(s) {
+  return s.replace(ANSI_RE, "");
 }
-function formatBytes(bytes) {
-  if (bytes < 1024) return `${bytes}B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
-  return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
+function summarizeFailure(result) {
+  const lines = [`verify failed: ${result.failed.join(", ")}`];
+  for (const name of result.failed) {
+    const d = result.details[name];
+    if (!d) continue;
+    lines.push(`
+--- ${name} (exit ${d.exitCode}, ${(d.durationMs / 1e3).toFixed(1)}s) ---`);
+    lines.push(stripAnsi(d.tail));
+  }
+  return lines.join("\n");
 }
 
-// src/agent.ts
-var DEFAULT_ALLOWED_TOOLS = ["Bash", "Edit", "Read", "Write", "Glob", "Grep"];
-async function runAgent(opts) {
-  const ndjsonDir = opts.ndjsonDir ?? path6.join(opts.cwd, ".kody2");
-  fs7.mkdirSync(ndjsonDir, { recursive: true });
-  const ndjsonPath = path6.join(ndjsonDir, "last-run.jsonl");
-  const fullLog = fs7.createWriteStream(ndjsonPath, { flags: "w" });
-  const env = {
-    ...process.env,
-    SKIP_HOOKS: "1",
-    HUSKY: "0",
-    CI: process.env.CI ?? "1"
-  };
-  if (opts.litellmUrl) {
-    env.ANTHROPIC_BASE_URL = opts.litellmUrl;
-    env.ANTHROPIC_API_KEY = getAnthropicApiKeyOrDummy();
+// src/scripts/verify.ts
+var verify = async (ctx) => {
+  try {
+    const result = await verifyAll(ctx.config, ctx.cwd);
+    ctx.data.verifyOk = result.ok;
+    ctx.data.verifyReason = result.ok ? "" : summarizeFailure(result);
+  } catch (err) {
+    ctx.data.verifyOk = false;
+    ctx.data.verifyReason = `verify crashed: ${err instanceof Error ? err.message : String(err)}`;
   }
-  let finalText = "";
-  let outcome = "failed";
-  let errorMessage;
+};
+
+// src/scripts/writeRunSummary.ts
+import * as fs9 from "fs";
+var writeRunSummary = async (ctx) => {
+  const summaryPath = process.env.GITHUB_STEP_SUMMARY;
+  if (!summaryPath) return;
+  const mode = ctx.args.mode;
+  const issue = ctx.args.issue;
+  const pr = ctx.args.pr;
+  const target = issue ? `issue #${issue}` : pr ? `PR #${pr}` : "(unknown)";
+  const prUrl = ctx.output.prUrl;
+  const exitCode = ctx.output.exitCode ?? 0;
+  const reason = ctx.output.reason;
+  const status = exitCode === 0 ? "\u2705 success" : exitCode === 3 ? "\u23ED\uFE0F no-op" : "\u26A0\uFE0F failed";
+  const lines = [];
+  lines.push(`## kody2 run \u2014 ${status}`);
+  lines.push("");
+  lines.push(`- **Mode:** \`${mode ?? "?"}\``);
+  lines.push(`- **Target:** ${target}`);
+  if (prUrl) lines.push(`- **PR:** ${prUrl}`);
+  lines.push(`- **Exit code:** ${exitCode}`);
+  if (reason) lines.push(`- **Reason:** ${reason}`);
+  lines.push("");
   try {
-    const result = query({
-      prompt: opts.prompt,
-      options: {
-        model: opts.model.model,
-        cwd: opts.cwd,
-        allowedTools: opts.allowedToolsOverride ?? DEFAULT_ALLOWED_TOOLS,
-        permissionMode: opts.permissionModeOverride ?? "acceptEdits",
-        env
-      }
-    });
-    for await (const msg of result) {
-      try {
-        fullLog.write(JSON.stringify(msg) + "\n");
-      } catch {
-      }
-      const line = renderEvent(msg, { verbose: opts.verbose, quiet: opts.quiet });
-      if (line) process.stdout.write(line + "\n");
-      const m = msg;
-      if (m.type === "result") {
-        if (m.subtype === "success") {
-          outcome = "completed";
-          finalText = (typeof m.result === "string" ? m.result : "").trim();
-        } else {
-          outcome = "failed";
-          errorMessage = `result subtype: ${m.subtype ?? "unknown"}`;
-        }
-      }
-    }
-  } catch (e) {
-    outcome = "failed";
-    errorMessage = e instanceof Error ? e.message : String(e);
-  } finally {
-    try {
-      fullLog.end();
-    } catch {
-    }
+    fs9.appendFileSync(summaryPath, `${lines.join("\n")}
+`);
+  } catch {
   }
-  return { outcome, finalText, error: errorMessage, ndjsonPath };
-}
+};
+
+// src/scripts/index.ts
+var preflightScripts = {
+  runFlow,
+  fixFlow,
+  fixCiFlow,
+  resolveFlow,
+  loadConventions,
+  loadCoverageRules,
+  composePrompt
+};
+var postflightScripts = {
+  parseAgentResult: parseAgentResult2,
+  verify,
+  checkCoverageWithRetry,
+  commitAndPush: commitAndPush2,
+  ensurePr: ensurePr2,
+  postIssueComment: postIssueComment2,
+  writeRunSummary
+};
+var allScriptNames = /* @__PURE__ */ new Set([
+  ...Object.keys(preflightScripts),
+  ...Object.keys(postflightScripts)
+]);
 
 // src/tools.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 function verifyCliTools(tools, cwd) {
   const out = [];
   for (const t of tools) out.push(verifyOne(t, cwd));
@@ -1815,121 +2025,13 @@ function verifyOne(tool, cwd) {
 }
 function runShell(cmd, cwd, timeoutMs = 3e4) {
   try {
-    execFileSync9("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
+    execFileSync10("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
     return true;
   } catch {
     return false;
   }
 }
 
-// src/litellm.ts
-import * as fs8 from "fs";
-import * as os from "os";
-import * as path7 from "path";
-import { execFileSync as execFileSync10, spawn as spawn2 } from "child_process";
-async function checkLitellmHealth(url) {
-  try {
-    const response = await fetch(`${url}/health`, { signal: AbortSignal.timeout(3e3) });
-    return response.ok;
-  } catch {
-    return false;
-  }
-}
-function generateLitellmConfigYaml(model) {
-  const apiKeyVar = providerApiKeyEnvVar(model.provider);
-  return [
-    "model_list:",
-    `  - model_name: ${model.model}`,
-    `    litellm_params:`,
-    `      model: ${model.provider}/${model.model}`,
-    `      api_key: os.environ/${apiKeyVar}`,
-    "",
-    "litellm_settings:",
-    "  drop_params: true",
-    ""
-  ].join("\n");
-}
-async function startLitellmIfNeeded(model, projectDir, url = LITELLM_DEFAULT_URL) {
-  if (!needsLitellmProxy(model)) return null;
-  if (await checkLitellmHealth(url)) {
-    return { url, kill: () => {
-    } };
-  }
-  let cmd = "litellm";
-  let args;
-  try {
-    execFileSync10("which", ["litellm"], { timeout: 3e3, stdio: "pipe" });
-  } catch {
-    try {
-      execFileSync10("python3", ["-c", "import litellm"], { timeout: 1e4, stdio: "pipe" });
-      cmd = "python3";
-    } catch {
-      throw new Error("litellm not installed \u2014 run: pip install 'litellm[proxy]'");
-    }
-  }
-  const configPath = path7.join(os.tmpdir(), `kody2-litellm-${Date.now()}.yaml`);
-  fs8.writeFileSync(configPath, generateLitellmConfigYaml(model));
-  const portMatch = url.match(/:(\d+)/);
-  const port = portMatch ? portMatch[1] : "4000";
-  args = cmd === "litellm" ? ["--config", configPath, "--port", port] : ["-m", "litellm", "--config", configPath, "--port", port];
-  const dotenvVars = readDotenvApiKeys(projectDir);
-  const logPath = path7.join(os.tmpdir(), `kody2-litellm-${Date.now()}.log`);
-  const outFd = fs8.openSync(logPath, "w");
-  const child = spawn2(cmd, args, {
-    stdio: ["ignore", outFd, outFd],
-    detached: true,
-    env: stripBlockingEnv({ ...process.env, ...dotenvVars })
-  });
-  fs8.closeSync(outFd);
-  for (let i = 0; i < 30; i++) {
-    await new Promise((r) => setTimeout(r, 2e3));
-    if (await checkLitellmHealth(url)) {
-      return { url, kill: () => {
-        try {
-          child.kill();
-        } catch {
-        }
-      } };
-    }
-  }
-  let logTail = "";
-  try {
-    logTail = fs8.readFileSync(logPath, "utf-8").slice(-2e3);
-  } catch {
-  }
-  try {
-    child.kill();
-  } catch {
-  }
-  throw new Error(`LiteLLM proxy failed to start within 60s. Log tail:
-${logTail}`);
-}
-function readDotenvApiKeys(projectDir) {
-  const dotenvPath = path7.join(projectDir, ".env");
-  if (!fs8.existsSync(dotenvPath)) return {};
-  const result = {};
-  for (const rawLine of fs8.readFileSync(dotenvPath, "utf-8").split("\n")) {
-    const line = rawLine.trim();
-    if (!line || line.startsWith("#")) continue;
-    const match = line.match(/^([A-Z_][A-Z0-9_]*_API_KEY)=(.*)$/);
-    if (!match) continue;
-    let value = match[2].trim();
-    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-      value = value.slice(1, -1);
-    }
-    const commentIdx = value.indexOf(" #");
-    if (commentIdx !== -1) value = value.slice(0, commentIdx).trim();
-    if (value) result[match[1]] = value;
-  }
-  return result;
-}
-function stripBlockingEnv(env) {
-  const out = { ...env };
-  delete out.DATABASE_URL;
-  delete out.AI_BASE_URL;
-  return out;
-}
-
 // src/executor.ts
 async function runExecutable(profileName, input) {
   const profilePath = resolveProfilePath(profileName);
@@ -1960,7 +2062,10 @@ async function runExecutable(profileName, input) {
   try {
     litellm = await startLitellmIfNeeded(model, input.cwd);
   } catch (err) {
-    return finish({ exitCode: 99, reason: `litellm startup failed: ${err instanceof Error ? err.message : String(err)}` });
+    return finish({
+      exitCode: 99,
+      reason: `litellm startup failed: ${err instanceof Error ? err.message : String(err)}`
+    });
   }
   const ctx = {
     args,
@@ -1981,7 +2086,8 @@ async function runExecutable(profileName, input) {
     quiet: input.quiet,
     ndjsonDir,
     allowedToolsOverride: profile.claudeCode.tools,
-    permissionModeOverride: profile.claudeCode.permissionMode
+    permissionModeOverride: profile.claudeCode.permissionMode,
+    mcpServers: profile.claudeCode.mcpServers
   });
   ctx.data.__invokeAgent = invokeAgent;
   try {
@@ -2006,9 +2112,21 @@ async function runExecutable(profileName, input) {
       if (!shouldRun(entry, ctx)) continue;
       const fn = postflightScripts[entry.script];
       if (!fn) return finish({ exitCode: 99, reason: `postflight script not registered: ${entry.script}` });
-      await fn(ctx, profile, agentResult);
+      try {
+        await fn(ctx, profile, agentResult);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`[kody2] postflight script "${entry.script}" crashed: ${msg}
+`);
+        if (!ctx.output.reason) ctx.output.reason = `postflight ${entry.script} crashed: ${msg}`;
+        if (ctx.output.exitCode === 0) ctx.output.exitCode = 99;
+      }
     }
-    return finish(ctx.output);
+    return finish({
+      exitCode: ctx.output.exitCode ?? 0,
+      prUrl: ctx.output.prUrl,
+      reason: ctx.output.reason
+    });
   } finally {
     try {
       litellm?.kill();
@@ -2027,7 +2145,7 @@ function resolveProfilePath(profileName) {
     // fallback
   ];
   for (const c of candidates) {
-    if (fs9.existsSync(c)) return c;
+    if (fs10.existsSync(c)) return c;
   }
   return candidates[0];
 }
@@ -2105,12 +2223,12 @@ function finish(out) {
 }
 
 // src/kody2-cli.ts
-import * as fs11 from "fs";
-import * as path9 from "path";
 import { execFileSync as execFileSync11 } from "child_process";
+import * as fs12 from "fs";
+import * as path9 from "path";
 
 // src/dispatch.ts
-import * as fs10 from "fs";
+import * as fs11 from "fs";
 function autoDispatch(explicit) {
   if (explicit?.mode && explicit.target) {
     return {
@@ -2120,10 +2238,10 @@ function autoDispatch(explicit) {
   }
   const eventName = process.env.GITHUB_EVENT_NAME;
   const eventPath = process.env.GITHUB_EVENT_PATH;
-  if (!eventName || !eventPath || !fs10.existsSync(eventPath)) return null;
+  if (!eventName || !eventPath || !fs11.existsSync(eventPath)) return null;
   let event = {};
   try {
-    event = JSON.parse(fs10.readFileSync(eventPath, "utf-8"));
+    event = JSON.parse(fs11.readFileSync(eventPath, "utf-8"));
   } catch {
     return null;
   }
@@ -2243,9 +2361,9 @@ function resolveAuthToken(env = process.env) {
   return token;
 }
 function detectPackageManager(cwd) {
-  if (fs11.existsSync(path9.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs11.existsSync(path9.join(cwd, "yarn.lock"))) return "yarn";
-  if (fs11.existsSync(path9.join(cwd, "bun.lockb"))) return "bun";
+  if (fs12.existsSync(path9.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs12.existsSync(path9.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs12.existsSync(path9.join(cwd, "bun.lockb"))) return "bun";
   return "npm";
 }
 function shellOut(cmd, args, cwd, stream = true) {
@@ -2325,13 +2443,13 @@ function postFailureTail(issueNumber, cwd, reason) {
   const logPath = path9.join(cwd, ".kody2", "last-run.jsonl");
   let tail = "";
   try {
-    if (fs11.existsSync(logPath)) {
-      const content = fs11.readFileSync(logPath, "utf-8");
+    if (fs12.existsSync(logPath)) {
+      const content = fs12.readFileSync(logPath, "utf-8");
       tail = content.slice(-3e3);
     }
   } catch {
   }
-  const body = tail ? `\u26A0\uFE0F kody2 preflight failed: ${truncate(reason, 500)}
+  const body = tail ? `\u26A0\uFE0F kody2 preflight failed: ${truncate2(reason, 500)}
 
 <details><summary>Last-run log tail</summary>
 
@@ -2339,7 +2457,7 @@ function postFailureTail(issueNumber, cwd, reason) {
 ${tail}
 \`\`\`
 
-</details>` : `\u26A0\uFE0F kody2 preflight failed: ${truncate(reason, 1500)}`;
+</details>` : `\u26A0\uFE0F kody2 preflight failed: ${truncate2(reason, 1500)}`;
   try {
     postIssueComment(issueNumber, body, cwd);
   } catch {
@@ -2359,7 +2477,8 @@ async function runCi(argv) {
   if (args.errors.length > 0 && !args.errors.includes("__HELP__")) {
     for (const e of args.errors) process.stderr.write(`error: ${e}
 `);
-    process.stderr.write("\n" + CI_HELP);
+    process.stderr.write(`
+${CI_HELP}`);
     return 64;
   }
   const cwd = args.cwd ? path9.resolve(args.cwd) : process.cwd();
@@ -2430,12 +2549,74 @@ async function runCi(argv) {
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[kody2] run crashed: ${msg}
 `);
-    if (err instanceof Error && err.stack) process.stderr.write(err.stack + "\n");
+    if (err instanceof Error && err.stack) process.stderr.write(`${err.stack}
+`);
     postFailureTail(issueNumber, cwd, `run crashed: ${msg}`);
     return 99;
   }
 }
 
+// src/registry.ts
+import * as fs13 from "fs";
+import * as path10 from "path";
+function getExecutablesRoot() {
+  const here = path10.dirname(new URL(import.meta.url).pathname);
+  const candidates = [
+    path10.join(here, "executables"),
+    // dev: src/
+    path10.join(here, "..", "executables"),
+    // built: dist/bin → dist/executables
+    path10.join(here, "..", "src", "executables")
+    // fallback
+  ];
+  for (const c of candidates) {
+    if (fs13.existsSync(c) && fs13.statSync(c).isDirectory()) return c;
+  }
+  return candidates[0];
+}
+function listExecutables(root = getExecutablesRoot()) {
+  if (!fs13.existsSync(root)) return [];
+  const entries = fs13.readdirSync(root, { withFileTypes: true });
+  const out = [];
+  for (const ent of entries) {
+    if (!ent.isDirectory()) continue;
+    const profilePath = path10.join(root, ent.name, "profile.json");
+    if (fs13.existsSync(profilePath) && fs13.statSync(profilePath).isFile()) {
+      out.push({ name: ent.name, profilePath });
+    }
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
+function hasExecutable(name, root = getExecutablesRoot()) {
+  if (!isSafeName(name)) return false;
+  const profilePath = path10.join(root, name, "profile.json");
+  return fs13.existsSync(profilePath) && fs13.statSync(profilePath).isFile();
+}
+function isSafeName(name) {
+  return /^[a-z][a-z0-9-]*$/.test(name) && !name.includes("..");
+}
+function parseGenericFlags(argv) {
+  const args = {};
+  const positional = [];
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (!arg.startsWith("--")) {
+      positional.push(arg);
+      continue;
+    }
+    const key = arg.slice(2);
+    const next = argv[i + 1];
+    if (next !== void 0 && !next.startsWith("--")) {
+      args[key] = next;
+      i++;
+    } else {
+      args[key] = true;
+    }
+  }
+  if (positional.length > 0) args._ = positional;
+  return args;
+}
+
 // src/entry.ts
 var HELP_TEXT = `kody2 \u2014 single-session autonomous engineer
 
@@ -2452,10 +2633,10 @@ All commands dispatch to the Build executable with a specific mode. The
 executable is defined by \`src/executables/build/profile.json\`.
 
 Exit codes:
-  0   success (PR opened, verify passed)
+  0   success (PR opened, verify passed \u2014 or resolve produced a merge commit)
   1   agent reported FAILED (draft PR opened)
-  2   verify failed (draft PR opened)
-  3   no commits to ship
+  2   verify failed (draft PR opened) \u2014 skipped in resolve mode
+  3   no commits to ship (also the resolve clean-merge short-circuit)
   4   PR creation failed
   5   uncommitted changes on target branch
   64  invalid CLI args
@@ -2475,7 +2656,18 @@ function parseArgs(argv) {
     parseCommandArgs(cmd, argv.slice(1), result);
     return result;
   }
-  result.errors.push(`unknown command: ${cmd}`);
+  if (hasExecutable(cmd)) {
+    result.command = "__executable__";
+    result.executableName = cmd;
+    result.cliArgs = parseGenericFlags(argv.slice(1));
+    if (typeof result.cliArgs.cwd === "string") result.cwd = result.cliArgs.cwd;
+    if (result.cliArgs.verbose === true) result.verbose = true;
+    if (result.cliArgs.quiet === true) result.quiet = true;
+    return result;
+  }
+  const discovered = listExecutables().map((e) => e.name).filter((n) => n !== "build");
+  const available = ["run", "fix", "fix-ci", "resolve", "ci", "help", "version", ...discovered];
+  result.errors.push(`unknown command: ${cmd} (available: ${available.join(", ")})`);
   return result;
 }
 function parseCommandArgs(cmd, rest, result) {
@@ -2510,7 +2702,8 @@ async function main(argv = process.argv.slice(2)) {
   if (args.errors.length > 0) {
     for (const e of args.errors) process.stderr.write(`error: ${e}
 `);
-    process.stderr.write("\n" + HELP_TEXT);
+    process.stderr.write(`
+${HELP_TEXT}`);
     return 64;
   }
   if (args.command === "help") {
@@ -2518,7 +2711,8 @@ async function main(argv = process.argv.slice(2)) {
     return 0;
   }
   if (args.command === "version") {
-    process.stdout.write("kody2 0.2.1\n");
+    process.stdout.write(`kody2 ${package_default.version}
+`);
     return 0;
   }
   if (args.command === "ci") {
@@ -2528,7 +2722,8 @@ async function main(argv = process.argv.slice(2)) {
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[kody2] fatal: ${msg}
 `);
-      if (err instanceof Error && err.stack) process.stderr.write(err.stack + "\n");
+      if (err instanceof Error && err.stack) process.stderr.write(`${err.stack}
+`);
       return 99;
     }
   }
@@ -2544,6 +2739,27 @@ async function main(argv = process.argv.slice(2)) {
 `);
     return 99;
   }
+  if (args.command === "__executable__") {
+    try {
+      const result = await runExecutable(args.executableName, {
+        cliArgs: args.cliArgs ?? {},
+        cwd,
+        config,
+        verbose: args.verbose,
+        quiet: args.quiet
+      });
+      return result.exitCode;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      process.stderr.write(`[kody2] ${args.executableName} crashed: ${msg}
+`);
+      if (err instanceof Error && err.stack) process.stderr.write(`${err.stack}
+`);
+      process.stdout.write(`PR_URL=FAILED: ${args.executableName} crashed: ${msg}
+`);
+      return 99;
+    }
+  }
   const cliArgs = { mode: args.command };
   if (args.issueNumber !== void 0) cliArgs.issue = args.issueNumber;
   if (args.prNumber !== void 0) cliArgs.pr = args.prNumber;
@@ -2562,7 +2778,8 @@ async function main(argv = process.argv.slice(2)) {
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[kody2] wrapper crashed: ${msg}
 `);
-    if (err instanceof Error && err.stack) process.stderr.write(err.stack + "\n");
+    if (err instanceof Error && err.stack) process.stderr.write(`${err.stack}
+`);
     process.stdout.write(`PR_URL=FAILED: wrapper crashed: ${msg}
 `);
     return 99;