@kody-ade/kody-engine 0.3.10 → 0.3.12

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.10",
+  version: "0.3.12",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -795,6 +795,7 @@ function coerceBare(spec, value) {
 }
 
 // src/executor.ts
+import { spawnSync as spawnSync2 } from "child_process";
 import * as fs21 from "fs";
 import * as path18 from "path";
 
@@ -977,7 +978,7 @@ function loadProfile(profilePath) {
 function validateScriptReferences(profile, registeredScripts) {
   const missing = [];
   for (const e of [...profile.scripts.preflight, ...profile.scripts.postflight]) {
-    if (!registeredScripts.has(e.script)) missing.push(e.script);
+    if (e.script && !registeredScripts.has(e.script)) missing.push(e.script);
   }
   return missing;
 }
@@ -1137,11 +1138,20 @@ function parseScriptList(p, key, raw) {
   const out = [];
   for (const [i, item] of raw.entries()) {
     if (!item || typeof item !== "object") {
-      throw new ProfileError(p, `scripts.${key}[${i}] must be an object like { script, runWhen? }`);
+      throw new ProfileError(p, `scripts.${key}[${i}] must be an object like { script, runWhen? } or { shell, runWhen? }`);
     }
     const r = item;
-    const script = requireString(p, r, "script");
-    const entry = { script };
+    const hasScript = typeof r.script === "string" && r.script.length > 0;
+    const hasShell = typeof r.shell === "string" && r.shell.length > 0;
+    if (hasScript && hasShell) {
+      throw new ProfileError(p, `scripts.${key}[${i}] cannot set both "script" and "shell" \u2014 pick one`);
+    }
+    if (!hasScript && !hasShell) {
+      throw new ProfileError(p, `scripts.${key}[${i}] must set "script" (registered TS function) or "shell" (filename in executable dir)`);
+    }
+    const entry = {};
+    if (hasScript) entry.script = r.script;
+    if (hasShell) entry.shell = r.shell;
     if (r.runWhen && typeof r.runWhen === "object") {
       entry.runWhen = r.runWhen;
     }
@@ -2870,7 +2880,7 @@ function ensurePr(opts) {
 
 // src/scripts/ensurePr.ts
 var ensurePr2 = async (ctx) => {
-  if (ctx.skipAgent && ctx.output.exitCode !== void 0 && ctx.output.exitCode !== 0) {
+  if (ctx.skipAgent && ctx.output.exitCode !== void 0) {
     return;
   }
   const commitResult = ctx.data.commitResult;
@@ -5441,9 +5451,13 @@ async function runExecutable(profileName, input) {
   try {
     for (const entry of profile.scripts.preflight) {
       if (!shouldRun(entry, ctx)) continue;
-      const fn = preflightScripts[entry.script];
-      if (!fn) return finish({ exitCode: 99, reason: `preflight script not registered: ${entry.script}` });
-      await fn(ctx, profile, entry.with);
+      if (entry.shell) {
+        runShellEntry(entry, ctx, profile);
+      } else {
+        const fn = preflightScripts[entry.script];
+        if (!fn) return finish({ exitCode: 99, reason: `preflight script not registered: ${entry.script}` });
+        await fn(ctx, profile, entry.with);
+      }
       if (ctx.skipAgent && ctx.output.exitCode !== void 0 && ctx.output.exitCode !== 0) {
         return finish(ctx.output);
       }
@@ -5458,15 +5472,20 @@ async function runExecutable(profileName, input) {
     }
     for (const entry of profile.scripts.postflight) {
       if (!shouldRun(entry, ctx)) continue;
-      const fn = postflightScripts[entry.script];
-      if (!fn) return finish({ exitCode: 99, reason: `postflight script not registered: ${entry.script}` });
+      const label = entry.script ?? entry.shell ?? "<unknown>";
       try {
-        await fn(ctx, profile, agentResult, entry.with);
+        if (entry.shell) {
+          runShellEntry(entry, ctx, profile);
+        } else {
+          const fn = postflightScripts[entry.script];
+          if (!fn) return finish({ exitCode: 99, reason: `postflight script not registered: ${entry.script}` });
+          await fn(ctx, profile, agentResult, entry.with);
+        }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        process.stderr.write(`[kody] postflight script "${entry.script}" crashed: ${msg}
+        process.stderr.write(`[kody] postflight "${label}" crashed: ${msg}
 `);
-        if (!ctx.output.reason) ctx.output.reason = `postflight ${entry.script} crashed: ${msg}`;
+        if (!ctx.output.reason) ctx.output.reason = `postflight ${label} crashed: ${msg}`;
         if (ctx.output.exitCode === 0) ctx.output.exitCode = 99;
       }
     }
@@ -5583,6 +5602,49 @@ function finish(out) {
 `);
   return out;
 }
+var SHELL_TIMEOUT_MS = 3e5;
+function runShellEntry(entry, ctx, profile) {
+  const shellName = entry.shell;
+  const shellPath = path18.join(profile.dir, shellName);
+  if (!fs21.existsSync(shellPath)) {
+    ctx.skipAgent = true;
+    ctx.output.exitCode = 99;
+    ctx.output.reason = `shell script not found: ${shellName} (looked in ${profile.dir})`;
+    return;
+  }
+  const positional = entry.with ? Object.values(entry.with).map((v) => String(v)) : [];
+  const env = { ...process.env, HUSKY: "0", SKIP_HOOKS: "1" };
+  for (const [k, v] of Object.entries(ctx.args)) {
+    if (v === void 0 || v === null) continue;
+    env[`KODY_ARG_${k.toUpperCase().replace(/-/g, "_")}`] = String(v);
+  }
+  const r = spawnSync2("bash", [shellPath, ...positional], {
+    cwd: ctx.cwd,
+    encoding: "utf-8",
+    env,
+    stdio: ["pipe", "pipe", "pipe"],
+    timeout: SHELL_TIMEOUT_MS
+  });
+  const stdout = r.stdout ?? "";
+  const stderr = r.stderr ?? "";
+  if (stdout) process.stdout.write(stdout);
+  if (stderr) process.stderr.write(stderr);
+  if (/^KODY_SKIP_AGENT=true\s*$/m.test(stdout)) {
+    ctx.skipAgent = true;
+    if (ctx.output.exitCode === void 0) ctx.output.exitCode = 0;
+  }
+  const exit = r.status ?? -1;
+  if (exit !== 0) {
+    ctx.skipAgent = true;
+    if (ctx.output.exitCode === void 0 || ctx.output.exitCode === 0) {
+      ctx.output.exitCode = exit;
+    }
+    if (!ctx.output.reason) {
+      const tail = (stderr || stdout).slice(-800);
+      ctx.output.reason = `shell '${shellName}' exited ${exit}${tail ? `: ${tail}` : ""}`;
+    }
+  }
+}
 
 // src/kody-cli.ts
 var CI_HELP = `kody ci \u2014 minimal-YAML autonomous engineer (CI preflight + run)

package/dist/executables/resolve/apply-prefer.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+#
+# Deterministic conflict resolution for `kody resolve --prefer ours|theirs`.
+#
+# Runs as a preflight shell entry (see src/executables/resolve/profile.json).
+# Gated by runWhen on args.prefer, so it only fires when the user requested
+# a side. Reads the side from $KODY_ARG_PREFER (the executor exposes every
+# ctx.args.<key> as an env var).
+#
+# Preconditions set by the prior `resolveFlow` preflight:
+#   - cwd is on the PR branch.
+#   - `git merge origin/<base> --no-edit --no-ff` already ran and conflicted.
+#   - Working tree has unmerged paths.
+#
+# Behavior: for each unmerged file, git checkout --ours (or --theirs), add,
+# commit the merge, push the branch. Prints `KODY_SKIP_AGENT=true` on
+# success so the executor bypasses the agent entirely.
+#
+# Exits:
+#   0   — resolved + pushed (or nothing to resolve)
+#   64  — invalid side value
+#   1+  — git operation failed (executor will surface stderr)
+
+set -euo pipefail
+
+side="${KODY_ARG_PREFER:-}"
+if [[ "$side" != "ours" && "$side" != "theirs" ]]; then
+  echo "apply-prefer: expected KODY_ARG_PREFER=ours|theirs, got '$side'" >&2
+  exit 64
+fi
+
+unmerged=$(git diff --name-only --diff-filter=U)
+if [[ -z "$unmerged" ]]; then
+  echo "apply-prefer: no unmerged paths — nothing to resolve"
+  echo "KODY_SKIP_AGENT=true"
+  exit 0
+fi
+
+count=0
+while IFS= read -r f; do
+  [[ -z "$f" ]] && continue
+  git checkout "--$side" -- "$f"
+  git add -- "$f"
+  count=$((count + 1))
+done <<< "$unmerged"
+echo "apply-prefer: resolved $count file(s) via --$side"
+
+# Complete the merge. git merge left MERGE_MSG in place; --no-edit uses it.
+HUSKY=0 SKIP_HOOKS=1 git -c commit.gpgsign=false commit --no-edit
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+git push origin "$branch"
+echo "apply-prefer: pushed $branch"
+echo "KODY_SKIP_AGENT=true"

package/dist/executables/resolve/profile.json

@@ -53,6 +53,10 @@
       {
         "script": "resolveFlow"
       },
+      {
+        "shell": "apply-prefer.sh",
+        "runWhen": { "args.prefer": ["ours", "theirs"] }
+      },
       {
         "script": "loadTaskState"
       },

package/dist/executables/types.ts

@@ -159,7 +159,20 @@ export interface CliToolSpec {
 }
 
 export interface ScriptEntry {
-  script: string
+  /**
+   * Name of a registered TS function in src/scripts/index.ts. Mutually
+   * exclusive with `shell` — exactly one must be set.
+   */
+  script?: string
+  /**
+   * Filename of a shell script colocated with the executable
+   * (e.g. "apply-prefer.sh"). Resolved relative to the profile's
+   * directory. Invoked via `bash <path> <with-args>` with ctx.args
+   * exposed as env vars (KODY_ARG_<UPPER_NAME>=<value>). A stdout
+   * line `KODY_SKIP_AGENT=true` signals the executor to bypass the
+   * agent. Non-zero exit is treated as a preflight failure.
+   */
+  shell?: string
   /**
    * Optional conditional. Keys are dotted paths into the context (e.g.
    * "args.mode"). Values are a single primitive or an array of primitives.

package/package.json

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