@kody-ade/kody-engine 0.3.24 → 0.3.25

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.24",
+  version: "0.3.25",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -227,6 +227,7 @@ function parseReleaseConfig(raw) {
   if (typeof r.e2eCommand === "string") out.e2eCommand = r.e2eCommand;
   if (typeof r.draftRelease === "boolean") out.draftRelease = r.draftRelease;
   if (typeof r.releaseBranch === "string") out.releaseBranch = r.releaseBranch;
+  if (typeof r.devBranch === "string" && r.devBranch.length > 0) out.devBranch = r.devBranch;
   if (typeof r.timeoutMs === "number" && r.timeoutMs > 0) out.timeoutMs = Math.floor(r.timeoutMs);
   return Object.keys(out).length > 0 ? out : void 0;
 }

package/dist/executables/release-deploy/deploy.sh

@@ -1,17 +1,26 @@
 #!/usr/bin/env bash
 #
-# release-deploy: run the configured deployCommand and/or notifyCommand
-# after release-publish has tagged and published the artifact. No agent.
+# release-deploy: promote the integration branch (dev) to the default
+# branch (main). Runs AFTER release-publish has tagged the bump commit
+# on dev. No agent.
 #
-# Both commands are optional. With neither set, deploy is a no-op success
-# (the orchestrator still advances to "done").
+# Behavior:
+#   - If release.devBranch is unset OR equals git.defaultBranch:
+#       no-op success (single-branch repos have nothing to promote).
+#   - Else: fast-forward `defaultBranch` to `devBranch` and push. If a
+#     fast-forward isn't possible (defaultBranch has commits dev doesn't
+#     have), fall back to `git merge --no-ff` so history is preserved.
+#
+# After the merge, runs `release.notifyCommand` (if set) as a best-effort
+# post-deploy hook.
 #
 # Inputs (env):
 #   KODY_ARG_DRY_RUN          true|false
 #   KODY_ARG_ISSUE            triggering issue/PR number (optional)
 #
 # Config (env):
-#   KODY_CFG_RELEASE_DEPLOYCOMMAND     optional; $VERSION substituted
+#   KODY_CFG_GIT_DEFAULTBRANCH         e.g. main
+#   KODY_CFG_RELEASE_DEVBRANCH         e.g. dev (unset → no-op)
 #   KODY_CFG_RELEASE_NOTIFYCOMMAND     optional; $VERSION substituted
 #   KODY_CFG_RELEASE_TIMEOUTMS         per-command timeout in ms (default 600000)
 #
@@ -22,52 +31,62 @@
 set -euo pipefail
 
 dry_run="${KODY_ARG_DRY_RUN:-false}"
-deploy_cmd="${KODY_CFG_RELEASE_DEPLOYCOMMAND:-}"
+default_branch="${KODY_CFG_GIT_DEFAULTBRANCH:-main}"
+dev_branch="${KODY_CFG_RELEASE_DEVBRANCH:-}"
 notify_cmd="${KODY_CFG_RELEASE_NOTIFYCOMMAND:-}"
 timeout_ms="${KODY_CFG_RELEASE_TIMEOUTMS:-600000}"
 timeout_s=$((timeout_ms / 1000))
 
 read_pkg_version() {
-  python3 -c "import json; print(json.load(open('package.json'))['version'])"
+  python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "unknown"
 }
 
-if [[ ! -f package.json ]]; then
-  echo "KODY_REASON=release deploy: package.json not found"
-  echo "KODY_SKIP_AGENT=true"
-  exit 99
-fi
-
 version=$(read_pkg_version)
 echo "→ release deploy: v${version}"
 
-if [[ -z "$deploy_cmd" && -z "$notify_cmd" ]]; then
-  echo "KODY_REASON=no deployCommand or notifyCommand configured — nothing to run"
+# Single-branch repos: nothing to promote.
+if [[ -z "$dev_branch" || "$dev_branch" == "$default_branch" ]]; then
+  echo "KODY_REASON=no devBranch configured (or equals defaultBranch) — nothing to promote"
   echo "KODY_SKIP_AGENT=true"
   exit 0
 fi
 
 if [[ "$dry_run" == "true" ]]; then
-  echo "KODY_REASON=dry-run — would run deploy/notify commands"
+  echo "KODY_REASON=dry-run — would merge ${dev_branch} into ${default_branch}"
   echo "KODY_SKIP_AGENT=true"
   exit 0
 fi
 
 export HUSKY=0 SKIP_HOOKS=1 CI="${CI:-1}"
 
-deploy_status="skipped"
-if [[ -n "$deploy_cmd" ]]; then
-  cmd="${deploy_cmd//\$VERSION/$version}"
-  echo "  deploy: ${cmd}"
-  if timeout "${timeout_s}" bash -c "$cmd"; then
-    deploy_status="ok"
-  else
-    deploy_status="failed"
-    echo "KODY_REASON=release deploy: deployCommand failed"
+# Sync local refs.
+git fetch origin "$dev_branch" "$default_branch" --tags
+
+# Move to defaultBranch and reset to its remote tip.
+git checkout "$default_branch"
+git reset --hard "origin/$default_branch"
+
+# Try fast-forward first; fall back to a merge commit.
+if git merge --ff-only "origin/$dev_branch" 2>/dev/null; then
+  echo "  fast-forwarded ${default_branch} to origin/${dev_branch}"
+else
+  echo "  fast-forward not possible — using --no-ff merge"
+  if ! git -c commit.gpgsign=false merge --no-ff "origin/$dev_branch" -m "chore: deploy ${dev_branch} → ${default_branch} (v${version})"; then
+    echo "KODY_REASON=release deploy: merge ${dev_branch} into ${default_branch} failed (conflicts?)"
     echo "KODY_SKIP_AGENT=true"
     exit 1
   fi
 fi
 
+if ! git push origin "$default_branch"; then
+  echo "KODY_REASON=release deploy: push to origin/${default_branch} failed"
+  echo "KODY_SKIP_AGENT=true"
+  exit 1
+fi
+
+echo "  pushed ${default_branch}"
+
+# Optional post-deploy notification.
 notify_status="skipped"
 if [[ -n "$notify_cmd" ]]; then
   cmd="${notify_cmd//\$VERSION/$version}"
@@ -80,5 +99,5 @@ if [[ -n "$notify_cmd" ]]; then
   fi
 fi
 
-echo "KODY_REASON=deploy=${deploy_status} notify=${notify_status}"
+echo "KODY_REASON=promoted ${dev_branch} → ${default_branch} (notify=${notify_status})"
 echo "KODY_SKIP_AGENT=true"

package/dist/executables/release-prepare/prepare.sh

@@ -26,6 +26,10 @@ bump="${KODY_ARG_BUMP:-patch}"
 dry_run="${KODY_ARG_DRY_RUN:-false}"
 prefer="${KODY_ARG_PREFER:-}"
 default_branch="${KODY_CFG_GIT_DEFAULTBRANCH:-main}"
+dev_branch="${KODY_CFG_RELEASE_DEVBRANCH:-}"
+# PR target: dev branch when configured (and different from default), else default.
+pr_base="${dev_branch:-$default_branch}"
+[[ "$pr_base" == "$default_branch" ]] && pr_base="$default_branch"
 version_files_json="${KODY_CFG_RELEASE_VERSIONFILES:-}"
 
 fail() {
@@ -313,8 +317,8 @@ _… truncated; see CHANGELOG.md_"
   else
     body_entry="$entry"
   fi
-  body=$'Automated release PR opened by kody.\n\n'"$body_entry"$'\n\nMerge this and then run `kody release --mode finalize`.'
-  pr_url=$(printf '%s' "$body" | gh pr create --head "$release_branch" --base "$default_branch" --title "chore: release ${tag}" --body-file -)
+  body=$'Automated release PR opened by kody.\n\n'"$body_entry"$'\n\nThe release orchestrator will merge this into `'"${pr_base}"$'` and continue to publish + deploy.'
+  pr_url=$(printf '%s' "$body" | gh pr create --head "$release_branch" --base "$pr_base" --title "chore: release ${tag}" --body-file -)
 fi
 
 if [[ -z "$pr_url" ]]; then

package/dist/executables/release-publish/publish.sh

@@ -24,6 +24,13 @@ set -euo pipefail
 
 dry_run="${KODY_ARG_DRY_RUN:-false}"
 default_branch="${KODY_CFG_GIT_DEFAULTBRANCH:-main}"
+dev_branch="${KODY_CFG_RELEASE_DEVBRANCH:-}"
+# Tag the branch where the release-prepare PR was merged: devBranch when set
+# (and different from default), else defaultBranch.
+target_branch="$default_branch"
+if [[ -n "$dev_branch" && "$dev_branch" != "$default_branch" ]]; then
+  target_branch="$dev_branch"
+fi
 publish_cmd="${KODY_CFG_RELEASE_PUBLISHCOMMAND:-}"
 draft="${KODY_CFG_RELEASE_DRAFTRELEASE:-false}"
 timeout_ms="${KODY_CFG_RELEASE_TIMEOUTMS:-600000}"
@@ -46,10 +53,10 @@ fi
 export HUSKY=0 SKIP_HOOKS=1 CI="${CI:-1}"
 
 # Make sure we're on the merged commit. The orchestrator merged the release
-# PR into default_branch; pull so the local tree has the bump commit.
-git fetch origin "$default_branch" --tags
-git checkout "$default_branch"
-git reset --hard "origin/$default_branch"
+# PR into target_branch; pull so the local tree has the bump commit.
+git fetch origin "$target_branch" --tags
+git checkout "$target_branch"
+git reset --hard "origin/$target_branch"
 
 version=$(read_pkg_version)
 tag="v${version}"

package/package.json

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