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

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

@@ -140,6 +140,12 @@ ISSUE_NUMBER=""    # board mode: GitHub issue number
 ISSUE_BODY=""      # board mode: issue body (PRD content)
 ISSUE_TITLE_RAW="" # board mode: issue title
 NW_CLI=""          # board mode: resolved night-watch CLI binary
+EXECUTOR_PR_JSON=""
+EXECUTOR_PR_NUMBER=""
+EXECUTOR_PR_URL=""
+EXECUTOR_PR_DRAFT=""
+RESUME_FROM_EXISTING_PR=0
+RESUME_BRANCH_NAME=""
 
 restore_issue_to_ready() {
   local reason="${1:-Execution failed before implementation started.}"
@@ -149,6 +155,26 @@ restore_issue_to_ready() {
   fi
 }
 
+if [ -z "${NW_TARGET_ISSUE:-}" ]; then
+  EXECUTOR_PR_JSON=$(find_executor_resume_pr "${BRANCH_PREFIX}" || true)
+  if [ -n "${EXECUTOR_PR_JSON}" ]; then
+    RESUME_FROM_EXISTING_PR=1
+    RESUME_BRANCH_NAME=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.headRefName // empty' 2>/dev/null || true)
+    EXECUTOR_PR_NUMBER=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
+    EXECUTOR_PR_URL=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.url // empty' 2>/dev/null || true)
+    EXECUTOR_PR_DRAFT=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.isDraft // false' 2>/dev/null || true)
+    if [ -n "${RESUME_BRANCH_NAME}" ]; then
+      log "RESUME: Prioritizing resumable PR #${EXECUTOR_PR_NUMBER:-unknown} on ${RESUME_BRANCH_NAME}"
+    else
+      RESUME_FROM_EXISTING_PR=0
+      EXECUTOR_PR_JSON=""
+      EXECUTOR_PR_NUMBER=""
+      EXECUTOR_PR_URL=""
+      EXECUTOR_PR_DRAFT=""
+    fi
+  fi
+fi
+
 if [ "${NW_BOARD_ENABLED:-}" = "true" ]; then
   # Board mode: discover next task from GitHub Projects board
   NW_CLI=$(resolve_night_watch_cli 2>/dev/null || true)
@@ -169,35 +195,51 @@ if [ "${NW_BOARD_ENABLED:-}" = "true" ]; then
     ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
     ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
   else
-    BOARD_DISCOVERY_STATUS=0
-    if ISSUE_JSON=$(find_eligible_board_issue "${PROJECT_DIR}" "${MAX_RUNTIME}"); then
-      BOARD_DISCOVERY_STATUS=0
-    else
-      BOARD_DISCOVERY_STATUS=$?
-    fi
-    if [ -z "${ISSUE_JSON}" ]; then
-      if [ "${BOARD_DISCOVERY_STATUS}" -eq 2 ]; then
-        log "INFO: Ready board issues were found, but all are in cooldown; skipping this run"
+    if [ "${RESUME_FROM_EXISTING_PR}" = "1" ] && [ -n "${RESUME_BRANCH_NAME}" ]; then
+      ELIGIBLE_PRD="${RESUME_BRANCH_NAME#*/}"
+      ISSUE_NUMBER=$(printf '%s' "${ELIGIBLE_PRD}" | grep -oE '^[0-9]+' || true)
+      if [ -n "${ISSUE_NUMBER}" ]; then
+        ISSUE_JSON=$(gh issue view "${ISSUE_NUMBER}" --json number,title,body 2>/dev/null || true)
+        ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
+        ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
+        "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "In Progress" 2>>"${LOG_FILE}" || \
+          log "WARN: Failed to move resumed issue #${ISSUE_NUMBER} to In Progress"
       else
-        log "INFO: No Ready board issues found; skipping this run"
+        ISSUE_TITLE_RAW=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
       fi
     else
-      ISSUE_NUMBER=$(printf '%s' "${ISSUE_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
-      ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
-      ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
-      if [ -z "${ISSUE_NUMBER}" ]; then
-        log "ERROR: Board mode: failed to parse issue number from JSON"
-        exit 1
+      BOARD_DISCOVERY_STATUS=0
+      if ISSUE_JSON=$(find_eligible_board_issue "${PROJECT_DIR}" "${MAX_RUNTIME}"); then
+        BOARD_DISCOVERY_STATUS=0
+      else
+        BOARD_DISCOVERY_STATUS=$?
+      fi
+      if [ -z "${ISSUE_JSON}" ]; then
+        if [ "${BOARD_DISCOVERY_STATUS}" -eq 2 ]; then
+          log "INFO: Ready board issues were found, but all are in cooldown; skipping this run"
+        else
+          log "INFO: No Ready board issues found; skipping this run"
+        fi
+      else
+        ISSUE_NUMBER=$(printf '%s' "${ISSUE_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
+        ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
+        ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
+        if [ -z "${ISSUE_NUMBER}" ]; then
+          log "ERROR: Board mode: failed to parse issue number from JSON"
+          exit 1
+        fi
+        # Move issue to In Progress (claim it on the board)
+        "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "In Progress" 2>>"${LOG_FILE}" || \
+          log "WARN: Failed to move issue #${ISSUE_NUMBER} to In Progress"
       fi
-      # Move issue to In Progress (claim it on the board)
-      "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "In Progress" 2>>"${LOG_FILE}" || \
-        log "WARN: Failed to move issue #${ISSUE_NUMBER} to In Progress"
     fi
   fi
 
   if [ -n "${ISSUE_NUMBER}" ]; then
-    # Slugify title for branch naming
-    ELIGIBLE_PRD="${ISSUE_NUMBER}-$(printf '%s' "${ISSUE_TITLE_RAW}" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-\|-$//g')"
+    # Slugify title for branch naming unless we're resuming an existing PR branch.
+    if [ "${RESUME_FROM_EXISTING_PR}" != "1" ] || [ -z "${ELIGIBLE_PRD:-}" ]; then
+      ELIGIBLE_PRD="${ISSUE_NUMBER}-$(printf '%s' "${ISSUE_TITLE_RAW}" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-\|-$//g')"
+    fi
     log "BOARD: Processing issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}"
   fi
 fi
@@ -208,8 +250,25 @@ if [ -z "${ISSUE_NUMBER}" ]; then
     emit_result "skip_no_eligible_prd"
     exit 0
   fi
+  if [ "${RESUME_FROM_EXISTING_PR}" = "1" ] && [ -n "${RESUME_BRANCH_NAME}" ]; then
+    RESUME_PRD_NAME="${RESUME_BRANCH_NAME#*/}"
+    if [ -f "${PRD_DIR}/${RESUME_PRD_NAME}.md" ]; then
+      ELIGIBLE_PRD="${RESUME_PRD_NAME}.md"
+      log "RESUME: Using resumable filesystem PRD ${ELIGIBLE_PRD}"
+    else
+      log "WARN: Resumable PR branch ${RESUME_BRANCH_NAME} has no matching PRD file in ${PRD_DIR}; falling back to normal selection"
+      RESUME_FROM_EXISTING_PR=0
+      EXECUTOR_PR_JSON=""
+      EXECUTOR_PR_NUMBER=""
+      EXECUTOR_PR_URL=""
+      EXECUTOR_PR_DRAFT=""
+      RESUME_BRANCH_NAME=""
+    fi
+  fi
   # Filesystem mode: scan PRD directory
-  ELIGIBLE_PRD=$(find_eligible_prd "${PRD_DIR}" "${MAX_RUNTIME}" "${PROJECT_DIR}")
+  if [ -z "${ELIGIBLE_PRD:-}" ]; then
+    ELIGIBLE_PRD=$(find_eligible_prd "${PRD_DIR}" "${MAX_RUNTIME}" "${PROJECT_DIR}")
+  fi
   if [ -z "${ELIGIBLE_PRD}" ]; then
     log "SKIP: No eligible PRDs (all done, in-progress, or blocked)"
     emit_result "skip_no_eligible_prd"
@@ -221,7 +280,11 @@ if [ -z "${ISSUE_NUMBER}" ]; then
 fi
 
 PRD_NAME="${ELIGIBLE_PRD%.md}"
-BRANCH_NAME="${BRANCH_PREFIX}/${PRD_NAME}"
+if [ -n "${RESUME_BRANCH_NAME}" ]; then
+  BRANCH_NAME="${RESUME_BRANCH_NAME}"
+else
+  BRANCH_NAME="${BRANCH_PREFIX}/${PRD_NAME}"
+fi
 WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-${PRD_NAME}"
 BOOKKEEP_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-bookkeeping"
 if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
@@ -248,6 +311,198 @@ count_prs_for_branch() {
   echo "${count:-0}"
 }
 
+extract_prd_title() {
+  local prd_path=""
+  local title=""
+
+  if [ -n "${ISSUE_TITLE_RAW}" ]; then
+    printf '%s' "${ISSUE_TITLE_RAW}"
+    return 0
+  fi
+
+  if [ -f "${PRD_DIR}/${ELIGIBLE_PRD}" ]; then
+    prd_path="${PRD_DIR}/${ELIGIBLE_PRD}"
+  elif [ -f "${PROJECT_DIR}/${PRD_DIR_REL}/${ELIGIBLE_PRD}" ]; then
+    prd_path="${PROJECT_DIR}/${PRD_DIR_REL}/${ELIGIBLE_PRD}"
+  fi
+
+  if [ -n "${prd_path}" ]; then
+    title=$(awk '/^[[:space:]]*#[[:space:]]+/ { sub(/^[[:space:]]*#[[:space:]]+/, "", $0); print; exit }' "${prd_path}" 2>/dev/null || true)
+  fi
+
+  if [ -n "${title}" ]; then
+    printf '%s' "${title}"
+  else
+    printf '%s' "${PRD_NAME}"
+  fi
+}
+
+build_executor_pr_title() {
+  local raw_title=""
+
+  raw_title=$(extract_prd_title)
+  raw_title=$(printf '%s' "${raw_title}" | tr '\r\n' ' ' | sed -E 's/[[:space:]]+/ /g; s/^[[:space:]]+//; s/[[:space:]]+$//')
+  if [ -z "${raw_title}" ]; then
+    raw_title="${PRD_NAME}"
+  fi
+
+  if printf '%s' "${raw_title}" | grep -Eqi '^feat:'; then
+    printf '%s' "${raw_title}"
+  else
+    printf 'feat: %s' "${raw_title}"
+  fi
+}
+
+build_executor_pr_body() {
+  local status_blurb=""
+
+  status_blurb="Status labels:
+- ${NW_EXECUTOR_PARTIAL_LABEL}: implementation is in progress and intentionally incomplete
+- ${NW_EXECUTOR_RESUMABLE_LABEL}: resume this PR before starting new work
+- ${NW_EXECUTOR_READY_REVIEW_LABEL}: implementation is complete and ready for review"
+
+  if [ -n "${ISSUE_NUMBER}" ]; then
+    printf 'Closes #%s\n\nNight Watch manages this draft PR automatically so progress is preserved across retries and timeouts.\n\n%s\n' \
+      "${ISSUE_NUMBER}" \
+      "${status_blurb}"
+  else
+    printf 'Source PRD: `%s/%s`\n\nNight Watch manages this draft PR automatically so progress is preserved across retries and timeouts.\n\n%s\n' \
+      "${PRD_DIR_REL}" \
+      "${ELIGIBLE_PRD}" \
+      "${status_blurb}"
+  fi
+}
+
+refresh_executor_pr_metadata() {
+  EXECUTOR_PR_JSON=$(find_open_pr_for_branch "${BRANCH_NAME}" || true)
+  EXECUTOR_PR_NUMBER=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
+  EXECUTOR_PR_URL=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.url // empty' 2>/dev/null || true)
+  EXECUTOR_PR_DRAFT=$(printf '%s' "${EXECUTOR_PR_JSON}" | jq -r '.isDraft // false' 2>/dev/null || true)
+}
+
+sync_executor_pr_status() {
+  local add_labels="${1:-}"
+  local remove_labels="${2:-}"
+  local mark_ready="${3:-0}"
+
+  if [ -z "${EXECUTOR_PR_NUMBER}" ]; then
+    return 1
+  fi
+
+  ensure_executor_status_labels
+
+  if [ -n "${add_labels}" ]; then
+    gh pr edit "${EXECUTOR_PR_NUMBER}" --add-label "${add_labels}" >> "${LOG_FILE}" 2>&1 || true
+  fi
+  if [ -n "${remove_labels}" ]; then
+    gh pr edit "${EXECUTOR_PR_NUMBER}" --remove-label "${remove_labels}" >> "${LOG_FILE}" 2>&1 || true
+  fi
+  if [ "${mark_ready}" = "1" ]; then
+    gh pr ready "${EXECUTOR_PR_NUMBER}" >> "${LOG_FILE}" 2>&1 || true
+  fi
+
+  refresh_executor_pr_metadata
+  return 0
+}
+
+mark_executor_pr_incomplete() {
+  sync_executor_pr_status \
+    "${NW_EXECUTOR_PARTIAL_LABEL},${NW_EXECUTOR_RESUMABLE_LABEL}" \
+    "${NW_EXECUTOR_READY_REVIEW_LABEL}" \
+    "0"
+}
+
+mark_executor_pr_ready_for_review() {
+  sync_executor_pr_status \
+    "${NW_EXECUTOR_READY_REVIEW_LABEL}" \
+    "${NW_EXECUTOR_PARTIAL_LABEL},${NW_EXECUTOR_RESUMABLE_LABEL}" \
+    "1"
+}
+
+push_executor_branch() {
+  local push_mode="${1:-update}"
+
+  if [ "${push_mode}" = "initial" ]; then
+    if git_push_for_project "${WORKTREE_DIR}" -u origin "${BRANCH_NAME}" >> "${LOG_FILE}" 2>&1; then
+      return 0
+    fi
+  fi
+
+  if git_push_for_project "${WORKTREE_DIR}" origin "${BRANCH_NAME}" --force-with-lease >> "${LOG_FILE}" 2>&1; then
+    return 0
+  fi
+
+  git_push_for_project "${WORKTREE_DIR}" -u origin "${BRANCH_NAME}" >> "${LOG_FILE}" 2>&1
+}
+
+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
+  fi
+
+  ahead_count=$(git -C "${WORKTREE_DIR}" rev-list --count "${base_ref}..HEAD" 2>/dev/null || echo "0")
+  [ "${ahead_count}" -gt 0 ]
+}
+
+ensure_executor_pr() {
+  local pr_title=""
+  local pr_body=""
+  local create_output=""
+
+  refresh_executor_pr_metadata
+  if [ -n "${EXECUTOR_PR_NUMBER}" ]; then
+    log "PR: Reusing existing open PR #${EXECUTOR_PR_NUMBER} for ${BRANCH_NAME}"
+    mark_executor_pr_incomplete
+    return 0
+  fi
+
+  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
+
+  ensure_executor_status_labels
+  if ! create_output=$(
+    gh pr create \
+      --draft \
+      --base "${DEFAULT_BRANCH}" \
+      --head "${BRANCH_NAME}" \
+      --title "${pr_title}" \
+      --body "${pr_body}" 2>> "${LOG_FILE}"
+  ); then
+    log "FAIL: gh pr create failed for ${BRANCH_NAME}"
+    return 1
+  fi
+
+  refresh_executor_pr_metadata
+  if [ -z "${EXECUTOR_PR_URL}" ]; then
+    EXECUTOR_PR_URL=$(printf '%s' "${create_output}" | grep -Eo 'https://[^[:space:]]+/pull/[0-9]+' | tail -n 1 || true)
+  fi
+  if [ -n "${EXECUTOR_PR_NUMBER}" ]; then
+    mark_executor_pr_incomplete
+    log "PR: Draft PR ready at ${EXECUTOR_PR_URL:-unknown} for ${BRANCH_NAME}"
+  else
+    log "WARN: gh pr create succeeded for ${BRANCH_NAME}, but PR metadata lookup did not resolve a number yet"
+  fi
+
+  return 0
+}
+
 checkpoint_timeout_progress() {
   local worktree_dir="${1:?worktree_dir required}"
   local branch_name="${2:?branch_name required}"
@@ -358,7 +613,7 @@ finalize_prd_done() {
       git -C "${BOOKKEEP_WORKTREE_DIR}" commit -m "chore: mark ${ELIGIBLE_PRD} as done (${reason})
 
 Co-Authored-By: Night Watch [${EFFECTIVE_PROVIDER_LABEL}] <noreply@anthropic.com>" || true
-      git -C "${BOOKKEEP_WORKTREE_DIR}" push origin "HEAD:${DEFAULT_BRANCH}" || true
+      git_push_for_project "${BOOKKEEP_WORKTREE_DIR}" origin "HEAD:${DEFAULT_BRANCH}" || true
       log "DONE: ${ELIGIBLE_PRD} ${reason}, PRD moved to done/"
       return 0
     fi
@@ -394,6 +649,7 @@ if [ -z "${EXECUTOR_PROMPT_PATH}" ]; then
   exit 1
 fi
 EXECUTOR_PROMPT_REF=$(instruction_ref_for_prompt "${PROJECT_DIR}" "${EXECUTOR_PROMPT_PATH}")
+PROGRESS_PUSH_CMD=$(project_git_push_command "${BRANCH_NAME}")
 
 if [ -n "${ISSUE_NUMBER}" ]; then
   PROMPT="Implement the following PRD (GitHub issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}):
@@ -416,13 +672,13 @@ Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline:
 5. Run the project's verify/test command between waves to catch issues early
 Follow all CLAUDE.md conventions (if present).
 
-## Finalize — open the PR FIRST, then verify
-- Commit all changes, push, and open the PR immediately:
-  git push -u origin ${BRANCH_NAME}
-  gh pr create --title \"feat: <short title>\" --body \"Closes #${ISSUE_NUMBER}
-
-<summary>\"
-- After the PR is open, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
+## PR Lifecycle
+- The controller owns PR lifecycle and labels for this branch
+- If a draft PR already exists, do NOT create another one and do NOT edit its labels
+- If no PR exists yet, do NOT create one manually; keep pushing to ${BRANCH_NAME} and the controller will open/update it automatically
+- After each completed phase/wave milestone, commit and push progress to the existing branch:
+  ${PROGRESS_PUSH_CMD}
+- When all implementation is complete, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
 - STOP immediately after the final push — do NOT do any additional work, visual checks, or exploration.
 - Do NOT process any other issues — only issue #${ISSUE_NUMBER}"
 else
@@ -445,11 +701,13 @@ Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline:
 5. Run the project's verify/test command between waves to catch issues early
 Follow all CLAUDE.md conventions (if present).
 
-## Finalize — open the PR FIRST, then verify
-- Commit all changes, push, and open the PR immediately:
-  git push -u origin ${BRANCH_NAME}
-  gh pr create --title \"feat: <short title>\" --body \"<summary referencing PRD>\"
-- After the PR is open, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
+## PR Lifecycle
+- The controller owns PR lifecycle and labels for this branch
+- If a draft PR already exists, do NOT create another one and do NOT edit its labels
+- If no PR exists yet, do NOT create one manually; keep pushing to ${BRANCH_NAME} and the controller will open/update it automatically
+- After each completed phase/wave milestone, commit and push progress to the existing branch:
+  ${PROGRESS_PUSH_CMD}
+- When all implementation is complete, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
 - STOP immediately after the final push — do NOT do any additional work, visual checks, or exploration.
 - Do NOT move the PRD to done/ — the cron script handles that
 - Do NOT process any other PRDs — only ${ELIGIBLE_PRD}"
@@ -505,6 +763,19 @@ if ! assert_isolated_worktree "${PROJECT_DIR}" "${WORKTREE_DIR}" "executor"; the
   exit 1
 fi
 
+if ! ensure_executor_pr; then
+  log "FAIL: Unable to create or reuse executor PR for ${BRANCH_NAME}"
+  restore_issue_to_ready "Failed to create or reuse the draft PR for branch ${BRANCH_NAME}. Moved back to Ready for retry."
+  night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+  emit_result "failure" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}|reason=pr_setup_failed|detail=$(latest_failure_detail "${LOG_FILE}")"
+  exit 1
+fi
+
+if [ -n "${ISSUE_NUMBER}" ] && [ -n "${NW_CLI}" ] && [ -n "${EXECUTOR_PR_URL}" ] && [ "${RESUME_FROM_EXISTING_PR}" != "1" ]; then
+  "${NW_CLI}" board comment "${ISSUE_NUMBER}" \
+    --body "Draft PR opened at executor start: ${EXECUTOR_PR_URL} (labels: \`${NW_EXECUTOR_PARTIAL_LABEL}\`, \`${NW_EXECUTOR_RESUMABLE_LABEL}\`)." 2>>"${LOG_FILE}" || true
+fi
+
 # Sandbox: prevent the agent from modifying crontab during execution
 export NW_EXECUTION_CONTEXT=agent
 
@@ -583,7 +854,8 @@ while [ "${ATTEMPT}" -lt "${MAX_RETRIES}" ]; do
     fi
     log "CONTEXT-EXHAUSTED: Session ${ATTEMPT_NUM} hit context limit — checkpointing and resuming (${ATTEMPT}/${MAX_RETRIES})"
     checkpoint_timeout_progress "${WORKTREE_DIR}" "${BRANCH_NAME}" "${ELIGIBLE_PRD}"
-    git -C "${WORKTREE_DIR}" push origin "${BRANCH_NAME}" --force-with-lease >> "${LOG_FILE}" 2>&1 || true
+    push_executor_branch "update" >> "${LOG_FILE}" 2>&1 || true
+    ensure_executor_pr >> "${LOG_FILE}" 2>&1 || true
     # Switch prompt to "continue" mode for the next attempt (fresh context)
     if [ -n "${ISSUE_NUMBER}" ]; then
       PROMPT="Continue implementing PRD (GitHub issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}).
@@ -606,13 +878,13 @@ The previous session ran out of context window. Progress has been committed on b
 Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline for remaining phases only.
 Follow all CLAUDE.md conventions (if present).
 
-## Finalize — open the PR FIRST, then verify
-- Commit all changes, push, and open the PR immediately:
-  git push -u origin ${BRANCH_NAME}
-  gh pr create --title \"feat: <short title>\" --body \"Closes #${ISSUE_NUMBER}
-
-<summary>\"
-- After the PR is open, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
+## PR Lifecycle
+- The controller owns PR lifecycle and labels for this branch
+- If a draft PR already exists, do NOT create another one and do NOT edit its labels
+- If no PR exists yet, do NOT create one manually; keep pushing to ${BRANCH_NAME} and the controller will open/update it automatically
+- After each completed phase/wave milestone, commit and push progress to the existing branch:
+  ${PROGRESS_PUSH_CMD}
+- When all implementation is complete, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
 - STOP immediately after the final push — do NOT do any additional work, visual checks, or exploration.
 - Do NOT process any other issues — only issue #${ISSUE_NUMBER}"
     else
@@ -636,11 +908,13 @@ The previous session ran out of context window. Progress has been committed on b
 Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline for remaining phases only.
 Follow all CLAUDE.md conventions (if present).
 
-## Finalize — open the PR FIRST, then verify
-- Commit all changes, push, and open the PR immediately:
-  git push -u origin ${BRANCH_NAME}
-  gh pr create --title \"feat: <short title>\" --body \"<summary referencing PRD>\"
-- After the PR is open, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
+## PR Lifecycle
+- The controller owns PR lifecycle and labels for this branch
+- If a draft PR already exists, do NOT create another one and do NOT edit its labels
+- If no PR exists yet, do NOT create one manually; keep pushing to ${BRANCH_NAME} and the controller will open/update it automatically
+- After each completed phase/wave milestone, commit and push progress to the existing branch:
+  ${PROGRESS_PUSH_CMD}
+- When all implementation is complete, run final verification (lint, typecheck, tests). If anything fails, fix it, commit, and push again.
 - STOP immediately after the final push — do NOT do any additional work, visual checks, or exploration.
 - Do NOT move the PRD to done/ — the cron script handles that
 - Do NOT process any other PRDs — only ${ELIGIBLE_PRD}"
@@ -800,9 +1074,20 @@ if [ "${EXIT_CODE}" -eq 0 ] && grep -qiF 'Exceeded USD budget' "${LOG_FILE}" 2>/
   EXIT_CODE=1
 fi
 
+if [ ${EXIT_CODE} -eq 0 ]; then
+  if ! ensure_executor_pr; then
+    log "FAIL: Unable to create or reuse executor PR for ${BRANCH_NAME} after provider completion"
+    night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+    emit_result "failure" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}|reason=pr_setup_failed|detail=$(latest_failure_detail "${LOG_FILE}")"
+    EXIT_CODE=1
+  fi
+fi
+
 if [ ${EXIT_CODE} -eq 0 ]; then
   OPEN_PR_COUNT=$(count_prs_for_branch open "${BRANCH_NAME}")
   if [ "${OPEN_PR_COUNT}" -gt 0 ]; then
+    refresh_executor_pr_metadata
+    mark_executor_pr_ready_for_review || true
     if [ -n "${ISSUE_NUMBER}" ]; then
       # Board mode: comment with PR URL, then close issue and move to Done
       PR_URL=$(gh pr list --state open --json headRefName,url \
@@ -858,6 +1143,8 @@ if [ ${EXIT_CODE} -eq 0 ]; then
 elif [ ${EXIT_CODE} -eq 124 ]; then
   log "TIMEOUT: Session limit hit after ${SESSION_MAX_RUNTIME}s while processing ${ELIGIBLE_PRD}"
   checkpoint_timeout_progress "${WORKTREE_DIR}" "${BRANCH_NAME}" "${ELIGIBLE_PRD}"
+  push_executor_branch "update" >> "${LOG_FILE}" 2>&1 || true
+  ensure_executor_pr >> "${LOG_FILE}" 2>&1 || true
   if [ -n "${ISSUE_NUMBER}" ]; then
     "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Ready" 2>>"${LOG_FILE}" || true
     if [ "${SESSION_MAX_RUNTIME}" != "${MAX_RUNTIME}" ]; then
@@ -888,7 +1175,8 @@ elif check_context_exhausted "${LOG_FILE}" "${LOG_LINE_BEFORE}"; then
   # All resume attempts for context exhaustion were used up
   log "FAIL: Context window exhausted after ${MAX_RETRIES} resume attempts for ${ELIGIBLE_PRD}"
   checkpoint_timeout_progress "${WORKTREE_DIR}" "${BRANCH_NAME}" "${ELIGIBLE_PRD}"
-  git -C "${WORKTREE_DIR}" push origin "${BRANCH_NAME}" --force-with-lease >> "${LOG_FILE}" 2>&1 || true
+  push_executor_branch "update" >> "${LOG_FILE}" 2>&1 || true
+  ensure_executor_pr >> "${LOG_FILE}" 2>&1 || true
   if [ -n "${ISSUE_NUMBER}" ]; then
     "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Ready" 2>>"${LOG_FILE}" || true
     "${NW_CLI}" board comment "${ISSUE_NUMBER}" \

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

@@ -87,6 +87,123 @@ validate_provider() {
   return 1
 }
 
+night_watch_push_uses_no_verify() {
+  [ "${NW_GIT_PUSH_NO_VERIFY:-0}" = "1" ]
+}
+
+git_push_for_project() {
+  local repo_dir="${1:?repo_dir required}"
+  shift
+
+  if night_watch_push_uses_no_verify; then
+    git -C "${repo_dir}" push --no-verify "$@"
+  else
+    git -C "${repo_dir}" push "$@"
+  fi
+}
+
+project_git_push_command() {
+  local branch_name="${1:?branch_name required}"
+  local mode="${2:-normal}"
+  local no_verify=""
+
+  if night_watch_push_uses_no_verify; then
+    no_verify=" --no-verify"
+  fi
+
+  case "${mode}" in
+    force-with-lease)
+      printf 'git push%s --force-with-lease origin %s' "${no_verify}" "${branch_name}"
+      ;;
+    *)
+      printf 'git push%s origin %s' "${no_verify}" "${branch_name}"
+      ;;
+  esac
+}
+
+# ── Executor PR status labels ────────────────────────────────────────────────
+
+NW_EXECUTOR_PARTIAL_LABEL="${NW_EXECUTOR_PARTIAL_LABEL:-nw:partial}"
+NW_EXECUTOR_RESUMABLE_LABEL="${NW_EXECUTOR_RESUMABLE_LABEL:-nw:resumable}"
+NW_EXECUTOR_READY_REVIEW_LABEL="${NW_EXECUTOR_READY_REVIEW_LABEL:-nw:ready-review}"
+
+csv_has_label() {
+  local csv="${1:-}"
+  local label="${2:?label required}"
+
+  printf '%s\n' "${csv}" \
+    | tr ',' '\n' \
+    | sed '/^[[:space:]]*$/d' \
+    | grep -Fxq "${label}"
+}
+
+ensure_github_label() {
+  local label_name="${1:?label_name required}"
+  local description="${2:-}"
+  local color="${3:-1d76db}"
+
+  gh label create "${label_name}" \
+    --description "${description}" \
+    --color "${color}" \
+    --force 2>/dev/null || true
+}
+
+ensure_executor_status_labels() {
+  ensure_github_label \
+    "${NW_EXECUTOR_PARTIAL_LABEL}" \
+    "Executor started this PR and work is intentionally incomplete" \
+    "fbca04"
+  ensure_github_label \
+    "${NW_EXECUTOR_RESUMABLE_LABEL}" \
+    "Executor should resume this unfinished PR before starting new work" \
+    "d93f0b"
+  ensure_github_label \
+    "${NW_EXECUTOR_READY_REVIEW_LABEL}" \
+    "Executor finished implementation and the PR is ready for automated/human review" \
+    "0e8a16"
+}
+
+find_open_pr_for_branch() {
+  local branch_name="${1:?branch_name required}"
+  local pr_list=""
+
+  pr_list=$(gh pr list --state open --limit 200 \
+    --json number,headRefName,url,title,isDraft,labels,createdAt 2>/dev/null || echo "[]")
+
+  printf '%s' "${pr_list}" \
+    | jq -c --arg branch_name "${branch_name}" '
+        .[]
+        | select((.headRefName // "") == $branch_name)
+      ' 2>/dev/null \
+    | head -n 1 || true
+}
+
+find_executor_resume_pr() {
+  local branch_prefix="${1:-night-watch}"
+  local pr_list=""
+
+  pr_list=$(gh pr list --state open --limit 200 \
+    --json number,headRefName,url,title,isDraft,labels,createdAt 2>/dev/null || echo "[]")
+
+  printf '%s' "${pr_list}" \
+    | jq -c \
+        --arg primary_prefix "${branch_prefix}/" \
+        --arg resumable_label "${NW_EXECUTOR_RESUMABLE_LABEL}" '
+        [
+          .[]
+          | select(
+              (.headRefName // "" | startswith($primary_prefix))
+              or
+              (.headRefName // "" | startswith("feat/"))
+            )
+          | .labelNames = ((.labels // []) | map(.name))
+          | select((.labelNames | index($resumable_label)) != null)
+        ]
+        | sort_by(.createdAt // "")
+        | .[0] // empty
+      ' 2>/dev/null || true
+}
+
 # ── Generic Provider Command Builder ──────────────────────────────────────────
 
 # Build a provider command from NW_PROVIDER_* environment variables.

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

@@ -192,7 +192,7 @@ append_exit_trap "kill ${WATCHDOG_PID} 2>/dev/null || true"
 # Discover open PRs sorted by creation date (oldest first = FIFO)
 log "INFO: Scanning open PRs..."
 PR_LIST_JSON=$(gh pr list --state open \
-  --json number,headRefName,createdAt,isDraft \
+  --json number,headRefName,createdAt,isDraft,labels \
   --jq 'sort_by(.createdAt)' \
   2>/dev/null || echo "[]")
 
@@ -211,6 +211,7 @@ while IFS= read -r pr_json; do
   pr_number=$(echo "${pr_json}" | jq -r '.number')
   pr_branch=$(echo "${pr_json}" | jq -r '.headRefName')
   is_draft=$(echo "${pr_json}" | jq -r '.isDraft')
+  pr_labels=$(echo "${pr_json}" | jq -r '[.labels[]?.name] | join(",")')
 
   # Skip drafts
   if [ "${is_draft}" = "true" ]; then
@@ -218,6 +219,11 @@ while IFS= read -r pr_json; do
     continue
   fi
 
+  if csv_has_label "${pr_labels:-}" "${NW_EXECUTOR_PARTIAL_LABEL}"; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Skipping partial executor PR"
+    continue
+  fi
+
   # Check branch pattern filter
   if ! matches_branch_patterns "${pr_branch}"; then
     log "DEBUG: PR #${pr_number} (${pr_branch}): Branch pattern mismatch, skipping"