@jonit-dev/night-watch-cli 1.8.10-beta.7 → 1.8.10-beta.8

package/dist/scripts/night-watch-cron.sh

@@ -439,12 +439,8 @@ executor_branch_has_commits_ahead_of_base() {
   local base_ref=""
   local ahead_count="0"
 
-  if git -C "${WORKTREE_DIR}" rev-parse --verify "origin/${DEFAULT_BRANCH}" >/dev/null 2>&1; then
-    base_ref="origin/${DEFAULT_BRANCH}"
-  elif git -C "${WORKTREE_DIR}" rev-parse --verify "${DEFAULT_BRANCH}" >/dev/null 2>&1; then
-    base_ref="${DEFAULT_BRANCH}"
-  else
-    return 0
+  if ! base_ref=$(resolve_worktree_base_ref "${WORKTREE_DIR}" "${DEFAULT_BRANCH}" 2>/dev/null); then
+    return 1
   fi
 
   ahead_count=$(git -C "${WORKTREE_DIR}" rev-list --count "${base_ref}..HEAD" 2>/dev/null || echo "0")
@@ -466,16 +462,16 @@ ensure_executor_pr() {
   pr_title=$(build_executor_pr_title)
   pr_body=$(build_executor_pr_body)
 
-  log "PR: Creating draft PR for ${BRANCH_NAME}"
-  if ! push_executor_branch "initial"; then
-    log "WARN: Initial push for ${BRANCH_NAME} failed before PR creation"
-  fi
-
   if ! executor_branch_has_commits_ahead_of_base; then
     log "PR: Deferring draft PR creation for ${BRANCH_NAME} until it has commits beyond ${DEFAULT_BRANCH}"
     return 0
   fi
 
+  log "PR: Creating draft PR for ${BRANCH_NAME}"
+  if ! push_executor_branch "initial"; then
+    log "WARN: Initial push for ${BRANCH_NAME} failed before PR creation"
+  fi
+
   ensure_executor_status_labels
   if ! create_output=$(
     gh pr create \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonit-dev/night-watch-cli",
-  "version": "1.8.10-beta.7",
+  "version": "1.8.10-beta.8",
   "description": "AI agent that implements your specs, opens PRs, and reviews code overnight. Queue GitHub issues or PRDs, wake up to pull requests.",
   "type": "module",
   "bin": {