@kody-ade/kody-engine-lite 0.1.79 → 0.1.81

package/dist/bin/cli.js

@@ -1,8 +1,13 @@
 #!/usr/bin/env node
+var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // src/agent-runner.ts
 import { spawn, execFileSync } from "child_process";
@@ -439,6 +444,41 @@ function syncWithDefault(cwd) {
     logger.warn(`  Merge conflict with origin/${defaultBranch} \u2014 skipping sync`);
   }
 }
+function mergeDefault(cwd) {
+  const defaultBranch = getDefaultBranch(cwd);
+  const current = getCurrentBranch(cwd);
+  if (current === defaultBranch) return "clean";
+  try {
+    git(["fetch", "origin", defaultBranch], { cwd, timeout: 3e4 });
+  } catch {
+    logger.warn("  Failed to fetch latest from origin");
+    return "error";
+  }
+  try {
+    git(["merge", `origin/${defaultBranch}`, "--no-edit"], { cwd, timeout: 3e4 });
+    logger.info(`  Merged origin/${defaultBranch} cleanly`);
+    return "clean";
+  } catch {
+    try {
+      const unmerged = git(["diff", "--name-only", "--diff-filter=U"], { cwd });
+      if (unmerged.trim()) return "conflict";
+    } catch {
+    }
+    try {
+      git(["merge", "--abort"], { cwd });
+    } catch {
+    }
+    return "error";
+  }
+}
+function getConflictedFiles(cwd) {
+  try {
+    const output = git(["diff", "--name-only", "--diff-filter=U"], { cwd });
+    return output ? output.split("\n") : [];
+  } catch {
+    return [];
+  }
+}
 function commitAll(message, cwd) {
   const status = git(["status", "--porcelain"], { cwd });
   if (!status) {
@@ -2920,8 +2960,16 @@ If no pipeline flaw is detected, set "pipelineFlaw" to null.
 import * as fs15 from "fs";
 import * as path15 from "path";
 function ensureFeatureBranchIfNeeded(ctx) {
-  if (ctx.input.prNumber) return;
-  if (!ctx.input.issueNumber || ctx.input.dryRun) return;
+  if (ctx.input.dryRun) return;
+  if (ctx.input.prNumber) {
+    try {
+      syncWithDefault(ctx.projectDir);
+    } catch (err) {
+      logger.warn(`  Failed to sync with default branch: ${err}`);
+    }
+    return;
+  }
+  if (!ctx.input.issueNumber) return;
   try {
     const taskMdPath = path15.join(ctx.taskDir, "task.md");
     const title = fs15.existsSync(taskMdPath) ? fs15.readFileSync(taskMdPath, "utf-8").split("\n")[0].slice(0, 50) : ctx.taskId;
@@ -3346,12 +3394,13 @@ function parseArgs() {
   kody fix    --task-id <id> [--cwd <path>] [--issue-number <n>] [--feedback "<text>"]
   kody fix-ci [--pr-number <n>] [--ci-run-id <id>] [--cwd <path>] [--issue-number <n>] [--feedback "<text>"]
   kody review [--pr-number <n>] [--issue-number <n>] [--cwd <path>] [--local]
+  kody resolve --pr-number <n> [--cwd <path>] [--local]
   kody status --task-id <id> [--cwd <path>]
   kody --help`);
     process.exit(0);
   }
   const command2 = args2[0];
-  if (!["run", "rerun", "fix", "fix-ci", "status", "review"].includes(command2)) {
+  if (!["run", "rerun", "fix", "fix-ci", "status", "review", "resolve"].includes(command2)) {
     console.error(`Unknown command: ${command2}`);
     process.exit(1);
   }
@@ -3584,6 +3633,133 @@ var init_task_state = __esm({
   }
 });
 
+// src/resolve.ts
+var resolve_exports = {};
+__export(resolve_exports, {
+  runResolve: () => runResolve
+});
+import { execFileSync as execFileSync11 } from "child_process";
+function getConflictContext(cwd, files) {
+  const parts = [];
+  for (const file of files.slice(0, 10)) {
+    try {
+      const content = execFileSync11("git", ["diff", file], {
+        cwd,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      parts.push(`### ${file}
+\`\`\`diff
+${content.slice(0, 3e3)}
+\`\`\``);
+    } catch {
+      parts.push(`### ${file}
+(could not read diff)`);
+    }
+  }
+  return parts.join("\n\n");
+}
+async function runResolve(options) {
+  const { prNumber, projectDir, runners, local } = options;
+  const defaultBranch = getDefaultBranch(projectDir);
+  logger.info(`Resolving PR #${prNumber} \u2014 merging ${defaultBranch}...`);
+  const mergeResult = mergeDefault(projectDir);
+  if (mergeResult === "error") {
+    return { outcome: "failed", error: "Failed to merge default branch" };
+  }
+  if (mergeResult === "clean") {
+    logger.info("  Clean merge \u2014 no conflicts");
+    if (!local) {
+      pushBranch(projectDir);
+    }
+    return { outcome: "merged" };
+  }
+  const conflictedFiles = getConflictedFiles(projectDir);
+  if (conflictedFiles.length === 0) {
+    return { outcome: "failed", error: "Merge reported conflict but no conflicted files found" };
+  }
+  logger.info(`  ${conflictedFiles.length} conflicted file(s): ${conflictedFiles.join(", ")}`);
+  const conflictContext = getConflictContext(projectDir, conflictedFiles);
+  const prompt = buildResolvePrompt(conflictedFiles, conflictContext, defaultBranch);
+  const config = getProjectConfig();
+  const runnerName = config.agent.defaultRunner ?? Object.keys(runners)[0] ?? "claude";
+  const runner = runners[runnerName];
+  if (!runner) {
+    return { outcome: "failed", error: `Runner "${runnerName}" not found` };
+  }
+  const model = resolveModel("mid");
+  const extraEnv = {};
+  if (needsLitellmProxy(config)) {
+    extraEnv.ANTHROPIC_BASE_URL = getLitellmUrl();
+  }
+  logger.info(`  Running agent to resolve conflicts (model=${model})...`);
+  const result = await runner.run("resolve", prompt, model, 3e5, projectDir, {
+    cwd: projectDir,
+    env: extraEnv
+  });
+  if (result.outcome !== "completed") {
+    return { outcome: "failed", error: `Agent failed: ${result.error}` };
+  }
+  logger.info("  Verifying resolution...");
+  const verify = runQualityGates(projectDir, projectDir);
+  if (!verify.pass) {
+    const errorSummary = verify.errors.slice(0, 5).join("\n");
+    logger.error(`  Verification failed:
+${errorSummary}`);
+    return { outcome: "failed", error: `Conflict resolution failed verification:
+${errorSummary}` };
+  }
+  logger.info("  Verification passed");
+  commitAll(`chore: resolve merge conflicts with ${defaultBranch}`, projectDir);
+  if (!local) {
+    pushBranch(projectDir);
+    try {
+      const fileList = conflictedFiles.map((f) => `- \`${f}\``).join("\n");
+      postPRComment(
+        prNumber,
+        `\u2705 **Merge conflicts resolved** with \`${defaultBranch}\`
+
+**Conflicted files:**
+${fileList}
+
+_Verification passed. Please review the resolution._`
+      );
+    } catch {
+    }
+  }
+  return { outcome: "resolved" };
+}
+function buildResolvePrompt(files, conflictContext, defaultBranch) {
+  return `You are resolving merge conflicts between a feature branch and the \`${defaultBranch}\` branch.
+
+## Conflicted files
+${files.map((f) => `- ${f}`).join("\n")}
+
+## Conflict diffs
+${conflictContext}
+
+## Instructions
+1. Read each conflicted file
+2. Resolve the conflict markers (<<<<<<< / ======= / >>>>>>>) by combining both sides correctly:
+   - For feature/business logic: preserve the PR branch's intent
+   - For infrastructure/config/dependencies: prefer the \`${defaultBranch}\` branch
+   - For imports/types: merge both sides
+3. Write the resolved file using the Edit or Write tool
+4. Do NOT add new features or refactor \u2014 only resolve the conflicts
+5. After resolving all files, run \`git add .\` to stage the resolution`;
+}
+var init_resolve = __esm({
+  "src/resolve.ts"() {
+    "use strict";
+    init_git_utils();
+    init_github_api();
+    init_verify_runner();
+    init_logger();
+    init_context();
+    init_config();
+  }
+});
+
 // src/entry.ts
 var entry_exports = {};
 import * as fs21 from "fs";
@@ -3773,6 +3949,42 @@ async function main() {
     }
     process.exit(0);
   }
+  if (input.command === "resolve") {
+    if (!input.prNumber) {
+      console.error("--pr-number is required for resolve command");
+      process.exit(1);
+    }
+    runPreflight();
+    const config2 = getProjectConfig();
+    const litellmProcess2 = await ensureLitellmProxy(config2, projectDir);
+    await runModelHealthCheck(config2);
+    const runners2 = createRunners(config2);
+    const defaultRunnerName2 = config2.agent.defaultRunner ?? Object.keys(runners2)[0] ?? "claude";
+    const defaultRunner2 = runners2[defaultRunnerName2];
+    if (!defaultRunner2) {
+      console.error(`Default runner "${defaultRunnerName2}" not configured`);
+      process.exit(1);
+    }
+    const healthy2 = await defaultRunner2.healthCheck();
+    if (!healthy2) {
+      console.error(`Runner "${defaultRunnerName2}" health check failed`);
+      process.exit(1);
+    }
+    const { runResolve: runResolve2 } = await Promise.resolve().then(() => (init_resolve(), resolve_exports));
+    const result = await runResolve2({
+      prNumber: input.prNumber,
+      projectDir,
+      runners: runners2,
+      local: input.local ?? true
+    });
+    if (litellmProcess2) litellmProcess2.kill?.();
+    if (result.outcome === "failed") {
+      console.error(`Resolve failed: ${result.error}`);
+      process.exit(1);
+    }
+    console.log(`Resolve: ${result.outcome}`);
+    process.exit(0);
+  }
   logger.info("Preflight checks:");
   runPreflight();
   if (input.task) {
@@ -3992,7 +4204,7 @@ var init_entry = __esm({
 // src/bin/cli.ts
 import * as fs22 from "fs";
 import * as path21 from "path";
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 import { fileURLToPath } from "url";
 var __dirname = path21.dirname(fileURLToPath(import.meta.url));
 var PKG_ROOT = path21.resolve(__dirname, "..", "..");
@@ -4003,7 +4215,7 @@ function getVersion() {
 }
 function checkCommand2(name, args2, fix) {
   try {
-    const output = execFileSync11(name, args2, {
+    const output = execFileSync12(name, args2, {
       encoding: "utf-8",
       timeout: 1e4,
       stdio: ["pipe", "pipe", "pipe"]
@@ -4021,7 +4233,7 @@ function checkFile(filePath, description, fix) {
 }
 function checkGhAuth(cwd) {
   try {
-    const output = execFileSync11("gh", ["auth", "status"], {
+    const output = execFileSync12("gh", ["auth", "status"], {
       encoding: "utf-8",
       timeout: 1e4,
       cwd,
@@ -4039,7 +4251,7 @@ function checkGhAuth(cwd) {
 }
 function checkGhRepoAccess(cwd) {
   try {
-    const remote = execFileSync11("git", ["remote", "get-url", "origin"], {
+    const remote = execFileSync12("git", ["remote", "get-url", "origin"], {
       encoding: "utf-8",
       timeout: 5e3,
       cwd,
@@ -4050,7 +4262,7 @@ function checkGhRepoAccess(cwd) {
       return { name: "GitHub repo", ok: false, fix: "Set git remote origin to a GitHub URL" };
     }
     const repoSlug = `${match[1]}/${match[2]}`;
-    execFileSync11("gh", ["repo", "view", repoSlug, "--json", "name"], {
+    execFileSync12("gh", ["repo", "view", repoSlug, "--json", "name"], {
       encoding: "utf-8",
       timeout: 1e4,
       cwd,
@@ -4063,7 +4275,7 @@ function checkGhRepoAccess(cwd) {
 }
 function checkGhSecret(repoSlug, secretName) {
   try {
-    const output = execFileSync11("gh", ["secret", "list", "--repo", repoSlug], {
+    const output = execFileSync12("gh", ["secret", "list", "--repo", repoSlug], {
       encoding: "utf-8",
       timeout: 1e4,
       stdio: ["pipe", "pipe", "pipe"]
@@ -4091,7 +4303,7 @@ function detectBasicConfig(cwd) {
   else if (!fs22.existsSync(path21.join(cwd, "pnpm-lock.yaml")) && fs22.existsSync(path21.join(cwd, "package-lock.json"))) pm = "npm";
   let defaultBranch = "main";
   try {
-    const ref = execFileSync11("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
+    const ref = execFileSync12("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
       encoding: "utf-8",
       timeout: 5e3,
       cwd,
@@ -4100,7 +4312,7 @@ function detectBasicConfig(cwd) {
     defaultBranch = ref.replace("refs/remotes/origin/", "");
   } catch {
     try {
-      execFileSync11("git", ["rev-parse", "--verify", "origin/dev"], {
+      execFileSync12("git", ["rev-parse", "--verify", "origin/dev"], {
         encoding: "utf-8",
         timeout: 5e3,
         cwd,
@@ -4113,7 +4325,7 @@ function detectBasicConfig(cwd) {
   let owner = "";
   let repo = "";
   try {
-    const remote = execFileSync11("git", ["remote", "get-url", "origin"], {
+    const remote = execFileSync12("git", ["remote", "get-url", "origin"], {
       encoding: "utf-8",
       timeout: 5e3,
       cwd,
@@ -4305,7 +4517,7 @@ function initCommand(opts) {
   if (filesToCommit.length > 0) {
     try {
       const fullPaths = filesToCommit.map((f) => path21.join(cwd, f));
-      execFileSync11("npx", ["prettier", "--write", ...fullPaths], {
+      execFileSync12("npx", ["prettier", "--write", ...fullPaths], {
         cwd,
         encoding: "utf-8",
         timeout: 3e4,
@@ -4316,13 +4528,13 @@ function initCommand(opts) {
   }
   if (filesToCommit.length > 0) {
     try {
-      execFileSync11("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
-      const staged = execFileSync11("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
+      execFileSync12("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
+      const staged = execFileSync12("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
       if (staged) {
-        execFileSync11("git", ["commit", "-m", "chore: Add Kody Engine workflow and config\n\nAdd GitHub Actions workflow and auto-detected configuration for Kody Engine Lite."], { cwd, stdio: "pipe" });
+        execFileSync12("git", ["commit", "-m", "chore: Add Kody Engine workflow and config\n\nAdd GitHub Actions workflow and auto-detected configuration for Kody Engine Lite."], { cwd, stdio: "pipe" });
         console.log(`  \u2713 Committed: ${filesToCommit.join(", ")}`);
         try {
-          execFileSync11("git", ["push"], { cwd, stdio: "pipe", timeout: 6e4 });
+          execFileSync12("git", ["push"], { cwd, stdio: "pipe", timeout: 6e4 });
           console.log("  \u2713 Pushed to origin");
         } catch {
           console.log("  \u25CB Push failed \u2014 run 'git push' manually");
@@ -4416,7 +4628,7 @@ function ghComment(issueNumber, body, cwd) {
     } catch {
     }
     if (!repoSlug) return;
-    execFileSync11("gh", [
+    execFileSync12("gh", [
       "issue",
       "comment",
       String(issueNumber),
@@ -4549,7 +4761,7 @@ Output ONLY valid JSON. No markdown fences. No explanation.
 ${repoContext}`;
   console.log("  \u23F3 Analyzing project...");
   try {
-    const output = execFileSync11("claude", [
+    const output = execFileSync12("claude", [
       "--print",
       "--model",
       "haiku",
@@ -4652,7 +4864,7 @@ ${repoContext}
 
 REMINDER: Output the full prompt template first (unchanged), then your three appended sections. Do NOT include "${contextPlaceholder}".`;
     try {
-      const output = execFileSync11("claude", [
+      const output = execFileSync12("claude", [
         "--print",
         "--model",
         "haiku",
@@ -4709,7 +4921,7 @@ REMINDER: Output the full prompt template first (unchanged), then your three app
       ];
       for (const label of labels) {
         try {
-          execFileSync11("gh", [
+          execFileSync12("gh", [
             "label",
             "create",
             label.name,
@@ -4729,7 +4941,7 @@ REMINDER: Output the full prompt template first (unchanged), then your three app
           console.log(`  \u2713 ${label.name}`);
         } catch {
           try {
-            execFileSync11("gh", ["label", "list", "--repo", repoSlug, "--search", label.name], {
+            execFileSync12("gh", ["label", "list", "--repo", repoSlug, "--search", label.name], {
               cwd,
               encoding: "utf-8",
               timeout: 1e4,
@@ -4768,7 +4980,7 @@ REMINDER: Output the full prompt template first (unchanged), then your three app
     try {
       const fullPaths = filesToCommit.map((f) => path21.join(cwd, f));
       for (let pass = 0; pass < 2; pass++) {
-        execFileSync11("npx", ["prettier", "--write", ...fullPaths], {
+        execFileSync12("npx", ["prettier", "--write", ...fullPaths], {
           cwd,
           encoding: "utf-8",
           timeout: 3e4,
@@ -4783,13 +4995,13 @@ REMINDER: Output the full prompt template first (unchanged), then your three app
   if (filesToCommit.length > 0) {
     try {
       if (isCI3) {
-        const branchName = `kody/bootstrap-${Date.now()}`;
-        execFileSync11("git", ["checkout", "-b", branchName], { cwd, stdio: "pipe" });
-        execFileSync11("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
-        const staged = execFileSync11("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
+        const branchName = `kody-bootstrap-${Date.now()}`;
+        execFileSync12("git", ["checkout", "-b", branchName], { cwd, stdio: "pipe" });
+        execFileSync12("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
+        const staged = execFileSync12("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
         if (staged) {
-          execFileSync11("git", ["commit", "-m", "chore: Add Kody project memory and step files\n\nBootstrap Kody Engine with project-specific architecture, conventions, and pipeline step files."], { cwd, stdio: "pipe" });
-          execFileSync11("git", ["push", "-u", "origin", branchName], { cwd, stdio: "pipe", timeout: 6e4 });
+          execFileSync12("git", ["commit", "-m", "chore: Add Kody project memory and step files\n\nBootstrap Kody Engine with project-specific architecture, conventions, and pipeline step files."], { cwd, stdio: "pipe" });
+          execFileSync12("git", ["push", "-u", "origin", branchName], { cwd, stdio: "pipe", timeout: 6e4 });
           console.log(`  \u2713 Pushed branch: ${branchName}`);
           let baseBranch = "main";
           try {
@@ -4801,7 +5013,7 @@ REMINDER: Output the full prompt template first (unchanged), then your three app
           } catch {
           }
           try {
-            const prUrl = execFileSync11("gh", [
+            const prUrl = execFileSync12("gh", [
               "pr",
               "create",
               "--title",
@@ -4840,13 +5052,13 @@ Create it manually.`, cwd);
           console.log("  \u25CB No new changes to commit");
         }
       } else {
-        execFileSync11("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
-        const staged = execFileSync11("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
+        execFileSync12("git", ["add", ...filesToCommit], { cwd, stdio: "pipe" });
+        const staged = execFileSync12("git", ["diff", "--cached", "--name-only"], { cwd, encoding: "utf-8" }).trim();
         if (staged) {
-          execFileSync11("git", ["commit", "-m", "chore: Add Kody project memory and step files\n\nBootstrap Kody Engine with project-specific architecture, conventions, and pipeline step files."], { cwd, stdio: "pipe" });
+          execFileSync12("git", ["commit", "-m", "chore: Add Kody project memory and step files\n\nBootstrap Kody Engine with project-specific architecture, conventions, and pipeline step files."], { cwd, stdio: "pipe" });
           console.log(`  \u2713 Committed: ${filesToCommit.join(", ")}`);
           try {
-            execFileSync11("git", ["push"], { cwd, stdio: "pipe", timeout: 6e4 });
+            execFileSync12("git", ["push"], { cwd, stdio: "pipe", timeout: 6e4 });
             console.log("  \u2713 Pushed to origin");
           } catch {
             console.log("  \u25CB Push failed \u2014 run 'git push' manually");
@@ -4967,7 +5179,7 @@ function installSkillsForProject(cwd) {
     }
     try {
       console.log(`  Installing: ${skill.label} (${skill.package})`);
-      execFileSync11("npx", ["skills", "add", skill.package, "--yes"], {
+      execFileSync12("npx", ["skills", "add", skill.package, "--yes"], {
         cwd,
         encoding: "utf-8",
         timeout: 6e4,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kody-ade/kody-engine-lite",
-  "version": "0.1.79",
+  "version": "0.1.81",
   "description": "Autonomous SDLC pipeline: Kody orchestration + Claude Code + LiteLLM",
   "license": "MIT",
   "type": "module",

package/templates/kody.yml

@@ -119,7 +119,7 @@ jobs:
 
           # Validate mode
           case "$MODE" in
-            full|rerun|fix|fix-ci|status|approve|review|bootstrap) ;;
+            full|rerun|fix|fix-ci|status|approve|review|resolve|bootstrap) ;;
             *)
               # If first arg isn't a mode, it might be a task-id or nothing
               if [ -n "$MODE" ] && [ "$MODE" != "" ]; then
@@ -219,7 +219,7 @@ jobs:
           token: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
 
       - name: Checkout PR branch (for fix/rerun/review on PRs)
-        if: github.event.issue.pull_request && (needs.parse.outputs.mode == 'fix' || needs.parse.outputs.mode == 'fix-ci' || needs.parse.outputs.mode == 'rerun' || needs.parse.outputs.mode == 'review')
+        if: github.event.issue.pull_request && (needs.parse.outputs.mode == 'fix' || needs.parse.outputs.mode == 'fix-ci' || needs.parse.outputs.mode == 'rerun' || needs.parse.outputs.mode == 'review' || needs.parse.outputs.mode == 'resolve')
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
         run: |
@@ -277,6 +277,7 @@ jobs:
             [ "$MODE" = "fix" ] && CMD="fix"
             [ "$MODE" = "fix-ci" ] && CMD="fix-ci"
             [ "$MODE" = "review" ] && CMD="review"
+            [ "$MODE" = "resolve" ] && CMD="resolve"
             ARGS="--issue-number $ISSUE_NUMBER"
             [ -n "$TASK_ID" ] && ARGS="$ARGS --task-id $TASK_ID"
             [ -n "$PR_NUMBER" ] && ARGS="$ARGS --pr-number $PR_NUMBER"