god: Fix manual terminate+task blocking - allow immediate task reassignment

[PROBLEM] When agents sent [ACTION: terminate_cc] followed by [TASK] in the
same message, the task submission condition was checked BEFORE the terminate_cc
action was processed. This caused:
1. has_manual_terminate bypass allowed submission even with cc_status["running"]=True
2. Race condition where terminate_cc was processed after task submission
3. Duplicate action history entries

[FIX] Process [ACTION: terminate_cc] BEFORE [TASK] block (now #1b, before #2).
This ensures cc_status["running"] is False when task submission condition runs,
eliminating the need for has_manual_terminate bypass and preventing race conditions.

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

scripts/conversation-loop.py

@@ -1646,20 +1646,23 @@ def parse_and_execute_turn(raw_text, ctx):
         task_assigned = True
         return raw_text, results, task_assigned
 
+    # 1b. Handle [ACTION: terminate_cc] FIRST (before task submission)
+    # This ensures cc_status["running"] is False before task submission check,
+    # preventing race conditions when agents terminate+submit in same message.
+    if re.search(r'\[ACTION:\s*terminate_cc\]', raw_text):
+        result = action_terminate_cc()
+        results.append({"action": "terminate_cc", "result": result})
+
     # 2. Handle [TASK]...[/TASK] → Claude Code
     task_match = re.search(r'\[TASK\](.*?)\[/TASK\]', raw_text, re.DOTALL)
     if task_match:
         task_desc = task_match.group(1).strip()
-        # Check if this message also contains [ACTION: terminate_cc]
-        # If so, the termination will be processed before task submission (below),
-        # so we should allow this task to proceed even if cc_status["running"] is currently True.
-        has_manual_terminate = re.search(r'\[ACTION:\s*terminate_cc\]', raw_text)
         # task_assigned is set to True ONLY when task is actually submitted, not when blocked
         if not task_desc:
             results.append({"action": "task", "result": "Empty task description."})
         elif child_state["stage"] in ("BUILDING", "RESTARTING", "APP_STARTING"):
             results.append({"action": "task", "result": f"BLOCKED: Cain is {child_state['stage']}. Wait for it to finish."})
-        elif cc_status["running"] and not has_manual_terminate:
+        elif cc_status["running"]:
             # LOW-PUSH-FREQUENCY EMERGENCY: If push frequency is critically low and task has been running 60s+, allow task handoff
             # This prevents all-talk-no-action when agents get stuck after 1 push
             global _push_count, _turns_since_last_push, _push_count_this_task
@@ -1684,8 +1687,7 @@ def parse_and_execute_turn(raw_text, ctx):
 
         # Task submission block - handles both normal flow and post-zero-push-termination flow
         # Only proceeds if not blocked above (results is empty or only contains termination notice)
-        # Also allows submission if this message contains [ACTION: terminate_cc] (manual termination)
-        if (not results or any("terminate_cc" in r.get("action", "") for r in results)) and (cc_status["running"] == False or has_manual_terminate):
+        if (not results or any("terminate_cc" in r.get("action", "") for r in results)) and cc_status["running"] == False:
             # Check cooldown
             check_and_clear_cooldown()
             if last_rebuild_trigger_at > 0:
@@ -1737,11 +1739,6 @@ def parse_and_execute_turn(raw_text, ctx):
         result = action_send_bubble(bubble_match.group(1).strip())
         results.append({"action": "send_bubble", "result": result})
 
-    # 5. Handle [ACTION: terminate_cc] (terminate stuck Claude Code)
-    if re.search(r'\[ACTION:\s*terminate_cc\]', raw_text):
-        result = action_terminate_cc()
-        results.append({"action": "terminate_cc", "result": result})
-
     # Activate deferred cooldown
     if _pending_cooldown:
         last_rebuild_trigger_at = time.time()