|
|
|
|
@@ -270,40 +270,37 @@ build_dev_agent_message() {
|
|
|
|
|
local number=$(echo "$issue_ref" | grep -oE '#[0-9]+$' | tr -d '#')
|
|
|
|
|
local worktree_path=$(issue_ref_to_worktree_path "$issue_ref")
|
|
|
|
|
|
|
|
|
|
local conflict_check=""
|
|
|
|
|
local review_notes=""
|
|
|
|
|
local delegator_header=""
|
|
|
|
|
local delegator_footer=""
|
|
|
|
|
if [ -n "$user_message" ]; then
|
|
|
|
|
cat <<EOF
|
|
|
|
|
You are continuing work on $issue_ref. A PR likely already exists.
|
|
|
|
|
conflict_check=" - CRITICAL: Check if PR has merge conflicts before asking for review:
|
|
|
|
|
- Use: curl -s \"https://$instance/api/v1/repos/$owner/$repo/pulls/$number\" -H \"Authorization: Bearer \$GITEA_TOKEN\"
|
|
|
|
|
- If \"mergeable\": false, there ARE conflicts - you MUST resolve them FIRST
|
|
|
|
|
- To resolve: cd to worktree, git fetch origin, git rebase origin/main, resolve conflicts, git rebase --continue, git push --force-with-lease
|
|
|
|
|
- Only after resolving conflicts (mergeable: true) can you ask for review"
|
|
|
|
|
delegator_header="IMPORTANT: Follow the workflow below as your guideline, but prioritize the delegator's message.
|
|
|
|
|
|
|
|
|
|
IMPORTANT - Review workflow:
|
|
|
|
|
1. First, check if PR exists: curl -s "https://$instance/api/v1/repos/$owner/$repo/pulls?state=open" -H "Authorization: Bearer \$GITEA_TOKEN" | grep -i "$number"
|
|
|
|
|
2. Get PR comments: curl -s "https://$instance/api/v1/repos/$owner/$repo/issues/$number/comments" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
3. Get PR reviews: curl -s "https://$instance/api/v1/repos/$owner/$repo/pulls/$number/reviews" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
|
|
|
|
|
You may need to:
|
|
|
|
|
- Make code changes and push to the same branch
|
|
|
|
|
- Reply to PR comments using: curl -X POST "https://$instance/api/v1/repos/$owner/$repo/issues/$number/comments" -H "Authorization: Bearer \$GITEA_TOKEN" -H "Content-Type: application/json" -d '{"body":"Your reply here"}'
|
|
|
|
|
- Or do both
|
|
|
|
|
|
|
|
|
|
MERGING: If instructed to merge, you MUST confirm approval first before merging:
|
|
|
|
|
- Check for PR approval via: curl -s "https://$instance/api/v1/repos/$owner/$repo/pulls/$number/reviews" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
- Check for "lgtm" or "approved" in comments: curl -s "https://$instance/api/v1/repos/$owner/$repo/issues/$number/comments" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
- Only merge if you see approval OR the instruction explicitly says to merge (e.g., "merge the PR", "please merge", "go ahead and merge")
|
|
|
|
|
- To merge: tea pr merge --repo $owner/$repo $number --style merge
|
|
|
|
|
- If no approval yet, reply asking for review/approval first
|
|
|
|
|
Workflow:"
|
|
|
|
|
delegator_footer="
|
|
|
|
|
|
|
|
|
|
Delegator's message:
|
|
|
|
|
$user_message
|
|
|
|
|
|
|
|
|
|
Work directory: $worktree_path (already on the fix branch)
|
|
|
|
|
EOF
|
|
|
|
|
$user_message"
|
|
|
|
|
else
|
|
|
|
|
cat <<EOF
|
|
|
|
|
review_notes=" - IMPORTANT: After listing reviews, READ the review comments and incorporate feedback
|
|
|
|
|
- Check for review state: \"APPROVED\" means ready to merge, \"COMMENT\" means feedback to address"
|
|
|
|
|
delegator_header="Workflow:"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
cat <<EOF
|
|
|
|
|
You are assigned to work on $issue_ref.
|
|
|
|
|
|
|
|
|
|
Workflow:
|
|
|
|
|
$delegator_header
|
|
|
|
|
1. Read the issue at $instance/$owner/$repo/issues/$number AND all comments on that issue
|
|
|
|
|
2. Check if a PR already exists for this issue
|
|
|
|
|
- If PR exists and is open, review it and learn from it
|
|
|
|
|
$conflict_check
|
|
|
|
|
- If PR makes sense to continue, work on it instead
|
|
|
|
|
- If PR is not worth continuing, create a new branch/PR but explain in PR description why you're creating a new one instead of continuing the existing PR
|
|
|
|
|
3. Read README.md (if exists) to understand the general concept of this repository
|
|
|
|
|
@@ -321,13 +318,14 @@ Tools for PR interaction:
|
|
|
|
|
- Post issue/PR comment: curl -X POST "https://$instance/api/v1/repos/$owner/$repo/issues/$number/comments" -H "Authorization: Bearer \$GITEA_TOKEN" -H "Content-Type: application/json" -d '{"body":"Your comment"}'
|
|
|
|
|
- List PR comments: curl -s "https://$instance/api/v1/repos/$owner/$repo/issues/$number/comments" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
- List PR reviews: curl -s "https://$instance/api/v1/repos/$owner/$repo/pulls/$number/reviews" -H "Authorization: Bearer \$GITEA_TOKEN"
|
|
|
|
|
$review_notes
|
|
|
|
|
- Merge PR (only with approval): tea pr merge --repo $owner/$repo $number --style merge
|
|
|
|
|
- MERGING requires approval first! Check for: approval in reviews, OR "lgtm"/"approved" in comments
|
|
|
|
|
- If no approval, ask reviewer to approve first before merging
|
|
|
|
|
$delegator_footer
|
|
|
|
|
|
|
|
|
|
Work directory: $worktree_path
|
|
|
|
|
EOF
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ensure_worktree() {
|
|
|
|
|
@@ -475,6 +473,8 @@ cmd_continue() {
|
|
|
|
|
|
|
|
|
|
if [ -z "$message" ]; then
|
|
|
|
|
message=$(build_dev_agent_message "$issue_ref" "")
|
|
|
|
|
else
|
|
|
|
|
message=$(build_dev_agent_message "$issue_ref" "$message")
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local worktree_status=$(ensure_worktree "$issue_ref")
|
|
|
|
|
@@ -489,6 +489,8 @@ cmd_continue() {
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
kugetsu_context_dump "$issue_ref" "$message" "$(issue_ref_to_branch_name "$issue_ref")"
|
|
|
|
|
|
|
|
|
|
local session_file=$(issue_ref_to_filename "$issue_ref")
|
|
|
|
|
local session_path="$SESSIONS_DIR/$session_file"
|
|
|
|
|
local opencode_session_id=$(python3 -c "import json; print(json.load(open('$session_path')).get('opencode_session_id', ''))" 2>/dev/null || echo "")
|
|
|
|
|
|
