@moretea-labs/forge 1.7.0 → 1.7.1

package/scripts/ship-worktrees.sh

@@ -1,534 +1,4 @@
 #!/bin/bash
 set -euo pipefail
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-if REPO_ROOT="$(git -C "$SCRIPT_DIR/.." rev-parse --show-toplevel 2>/dev/null)"; then
-  :
-elif [[ "$SCRIPT_DIR" == */.ai/harness/scripts ]]; then
-  REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
-else
-  REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-fi
-cd "$REPO_ROOT"
-
-usage() {
-  cat <<'USAGE_EOF'
-Usage:
-  scripts/ship-worktrees.sh [--target <branch>] [--remote <name>] [--slug <slug>] [--ready] [--dry-run]
-  scripts/ship-worktrees.sh --local-merge [--target <branch>] [--slug <slug>] [--dry-run]
-  scripts/ship-worktrees.sh --cleanup-merged [--target <branch>] [--slug <slug>] [--discard-scaffold-only] [--dry-run]
-
-Default mode validates finished contract worktrees, commits them through
-contract-worktree finish --no-merge, pushes their codex/* branches, and opens
-draft PRs. It does not fast-forward main by default.
-USAGE_EOF
-}
-
-json_escape() {
-  local value="$1"
-  value="${value//\\/\\\\}"
-  value="${value//\"/\\\"}"
-  value="${value//$'\n'/\\n}"
-  value="${value//$'\r'/\\r}"
-  value="${value//$'\t'/\\t}"
-  printf '%s' "$value"
-}
-
-policy_get() {
-  local jq_path="$1"
-  local default_value="${2:-}"
-  local value=""
-
-  if [[ -f ".ai/harness/policy.json" ]] && command -v jq >/dev/null 2>&1; then
-    value="$(jq -r "$jq_path // empty" ".ai/harness/policy.json" 2>/dev/null || true)"
-    if [[ -n "$value" ]]; then
-      printf '%s' "$value"
-      return 0
-    fi
-  fi
-
-  printf '%s' "$default_value"
-}
-
-normalize_slug() {
-  printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//; s/-{2,}/-/g'
-}
-
-plan_slug_from_path() {
-  local plan_file="$1"
-  local base slug
-  base="$(basename "$plan_file")"
-  slug="$(printf '%s' "$base" | sed -E 's/^plan-[0-9]{8}-[0-9]{4}-//; s/\.md$//')"
-  normalize_slug "${slug:-contract-task}"
-}
-
-is_linked_worktree() {
-  local git_dir
-  git_dir="$(git rev-parse --git-dir 2>/dev/null || true)"
-  [[ "$git_dir" == *".git/worktrees/"* ]]
-}
-
-current_branch() {
-  git branch --show-current 2>/dev/null || true
-}
-
-load_workflow_state() {
-  if [[ -f ".ai/hooks/lib/workflow-state.sh" ]]; then
-    # shellcheck source=/dev/null
-    . ".ai/hooks/lib/workflow-state.sh"
-  fi
-}
-
-run_cmd() {
-  echo "[Ship] $*"
-  if [[ "$DRY_RUN" -eq 1 ]]; then
-    return 0
-  fi
-  "$@"
-}
-
-fail() {
-  echo "ship-worktrees: $*" >&2
-  exit 1
-}
-
-list_contract_worktrees() {
-  local branch_prefix="$1"
-  git worktree list --porcelain | awk -v prefix="refs/heads/${branch_prefix}" '
-    $1 == "worktree" { path = $2; next }
-    $1 == "branch" && index($2, prefix) == 1 {
-      branch = $2
-      sub(/^refs\/heads\//, "", branch)
-      print branch "\t" path
-    }
-  '
-}
-
-dirty_paths_for_worktree() {
-  local worktree="$1"
-  {
-    git -C "$worktree" diff --name-only
-    git -C "$worktree" diff --cached --name-only
-    git -C "$worktree" ls-files --others --exclude-standard
-  } | sed '/^$/d' | sort -u
-}
-
-is_scaffold_path() {
-  local path="$1"
-  case "$path" in
-    tasks/todos.md|plans/plan-*.md|tasks/contracts/*.contract.md|tasks/reviews/*.review.md|tasks/notes/*.notes.md|.ai/harness/active-plan|.ai/harness/active-worktree|.claude/.active-plan|.ai/harness/worktrees/*.json)
-      return 0
-      ;;
-  esac
-  return 1
-}
-
-non_scaffold_dirty_paths() {
-  local worktree="$1" path
-  while IFS= read -r path; do
-    [[ -n "$path" ]] || continue
-    is_scaffold_path "$path" || printf '%s\n' "$path"
-  done < <(dirty_paths_for_worktree "$worktree")
-}
-
-print_dirty_paths() {
-  local worktree="$1"
-  dirty_paths_for_worktree "$worktree" | sed 's/^/  - /' >&2
-}
-
-fail_dirty_merged_worktree() {
-  local branch="$1" path="$2" non_scaffold
-  echo "ship-worktrees: dirty merged linked worktree: $branch at $path" >&2
-  echo "ship-worktrees: branch ancestry only proves committed changes are in $TARGET_BRANCH; these worktree changes are still outside $TARGET_BRANCH." >&2
-  echo "ship-worktrees: pick/apply/commit useful changes before cleanup; do not use tgz, reset --hard, git clean, or stash as closeout." >&2
-  echo "ship-worktrees: dirty paths:" >&2
-  print_dirty_paths "$path"
-
-  non_scaffold="$(non_scaffold_dirty_paths "$path")"
-  if [[ -z "$non_scaffold" ]]; then
-    echo "ship-worktrees: if these are generated plan/contract/review/notes scaffold only, rerun with --discard-scaffold-only." >&2
-  else
-    echo "ship-worktrees: --discard-scaffold-only is blocked by non-scaffold paths:" >&2
-    printf '%s\n' "$non_scaffold" | sed 's/^/  - /' >&2
-  fi
-  return 1
-}
-
-discard_scaffold_dirty_paths() {
-  local worktree="$1" path
-  local tracked_paths=()
-  local untracked_paths=()
-
-  while IFS= read -r path; do
-    [[ -n "$path" ]] || continue
-    if git -C "$worktree" ls-files --error-unmatch -- "$path" >/dev/null 2>&1; then
-      tracked_paths+=("$path")
-    else
-      untracked_paths+=("$path")
-    fi
-  done < <(dirty_paths_for_worktree "$worktree")
-
-  if [[ "${#tracked_paths[@]}" -gt 0 ]]; then
-    run_cmd git -C "$worktree" reset -- "${tracked_paths[@]}"
-    run_cmd git -C "$worktree" checkout -- "${tracked_paths[@]}"
-  fi
-
-  for path in "${untracked_paths[@]}"; do
-    if [[ "$DRY_RUN" -eq 1 ]]; then
-      echo "[Ship] would remove scaffold file: $worktree/$path"
-    else
-      rm -f "$worktree/$path"
-    fi
-  done
-
-  if [[ "$DRY_RUN" -eq 1 ]]; then
-    echo "[Ship] Would discard scaffold-only changes in $worktree"
-  else
-    echo "[Ship] Discarded scaffold-only changes in $worktree"
-  fi
-}
-
-guard_dirty_merged_worktree() {
-  local branch="$1" path="$2" non_scaffold
-  [[ -z "$(git -C "$path" status --porcelain=v1 --untracked-files=all)" ]] && return 0
-
-  if [[ "$DISCARD_SCAFFOLD_ONLY" -eq 0 ]]; then
-    fail_dirty_merged_worktree "$branch" "$path"
-    return 1
-  fi
-
-  non_scaffold="$(non_scaffold_dirty_paths "$path")"
-  if [[ -n "$non_scaffold" ]]; then
-    echo "ship-worktrees: refusing --discard-scaffold-only for dirty merged linked worktree with non-scaffold paths: $branch at $path" >&2
-    printf '%s\n' "$non_scaffold" | sed 's/^/  - /' >&2
-    return 1
-  fi
-
-  discard_scaffold_dirty_paths "$path"
-}
-
-active_plan_or_empty() {
-  local active_plan=""
-  if declare -F get_active_plan >/dev/null 2>&1; then
-    active_plan="$(get_active_plan 2>/dev/null || true)"
-  elif [[ -f ".ai/harness/active-plan" ]]; then
-    active_plan="$(cat ".ai/harness/active-plan" 2>/dev/null | xargs)"
-  fi
-  printf '%s' "$active_plan"
-}
-
-active_slug_or_empty() {
-  local active_plan
-  active_plan="$(active_plan_or_empty)"
-  [[ -n "$active_plan" ]] || return 0
-  plan_slug_from_path "$active_plan"
-}
-
-require_finish_ready() {
-  local contract_file="" checks_file=".ai/harness/checks/latest.json" checks_error=""
-
-  [[ -x "scripts/contract-worktree.sh" ]] || fail "scripts/contract-worktree.sh is missing or not executable"
-  [[ -x "scripts/verify-sprint.sh" ]] || fail "scripts/verify-sprint.sh is missing or not executable"
-
-  load_workflow_state
-  if declare -F workflow_active_contract >/dev/null 2>&1; then
-    contract_file="$(workflow_active_contract 2>/dev/null || true)"
-  fi
-  if declare -F workflow_checks_file >/dev/null 2>&1; then
-    checks_file="$(workflow_checks_file)"
-  fi
-
-  [[ -n "$contract_file" && -f "$contract_file" ]] || fail "active sprint contract is missing"
-
-  run_cmd bash "scripts/verify-sprint.sh"
-  if [[ "$DRY_RUN" -eq 1 ]]; then
-    return 0
-  fi
-
-  if declare -F workflow_checks_pass >/dev/null 2>&1; then
-    if ! checks_error="$(workflow_checks_pass "$checks_file" "$contract_file")"; then
-      fail "$checks_error"
-    fi
-  elif ! grep -Eq '"status"[[:space:]]*:[[:space:]]*"pass"' "$checks_file"; then
-    fail "structured checks are not passing in $checks_file"
-  fi
-}
-
-finish_contract_worktree() {
-  local merge_mode="$1"
-  require_finish_ready
-  if [[ "$merge_mode" == "local" ]]; then
-    run_cmd bash "scripts/contract-worktree.sh" finish --target "$TARGET_BRANCH"
-  else
-    run_cmd bash "scripts/contract-worktree.sh" finish --no-merge --target "$TARGET_BRANCH"
-  fi
-}
-
-pr_title_for_branch() {
-  local branch="$1"
-  local active_plan title
-  active_plan="$(active_plan_or_empty)"
-  if [[ -n "$active_plan" && -f "$active_plan" ]]; then
-    title="$(awk '/^# / { sub(/^# /, ""); print; exit }' "$active_plan" | sed -E 's/^Plan:[[:space:]]*//')"
-  fi
-  title="${title:-Ship ${branch}}"
-  printf '%s' "$title"
-}
-
-pr_body_for_branch() {
-  local branch="$1"
-  cat <<EOF_BODY
-Automated forge ship for \`${branch}\`.
-
-Checks:
-- Forge /review review artifact recommends pass.
-- External acceptance is recorded in the sprint review.
-- \`bash scripts/verify-sprint.sh\` passed before \`contract-worktree.sh finish --no-merge\`.
-
-This PR intentionally does not merge \`${TARGET_BRANCH}\` locally.
-EOF_BODY
-}
-
-push_branch() {
-  local branch="$1"
-  git remote get-url "$REMOTE_NAME" >/dev/null 2>&1 || fail "remote not found: $REMOTE_NAME"
-  run_cmd git push -u "$REMOTE_NAME" "$branch"
-}
-
-create_or_report_pr() {
-  local branch="$1"
-  local gh_bin existing title body output status
-  local args=()
-  gh_bin="${FORGE_GH_BIN:-gh}"
-  command -v "$gh_bin" >/dev/null 2>&1 || fail "gh is required for default PR ship mode"
-
-  existing="$("$gh_bin" pr list --base "$TARGET_BRANCH" --head "$branch" --json url --jq '.[0].url // ""' 2>/dev/null || true)"
-  if [[ -n "$existing" ]]; then
-    echo "[Ship] PR already exists for $branch: $existing"
-    return 0
-  fi
-
-  title="$(pr_title_for_branch "$branch")"
-  body="$(pr_body_for_branch "$branch")"
-  args=(pr create --base "$TARGET_BRANCH" --head "$branch" --title "$title" --body "$body")
-  if [[ "$DRAFT_PR" -eq 1 ]]; then
-    args+=(--draft)
-  fi
-
-  echo "[Ship] $gh_bin ${args[*]}"
-  if [[ "$DRY_RUN" -eq 1 ]]; then
-    return 0
-  fi
-
-  if output="$("$gh_bin" "${args[@]}" 2>&1)"; then
-    [[ -z "$output" ]] || printf '%s\n' "$output"
-    return 0
-  fi
-
-  status=$?
-  existing="$("$gh_bin" pr list --base "$TARGET_BRANCH" --head "$branch" --json url --jq '.[0].url // ""' 2>/dev/null || true)"
-  if [[ -n "$existing" ]]; then
-    echo "[Ship] PR already exists for $branch after create failure: $existing"
-    return 0
-  fi
-
-  [[ -z "$output" ]] || printf '%s\n' "$output" >&2
-  fail "gh pr create failed for $branch (exit $status)"
-}
-
-ship_linked_pr() {
-  local branch
-  branch="$(current_branch)"
-  [[ -n "$branch" ]] || fail "detached HEAD is not supported"
-  [[ "$branch" != "$TARGET_BRANCH" ]] || fail "refusing to ship target branch as linked worktree"
-  case "$branch" in
-    "$BRANCH_PREFIX"*) ;;
-    *) fail "linked ship expects branch prefix $BRANCH_PREFIX, got $branch" ;;
-  esac
-
-  finish_contract_worktree "pr"
-  push_branch "$branch"
-  create_or_report_pr "$branch"
-}
-
-ship_linked_local_merge() {
-  local branch
-  branch="$(current_branch)"
-  [[ -n "$branch" ]] || fail "detached HEAD is not supported"
-  [[ "$branch" != "$TARGET_BRANCH" ]] || fail "refusing to local-merge target branch as linked worktree"
-  finish_contract_worktree "local"
-}
-
-ship_primary_dirty_pr() {
-  local status active_slug base_slug branch message
-  status="$(git status --porcelain=v1 --untracked-files=all)"
-  [[ -n "$status" ]] || return 0
-
-  [[ "$(current_branch)" == "$TARGET_BRANCH" ]] || fail "main closeout must start from $TARGET_BRANCH"
-  active_slug="$(active_slug_or_empty)"
-  base_slug="${SLUG_OVERRIDE:-$active_slug}"
-  [[ -n "$base_slug" ]] || fail "main worktree has changes; pass --slug or keep an active plan so ship can name the closeout branch"
-  base_slug="$(normalize_slug "$base_slug")"
-  branch="${BRANCH_PREFIX}${base_slug}-main-closeout"
-  message="chore(ship): close out ${base_slug}"
-
-  if git show-ref --verify --quiet "refs/heads/$branch"; then
-    fail "closeout branch already exists: $branch"
-  fi
-
-  run_cmd git switch -c "$branch"
-  run_cmd git add -A
-  run_cmd git commit -m "$message"
-  push_branch "$branch"
-  create_or_report_pr "$branch"
-}
-
-ship_primary_pr() {
-  local branch path shipped=0
-  local child_args=()
-  [[ "$DRY_RUN" -eq 1 ]] && child_args+=(--dry-run)
-  [[ "$DRAFT_PR" -eq 0 ]] && child_args+=(--ready)
-  while IFS=$'\t' read -r branch path; do
-    [[ -n "$branch" && -n "$path" ]] || continue
-    [[ "$(cd "$path" && pwd -P)" != "$(pwd -P)" ]] || continue
-    echo "[Ship] Shipping linked worktree $branch at $path with PR mode"
-    (cd "$path" && bash "scripts/ship-worktrees.sh" --target "$TARGET_BRANCH" --remote "$REMOTE_NAME" "${child_args[@]}")
-    shipped=1
-  done < <(list_contract_worktrees "$BRANCH_PREFIX")
-
-  ship_primary_dirty_pr
-
-  if [[ "$shipped" -eq 0 && -z "$(git status --porcelain=v1 --untracked-files=all)" ]]; then
-    echo "[Ship] Nothing to ship."
-  fi
-}
-
-ship_primary_local_merge() {
-  local branch path slug shipped=0
-  local child_args=()
-  [[ "$DRY_RUN" -eq 1 ]] && child_args+=(--dry-run)
-  while IFS=$'\t' read -r branch path; do
-    [[ -n "$branch" && -n "$path" ]] || continue
-    [[ "$(cd "$path" && pwd -P)" != "$(pwd -P)" ]] || continue
-    slug="${branch#${BRANCH_PREFIX}}"
-    echo "[Ship] Shipping linked worktree $branch at $path with local merge mode"
-    (cd "$path" && bash "scripts/ship-worktrees.sh" --local-merge --target "$TARGET_BRANCH" "${child_args[@]}")
-    run_cmd bash "scripts/contract-worktree.sh" cleanup --slug "$slug" --target "$TARGET_BRANCH"
-    shipped=1
-  done < <(list_contract_worktrees "$BRANCH_PREFIX")
-
-  if [[ "$shipped" -eq 0 ]]; then
-    echo "[Ship] No linked contract worktrees found for local merge."
-  fi
-}
-
-cleanup_merged() {
-  local branch path slug cleaned=0
-  ! is_linked_worktree || fail "--cleanup-merged must run from the target primary worktree"
-
-  while IFS=$'\t' read -r branch path; do
-    [[ -n "$branch" && -n "$path" ]] || continue
-    slug="${branch#${BRANCH_PREFIX}}"
-    if git merge-base --is-ancestor "$branch" "$TARGET_BRANCH" >/dev/null 2>&1; then
-      guard_dirty_merged_worktree "$branch" "$path" || exit 1
-      if [[ "$DRY_RUN" -eq 1 ]]; then
-        run_cmd bash "scripts/contract-worktree.sh" cleanup --slug "$slug" --target "$TARGET_BRANCH" --dry-run
-      else
-        run_cmd bash "scripts/contract-worktree.sh" cleanup --slug "$slug" --target "$TARGET_BRANCH"
-      fi
-      cleaned=1
-    else
-      echo "[Ship] Skipped unmerged branch: $branch"
-    fi
-  done < <(list_contract_worktrees "$BRANCH_PREFIX")
-
-  if [[ "$cleaned" -eq 0 ]]; then
-    echo "[Ship] No merged contract worktrees to clean."
-  fi
-}
-
-MODE="pr"
-TARGET_BRANCH=""
-REMOTE_NAME="origin"
-SLUG_OVERRIDE=""
-DRAFT_PR=1
-DRY_RUN=0
-DISCARD_SCAFFOLD_ONLY=0
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --target)
-      [[ -n "${2:-}" ]] || fail "--target requires a value"
-      TARGET_BRANCH="$2"
-      shift 2
-      ;;
-    --remote)
-      [[ -n "${2:-}" ]] || fail "--remote requires a value"
-      REMOTE_NAME="$2"
-      shift 2
-      ;;
-    --slug)
-      [[ -n "${2:-}" ]] || fail "--slug requires a value"
-      SLUG_OVERRIDE="$(normalize_slug "$2")"
-      shift 2
-      ;;
-    --ready)
-      DRAFT_PR=0
-      shift
-      ;;
-    --draft)
-      DRAFT_PR=1
-      shift
-      ;;
-    --dry-run)
-      DRY_RUN=1
-      shift
-      ;;
-    --local-merge)
-      MODE="local-merge"
-      shift
-      ;;
-    --cleanup-merged)
-      MODE="cleanup-merged"
-      shift
-      ;;
-    --discard-scaffold-only)
-      DISCARD_SCAFFOLD_ONLY=1
-      shift
-      ;;
-    --help|-h)
-      usage
-      exit 0
-      ;;
-    *)
-      fail "unknown argument: $1"
-      ;;
-  esac
-done
-
-git rev-parse --is-inside-work-tree >/dev/null 2>&1 || fail "not inside a git repository"
-TARGET_BRANCH="${TARGET_BRANCH:-$(policy_get '.worktree_strategy.merge_back.target' 'main')}"
-BRANCH_PREFIX="$(policy_get '.worktree_strategy.branch_prefix' 'codex/')"
-
-case "$MODE" in
-  pr)
-    if is_linked_worktree; then
-      ship_linked_pr
-    else
-      ship_primary_pr
-    fi
-    ;;
-  local-merge)
-    if is_linked_worktree; then
-      ship_linked_local_merge
-    else
-      ship_primary_local_merge
-    fi
-    ;;
-  cleanup-merged)
-    cleanup_merged
-    ;;
-  *)
-    fail "unsupported mode: $MODE"
-    ;;
-esac
+exec "$SCRIPT_DIR/lib/run-forge-helper.sh" "ship-worktrees.sh" "$@"