@kody-ade/kody-engine 0.3.74 → 0.3.75

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.74",
+  version: "0.3.75",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -676,10 +676,16 @@ async function waitForNextUserMessage(opts) {
     if (now - idleStart >= opts.idleTimeoutMs) return { kind: "idle-timeout" };
     if (!opts.skipPull) {
       try {
-        execFileSync("git", ["pull", "--ff-only", "--quiet", "origin", "HEAD"], {
-          cwd: opts.cwd,
-          stdio: "pipe"
-        });
+        const branch = currentBranch(opts.cwd);
+        if (branch) {
+          execFileSync("git", ["fetch", "--quiet", "origin", branch], { cwd: opts.cwd, stdio: "pipe" });
+          execFileSync("git", ["merge", "--ff-only", "--quiet", `origin/${branch}`], {
+            cwd: opts.cwd,
+            stdio: "pipe"
+          });
+        } else {
+          execFileSync("git", ["fetch", "--quiet", "--all"], { cwd: opts.cwd, stdio: "pipe" });
+        }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         logger.warn(`git pull failed (will retry): ${msg}`);
@@ -702,6 +708,18 @@ async function waitForNextUserMessage(opts) {
 function sleep(ms) {
   return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
+function currentBranch(cwd) {
+  try {
+    const out = execFileSync("git", ["symbolic-ref", "--short", "HEAD"], {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const branch = out.toString("utf-8").trim();
+    return branch || null;
+  } catch {
+    return null;
+  }
+}
 
 // src/chat/modes/interactive.ts
 var DEFAULT_IDLE_EXIT_MS = 5 * 6e4;
@@ -785,7 +803,7 @@ function commitTurn(cwd, sessionId, verbose) {
   if (paths.length === 0) return;
   const stdio = verbose ? "inherit" : "pipe";
   try {
-    execFileSync2("git", ["add", ...paths], { cwd, stdio });
+    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 });
   } catch (err) {
@@ -8077,7 +8095,7 @@ function commitChatFiles(cwd, sessionId, verbose) {
   if (paths.length === 0) return;
   const opts = { cwd, stdio: verbose ? "inherit" : "pipe" };
   try {
-    execFileSync28("git", ["add", ...paths], opts);
+    execFileSync28("git", ["add", "-f", ...paths], opts);
     execFileSync28("git", ["commit", "--quiet", "-m", `chat: reply for ${sessionId}`], opts);
     execFileSync28("git", ["push", "--quiet", "origin", "HEAD"], opts);
   } catch (err) {

package/package.json

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