@kody-ade/kody-engine 0.3.81 → 0.3.83

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.81",
+  version: "0.3.83",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -820,14 +820,58 @@ function commitTurn(cwd, sessionId, verbose) {
   const paths = [sessionRel, eventsRel].filter((p) => fs5.existsSync(path5.join(cwd, p)));
   if (paths.length === 0) return;
   const stdio = verbose ? "inherit" : "pipe";
+  const exec = (args) => execFileSync2("git", args, { cwd, stdio });
   try {
-    execFileSync2("git", ["add", "-f", ...paths], { cwd, stdio });
-    execFileSync2("git", ["commit", "--quiet", "-m", `chat: interactive turn for ${sessionId}`], { cwd, stdio });
-    execFileSync2("git", ["push", "--quiet", "origin", "HEAD"], { cwd, stdio });
+    exec(["add", "-f", ...paths]);
+    exec(["commit", "--quiet", "-m", `chat: interactive turn for ${sessionId}`]);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[kody:chat:interactive] commit/push skipped: ${msg}
+    process.stderr.write(`[kody:chat:interactive] commit failed: ${msg}
 `);
+    return;
+  }
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    try {
+      exec(["push", "--quiet", "origin", "HEAD"]);
+      return;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      const isNonFf = /non-fast-forward|fetch first|rejected/i.test(msg);
+      if (!isNonFf || attempt === 3) {
+        process.stderr.write(`[kody:chat:interactive] push failed (attempt ${attempt}): ${msg}
+`);
+        return;
+      }
+      process.stderr.write(`[kody:chat:interactive] push rejected (attempt ${attempt}); fetch+rebase+retry
+`);
+      try {
+        exec(["fetch", "--quiet", "origin"]);
+        const branch = currentBranch2(cwd);
+        if (branch) {
+          exec(["rebase", "--quiet", `origin/${branch}`]);
+        } else {
+          process.stderr.write(`[kody:chat:interactive] cannot rebase: no current branch
+`);
+          return;
+        }
+      } catch (rebaseErr) {
+        const rmsg = rebaseErr instanceof Error ? rebaseErr.message : String(rebaseErr);
+        process.stderr.write(`[kody:chat:interactive] rebase failed: ${rmsg}
+`);
+        return;
+      }
+    }
+  }
+}
+function currentBranch2(cwd) {
+  try {
+    const out = execFileSync2("git", ["symbolic-ref", "--short", "HEAD"], {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    return out.toString("utf-8").trim() || null;
+  } catch {
+    return null;
   }
 }
 async function emitExit(opts, reason, turnsCompleted) {

package/dist/executables/reproduce/profile.json

@@ -54,12 +54,10 @@
       { "script": "verifyReproFails" },
       { "script": "abortUnfinishedGitOps" },
       { "script": "commitAndPush" },
-      { "script": "ensurePr" },
       { "script": "postIssueComment" },
       { "script": "persistArtifacts" },
       { "script": "writeRunSummary" },
       { "script": "saveTaskState" },
-      { "script": "mirrorStateToPr" },
       { "script": "advanceFlow" }
     ]
   },

package/package.json

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