prizmkit 1.1.20 → 1.1.23

package/bundled/dev-pipeline/run-bugfix.sh

@@ -254,8 +254,15 @@ if incomplete:
     sys.exit(1)
 print('ALL_COMPLETE')
 sys.exit(0)
-" "$checkpoint_file" 2>&1)
+" "$checkpoint_file" 2>&1) || checkpoint_result="CHECK_FAILED"
             local check_exit=$?
+            if [[ "$checkpoint_result" == "CHECK_FAILED" ]]; then
+                check_exit=2
+            elif [[ "$checkpoint_result" == *"INCOMPLETE"* ]]; then
+                check_exit=1
+            else
+                check_exit=0
+            fi
             if [[ $check_exit -eq 2 ]]; then
                 log_warn "CHECKPOINT_CORRUPTED: workflow-checkpoint.json is not valid JSON"
             elif [[ $check_exit -eq 1 ]]; then
@@ -270,7 +277,7 @@ sys.exit(0)
     # Subagent detection
     prizm_detect_subagents "$session_log"
 
-    # Update bug status
+    # Update bug status (do NOT commit on dev branch — commit happens after merge)
     python3 "$SCRIPTS_DIR/update-bug-status.py" \
         --bug-list "$bug_list" \
         --state-dir "$STATE_DIR" \
@@ -280,12 +287,6 @@ sys.exit(0)
         --max-retries "$max_retries" \
         --action update >/dev/null 2>&1 || true
 
-    # Commit .prizmkit/plans/bug-fix-list.json status update (pipeline management commit)
-    if ! git -C "$project_root" diff --quiet "$bug_list" 2>/dev/null; then
-        git -C "$project_root" add "$bug_list"
-        git -C "$project_root" commit --no-verify -m "chore($bug_id): update bug status" 2>/dev/null || true
-    fi
-
     _SPAWN_RESULT="$session_status"
 }
 
@@ -306,13 +307,40 @@ cleanup() {
         log_info "Original branch was: $_ORIGINAL_BRANCH"
     fi
 
+    # Update status of currently in-progress bug to interrupted
     if [[ -n "$BUG_LIST" && -f "$BUG_LIST" ]]; then
+        # Find any in-progress bug and mark it as failed
+        local _interrupted_id
+        _interrupted_id=$(python3 -c "
+import json, sys
+with open(sys.argv[1]) as f:
+    data = json.load(f)
+for bug in data.get('bugs', []):
+    if bug.get('status') == 'in_progress':
+        print(bug['id'])
+        break
+" "$BUG_LIST" 2>/dev/null || echo "")
+
+        if [[ -n "$_interrupted_id" ]]; then
+            python3 "$SCRIPTS_DIR/update-bug-status.py" \
+                --bug-list "$BUG_LIST" \
+                --state-dir "$STATE_DIR" \
+                --bug-id "$_interrupted_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Bug $_interrupted_id marked as failed due to interrupt"
+        fi
+
+        # Pause the pipeline
         python3 "$SCRIPTS_DIR/update-bug-status.py" \
             --bug-list "$BUG_LIST" \
             --state-dir "$STATE_DIR" \
             --action pause 2>/dev/null || true
     fi
 
+    # GUARANTEED: always return to original branch (save WIP on dev branch first)
+    branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
+
     log_info "Bug fix pipeline paused. Run './run-bugfix.sh run' to resume."
     exit 130
 }
@@ -639,6 +667,20 @@ else:
             log_info "Development was on branch: $_DEV_BRANCH_NAME"
         fi
         log_info "Session log: $session_dir/logs/session.log"
+
+        # Update bug status to failed on interrupt
+        if [[ -n "$bug_list" && -f "$bug_list" ]]; then
+            python3 "$SCRIPTS_DIR/update-bug-status.py" \
+                --bug-list "$bug_list" \
+                --state-dir "$STATE_DIR" \
+                --bug-id "$bug_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Bug $bug_id marked as failed due to interrupt"
+        fi
+
+        # GUARANTEED: always return to original branch (save WIP on dev branch first)
+        branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
         exit 130
     }
     trap cleanup_single_bug SIGINT SIGTERM
@@ -652,6 +694,20 @@ else:
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
+    # Mark bug as in-progress BEFORE creating dev branch
+    # This ensures the in_progress status commit lands on the original branch,
+    # not the dev branch — preventing rebase conflicts in branch_merge later.
+    python3 "$SCRIPTS_DIR/update-bug-status.py" \
+        --bug-list "$bug_list" \
+        --state-dir "$STATE_DIR" \
+        --bug-id "$bug_id" \
+        --action start >/dev/null 2>&1 || true
+    # Commit the in_progress status on the original branch
+    if ! git -C "$_proj_root" diff --quiet "$bug_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$bug_list" 2>/dev/null || true
+        git -C "$_proj_root" commit --no-verify -m "chore($bug_id): mark in_progress" 2>/dev/null || true
+    fi
+
     local _branch_name="${DEV_BRANCH:-bugfix/${bug_id}-$(date +%s)}"
     if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
         _DEV_BRANCH_NAME="$_branch_name"
@@ -671,18 +727,23 @@ else:
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
             log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
             _DEV_BRANCH_NAME=""
         fi
     elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-        # Session failed — return to original branch, preserve dev branch for inspection
-        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-        fi
+        # Session failed — preserve dev branch for inspection
         log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
         _DEV_BRANCH_NAME=""
     fi
 
+    # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+    branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+    # Commit bug status update on the original branch (after guaranteed return)
+    if ! git -C "$_proj_root" diff --quiet "$bug_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$bug_list"
+        git -C "$_proj_root" commit --no-verify -m "chore($bug_id): update bug status" 2>/dev/null || true
+    fi
+
     echo ""
     if [[ "$session_status" == "success" ]]; then
         log_success "════════════════════════════════════════════════════"
@@ -785,6 +846,18 @@ main() {
     local total_subagent_calls=0
 
     while true; do
+        # Safety net: ensure we're on the original branch at the start of each iteration.
+        # If a previous iteration's `continue` skipped branch_ensure_return, we could
+        # still be on a dev branch. This prevents cascading branch confusion.
+        if [[ -n "$_ORIGINAL_BRANCH" ]]; then
+            local _cur_branch
+            _cur_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+            if [[ -n "$_cur_branch" && "$_cur_branch" != "$_ORIGINAL_BRANCH" ]]; then
+                log_warn "Still on branch $_cur_branch at loop start — returning to $_ORIGINAL_BRANCH"
+                branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            fi
+        fi
+
         # Find next bug to process
         local next_bug
         if ! next_bug=$(python3 "$SCRIPTS_DIR/update-bug-status.py" \
@@ -839,7 +912,21 @@ main() {
             git -C "$_proj_root" commit --no-verify -m "chore: capture artifacts before $bug_id session" 2>/dev/null || true
         fi
 
-        # Create per-bug dev branch
+        # Mark bug as in-progress BEFORE creating dev branch
+        # This ensures the in_progress status commit lands on the original branch,
+        # not the dev branch — preventing rebase conflicts in branch_merge later.
+        python3 "$SCRIPTS_DIR/update-bug-status.py" \
+            --bug-list "$bug_list" \
+            --state-dir "$STATE_DIR" \
+            --bug-id "$bug_id" \
+            --action start >/dev/null 2>&1 || true
+        # Commit the in_progress status on the original branch
+        if ! git -C "$_proj_root" diff --quiet "$bug_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$bug_list" 2>/dev/null || true
+            git -C "$_proj_root" commit --no-verify -m "chore($bug_id): mark in_progress" 2>/dev/null || true
+        fi
+
+        # Create per-bug dev branch (from the now-updated original branch)
         local _bug_branch="${DEV_BRANCH:-bugfix/${bug_id}-$(date +%Y%m%d%H%M)}"
         if branch_create "$_proj_root" "$_bug_branch" "$_ORIGINAL_BRANCH"; then
             _DEV_BRANCH_NAME="$_bug_branch"
@@ -885,6 +972,8 @@ main() {
         local gen_output
         gen_output=$(python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" "${main_prompt_args[@]}" 2>/dev/null) || {
             log_error "Failed to generate bootstrap prompt for $bug_id"
+            branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            _DEV_BRANCH_NAME=""
             continue
         }
         local bug_model pipeline_mode agent_count critic_enabled
@@ -907,13 +996,6 @@ main() {
             log_info "Bug model: $bug_model"
         fi
 
-        # Mark bug as in-progress before spawning session
-        python3 "$SCRIPTS_DIR/update-bug-status.py" \
-            --bug-list "$bug_list" \
-            --state-dir "$STATE_DIR" \
-            --bug-id "$bug_id" \
-            --action start >/dev/null 2>&1 || true
-
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
@@ -931,18 +1013,23 @@ main() {
             else
                 log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
                 log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-                git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
                 _DEV_BRANCH_NAME=""
             fi
         elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-            # Session failed — return to original branch, preserve dev branch for inspection
-            if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-                log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-            fi
+            # Session failed — preserve dev branch for inspection
             log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
             _DEV_BRANCH_NAME=""
         fi
 
+        # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+        branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+        # Commit bug status update on the original branch (after guaranteed return)
+        if ! git -C "$_proj_root" diff --quiet "$bug_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$bug_list"
+            git -C "$_proj_root" commit --no-verify -m "chore($bug_id): update bug status" 2>/dev/null || true
+        fi
+
         session_count=$((session_count + 1))
         total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
 

package/bundled/dev-pipeline/run-feature.sh

@@ -308,8 +308,15 @@ if incomplete:
     sys.exit(1)
 print('ALL_COMPLETE')
 sys.exit(0)
-" "$checkpoint_file" 2>&1)
+" "$checkpoint_file" 2>&1) || checkpoint_result="CHECK_FAILED"
             local check_exit=$?
+            if [[ "$checkpoint_result" == "CHECK_FAILED" ]]; then
+                check_exit=2
+            elif [[ "$checkpoint_result" == *"INCOMPLETE"* ]]; then
+                check_exit=1
+            else
+                check_exit=0
+            fi
             if [[ $check_exit -eq 2 ]]; then
                 log_warn "CHECKPOINT_CORRUPTED: workflow-checkpoint.json is not valid JSON"
             elif [[ $check_exit -eq 1 ]]; then
@@ -352,7 +359,7 @@ sys.exit(0)
         fi
     fi
 
-    # Update feature status
+    # Update feature status (do NOT commit on dev branch — commit happens after merge)
     local update_output
     update_output=$(python3 "$SCRIPTS_DIR/update-feature-status.py" \
         --feature-list "$feature_list" \
@@ -366,12 +373,6 @@ sys.exit(0)
         log_error ".prizmkit/plans/feature-list.json may be out of sync. Manual intervention needed."
     }
 
-    # Commit feature status update (pipeline management commit)
-    if ! git -C "$project_root" diff --quiet "$feature_list" 2>/dev/null; then
-        git -C "$project_root" add "$feature_list"
-        git -C "$project_root" commit --no-verify -m "chore($feature_id): update feature status" 2>/dev/null || true
-    fi
-
     # Return status via global variable (avoids $() swallowing stdout)
     _SPAWN_RESULT="$session_status"
 }
@@ -393,13 +394,40 @@ cleanup() {
         log_info "Original branch was: $_ORIGINAL_BRANCH"
     fi
 
+    # Update status of currently in-progress feature to interrupted
     if [[ -n "$FEATURE_LIST" && -f "$FEATURE_LIST" ]]; then
+        # Find any in-progress feature and mark it as interrupted
+        local _interrupted_id
+        _interrupted_id=$(python3 -c "
+import json, sys
+with open(sys.argv[1]) as f:
+    data = json.load(f)
+for feat in data.get('features', []):
+    if feat.get('status') == 'in_progress':
+        print(feat['id'])
+        break
+" "$FEATURE_LIST" 2>/dev/null || echo "")
+
+        if [[ -n "$_interrupted_id" ]]; then
+            python3 "$SCRIPTS_DIR/update-feature-status.py" \
+                --feature-list "$FEATURE_LIST" \
+                --state-dir "$STATE_DIR" \
+                --feature-id "$_interrupted_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Feature $_interrupted_id marked as failed due to interrupt"
+        fi
+
+        # Pause the pipeline (mark remaining pending items)
         python3 "$SCRIPTS_DIR/update-feature-status.py" \
             --feature-list "$FEATURE_LIST" \
             --state-dir "$STATE_DIR" \
             --action pause 2>/dev/null || true
     fi
 
+    # GUARANTEED: always return to original branch (save WIP on dev branch first)
+    branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
+
     log_info "Pipeline paused. Run './run-feature.sh run' to resume."
     exit 130
 }
@@ -814,6 +842,20 @@ else:
             log_info "Development was on branch: $_DEV_BRANCH_NAME"
         fi
         log_info "Session log: $session_dir/logs/session.log"
+
+        # Update feature status to failed on interrupt
+        if [[ -n "$feature_list" && -f "$feature_list" ]]; then
+            python3 "$SCRIPTS_DIR/update-feature-status.py" \
+                --feature-list "$feature_list" \
+                --state-dir "$STATE_DIR" \
+                --feature-id "$feature_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Feature $feature_id marked as failed due to interrupt"
+        fi
+
+        # GUARANTEED: always return to original branch (save WIP on dev branch first)
+        branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
         exit 130
     }
     trap cleanup_single_feature SIGINT SIGTERM
@@ -827,6 +869,20 @@ else:
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
+    # Mark feature as in-progress BEFORE creating dev branch
+    # This ensures the in_progress status commit lands on the original branch,
+    # not the dev branch — preventing rebase conflicts in branch_merge later.
+    python3 "$SCRIPTS_DIR/update-feature-status.py" \
+        --feature-list "$feature_list" \
+        --state-dir "$STATE_DIR" \
+        --feature-id "$feature_id" \
+        --action start >/dev/null 2>&1 || true
+    # Commit the in_progress status on the original branch
+    if ! git -C "$_proj_root" diff --quiet "$feature_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$feature_list" 2>/dev/null || true
+        git -C "$_proj_root" commit --no-verify -m "chore($feature_id): mark in_progress" 2>/dev/null || true
+    fi
+
     local _branch_name="${DEV_BRANCH:-dev/${feature_id}-$(date +%Y%m%d%H%M)}"
     if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
         _DEV_BRANCH_NAME="$_branch_name"
@@ -846,18 +902,23 @@ else:
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
             log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
             _DEV_BRANCH_NAME=""
         fi
     elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-        # Session failed — return to original branch, preserve dev branch for inspection
-        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-        fi
+        # Session failed — preserve dev branch for inspection
         log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
         _DEV_BRANCH_NAME=""
     fi
 
+    # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+    branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+    # Commit feature status update on the original branch (after guaranteed return)
+    if ! git -C "$_proj_root" diff --quiet "$feature_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$feature_list"
+        git -C "$_proj_root" commit --no-verify -m "chore($feature_id): update feature status" 2>/dev/null || true
+    fi
+
     echo ""
     if [[ "$session_status" == "success" ]]; then
         log_success "════════════════════════════════════════════════════"
@@ -980,6 +1041,18 @@ main() {
     local total_subagent_calls=0
 
     while true; do
+        # Safety net: ensure we're on the original branch at the start of each iteration.
+        # If a previous iteration's `continue` skipped branch_ensure_return, we could
+        # still be on a dev branch. This prevents cascading branch confusion.
+        if [[ -n "$_ORIGINAL_BRANCH" ]]; then
+            local _cur_branch
+            _cur_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+            if [[ -n "$_cur_branch" && "$_cur_branch" != "$_ORIGINAL_BRANCH" ]]; then
+                log_warn "Still on branch $_cur_branch at loop start — returning to $_ORIGINAL_BRANCH"
+                branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            fi
+        fi
+
         # Check for stuck features
         local stuck_result
         stuck_result=$(python3 "$SCRIPTS_DIR/detect-stuck.py" \
@@ -1081,7 +1154,21 @@ print(count)
             git -C "$_proj_root" commit --no-verify -m "ready for run $feature_id" 2>/dev/null || true
         fi
 
-        # Create per-feature dev branch
+        # Mark feature as in-progress BEFORE creating dev branch
+        # This ensures the in_progress status commit lands on the original branch,
+        # not the dev branch — preventing rebase conflicts in branch_merge later.
+        python3 "$SCRIPTS_DIR/update-feature-status.py" \
+            --feature-list "$feature_list" \
+            --state-dir "$STATE_DIR" \
+            --feature-id "$feature_id" \
+            --action start >/dev/null 2>&1 || true
+        # Commit the in_progress status on the original branch
+        if ! git -C "$_proj_root" diff --quiet "$feature_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$feature_list" 2>/dev/null || true
+            git -C "$_proj_root" commit --no-verify -m "chore($feature_id): mark in_progress" 2>/dev/null || true
+        fi
+
+        # Create per-feature dev branch (from the now-updated original branch)
         local _feature_branch="${DEV_BRANCH:-dev/${feature_id}-$(date +%Y%m%d%H%M)}"
         if branch_create "$_proj_root" "$_feature_branch" "$_ORIGINAL_BRANCH"; then
             _DEV_BRANCH_NAME="$_feature_branch"
@@ -1127,6 +1214,8 @@ print(count)
         local gen_output
         gen_output=$(python3 "$SCRIPTS_DIR/generate-bootstrap-prompt.py" "${main_prompt_args[@]}" 2>/dev/null) || {
             log_error "Failed to generate bootstrap prompt for $feature_id"
+            branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            _DEV_BRANCH_NAME=""
             continue
         }
         local feature_model pipeline_mode agent_count critic_enabled
@@ -1146,13 +1235,6 @@ print(count)
         log_info "Pipeline mode: ${BOLD}$pipeline_mode${NC} ($_mode_desc)"
         log_info "Agents: $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
 
-        # Mark feature as in-progress before spawning session
-        python3 "$SCRIPTS_DIR/update-feature-status.py" \
-            --feature-list "$feature_list" \
-            --state-dir "$STATE_DIR" \
-            --feature-id "$feature_id" \
-            --action start >/dev/null 2>&1 || true
-
         # Spawn session and wait
         prizm_log_bootstrap_prompt "$bootstrap_prompt" "$feature_id"
         log_info "Spawning AI CLI session: $session_id"
@@ -1173,19 +1255,23 @@ print(count)
             else
                 log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
                 log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-                # Return to original branch; state/ files are untracked and persist across checkout
-                git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
                 _DEV_BRANCH_NAME=""
             fi
         elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-            # Session failed — return to original branch, preserve dev branch for inspection
-            if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-                log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-            fi
+            # Session failed — preserve dev branch for inspection
             log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
             _DEV_BRANCH_NAME=""
         fi
 
+        # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+        branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+        # Commit feature status update on the original branch (after guaranteed return)
+        if ! git -C "$_proj_root" diff --quiet "$feature_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$feature_list"
+            git -C "$_proj_root" commit --no-verify -m "chore($feature_id): update feature status" 2>/dev/null || true
+        fi
+
         session_count=$((session_count + 1))
         total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))