|
|
|
@@ -280,11 +280,6 @@ 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
|
|
|
|
|
- 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
|
|
|
|
|
- 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
|
|
|
|
@@ -319,11 +314,6 @@ 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
|
|
|
|
|
- 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
|
|
|
|
|
- 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
|
|
|
|
@@ -511,6 +501,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 "")
|
|
|
|
|