Merge pull request 'fix: investigate: PreToolUse guard blocks do_merge() in dev-agent — every disinto PR escalates on merge (#568)' (#586) from fix/issue-568 into main

dev/dev-agent.sh

@@ -579,27 +579,8 @@ echo \"PHASE:awaiting_ci\" > \"${PHASE_FILE}\"
 (CI runs again after each push — always write awaiting_ci, not awaiting_review)
 
 **When you receive an \"Approved\" injection:**
-The injection includes exact API commands. Merge the PR and close the issue directly:
-\`\`\`bash
-# Merge (replace NNN with the actual PR number from the injection):
-curl -sf -X POST \\
-  -H \"Authorization: token \${CODEBERG_TOKEN}\" \\
-  -H 'Content-Type: application/json' \\
-  \"${API}/pulls/NNN/merge\" \\
-  -d '{\"Do\":\"merge\",\"delete_branch_after_merge\":true}'
-
-# Close the issue:
-curl -sf -X PATCH \\
-  -H \"Authorization: token \${CODEBERG_TOKEN}\" \\
-  -H 'Content-Type: application/json' \\
-  \"${API}/issues/${ISSUE}\" \\
-  -d '{\"state\":\"closed\"}'
-
-# Signal done:
-echo \"PHASE:done\" > \"${PHASE_FILE}\"
-\`\`\`
-If merge fails due to conflicts, rebase first then retry the merge.
-If merge repeatedly fails, write PHASE:escalate with a reason.
+The orchestrator handles merging and issue closure automatically via the bash
+phase handler. You do not need to merge or close anything — stop and wait.
 
 **When you need human help (CI exhausted, merge blocked, stuck on a decision):**
 \`\`\`bash

review/review-poll.sh

@@ -139,24 +139,9 @@ inject_review_into_dev_session() {
   local inject_msg=""
   if [ "${verdict}" = "APPROVE" ]; then
     inject_msg="Approved! PR #${pr_num} has been approved by the reviewer.
-Merge the PR and close the issue, then signal done:
 
-curl -sf -X POST \\
-  -H \"Authorization: token \$CODEBERG_TOKEN\" \\
-  -H 'Content-Type: application/json' \\
-  \"${API_BASE}/pulls/${pr_num}/merge\" \\
-  -d '{\"Do\":\"merge\",\"delete_branch_after_merge\":true}'
-
-curl -sf -X PATCH \\
-  -H \"Authorization: token \$CODEBERG_TOKEN\" \\
-  -H 'Content-Type: application/json' \\
-  \"${API_BASE}/issues/${issue_num}\" \\
-  -d '{\"state\":\"closed\"}'
-
-echo \"PHASE:done\" > \"${phase_file}\"
-
-If merge fails due to conflicts, rebase first then retry.
-If merge repeatedly fails, write PHASE:escalate with a reason."
+The orchestrator will handle merging and closing the issue automatically.
+You do not need to take any action — stop and wait."
   elif [ "${verdict}" = "REQUEST_CHANGES" ] || [ "${verdict}" = "DISCUSS" ]; then
     inject_msg="Review: ${verdict} on PR #${pr_num}: