fix: resolve unbound MAIN_REPO/PRE_MERGE_SHA on --resume and remove dead archive phase (merge worktree-20260323-193735)

Author: JoeOakhartNava

plugins/dso/scripts/merge-to-main.sh

@@ -47,24 +47,6 @@ WORKTREE_DIR="$REPO_ROOT"
 _SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 : "${CLAUDE_PLUGIN_ROOT:?CLAUDE_PLUGIN_ROOT must be set}"
 
-# --- Count closed tickets using a single awk pass over all .md files ---
-# Usage: _count_closed_tickets <tickets_dir>
-# Returns: integer count of .md files whose YAML front-matter contains "status: closed"
-_count_closed_tickets() {
-    local dir="$1"
-    local _result
-    _result=$(find "$dir" -maxdepth 1 -name "*.md" -type f -print0 \
-        | xargs -0 awk '
-            FILENAME != _prev {
-                if (_prev != "" && _found) count++
-                _prev=FILENAME; _found=0; _n=0
-            }
-            /^---$/ { _n++; if(_n==2) nextfile }
-            _n==1 && /^status:[[:space:]]*closed/ { _found=1 }
-            END { if (_prev != "" && _found) count++; print count+0 }
-        ' 2>/dev/null)
-    echo "${_result:-0}"
-}
 
 # --- State file helpers (resumable merge support) ---
 
@@ -917,6 +899,22 @@ fi
 _state_init
 trap '_sigurg_handler' URG
 
+# --- Resolve MAIN_REPO early so all phases can use it (including --resume) ---
+# MAIN_REPO is the path to the main (non-worktree) checkout. Phases like
+# validate and ci_trigger need it, but it was previously set only inside
+# _phase_sync — causing unbound variable errors on --resume.
+MAIN_REPO=$(dirname "$(git rev-parse --git-common-dir)")
+if [ -z "$MAIN_REPO" ]; then
+    echo "ERROR: Could not determine main repo path."
+    exit 1
+fi
+
+# PRE_MERGE_SHA: set to current HEAD as a safe default. _phase_merge overwrites
+# it with the actual pre-merge SHA before merging. On --resume (merge already
+# done), this default is stale but _phase_ci_trigger handles empty/stale values
+# gracefully via git diff error suppression (2>/dev/null).
+PRE_MERGE_SHA=$(git -C "$MAIN_REPO" rev-parse HEAD 2>/dev/null || echo "")
+
 # =============================================================================
 # Phase functions — each wraps a sequential phase with state recording
 # =============================================================================
@@ -1230,38 +1228,10 @@ _phase_push() {
     fi
 }
 
-# --- 4.5) Archive closed tickets if count exceeds threshold ---
+# --- 4.5) Archive phase (no-op — archive-closed-tickets.sh removed in v3 cleanup) ---
 _phase_archive() {
     _CURRENT_PHASE="archive"
     _state_write_phase "archive"
-
-    _ARCHIVE_SCRIPT="$_SCRIPT_DIR/archive-closed-tickets.sh"
-    if [ ! -f "$_ARCHIVE_SCRIPT" ]; then
-        _ARCHIVE_SCRIPT="$MAIN_REPO/scripts/archive-closed-tickets.sh"
-    fi
-    if [ -f "$_ARCHIVE_SCRIPT" ]; then
-        _CLOSED_COUNT=$(_count_closed_tickets "$TICKETS_DIR")
-        if [ "$_CLOSED_COUNT" -gt 100 ]; then
-            echo "Archiving $_CLOSED_COUNT closed ticket(s)..."
-            _ARCHIVE_OUT=$(TICKETS_DIR="$TICKETS_DIR" bash "$_ARCHIVE_SCRIPT" 2>&1)
-            echo "$_ARCHIVE_OUT"
-            # Commit archived tickets if any were moved
-            if echo "$_ARCHIVE_OUT" | grep -qE '^Archived [1-9]'; then
-                git add "$TICKETS_DIR"/archive/ 2>/dev/null || true
-                git add -u "$TICKETS_DIR"/ 2>/dev/null || true
-                if ! git diff --cached --quiet 2>/dev/null; then
-                    git commit -m "chore: archive closed tickets [skip ci]" --quiet
-                    git push --quiet 2>&1 || echo "WARNING: Push of archive commit failed — retry with git push."
-                    echo "OK: Archived tickets committed and pushed."
-                fi
-            fi
-        else
-            echo "INFO: $_CLOSED_COUNT closed ticket(s) — below threshold (100), skipping archive."
-        fi
-    else
-        echo "INFO: archive-closed-tickets.sh not found — skipping archive step."
-    fi
-
     _state_mark_complete "archive"
 }
 

tests/scripts/test-merge-to-main.sh

@@ -146,59 +146,10 @@ assert_ne "test_parallel_validation_fmt_exit_code_captured" "0" "$_FMT_RC"
 assert_ne "test_parallel_validation_lint_exit_code_captured" "0" "$_LINT_RC"
 
 # =============================================================================
-# Test: _count_closed_tickets() function exists in merge-to-main.sh
+# Test: _count_closed_tickets() removed (v2 cleanup — v3 uses ticket list)
 # =============================================================================
 HAS_COUNT_FUNCTION=$(grep -c '_count_closed_tickets' "$MERGE_SCRIPT" || true)
-assert_ne "test_count_closed_tickets_function_exists" "0" "$HAS_COUNT_FUNCTION"
-
-# =============================================================================
-# Test: _count_closed_tickets() uses single awk pass (not -exec awk per file)
-# =============================================================================
-HAS_EXEC_AWK=$(grep -c '\-exec awk' "$MERGE_SCRIPT" || true)
-assert_eq "test_count_closed_tickets_no_exec_awk" "0" "$HAS_EXEC_AWK"
-
-# =============================================================================
-# Test: _count_closed_tickets() returns correct count for temp dir fixture
-# Create a temp dir with 2 open + 3 closed tickets; assert count == 3
-# =============================================================================
-_TC_TMPDIR=$(mktemp -d)
-trap 'rm -rf "$_TC_TMPDIR"' EXIT
-
-# Helper to write a minimal markdown ticket with given status
-_write_ticket() {
-    local file="$1" status="$2"
-    printf -- '---\nstatus: %s\ntitle: Ticket %s\n---\nBody text.\n' "$status" "$status" > "$file"
-}
-
-_write_ticket "$_TC_TMPDIR/open1.md" "open"
-_write_ticket "$_TC_TMPDIR/open2.md" "open"
-_write_ticket "$_TC_TMPDIR/closed1.md" "closed"
-_write_ticket "$_TC_TMPDIR/closed2.md" "closed"
-_write_ticket "$_TC_TMPDIR/closed3.md" "closed"
-
-# Source the function under test by extracting and eval-ing just the function
-# definition from merge-to-main.sh (avoid executing the full script).
-_FN_BODY=$(awk '/^_count_closed_tickets\(\)/{found=1} found{print; if(/^\}$/){exit}}' "$MERGE_SCRIPT")
-if [[ -z "$_FN_BODY" ]]; then
-    # Function not yet defined — RED: mark both behavioural tests as failing
-    assert_eq "test_count_closed_tickets_correct_count" "3" "FUNCTION_NOT_FOUND"
-    assert_eq "test_count_closed_tickets_open_not_counted" "0" "FUNCTION_NOT_FOUND"
-else
-    eval "$_FN_BODY"
-    _GOT_COUNT=$(_count_closed_tickets "$_TC_TMPDIR")
-    assert_eq "test_count_closed_tickets_correct_count" "3" "$_GOT_COUNT"
-
-    # Also verify open tickets are NOT counted (open-only dir)
-    _OPEN_TMPDIR=$(mktemp -d)
-    trap 'rm -rf "$_OPEN_TMPDIR"' EXIT
-    _write_ticket "$_OPEN_TMPDIR/open1.md" "open"
-    _write_ticket "$_OPEN_TMPDIR/open2.md" "open"
-    _GOT_OPEN_COUNT=$(_count_closed_tickets "$_OPEN_TMPDIR")
-    assert_eq "test_count_closed_tickets_open_not_counted" "0" "$_GOT_OPEN_COUNT"
-    rm -rf "$_OPEN_TMPDIR"
-fi
-
-rm -rf "$_TC_TMPDIR"
+assert_eq "test_count_closed_tickets_removed" "0" "$HAS_COUNT_FUNCTION"
 
 # =============================================================================
 # State file helper function tests