fix: prevent double-bump in _phase_version_bump on interrupted resume (6ea9-a2af) (merge worktree-20260324-164324)

Author: JoeOakhartNava

plugins/dso/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dso",
-  "version": "0.26.5",
+  "version": "0.26.6",
   "description": "Workflow infrastructure plugin for Claude Code projects",
   "commands": "./commands/",
   "skills": "./skills/",

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

@@ -1131,8 +1131,15 @@ _phase_version_bump() {
         _state_mark_complete "version_bump"; return 0; fi
     local _bf="--${BUMP_TYPE:-patch}" _bs
     _bs=$(command -v bump-version.sh 2>/dev/null || echo "${_SCRIPT_DIR:-${CLAUDE_PLUGIN_ROOT:-}/scripts}/bump-version.sh")
-    echo "Bumping version ($_bf)..."
-    if ! bash "$_bs" "$_bf" 2>&1; then echo 'ERROR: bump-version.sh failed. Fix version file before pushing.'; exit 1; fi
+    # Idempotency guard: if the version file is already bumped (modified on disk)
+    # from a prior interrupted attempt, skip bump-version.sh to avoid double-bump.
+    local _vf="${VERSION_FILE_PATH:-}"
+    if [[ -n "$_vf" && -f "$_vf" ]] && ! git diff --quiet -- "$_vf" 2>/dev/null; then
+        echo "INFO: version file already bumped (prior attempt) — skipping bump-version.sh."
+    else
+        echo "Bumping version ($_bf)..."
+        if ! bash "$_bs" "$_bf" 2>&1; then echo 'ERROR: bump-version.sh failed. Fix version file before pushing.'; exit 1; fi
+    fi
     echo "OK: Version bumped."
     git add -u 2>/dev/null || true
     if ! git diff --cached --quiet 2>/dev/null; then git commit --amend --no-edit --quiet

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

@@ -646,5 +646,29 @@ assert_eq "test_merge_to_main_no_v2_tickets_dir_case" "0" "$HAS_V2_TICKETS_ARCHI
 HAS_TICKETS_DIR_V2=$(grep -cE 'TICKETS_DIR.*=.*"?\.tickets"?' "$MERGE_SCRIPT" || true)
 assert_eq "test_merge_to_main_no_TICKETS_DIR_tickets_path" "0" "$HAS_TICKETS_DIR_V2"
 
+# =============================================================================
+# Test: _phase_version_bump checks for already-modified version file before bumping
+# Bug 6ea9-a2af: if bump-version.sh ran but git commit --amend failed, resume
+# would call bump-version.sh again (double-bump). The fix is to check whether the
+# version file is already modified before bumping.
+# =============================================================================
+echo "--- test_version_bump_idempotent_guard ---"
+_snapshot_fail
+# Look for a guard in _phase_version_bump that checks if version file is already modified
+# before calling bump-version.sh. The pattern: git diff or similar check before bump-version.sh
+_has_already_bumped_guard=0
+# Extract _phase_version_bump function body and check for a pre-bump guard
+# that detects an already-modified version file before calling bump-version.sh.
+# Must reference "already bumped" or check git diff on the version file.
+_vb_body=$(sed -n '/_phase_version_bump()/,/^}/p' "$MERGE_SCRIPT")
+# The pattern must appear AFTER the resume-skip block and BEFORE bump-version.sh call.
+# Filter out the "already completed (resume skip)" line — that's the state-file check, not the file-level guard.
+if echo "$_vb_body" | grep -v "resume skip" | grep -qE 'already.*bump|git diff.*version|version.*file.*modif'; then
+    _has_already_bumped_guard=1
+fi
+assert_eq "test_version_bump_idempotent_guard: _phase_version_bump must check if version already bumped before calling bump-version.sh" \
+    "1" "$_has_already_bumped_guard"
+assert_pass_if_clean "test_version_bump_idempotent_guard"
+
 # =============================================================================
 print_summary