@kody-ade/kody-engine 0.4.99 → 0.4.100

package/dist/bin/kody.js

@@ -877,7 +877,7 @@ var init_loadPriorArt = __esm({
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.4.99",
+  version: "0.4.100",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -931,7 +931,7 @@ var package_default = {
 };
 
 // src/chat-cli.ts
-import { execFileSync as execFileSync31 } from "child_process";
+import { execFileSync as execFileSync32 } from "child_process";
 import * as fs39 from "fs";
 import * as path36 from "path";
 
@@ -2356,7 +2356,7 @@ async function emit2(sink, type, sessionId, suffix, payload) {
 }
 
 // src/kody-cli.ts
-import { execFileSync as execFileSync30 } from "child_process";
+import { execFileSync as execFileSync31 } from "child_process";
 import * as fs38 from "fs";
 import * as path35 from "path";
 
@@ -2679,7 +2679,7 @@ function coerceBare(spec, value) {
 init_issue();
 
 // src/executor.ts
-import { execFileSync as execFileSync29, spawn as spawn6 } from "child_process";
+import { execFileSync as execFileSync30, spawn as spawn6 } from "child_process";
 import * as fs37 from "fs";
 import * as path34 from "path";
 init_events();
@@ -3423,7 +3423,85 @@ function stripBlockingEnv(env) {
 }
 
 // src/commit.ts
+import { execFileSync as execFileSync6 } from "child_process";
+
+// src/pushWithRetry.ts
 import { execFileSync as execFileSync5 } from "child_process";
+var DEFAULT_MAX_RETRIES = 3;
+var DEFAULT_BACKOFF_MS = 1e3;
+var MAX_BACKOFF_MS = 6e4;
+var NON_FAST_FORWARD_RE = /non-fast-forward|fetch first|\(rejected\)|! \[rejected\]/i;
+function sleepSync(ms) {
+  if (ms <= 0) return;
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function runGit(args, cwd) {
+  try {
+    const stdout = execFileSync5("git", args, {
+      cwd,
+      encoding: "utf-8",
+      env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    return { ok: true, stdout: stdout?.toString() ?? "", stderr: "" };
+  } catch (err) {
+    const e = err;
+    const stderr = e.stderr?.toString() ?? e.message ?? "";
+    const stdout = e.stdout?.toString() ?? "";
+    return { ok: false, stdout, stderr };
+  }
+}
+function resolveBranch(cwd, explicit) {
+  if (explicit && explicit.trim()) return explicit.trim();
+  const r = runGit(["symbolic-ref", "--short", "HEAD"], cwd);
+  return r.ok ? r.stdout.trim() : "";
+}
+function pushWithRetry(opts = {}) {
+  const cwd = opts.cwd ?? process.cwd();
+  const maxRetries = opts.maxRetries ?? DEFAULT_MAX_RETRIES;
+  const baseBackoff = opts.backoffMs ?? DEFAULT_BACKOFF_MS;
+  const branch = resolveBranch(cwd, opts.branch);
+  if (!branch) {
+    return { ok: false, reason: "could not determine current branch (detached HEAD?)", attempts: 0 };
+  }
+  const pushArgs = opts.setUpstream ? ["push", "-u", "origin", `HEAD:${branch}`] : ["push", "origin", "HEAD"];
+  let lastError = "";
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    const push = runGit(pushArgs, cwd);
+    if (push.ok) return { ok: true, attempts: attempt };
+    lastError = push.stderr || push.stdout || "(no error detail)";
+    if (!NON_FAST_FORWARD_RE.test(lastError)) {
+      return { ok: false, reason: `push failed (not retryable): ${lastError.trim().slice(-400)}`, attempts: attempt };
+    }
+    if (attempt === maxRetries) break;
+    const fetch2 = runGit(["fetch", "origin", branch], cwd);
+    if (!fetch2.ok) {
+      return {
+        ok: false,
+        reason: `fetch failed during retry: ${(fetch2.stderr || fetch2.stdout).trim().slice(-400)}`,
+        attempts: attempt
+      };
+    }
+    const rebase = runGit(["rebase", `origin/${branch}`], cwd);
+    if (!rebase.ok) {
+      runGit(["rebase", "--abort"], cwd);
+      return {
+        ok: false,
+        reason: `rebase onto origin/${branch} failed (conflict?): ${(rebase.stderr || rebase.stdout).trim().slice(-400)}`,
+        attempts: attempt
+      };
+    }
+    const delay = Math.min(baseBackoff * 2 ** (attempt - 1), MAX_BACKOFF_MS);
+    sleepSync(delay);
+  }
+  return {
+    ok: false,
+    reason: `push rejected after ${maxRetries} attempts: ${lastError.trim().slice(-400)}`,
+    attempts: maxRetries
+  };
+}
+
+// src/commit.ts
 import * as fs14 from "fs";
 import * as path12 from "path";
 var FORBIDDEN_PATH_PREFIXES = [
@@ -3452,13 +3530,9 @@ var CONVENTIONAL_PREFIXES = [
   "build:",
   "revert:"
 ];
-var PUSH_RETRY_DELAYS_MS = [2e3, 4e3, 8e3];
-function sleepSync(ms) {
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
-}
 function git(args, cwd) {
   try {
-    return execFileSync5("git", args, {
+    return execFileSync6("git", args, {
       encoding: "utf-8",
       timeout: 12e4,
       cwd,
@@ -3517,7 +3591,7 @@ function isForbiddenPath(p) {
   return false;
 }
 function listChangedFiles(cwd) {
-  const raw = execFileSync5("git", ["status", "--porcelain=v1", "-z"], {
+  const raw = execFileSync6("git", ["status", "--porcelain=v1", "-z"], {
     encoding: "utf-8",
     cwd,
     env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
@@ -3529,7 +3603,7 @@ function listChangedFiles(cwd) {
 }
 function listFilesInCommit(ref = "HEAD", cwd) {
   try {
-    const raw = execFileSync5("git", ["show", "--name-only", "--pretty=format:", "-z", ref], {
+    const raw = execFileSync6("git", ["show", "--name-only", "--pretty=format:", "-z", ref], {
       encoding: "utf-8",
       cwd,
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
@@ -3573,28 +3647,11 @@ function commitAndPush(branch, agentMessage, cwd) {
     throw err;
   }
   const sha = git(["rev-parse", "HEAD"], cwd).slice(0, 7);
-  let pushError = "push failed (no error detail)";
-  for (let attempt = 0; attempt <= PUSH_RETRY_DELAYS_MS.length; attempt++) {
-    try {
-      git(["push", "-u", "origin", branch], cwd);
-      return { committed: true, pushed: true, sha, message };
-    } catch (firstErr) {
-      try {
-        git(["push", "--force-with-lease", "-u", "origin", branch], cwd);
-        return { committed: true, pushed: true, sha, message };
-      } catch (secondErr) {
-        const tail = (secondErr instanceof Error ? secondErr.message : String(secondErr)).slice(-400);
-        const initial = firstErr instanceof Error ? firstErr.message : String(firstErr);
-        pushError = `push failed: ${initial.slice(-200)} | force-with-lease failed: ${tail}`;
-        const delay = PUSH_RETRY_DELAYS_MS[attempt];
-        if (delay === void 0) break;
-        process.stderr.write(`[kody:commit] push failed (attempt ${attempt + 1}); retrying in ${delay}ms
-`);
-        sleepSync(delay);
-      }
-    }
+  const pushResult = pushWithRetry({ cwd, branch, setUpstream: true });
+  if (pushResult.ok) {
+    return { committed: true, pushed: true, sha, message };
   }
-  return { committed: true, pushed: false, sha, message, pushError };
+  return { committed: true, pushed: false, sha, message, pushError: pushResult.reason };
 }
 function hasCommitsAhead(branch, defaultBranch2, cwd) {
   try {
@@ -3621,10 +3678,10 @@ var abortUnfinishedGitOps2 = async (ctx) => {
 };
 
 // src/scripts/advanceFlow.ts
-import { execFileSync as execFileSync7 } from "child_process";
+import { execFileSync as execFileSync8 } from "child_process";
 
 // src/state.ts
-import { execFileSync as execFileSync6 } from "child_process";
+import { execFileSync as execFileSync7 } from "child_process";
 var STATE_BEGIN = "<!-- kody:state:v1:begin -->";
 var STATE_END = "<!-- kody:state:v1:end -->";
 var HISTORY_MAX_ENTRIES = 20;
@@ -3650,7 +3707,7 @@ function ghToken2() {
 function gh2(args, input, cwd) {
   const token = ghToken2();
   const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-  return execFileSync6("gh", args, {
+  return execFileSync7("gh", args, {
     encoding: "utf-8",
     timeout: API_TIMEOUT_MS2,
     cwd,
@@ -3853,7 +3910,7 @@ var advanceFlow = async (ctx, profile) => {
   }
   const body = `@kody ${flow.name}`;
   try {
-    execFileSync7("gh", ["issue", "comment", String(flow.issueNumber), "--body", body], {
+    execFileSync8("gh", ["issue", "comment", String(flow.issueNumber), "--body", body], {
       timeout: API_TIMEOUT_MS3,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -4414,7 +4471,7 @@ function copyDir(src, dst) {
 }
 
 // src/coverage.ts
-import { execFileSync as execFileSync8 } from "child_process";
+import { execFileSync as execFileSync9 } from "child_process";
 function patternToRegex(pattern) {
   let s = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
   s = s.replace(/\*\*\//g, "\xA7S").replace(/\*\*/g, "\xA7A").replace(/\*/g, "[^/]*");
@@ -4432,7 +4489,7 @@ function renderSiblingPath(file, requireSibling) {
 }
 function safeGit(args, cwd) {
   try {
-    return execFileSync8("git", args, { encoding: "utf-8", cwd, env: { ...process.env, HUSKY: "0" } }).trim();
+    return execFileSync9("git", args, { encoding: "utf-8", cwd, env: { ...process.env, HUSKY: "0" } }).trim();
   } catch {
     return "";
   }
@@ -4642,14 +4699,14 @@ var commitAndPush2 = async (ctx, profile) => {
 };
 
 // src/scripts/commitGoalState.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 import * as path18 from "path";
 var commitGoalState = async (ctx) => {
   const goal = ctx.data.goal;
   if (!goal) return;
   const stateRel = path18.posix.join(".kody", "goals", goal.id, "state.json");
   try {
-    execFileSync9("git", ["add", stateRel], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync10("git", ["add", stateRel], { cwd: ctx.cwd, stdio: "pipe" });
   } catch (err) {
     process.stderr.write(
       `[goal-tick] commitGoalState: git add failed: ${err instanceof Error ? err.message : String(err)}
@@ -4658,13 +4715,13 @@ var commitGoalState = async (ctx) => {
     return;
   }
   try {
-    execFileSync9("git", ["diff", "--cached", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync10("git", ["diff", "--cached", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
     return;
   } catch {
   }
   const msg = describeCommitMessage(goal);
   try {
-    execFileSync9("git", ["commit", "-m", msg, "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
+    execFileSync10("git", ["commit", "-m", msg, "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
   } catch (err) {
     process.stderr.write(
       `[goal-tick] commitGoalState: git commit failed: ${err instanceof Error ? err.message : String(err)}
@@ -4672,10 +4729,10 @@ var commitGoalState = async (ctx) => {
     );
     return;
   }
-  try {
-    execFileSync9("git", ["push", "--quiet"], { cwd: ctx.cwd, stdio: "pipe" });
-  } catch {
-    process.stderr.write("[goal-tick] commitGoalState: push failed (will retry next tick)\n");
+  const result = pushWithRetry({ cwd: ctx.cwd });
+  if (!result.ok) {
+    process.stderr.write(`[goal-tick] commitGoalState: push failed (${result.reason}); will retry next tick
+`);
   }
 };
 function describeCommitMessage(goal) {
@@ -4791,7 +4848,7 @@ function formatToolsUsage(profile) {
 
 // src/scripts/createQaGoal.ts
 init_issue();
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 import * as fs21 from "fs";
 import * as path20 from "path";
 
@@ -5063,7 +5120,7 @@ function writeStateFile(cwd, goalId, lastDispatchedIssue) {
 function gitTry(args, cwd) {
   const env = { ...process.env, SKIP_HOOKS: "1", HUSKY: "0" };
   try {
-    execFileSync10("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], env });
+    execFileSync11("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], env });
     return { ok: true, stderr: "" };
   } catch (err) {
     const e = err;
@@ -5564,7 +5621,7 @@ function filterGoalTaskPrs(prs, taskIssueNumbers) {
 }
 
 // src/scripts/diagMcp.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 import * as fs22 from "fs";
 import * as os4 from "os";
 import * as path21 from "path";
@@ -5584,7 +5641,7 @@ var diagMcp = async (_ctx) => {
   process.stderr.write(`[kody diag] chromium present: ${hasChromium ? "yes" : "no"}
 `);
   try {
-    const v = execFileSync11("npx", ["-y", "--package=@playwright/mcp@latest", "--", "playwright-mcp", "--version"], {
+    const v = execFileSync12("npx", ["-y", "--package=@playwright/mcp@latest", "--", "playwright-mcp", "--version"], {
       stdio: "pipe",
       timeout: 6e4,
       encoding: "utf8"
@@ -6086,7 +6143,7 @@ var discoverQaContext = async (ctx) => {
 };
 
 // src/scripts/dispatch.ts
-import { execFileSync as execFileSync12 } from "child_process";
+import { execFileSync as execFileSync13 } from "child_process";
 var API_TIMEOUT_MS4 = 3e4;
 var dispatch = async (ctx, _profile, _agentResult, args) => {
   const next = args?.next;
@@ -6122,7 +6179,7 @@ var dispatch = async (ctx, _profile, _agentResult, args) => {
   const sub = usePr ? "pr" : "issue";
   const body = `@kody ${next}`;
   try {
-    execFileSync12("gh", [sub, "comment", String(targetNumber), "--body", body], {
+    execFileSync13("gh", [sub, "comment", String(targetNumber), "--body", body], {
       timeout: API_TIMEOUT_MS4,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -6142,7 +6199,7 @@ function parsePr(url) {
 }
 
 // src/scripts/dispatchClassified.ts
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 var API_TIMEOUT_MS5 = 3e4;
 var VALID_CLASSES2 = /* @__PURE__ */ new Set(["feature", "bug", "spec", "chore"]);
 var dispatchClassified = async (ctx) => {
@@ -6166,7 +6223,7 @@ ${auditLine}
 
 ${stateBody}`;
   try {
-    execFileSync13("gh", ["issue", "comment", String(issueNumber), "--body", body], {
+    execFileSync14("gh", ["issue", "comment", String(issueNumber), "--body", body], {
       cwd: ctx.cwd,
       timeout: API_TIMEOUT_MS5,
       stdio: ["ignore", "pipe", "pipe"]
@@ -7263,7 +7320,7 @@ var finalizeTerminal = async (ctx) => {
 
 // src/scripts/finishFlow.ts
 init_issue();
-import { execFileSync as execFileSync14 } from "child_process";
+import { execFileSync as execFileSync15 } from "child_process";
 var TERMINAL_PHASE = {
   "review-passed": { phase: "shipped", status: "succeeded" },
   "fix-applied": { phase: "shipped", status: "succeeded" },
@@ -7303,7 +7360,7 @@ var finishFlow = async (ctx, profile, _agentResult, args) => {
 **PR:** ${state.core.prUrl}` : "";
   const body = `${icon} kody flow \`${flowName}\` finished \u2014 \`${reason}\`${prSuffix}`;
   try {
-    execFileSync14("gh", ["issue", "comment", String(issueNumber), "--body", body], {
+    execFileSync15("gh", ["issue", "comment", String(issueNumber), "--body", body], {
       timeout: API_TIMEOUT_MS6,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -7333,9 +7390,9 @@ var finishFlow = async (ctx, profile, _agentResult, args) => {
 };
 
 // src/branch.ts
-import { execFileSync as execFileSync15 } from "child_process";
+import { execFileSync as execFileSync16 } from "child_process";
 function git2(args, cwd) {
-  return execFileSync15("git", args, {
+  return execFileSync16("git", args, {
     encoding: "utf-8",
     timeout: 3e4,
     cwd,
@@ -7352,11 +7409,11 @@ function getCurrentBranch(cwd) {
 }
 function resetWorkingTree(cwd) {
   try {
-    execFileSync15("git", ["reset", "--hard", "HEAD"], { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+    execFileSync16("git", ["reset", "--hard", "HEAD"], { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
   } catch {
   }
   try {
-    execFileSync15("git", ["clean", "-fd"], { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+    execFileSync16("git", ["clean", "-fd"], { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
   } catch {
   }
 }
@@ -7368,14 +7425,14 @@ function checkoutPrBranch(prNumber, cwd) {
     GH_TOKEN: process.env.GH_PAT?.trim() || process.env.GH_TOKEN || ""
   };
   try {
-    execFileSync15("git", ["reset", "--hard", "HEAD"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+    execFileSync16("git", ["reset", "--hard", "HEAD"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
   } catch {
   }
   try {
-    execFileSync15("git", ["clean", "-fd"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+    execFileSync16("git", ["clean", "-fd"], { cwd, env, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
   } catch {
   }
-  execFileSync15("gh", ["pr", "checkout", String(prNumber)], {
+  execFileSync16("gh", ["pr", "checkout", String(prNumber)], {
     cwd,
     env,
     stdio: ["ignore", "pipe", "pipe"],
@@ -7501,7 +7558,7 @@ function ensureFeatureBranch(issueNumber, title, defaultBranch2, cwd, baseBranch
 }
 
 // src/gha.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync17 } from "child_process";
 import * as fs27 from "fs";
 function getRunUrl() {
   const server = process.env.GITHUB_SERVER_URL;
@@ -7544,7 +7601,7 @@ function reactToTriggerComment(cwd) {
   for (let attempt = 0; attempt < 3; attempt++) {
     if (attempt > 0) sleepMs(attempt === 1 ? 500 : 1500);
     try {
-      execFileSync16("gh", args, opts);
+      execFileSync17("gh", args, opts);
       return;
     } catch (err) {
       lastErr = err;
@@ -7557,7 +7614,7 @@ function reactToTriggerComment(cwd) {
 }
 function sleepMs(ms) {
   try {
-    execFileSync16("sleep", [(ms / 1e3).toString()], { stdio: "ignore", timeout: ms + 1e3 });
+    execFileSync17("sleep", [(ms / 1e3).toString()], { stdio: "ignore", timeout: ms + 1e3 });
   } catch {
   }
 }
@@ -7566,7 +7623,7 @@ function sleepMs(ms) {
 init_issue();
 
 // src/workflow.ts
-import { execFileSync as execFileSync17 } from "child_process";
+import { execFileSync as execFileSync18 } from "child_process";
 var GH_TIMEOUT_MS = 3e4;
 function ghToken3() {
   return process.env.GH_PAT?.trim() || process.env.GH_TOKEN;
@@ -7574,7 +7631,7 @@ function ghToken3() {
 function gh3(args, cwd) {
   const token = ghToken3();
   const env = token ? { ...process.env, GH_TOKEN: token } : { ...process.env };
-  return execFileSync17("gh", args, {
+  return execFileSync18("gh", args, {
     encoding: "utf-8",
     timeout: GH_TIMEOUT_MS,
     cwd,
@@ -7808,7 +7865,7 @@ var handleAbandonedGoal = async (ctx) => {
 };
 
 // src/scripts/initFlow.ts
-import { execFileSync as execFileSync18 } from "child_process";
+import { execFileSync as execFileSync19 } from "child_process";
 import * as fs29 from "fs";
 import * as path27 from "path";
 
@@ -7849,7 +7906,7 @@ function qualityCommandsFor(pm) {
 function detectOwnerRepo(cwd) {
   let url;
   try {
-    url = execFileSync18("git", ["remote", "get-url", "origin"], {
+    url = execFileSync19("git", ["remote", "get-url", "origin"], {
       cwd,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
@@ -7934,7 +7991,7 @@ jobs:
 `;
 function defaultBranchFromGit(cwd) {
   try {
-    const ref = execFileSync18("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
+    const ref = execFileSync19("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
       cwd,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
@@ -7942,7 +7999,7 @@ function defaultBranchFromGit(cwd) {
     return ref.replace("refs/remotes/origin/", "");
   } catch {
     try {
-      return execFileSync18("git", ["branch", "--show-current"], {
+      return execFileSync19("git", ["branch", "--show-current"], {
         cwd,
         encoding: "utf-8",
         stdio: ["ignore", "pipe", "pipe"]
@@ -8484,7 +8541,7 @@ var markFlowSuccess = async (ctx) => {
 };
 
 // src/scripts/mergeReleasePr.ts
-import { execFileSync as execFileSync19 } from "child_process";
+import { execFileSync as execFileSync20 } from "child_process";
 var API_TIMEOUT_MS7 = 6e4;
 var mergeReleasePr = async (ctx) => {
   const state = ctx.data.taskState;
@@ -8503,7 +8560,7 @@ var mergeReleasePr = async (ctx) => {
   process.stderr.write(`[kody mergeReleasePr] merging PR #${prNumber} (${prUrl})
 `);
   try {
-    const out = execFileSync19("gh", ["pr", "merge", String(prNumber), "--merge"], {
+    const out = execFileSync20("gh", ["pr", "merge", String(prNumber), "--merge"], {
       timeout: API_TIMEOUT_MS7,
       cwd: ctx.cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -9138,7 +9195,7 @@ ${body}`;
 }
 
 // src/scripts/recordClassification.ts
-import { execFileSync as execFileSync20 } from "child_process";
+import { execFileSync as execFileSync21 } from "child_process";
 var API_TIMEOUT_MS8 = 3e4;
 var VALID_CLASSES3 = /* @__PURE__ */ new Set(["feature", "bug", "spec", "chore"]);
 var recordClassification = async (ctx) => {
@@ -9186,7 +9243,7 @@ function parseClassification(prSummary) {
 }
 function tryAuditComment(issueNumber, body, cwd) {
   try {
-    execFileSync20("gh", ["issue", "comment", String(issueNumber), "--body", body], {
+    execFileSync21("gh", ["issue", "comment", String(issueNumber), "--body", body], {
       cwd,
       timeout: API_TIMEOUT_MS8,
       stdio: ["ignore", "pipe", "pipe"]
@@ -9300,7 +9357,7 @@ var resolveArtifacts = async (ctx, profile) => {
 };
 
 // src/scripts/resolveFlow.ts
-import { execFileSync as execFileSync21 } from "child_process";
+import { execFileSync as execFileSync22 } from "child_process";
 init_issue();
 var CONFLICT_DIFF_MAX_BYTES = 4e4;
 var resolveFlow = async (ctx) => {
@@ -9394,7 +9451,7 @@ function buildPreferBlock(prefer, baseBranch) {
 }
 function getConflictedFiles(cwd) {
   try {
-    const out = execFileSync21("git", ["diff", "--name-only", "--diff-filter=U"], {
+    const out = execFileSync22("git", ["diff", "--name-only", "--diff-filter=U"], {
       encoding: "utf-8",
       cwd,
       env: { ...process.env, HUSKY: "0" }
@@ -9409,7 +9466,7 @@ function getConflictMarkersPreview(files, cwd, maxBytes = CONFLICT_DIFF_MAX_BYTE
   let total = 0;
   for (const f of files) {
     try {
-      const content = execFileSync21("cat", [f], { encoding: "utf-8", cwd }).toString();
+      const content = execFileSync22("cat", [f], { encoding: "utf-8", cwd }).toString();
       const snippet = `### ${f}
 
 \`\`\`
@@ -9433,12 +9490,12 @@ function tryPostPr3(prNumber, body, cwd) {
 function pushEmptyCommit(branch, cwd) {
   const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
   try {
-    execFileSync21(
+    execFileSync22(
       "git",
       ["commit", "--allow-empty", "-m", "chore: kody resolve refresh \u2014 empty commit to recompute mergeable status"],
       { cwd, env, stdio: ["ignore", "pipe", "pipe"] }
     );
-    execFileSync21("git", ["push", "-u", "origin", branch], {
+    execFileSync22("git", ["push", "-u", "origin", branch], {
       cwd,
       env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -9529,10 +9586,10 @@ var resolvePreviewUrl = async (ctx) => {
 };
 
 // src/scripts/resolveQaUrl.ts
-import { execFileSync as execFileSync22 } from "child_process";
+import { execFileSync as execFileSync23 } from "child_process";
 function ghQuery(args, cwd) {
   try {
-    const out = execFileSync22("gh", args, {
+    const out = execFileSync23("gh", args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       encoding: "utf-8",
@@ -9602,7 +9659,7 @@ var resolveQaUrl = async (ctx) => {
 };
 
 // src/scripts/revertFlow.ts
-import { execFileSync as execFileSync23 } from "child_process";
+import { execFileSync as execFileSync24 } from "child_process";
 init_issue();
 var SHA_RE = /^[0-9a-f]{4,40}$/i;
 var revertFlow = async (ctx) => {
@@ -9685,7 +9742,7 @@ function buildPrSummary(resolved) {
   return resolved.map((r) => `- Reverted \`${r.full.slice(0, 7)}\`${r.subject ? ` \u2014 ${r.subject}` : ""}`).join("\n");
 }
 function git3(args, cwd) {
-  return execFileSync23("git", args, {
+  return execFileSync24("git", args, {
     encoding: "utf-8",
     timeout: 3e4,
     cwd,
@@ -9695,7 +9752,7 @@ function git3(args, cwd) {
 }
 function isAncestorOfHead(sha, cwd) {
   try {
-    execFileSync23("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
+    execFileSync24("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
       cwd,
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
       stdio: ["ignore", "ignore", "ignore"]
@@ -10114,11 +10171,11 @@ var skipAgent = async (ctx) => {
 };
 
 // src/scripts/stageMergeConflicts.ts
-import { execFileSync as execFileSync24 } from "child_process";
+import { execFileSync as execFileSync25 } from "child_process";
 var stageMergeConflicts = async (ctx) => {
   if (ctx.data.agentDone === false) return;
   try {
-    execFileSync24("git", ["add", "-A"], {
+    execFileSync25("git", ["add", "-A"], {
       cwd: ctx.cwd,
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" },
       stdio: "pipe"
@@ -10129,7 +10186,7 @@ var stageMergeConflicts = async (ctx) => {
 
 // src/scripts/startFlow.ts
 init_issue();
-import { execFileSync as execFileSync25 } from "child_process";
+import { execFileSync as execFileSync26 } from "child_process";
 var API_TIMEOUT_MS9 = 3e4;
 var startFlow = async (ctx, profile, _agentResult, args) => {
   const entry = args?.entry;
@@ -10163,7 +10220,7 @@ function postKodyComment(target, issueNumber, state, next, cwd) {
   const sub = target === "pr" && state?.core.prUrl ? "pr" : "issue";
   const body = `@kody ${next}`;
   try {
-    execFileSync25("gh", [sub, "comment", String(targetNumber), "--body", body], {
+    execFileSync26("gh", [sub, "comment", String(targetNumber), "--body", body], {
       timeout: API_TIMEOUT_MS9,
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
@@ -10177,7 +10234,7 @@ function postKodyComment(target, issueNumber, state, next, cwd) {
 }
 
 // src/scripts/syncFlow.ts
-import { execFileSync as execFileSync26 } from "child_process";
+import { execFileSync as execFileSync27 } from "child_process";
 init_issue();
 var syncFlow = async (ctx, _profile, args) => {
   const announceOnSuccess = Boolean(args?.announceOnSuccess);
@@ -10242,21 +10299,15 @@ function bail2(ctx, prNumber, reason) {
 }
 function revParseHead(cwd) {
   try {
-    return execFileSync26("git", ["rev-parse", "HEAD"], { cwd, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }).toString().trim();
+    return execFileSync27("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 {
-    execFileSync26("git", ["push", "-u", "origin", branch], { cwd, env, stdio: ["ignore", "pipe", "pipe"] });
-  } catch {
-    execFileSync26("git", ["push", "--force-with-lease", "-u", "origin", branch], {
-      cwd,
-      env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
+  const result = pushWithRetry({ cwd: cwd ?? process.cwd(), branch, setUpstream: true });
+  if (!result.ok) {
+    throw new Error(result.reason);
   }
 }
 function tryPostPr6(prNumber, body, cwd) {
@@ -10505,7 +10556,7 @@ var verifyWithRetry = async (ctx) => {
 
 // src/scripts/waitForCi.ts
 init_issue();
-import { execFileSync as execFileSync27 } from "child_process";
+import { execFileSync as execFileSync28 } from "child_process";
 var API_TIMEOUT_MS10 = 3e4;
 var waitForCi = async (ctx, _profile, _agentResult, args) => {
   const timeoutMinutes = numArg(args, "timeoutMinutes", 30);
@@ -10583,7 +10634,7 @@ var waitForCi = async (ctx, _profile, _agentResult, args) => {
 };
 function fetchChecks(prNumber, cwd) {
   try {
-    const raw = execFileSync27("gh", ["pr", "checks", String(prNumber), "--json", "bucket,state,name,workflow,link"], {
+    const raw = execFileSync28("gh", ["pr", "checks", String(prNumber), "--json", "bucket,state,name,workflow,link"], {
       encoding: "utf-8",
       timeout: API_TIMEOUT_MS10,
       cwd,
@@ -10962,7 +11013,7 @@ var allScriptNames = /* @__PURE__ */ new Set([
 ]);
 
 // src/tools.ts
-import { execFileSync as execFileSync28 } from "child_process";
+import { execFileSync as execFileSync29 } from "child_process";
 function verifyCliTools(tools, cwd) {
   const out = [];
   for (const t of tools) out.push(verifyOne(t, cwd));
@@ -10995,7 +11046,7 @@ function verifyOne(tool2, cwd) {
 }
 function runShell(cmd, cwd, timeoutMs = 3e4) {
   try {
-    execFileSync28("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
+    execFileSync29("sh", ["-c", cmd], { cwd, stdio: "pipe", timeout: timeoutMs });
     return true;
   } catch {
     return false;
@@ -11759,7 +11810,7 @@ async function runContainerLoop(profile, ctx, input) {
 }
 function resetWorkingTree2(cwd) {
   try {
-    execFileSync29("git", ["reset", "--hard", "HEAD"], {
+    execFileSync30("git", ["reset", "--hard", "HEAD"], {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       timeout: 3e4
@@ -11918,7 +11969,7 @@ function detectPackageManager2(cwd) {
 }
 function shellOut(cmd, args, cwd, stream = true) {
   try {
-    execFileSync30(cmd, args, {
+    execFileSync31(cmd, args, {
       cwd,
       stdio: stream ? "inherit" : "pipe",
       env: { ...process.env, HUSKY: "0", SKIP_HOOKS: "1", CI: process.env.CI ?? "1" }
@@ -11931,7 +11982,7 @@ function shellOut(cmd, args, cwd, stream = true) {
 }
 function isOnPath(bin) {
   try {
-    execFileSync30("which", [bin], { stdio: "pipe" });
+    execFileSync31("which", [bin], { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -11972,7 +12023,7 @@ function installLitellmIfNeeded(cwd) {
   } catch {
   }
   try {
-    execFileSync30("python3", ["-c", "import litellm"], { stdio: "pipe" });
+    execFileSync31("python3", ["-c", "import litellm"], { stdio: "pipe" });
     process.stdout.write("\u2192 kody: litellm already installed\n");
     return 0;
   } catch {
@@ -11982,16 +12033,16 @@ function installLitellmIfNeeded(cwd) {
 }
 function configureGitIdentity(cwd) {
   try {
-    const name = execFileSync30("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
+    const name = execFileSync31("git", ["config", "user.name"], { cwd, stdio: "pipe", encoding: "utf-8" }).trim();
     if (name) return;
   } catch {
   }
   try {
-    execFileSync30("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
+    execFileSync31("git", ["config", "user.name", "github-actions[bot]"], { cwd, stdio: "pipe" });
   } catch {
   }
   try {
-    execFileSync30("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
+    execFileSync31("git", ["config", "user.email", "41898282+github-actions[bot]@users.noreply.github.com"], {
       cwd,
       stdio: "pipe"
     });
@@ -12302,17 +12353,26 @@ function parseChatArgs(argv, env = process.env) {
 function commitChatFiles(cwd, sessionId, verbose) {
   const sessionFile = path36.relative(cwd, sessionFilePath(cwd, sessionId));
   const eventsFile = path36.relative(cwd, eventsFilePath(cwd, sessionId));
-  const paths = [sessionFile, eventsFile].filter((p) => fs39.existsSync(path36.join(cwd, p)));
+  const safeSession = sessionId.replace(/[^a-zA-Z0-9._-]/g, "_");
+  const tasksDir = path36.join(".kody", "tasks", safeSession);
+  const candidatePaths = [sessionFile, eventsFile, tasksDir];
+  const paths = candidatePaths.filter((p) => fs39.existsSync(path36.join(cwd, p)));
   if (paths.length === 0) return;
   const opts = { cwd, stdio: verbose ? "inherit" : "pipe" };
   try {
-    execFileSync31("git", ["add", "-f", ...paths], opts);
-    execFileSync31("git", ["commit", "--quiet", "-m", `chat: reply for ${sessionId}`], opts);
-    execFileSync31("git", ["push", "--quiet", "origin", "HEAD"], opts);
+    execFileSync32("git", ["add", "-f", ...paths], opts);
+    execFileSync32("git", ["commit", "--quiet", "-m", `chat: reply for ${sessionId}`], opts);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[kody:chat] commit/push skipped: ${msg}
+    process.stderr.write(`[kody:chat] commit skipped: ${msg}
+`);
+    return;
+  }
+  const result = pushWithRetry({ cwd });
+  if (!result.ok) {
+    process.stderr.write(`[kody:chat] push FAILED after ${result.attempts} attempt(s): ${result.reason}
 `);
+    throw new Error(`chat push failed: ${result.reason}`);
   }
 }
 function tryLoadConfig(cwd) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kody-ade/kody-engine",
-  "version": "0.4.99",
-  "description": "kody — autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
+  "version": "0.4.100",
+  "description": "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -12,6 +12,23 @@
     "templates",
     "kody.config.schema.json"
   ],
+  "scripts": {
+    "kody:run": "tsx bin/kody.ts",
+    "serve": "tsx bin/kody.ts serve",
+    "serve:vscode": "tsx bin/kody.ts serve vscode",
+    "serve:claude": "tsx bin/kody.ts serve claude",
+    "build": "tsup && node scripts/copy-assets.cjs",
+    "check:modularity": "tsx scripts/check-script-modularity.ts",
+    "pretest": "pnpm check:modularity",
+    "test": "vitest run tests/unit tests/int --no-coverage",
+    "test:e2e": "vitest run tests/e2e --no-coverage",
+    "test:all": "vitest run tests --no-coverage",
+    "typecheck": "tsc --noEmit",
+    "lint": "biome check",
+    "lint:fix": "biome check --write",
+    "format": "biome format --write",
+    "prepublishOnly": "pnpm build"
+  },
   "dependencies": {
     "@actions/cache": "^6.0.0",
     "@anthropic-ai/claude-agent-sdk": "0.2.119",
@@ -33,21 +50,5 @@
     "url": "git+https://github.com/aharonyaircohen/kody-engine.git"
   },
   "homepage": "https://github.com/aharonyaircohen/kody-engine",
-  "bugs": "https://github.com/aharonyaircohen/kody-engine/issues",
-  "scripts": {
-    "kody:run": "tsx bin/kody.ts",
-    "serve": "tsx bin/kody.ts serve",
-    "serve:vscode": "tsx bin/kody.ts serve vscode",
-    "serve:claude": "tsx bin/kody.ts serve claude",
-    "build": "tsup && node scripts/copy-assets.cjs",
-    "check:modularity": "tsx scripts/check-script-modularity.ts",
-    "pretest": "pnpm check:modularity",
-    "test": "vitest run tests/unit tests/int --no-coverage",
-    "test:e2e": "vitest run tests/e2e --no-coverage",
-    "test:all": "vitest run tests --no-coverage",
-    "typecheck": "tsc --noEmit",
-    "lint": "biome check",
-    "lint:fix": "biome check --write",
-    "format": "biome format --write"
-  }
-}
+  "bugs": "https://github.com/aharonyaircohen/kody-engine/issues"
+}