fix(tui): prevent loop re-spawn on action selection, improve loop lifecycle

Three fixes for the feature loop:

1. RunScreen re-spawned the loop process after action selection because
   refreshStatus (which depends on actionRequest) was in the spawn
   useEffect's dependency array. Use a ref to decouple poll scheduling
   from process spawning.

2. Add "Done — end loop" action choice as the default. Remove redundant
   "Push and create PR" since auto/merge modes already create the PR.

3. Review fix iterations used PROMPT.md which triggers the
   finishing-a-development-branch skill when all tasks are complete.
   Replace with an inline prompt focused solely on fixing review issues.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: federiconeri

src/templates/scripts/feature-loop.sh.tmpl

@@ -148,14 +148,14 @@ write_action_request() {
     cat > "$action_file" << 'EOF'
 {
   "id": "post_pr_choice",
-  "prompt": "Implementation complete. What would you like to do?",
+  "prompt": "Loop complete. What would you like to do?",
   "choices": [
+    {"id": "done", "label": "Done — end loop"},
     {"id": "merge_local", "label": "Merge back to main locally"},
-    {"id": "push_pr", "label": "Push and create PR"},
     {"id": "keep_branch", "label": "Keep branch as-is"},
     {"id": "discard", "label": "Discard this work"}
   ],
-  "default": "keep_branch"
+  "default": "done"
 }
 EOF
     echo "Action request written: $action_file"
@@ -432,7 +432,11 @@ elif [ "$REVIEW_MODE" = "merge" ]; then
 
         if [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; then
             echo "Review found issues. Running fix iteration..."
-            cat "$PROMPTS_DIR/PROMPT.md" | envsubst | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
+            echo "Fix the issues found in the code review above. Run git diff main to see the current changes, then:
+1. Fix each issue referenced in the review
+2. Run tests: npm test
+3. Commit and push the fixes
+Do NOT propose completion options or ask interactive questions. Just fix, test, commit, push." | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
             parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
         fi
     done
@@ -460,7 +464,11 @@ else
 
         if [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; then
             echo "Review found issues. Running fix iteration..."
-            cat "$PROMPTS_DIR/PROMPT.md" | envsubst | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
+            echo "Fix the issues found in the code review above. Run git diff main to see the current changes, then:
+1. Fix each issue referenced in the review
+2. Run tests: npm test
+3. Commit and push the fixes
+Do NOT propose completion options or ask interactive questions. Just fix, test, commit, push." | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
             parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
         fi
     done
@@ -478,15 +486,15 @@ echo "User chose: $CHOSEN_ACTION"
 
 # Dispatch based on user choice
 case "$CHOSEN_ACTION" in
+    done)
+        echo "Loop complete. Exiting."
+        ;;
     merge_local)
         echo "Merging back to main locally..."
         git checkout main 2>/dev/null || git checkout master
         git merge --squash "$BRANCH" && git commit -m "feat($FEATURE): squash merge from $BRANCH"
         echo "Merged. You can delete the branch with: git branch -D $BRANCH"
         ;;
-    push_pr)
-        echo "Branch and PR already created during review phase."
-        ;;
     discard)
         echo "Discarding work on branch $BRANCH..."
         git checkout main 2>/dev/null || git checkout master

src/tui/screens/RunScreen.tsx

@@ -355,9 +355,7 @@ export function RunScreen({
     } else {
       // File cleaned up by shell — reset tracking so future requests work
       handledActionIdRef.current = null;
-      if (actionRequest) {
-        setActionRequest(null);
-      }
+      setActionRequest((prev) => prev ? null : prev);
     }
 
     // In monitor mode, detect completion (only fire once)
@@ -402,7 +400,12 @@ export function RunScreen({
         logger.error(`Failed to persist summary file for ${featureName}: ${err instanceof Error ? err.message : String(err)}`);
       });
     }
-  }, [featureName, projectRoot, monitorOnly, actionRequest]);
+  }, [featureName, projectRoot, monitorOnly]);
+
+  // Keep a stable ref to the latest refreshStatus so the spawn effect
+  // can schedule polls without re-running when refreshStatus changes.
+  const refreshStatusRef = useRef(refreshStatus);
+  useEffect(() => { refreshStatusRef.current = refreshStatus; }, [refreshStatus]);
 
   const stopLoop = useCallback(() => {
     stopRequestedRef.current = true;
@@ -455,11 +458,11 @@ export function RunScreen({
         }
         if (cancelled) return;
         setIsStarting(false);
-        refreshStatus().catch((err) => {
+        refreshStatusRef.current().catch((err: unknown) => {
           logger.warn(`Status refresh failed: ${err instanceof Error ? err.message : String(err)}`);
         });
         pollTimer = setInterval(() => {
-          refreshStatus().catch((err) => {
+          refreshStatusRef.current().catch((err: unknown) => {
             logger.warn(`Status refresh failed: ${err instanceof Error ? err.message : String(err)}`);
           });
         }, POLL_INTERVAL_MS);
@@ -548,12 +551,12 @@ export function RunScreen({
           }
 
           pollTimer = setInterval(() => {
-            refreshStatus().catch((err) => {
+            refreshStatusRef.current().catch((err: unknown) => {
               logger.warn(`Status refresh failed: ${err instanceof Error ? err.message : String(err)}`);
             });
           }, POLL_INTERVAL_MS);
 
-          refreshStatus().catch((err) => {
+          refreshStatusRef.current().catch((err: unknown) => {
             logger.warn(`Status refresh failed: ${err instanceof Error ? err.message : String(err)}`);
           });
 
@@ -634,7 +637,10 @@ export function RunScreen({
       isMountedRef.current = false;
       if (pollTimer) clearInterval(pollTimer);
     };
-  }, [featureName, projectRoot, refreshStatus, monitorOnly, sessionState.config]);
+  // Note: refreshStatusRef (not refreshStatus) is used inside to avoid re-spawning
+  // the child process when the callback identity changes due to actionRequest updates.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [featureName, projectRoot, monitorOnly, sessionState.config]);
 
   const totalTasks = tasks.tasksDone + tasks.tasksPending;
   const totalE2e = tasks.e2eDone + tasks.e2ePending;