@kody-ade/kody-engine 0.3.25 → 0.3.27

package/dist/bin/kody.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@kody-ade/kody-engine",
-  version: "0.3.25",
+  version: "0.3.27",
   description: "kody \u2014 autonomous development engine. Single-session Claude Code agent behind a generic executor + declarative executable profiles.",
   license: "MIT",
   type: "module",
@@ -223,11 +223,9 @@ function parseReleaseConfig(raw) {
   if (Array.isArray(r.versionFiles)) out.versionFiles = r.versionFiles.filter((f) => typeof f === "string");
   if (typeof r.publishCommand === "string") out.publishCommand = r.publishCommand;
   if (typeof r.notifyCommand === "string") out.notifyCommand = r.notifyCommand;
-  if (typeof r.deployCommand === "string") out.deployCommand = r.deployCommand;
   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,30 +1,31 @@
 #!/usr/bin/env bash
 #
-# 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.
+# release-deploy: open a PR from the integration branch (git.defaultBranch)
+# into the production target (release.releaseBranch) — the human gate for
+# production deploy. The orchestrator's chain ENDS with this PR opened;
+# merging it is a manual step. No agent.
 #
 # 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.
+#   - If release.releaseBranch is unset OR equals git.defaultBranch:
+#       no-op success (single-branch repos have nothing to deploy).
+#   - Else: idempotently open PR `defaultBranch` → `releaseBranch`. If an
+#     open PR for that pair already exists, reuse its URL.
 #
-# After the merge, runs `release.notifyCommand` (if set) as a best-effort
-# post-deploy hook.
+# After the PR is opened, 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_GIT_DEFAULTBRANCH         e.g. main
-#   KODY_CFG_RELEASE_DEVBRANCH         e.g. dev (unset → no-op)
+#   KODY_CFG_GIT_DEFAULTBRANCH         e.g. dev
+#   KODY_CFG_RELEASE_RELEASEBRANCH     e.g. main (unset → no-op)
 #   KODY_CFG_RELEASE_NOTIFYCOMMAND     optional; $VERSION substituted
 #   KODY_CFG_RELEASE_TIMEOUTMS         per-command timeout in ms (default 600000)
 #
 # Stdout signals:
+#   KODY_PR_URL=<deploy PR url>
 #   KODY_REASON=<text>
 #   KODY_SKIP_AGENT=true
 
@@ -32,61 +33,71 @@ set -euo pipefail
 
 dry_run="${KODY_ARG_DRY_RUN:-false}"
 default_branch="${KODY_CFG_GIT_DEFAULTBRANCH:-main}"
-dev_branch="${KODY_CFG_RELEASE_DEVBRANCH:-}"
+release_branch="${KODY_CFG_RELEASE_RELEASEBRANCH:-}"
 notify_cmd="${KODY_CFG_RELEASE_NOTIFYCOMMAND:-}"
 timeout_ms="${KODY_CFG_RELEASE_TIMEOUTMS:-600000}"
 timeout_s=$((timeout_ms / 1000))
 
-read_pkg_version() {
+# Read version from the integration branch tip (where the bump commit lives),
+# not from the local working tree (the workflow may have checked out another
+# branch). Falls back to local package.json if the fetch fails.
+read_version() {
+  local branch="$1"
+  if git fetch origin "$branch" --quiet 2>/dev/null; then
+    if pkg=$(git show "origin/${branch}:package.json" 2>/dev/null); then
+      echo "$pkg" | python3 -c "import json,sys; print(json.load(sys.stdin)['version'])" 2>/dev/null && return
+    fi
+  fi
   python3 -c "import json; print(json.load(open('package.json'))['version'])" 2>/dev/null || echo "unknown"
 }
 
-version=$(read_pkg_version)
+version=$(read_version "$default_branch")
 echo "→ release deploy: v${version}"
 
-# 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"
+# Single-branch repos: nothing to deploy.
+if [[ -z "$release_branch" || "$release_branch" == "$default_branch" ]]; then
+  echo "KODY_REASON=no releaseBranch configured (or equals defaultBranch) — nothing to deploy"
   echo "KODY_SKIP_AGENT=true"
   exit 0
 fi
 
 if [[ "$dry_run" == "true" ]]; then
-  echo "KODY_REASON=dry-run — would merge ${dev_branch} into ${default_branch}"
+  echo "KODY_REASON=dry-run — would open PR ${default_branch} → ${release_branch}"
   echo "KODY_SKIP_AGENT=true"
   exit 0
 fi
 
 export HUSKY=0 SKIP_HOOKS=1 CI="${CI:-1}"
 
-# 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"
+# Idempotency: reuse an open PR for this branch pair if one exists.
+existing=$(gh pr list --head "$default_branch" --base "$release_branch" --state open --json url --limit 1 2>/dev/null \
+  | python3 -c 'import json,sys; data=json.load(sys.stdin); print(data[0]["url"] if data else "")' 2>/dev/null \
+  || echo "")
 
-# 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}"
+if [[ -n "$existing" ]]; then
+  echo "  reusing existing deploy PR: ${existing}"
+  pr_url="$existing"
 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?)"
+  body="Automated deploy PR opened by kody — promotes \`${default_branch}\` to \`${release_branch}\` for release **v${version}**.
+
+Merge this PR to deploy v${version} to \`${release_branch}\`."
+  if ! pr_url=$(printf '%s' "$body" | gh pr create --head "$default_branch" --base "$release_branch" --title "deploy: ${default_branch} → ${release_branch} (v${version})" --body-file -); then
+    echo "KODY_REASON=release deploy: gh pr create failed"
     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"
+if [[ -z "$pr_url" ]]; then
+  echo "KODY_REASON=release deploy: empty PR URL after gh pr create"
   echo "KODY_SKIP_AGENT=true"
   exit 1
 fi
 
-echo "  pushed ${default_branch}"
+echo "RELEASE_DEPLOY_PR=${pr_url}"
+echo "KODY_PR_URL=${pr_url}"
 
-# Optional post-deploy notification.
+# Optional post-deploy notification (e.g. Slack ping that a deploy PR is up).
 notify_status="skipped"
 if [[ -n "$notify_cmd" ]]; then
   cmd="${notify_cmd//\$VERSION/$version}"
@@ -99,5 +110,5 @@ if [[ -n "$notify_cmd" ]]; then
   fi
 fi
 
-echo "KODY_REASON=promoted ${dev_branch} → ${default_branch} (notify=${notify_status})"
+echo "KODY_REASON=opened deploy PR ${default_branch} → ${release_branch} (notify=${notify_status})"
 echo "KODY_SKIP_AGENT=true"

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

@@ -26,10 +26,6 @@ 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() {
@@ -317,8 +313,8 @@ _… truncated; see CHANGELOG.md_"
   else
     body_entry="$entry"
   fi
-  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 -)
+  body=$'Automated release PR opened by kody.\n\n'"$body_entry"$'\n\nThe release orchestrator will merge this into `'"${default_branch}"$'` and continue to publish + deploy.'
+  pr_url=$(printf '%s' "$body" | gh pr create --head "$release_branch" --base "$default_branch" --title "chore: release ${tag}" --body-file -)
 fi
 
 if [[ -z "$pr_url" ]]; then

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

@@ -24,13 +24,6 @@ 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}"
@@ -53,10 +46,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 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"
+# 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"
 
 version=$(read_pkg_version)
 tag="v${version}"

package/package.json

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