@kody-ade/kody-engine 0.2.19 → 0.2.20

package/dist/bin/kody2.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.2.19",
+  version: "0.2.20",
   description: "kody2 \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -2912,6 +2912,94 @@ function synthesizeAction(ctx) {
   };
 }
 
+// src/scripts/syncFlow.ts
+import { execFileSync as execFileSync13 } from "child_process";
+var syncFlow = async (ctx) => {
+  ctx.skipAgent = true;
+  const prNumber = ctx.args.pr;
+  const pr = getPr(prNumber, ctx.cwd);
+  if (pr.state !== "OPEN") {
+    bail2(ctx, prNumber, `PR #${prNumber} is not OPEN (state: ${pr.state})`);
+    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 headBefore = revParseHead(ctx.cwd);
+  const mergeStatus = mergeBase(baseBranch, ctx.cwd);
+  if (mergeStatus === "error") {
+    bail2(ctx, prNumber, `failed to merge origin/${baseBranch} (non-conflict error); see runner log`);
+    return;
+  }
+  if (mergeStatus === "conflict") {
+    bail2(
+      ctx,
+      prNumber,
+      `merge from origin/${baseBranch} produced conflicts \u2014 run \`@kody2 resolve\` to let kody2 resolve them`
+    );
+    return;
+  }
+  const headAfter = revParseHead(ctx.cwd);
+  if (headAfter === headBefore) {
+    ctx.output.exitCode = 0;
+    ctx.output.reason = `already up to date with origin/${baseBranch}`;
+    tryPostPr5(prNumber, `\u2139\uFE0F kody2 sync: already up to date with origin/${baseBranch}`, ctx.cwd);
+    return;
+  }
+  try {
+    pushBranch(ctx.data.branch, ctx.cwd);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    bail2(ctx, prNumber, `merge succeeded but push failed: ${msg}`);
+    return;
+  }
+  ctx.output.exitCode = 0;
+  ctx.output.reason = `merged origin/${baseBranch} into ${ctx.data.branch}`;
+  const runUrl = getRunUrl();
+  const runSuffix = runUrl ? ` ([logs](${runUrl}))` : "";
+  tryPostPr5(
+    prNumber,
+    `\u2705 kody2 sync: merged \`origin/${baseBranch}\` into \`${ctx.data.branch}\`${runSuffix}`,
+    ctx.cwd
+  );
+};
+function bail2(ctx, prNumber, reason) {
+  ctx.output.exitCode = 1;
+  ctx.output.reason = reason;
+  const runUrl = getRunUrl();
+  const runSuffix = runUrl ? ` ([logs](${runUrl}))` : "";
+  tryPostPr5(prNumber, `\u274C kody2 sync could not complete${runSuffix}: ${reason}`, ctx.cwd);
+}
+function revParseHead(cwd) {
+  try {
+    return execFileSync13("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
+  } catch {
+    return "";
+  }
+}
+function pushBranch(branch, cwd) {
+  const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
+  try {
+    execFileSync13("git", ["push", "-u", "origin", branch], { cwd, env, stdio: ["ignore", "pipe", "pipe"] });
+  } catch {
+    execFileSync13("git", ["push", "--force-with-lease", "-u", "origin", branch], {
+      cwd,
+      env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+  }
+}
+function tryPostPr5(prNumber, body, cwd) {
+  try {
+    postPrReviewComment(prNumber, body, cwd);
+  } catch {
+  }
+}
+
 // src/verify.ts
 import { spawn as spawn2 } from "child_process";
 var TAIL_CHARS = 4e3;
@@ -3111,6 +3199,7 @@ var preflightScripts = {
   fixCiFlow,
   resolveFlow,
   reviewFlow,
+  syncFlow,
   initFlow,
   releaseFlow,
   watchStalePrsFlow,
@@ -3138,7 +3227,7 @@ var allScriptNames = /* @__PURE__ */ new Set([
 ]);
 
 // src/tools.ts
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 function verifyCliTools(tools, cwd) {
   const out = [];
   for (const t of tools) out.push(verifyOne(t, cwd));
@@ -3171,7 +3260,7 @@ function verifyOne(tool, cwd) {
 }
 function runShell2(cmd, cwd, timeoutMs = 3e4) {
   try {
-    execFileSync13("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
+    execFileSync14("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
     return true;
   } catch {
     return false;
@@ -3409,7 +3498,7 @@ function finish(out) {
 }
 
 // src/kody2-cli.ts
-import { execFileSync as execFileSync14 } from "child_process";
+import { execFileSync as execFileSync15 } from "child_process";
 import * as fs16 from "fs";
 import * as path13 from "path";
 
@@ -3456,6 +3545,9 @@ function autoDispatch(opts) {
     if (/\breview\b/.test(afterTag)) {
       return { executable: "review", cliArgs: { pr: targetNum }, target: targetNum };
     }
+    if (/\bsync\b/.test(afterTag)) {
+      return { executable: "sync", cliArgs: { pr: targetNum }, target: targetNum };
+    }
     const feedback = extractFeedback(afterTag);
     return {
       executable: "fix",
@@ -3586,7 +3678,7 @@ function detectPackageManager2(cwd) {
 }
 function shellOut(cmd, args, cwd, stream = true) {
   try {
-    execFileSync14(cmd, args, {
+    execFileSync15(cmd, args, {
       cwd,
       stdio: stream ? "inherit" : "pipe",
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1", CI: process.env.CI ?? "1" }
@@ -3599,7 +3691,7 @@ function shellOut(cmd, args, cwd, stream = true) {
 }
 function isOnPath(bin) {
   try {
-    execFileSync14("which", [bin], { stdio: "pipe" });
+    execFileSync15("which", [bin], { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -3633,7 +3725,7 @@ function installLitellmIfNeeded(cwd) {
   } catch {
   }
   try {
-    execFileSync14("python3", ["-c", "import litellm"], { stdio: "pipe" });
+    execFileSync15("python3", ["-c", "import litellm"], { stdio: "pipe" });
     process.stdout.write("\u2192 kody2: litellm already installed\n");
     return 0;
   } catch {
@@ -3643,16 +3735,16 @@ function installLitellmIfNeeded(cwd) {
 }
 function configureGitIdentity(cwd) {
   try {
-    const name = execFileSync14("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
+    const name = execFileSync15("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
     if (name) return;
   } catch {
   }
   try {
-    execFileSync14("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
+    execFileSync15("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
   } catch {
   }
   try {
-    execFileSync14("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
+    execFileSync15("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
       cwd,
       stdio: "pipe"
     });

package/dist/executables/sync/profile.json

@@ -0,0 +1,35 @@
+{
+  "name": "sync",
+  "describe": "Merge the default (base) branch into a PR branch and push. No agent.",
+  "inputs": [
+    {
+      "name": "pr",
+      "flag": "--pr",
+      "type": "int",
+      "required": true,
+      "describe": "GitHub PR number to update from its base branch."
+    }
+  ],
+  "claudeCode": {
+    "model": "inherit",
+    "permissionMode": "acceptEdits",
+    "maxTurns": null,
+    "systemPromptAppend": null,
+    "tools": [],
+    "hooks": [],
+    "skills": [],
+    "commands": [],
+    "subagents": [],
+    "plugins": [],
+    "mcpServers": []
+  },
+  "cliTools": [],
+  "scripts": {
+    "preflight": [
+      {
+        "script": "syncFlow"
+      }
+    ],
+    "postflight": []
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kody-ade/kody-engine",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "kody2 — autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   "license": "MIT",
   "type": "module",