Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9eb8badea |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@ results/
|
|||||||
*/results/
|
*/results/
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|
||||||
|
.kugetsu/
|
||||||
|
|||||||
@@ -270,37 +270,16 @@ build_dev_agent_message() {
|
|||||||
local number=$(echo "$issue_ref" | grep -oE '#[0-9]+$' | tr -d '#')
|
local number=$(echo "$issue_ref" | grep -oE '#[0-9]+$' | tr -d '#')
|
||||||
local worktree_path=$(issue_ref_to_worktree_path "$issue_ref")
|
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
|
if [ -n "$user_message" ]; then
|
||||||
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.
|
|
||||||
|
|
||||||
Workflow:"
|
|
||||||
delegator_footer="
|
|
||||||
|
|
||||||
Delegator's message:
|
|
||||||
$user_message"
|
|
||||||
else
|
|
||||||
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
|
cat <<EOF
|
||||||
You are assigned to work on $issue_ref.
|
You are assigned to work on $issue_ref.
|
||||||
|
|
||||||
$delegator_header
|
IMPORTANT: Follow the workflow below as your guideline, but prioritize the delegator's message.
|
||||||
|
|
||||||
|
Workflow:
|
||||||
1. Read the issue at $instance/$owner/$repo/issues/$number AND all comments on that issue
|
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
|
2. Check if a PR already exists for this issue
|
||||||
- If PR exists and is open, review it and learn from it
|
- 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 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
|
- 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
|
3. Read README.md (if exists) to understand the general concept of this repository
|
||||||
@@ -318,14 +297,47 @@ 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"}'
|
- 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 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"
|
- 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
|
- 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
|
- MERGING requires approval first! Check for: approval in reviews, OR "lgtm"/"approved" in comments
|
||||||
- If no approval, ask reviewer to approve first before merging
|
- If no approval, ask reviewer to approve first before merging
|
||||||
$delegator_footer
|
|
||||||
|
Delegator's message:
|
||||||
|
$user_message
|
||||||
|
|
||||||
Work directory: $worktree_path
|
Work directory: $worktree_path
|
||||||
EOF
|
EOF
|
||||||
|
else
|
||||||
|
cat <<EOF
|
||||||
|
You are assigned to work on $issue_ref.
|
||||||
|
|
||||||
|
Workflow:
|
||||||
|
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
|
||||||
|
- 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
|
||||||
|
4. Read CONTRIBUTING.md (if exists) to understand how to contribute
|
||||||
|
- If CONTRIBUTING.md doesn't exist, follow steps 5-9 as your guideline
|
||||||
|
5. Explore the repository to understand the codebase
|
||||||
|
6. If anything is unclear, post a comment on the issue asking for clarification before implementing
|
||||||
|
7. Implement the solution
|
||||||
|
8. Create a branch named fix/issue-$number and implement the fix
|
||||||
|
9. Create a PR when the implementation is complete using: tea pr create --repo $owner/$repo --title "Your PR title" --body "PR description"
|
||||||
|
- Make sure you are logged in with: tea login add --name gitea --token \$GITEA_TOKEN --url https://$instance
|
||||||
|
- If tea is not available, use: curl -X POST "https://$instance/api/v1/repos/$owner/$repo/pulls" -H "Authorization: Bearer \$GITEA_TOKEN" -H "Content-Type: application/json" -d '{"title":"PR Title","head":"branch-name","base":"main","body":"PR description"}'
|
||||||
|
|
||||||
|
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"
|
||||||
|
- 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
|
||||||
|
|
||||||
|
Work directory: $worktree_path
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_worktree() {
|
ensure_worktree() {
|
||||||
@@ -489,6 +501,8 @@ cmd_continue() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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_file=$(issue_ref_to_filename "$issue_ref")
|
||||||
local session_path="$SESSIONS_DIR/$session_file"
|
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 "")
|
local opencode_session_id=$(python3 -c "import json; print(json.load(open('$session_path')).get('opencode_session_id', ''))" 2>/dev/null || echo "")
|
||||||
|
|||||||
Reference in New Issue
Block a user