@kody-ade/kody-engine 0.3.9 → 0.3.10

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.9",
+  version: "0.3.10",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -4327,6 +4327,24 @@ function lastReleaseTag(cwd) {
     return null;
   }
 }
+function remoteBranchExists(branch, cwd) {
+  try {
+    const out = git3(["ls-remote", "--heads", "origin", branch], cwd, 3e4);
+    return out.length > 0;
+  } catch {
+    return false;
+  }
+}
+function findOpenPrForBranch(branch, cwd) {
+  try {
+    const out = gh2(["pr", "list", "--head", branch, "--state", "open", "--json", "url", "--limit", "1"], { cwd });
+    const parsed = JSON.parse(out || "[]");
+    const first = parsed[0];
+    return first?.url ?? null;
+  } catch {
+    return null;
+  }
+}
 function runShell(cmd, cwd, timeoutMs) {
   const r = spawnSync(cmd, {
     cwd,
@@ -4341,6 +4359,7 @@ var releaseFlow = async (ctx) => {
   const mode = ctx.args.mode ?? "prepare";
   const bump = ctx.args.bump ?? "patch";
   const dryRun = ctx.args["dry-run"] === true || ctx.args.dryRun === true;
+  const prefer = ctx.args.prefer ?? void 0;
   const issueNumber = typeof ctx.args.issue === "number" ? ctx.args.issue : void 0;
   const cwd = ctx.cwd;
   const releaseCfg = ctx.config.release ?? {};
@@ -4348,7 +4367,7 @@ var releaseFlow = async (ctx) => {
   const timeoutMs = releaseCfg.timeoutMs ?? 6e5;
   ctx.skipAgent = true;
   if (mode === "prepare") {
-    await runPrepare({ cwd, bump, dryRun, versionFiles, ctx });
+    await runPrepare({ cwd, bump, dryRun, prefer, versionFiles, ctx });
   } else if (mode === "finalize") {
     await runFinalize({ cwd, dryRun, timeoutMs, releaseCfg, ctx });
   } else {
@@ -4378,7 +4397,7 @@ function buildIssueNotice(mode, dryRun, ctx) {
   return `\u2705 kody ${label} complete`;
 }
 async function runPrepare(args) {
-  const { cwd, bump, dryRun, versionFiles, ctx } = args;
+  const { cwd, bump, dryRun, prefer, versionFiles, ctx } = args;
   const pkgPath = path17.join(cwd, "package.json");
   if (!fs19.existsSync(pkgPath)) {
     ctx.output.exitCode = 99;
@@ -4398,11 +4417,35 @@ async function runPrepare(args) {
 `);
   if (dryRun) {
     ctx.output.exitCode = 0;
-    ctx.output.reason = `dry-run \u2014 would bump to ${newVersion}`;
+    ctx.output.reason = `dry-run \u2014 would bump to ${newVersion}${prefer ? ` (--prefer ${prefer})` : ""}`;
     process.stdout.write(`RELEASE_PLAN=bump=${newVersion} tag=${tag}
 `);
     return;
   }
+  const releaseBranch = `release/${tag}`;
+  const collides = remoteBranchExists(releaseBranch, cwd);
+  if (collides) {
+    if (prefer === "theirs") {
+      const existingPr = findOpenPrForBranch(releaseBranch, cwd);
+      if (existingPr) {
+        process.stdout.write(`  reusing existing PR (--prefer theirs): ${existingPr}
+`);
+        ctx.output.prUrl = existingPr;
+        ctx.output.exitCode = 0;
+        return;
+      }
+      ctx.output.exitCode = 4;
+      ctx.output.reason = `release prepare --prefer theirs: ${releaseBranch} exists on remote but has no open PR \u2014 nothing to reuse`;
+      return;
+    }
+    if (prefer !== "ours") {
+      ctx.output.exitCode = 4;
+      ctx.output.reason = `release prepare: branch ${releaseBranch} already exists on remote. Use --prefer ours to force-push, or --prefer theirs to reuse the existing PR.`;
+      return;
+    }
+    process.stdout.write(`  branch ${releaseBranch} exists on remote \u2014 will force-push (--prefer ours)
+`);
+  }
   const touched = [];
   for (const f of versionFiles) {
     if (updateVersionInFile(f, newVersion, cwd)) touched.push(f);
@@ -4418,12 +4461,12 @@ async function runPrepare(args) {
   prependChangelog(cwd, entry);
   process.stdout.write(`  wrote    CHANGELOG.md
 `);
-  const releaseBranch = `release/${tag}`;
   try {
     git3(["checkout", "-b", releaseBranch], cwd);
     for (const f of [...touched, "CHANGELOG.md"]) git3(["add", "--", f], cwd);
     git3(["commit", "--no-gpg-sign", "-m", `chore: release ${tag}`], cwd);
-    git3(["push", "-u", "origin", releaseBranch], cwd, 12e4);
+    const pushArgs = collides && prefer === "ours" ? ["push", "-u", "--force-with-lease", "origin", releaseBranch] : ["push", "-u", "origin", releaseBranch];
+    git3(pushArgs, cwd, 12e4);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     ctx.output.exitCode = 4;
@@ -4442,16 +4485,23 @@ ${rawEntry}
 
 Merge this and then run \`kody release --mode finalize\`.`;
   let prUrl = "";
-  try {
-    prUrl = gh2(["pr", "create", "--head", releaseBranch, "--base", base, "--title", title, "--body-file", "-"], {
-      input: body,
-      cwd
-    }).trim();
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    ctx.output.exitCode = 4;
-    ctx.output.reason = `release prepare: gh pr create failed: ${msg}`;
-    return;
+  const preexistingPr = collides && prefer === "ours" ? findOpenPrForBranch(releaseBranch, cwd) : null;
+  if (preexistingPr) {
+    process.stdout.write(`  PR already open for ${releaseBranch}: ${preexistingPr}
+`);
+    prUrl = preexistingPr;
+  } else {
+    try {
+      prUrl = gh2(["pr", "create", "--head", releaseBranch, "--base", base, "--title", title, "--body-file", "-"], {
+        input: body,
+        cwd
+      }).trim();
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      ctx.output.exitCode = 4;
+      ctx.output.reason = `release prepare: gh pr create failed: ${msg}`;
+      return;
+    }
   }
   ctx.output.prUrl = prUrl;
   ctx.output.exitCode = 0;
@@ -4681,6 +4731,7 @@ var resolveFlow = async (ctx) => {
   }
   ctx.data.conflictedFiles = conflictedFiles;
   ctx.data.conflictMarkersPreview = getConflictMarkersPreview(conflictedFiles, ctx.cwd);
+  ctx.data.preferBlock = buildPreferBlock(ctx.args.prefer, baseBranch);
   const runUrl = getRunUrl();
   const runSuffix = runUrl ? `, run ${runUrl}` : "";
   tryPostPr3(
@@ -4689,6 +4740,23 @@ var resolveFlow = async (ctx) => {
     ctx.cwd
   );
 };
+function buildPreferBlock(prefer, baseBranch) {
+  if (prefer !== "ours" && prefer !== "theirs") return "";
+  const keepSide = prefer === "ours" ? "HEAD (this PR branch)" : `origin/${baseBranch} (base branch)`;
+  const keepMarkers = prefer === "ours" ? "content between `<<<<<<< HEAD` and `=======`" : `content between \`=======\` and \`>>>>>>> origin/${baseBranch}\``;
+  const dropSide = prefer === "ours" ? `origin/${baseBranch}` : "HEAD";
+  return [
+    "# Conflict resolution directive (AUTHORITATIVE \u2014 overrides defaults below)",
+    "",
+    `The user requested \`--prefer ${prefer}\`. For **every** conflict in **every** file:`,
+    "",
+    `- Keep the **${prefer}** side: ${keepSide} \u2014 ${keepMarkers}.`,
+    `- Discard the **${prefer === "ours" ? "theirs" : "ours"}** side (from ${dropSide}) entirely.`,
+    "- Remove all `<<<<<<<`, `=======`, `>>>>>>>` markers.",
+    "- Do NOT attempt to merge the two sides or apply judgement.",
+    ""
+  ].join("\n");
+}
 function getConflictedFiles(cwd) {
   try {
     const out = execFileSync17("git", ["diff", "--name-only", "--diff-filter=U"], {

package/dist/executables/release/profile.json

@@ -40,6 +40,17 @@
       "type": "int",
       "required": false,
       "describe": "Issue number to post success/failure follow-up on. Auto-populated by dispatch when triggered via @kody comment."
+    },
+    {
+      "name": "prefer",
+      "flag": "--prefer",
+      "type": "enum",
+      "values": [
+        "ours",
+        "theirs"
+      ],
+      "required": false,
+      "describe": "On release/vX.Y.Z branch collision (prepare mode): 'ours' force-pushes over the remote branch; 'theirs' reuses the existing branch and its open PR. Default (unset): refuse on non-ff."
     }
   ],
   "claudeCode": {

package/dist/executables/resolve/profile.json

@@ -9,6 +9,14 @@
       "type": "int",
       "required": true,
       "describe": "GitHub PR number whose branch has conflicts with the default branch."
+    },
+    {
+      "name": "prefer",
+      "flag": "--prefer",
+      "type": "enum",
+      "values": ["ours", "theirs"],
+      "required": false,
+      "describe": "Force one side for every conflict: 'ours' = PR branch (HEAD), 'theirs' = base branch. Omit to let the agent merge by judgement."
     }
   ],
   "claudeCode": {

package/dist/executables/resolve/prompt.md

@@ -9,13 +9,13 @@ You are Kody, an autonomous engineer. A `git merge origin/{{baseBranch}}` into P
 
 {{conflictedFiles}}
 
-{{conventionsBlock}}{{toolsUsage}}# Working-tree conflict markers (truncated)
+{{preferBlock}}{{conventionsBlock}}{{toolsUsage}}# Working-tree conflict markers (truncated)
 
 {{conflictMarkersPreview}}
 
 # Required steps
 1. For each conflicted file: read it, understand both sides of the `<<<<<<<` / `=======` / `>>>>>>>` markers, and produce the correct merged content. Remove all conflict markers.
-2. Preserve the PR's intent (the HEAD side) unless `origin/{{baseBranch}}` made a change that should be preserved (e.g. security fix, renamed API). Use judgement.
+2. If a conflict resolution directive is given above, follow it exactly — take the specified side for every conflict, no judgement. Otherwise, preserve the PR's intent (the HEAD side) unless `origin/{{baseBranch}}` made a change that should be preserved (e.g. security fix, renamed API), and use judgement.
 3. After resolving, run the quality commands with Bash and fix any issues YOUR resolution introduced.
 4. Final message format (or `FAILED: <reason>` on failure):
 

package/package.json

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