diff --git a/.opencode/agents/pr-merge-worker.md b/.opencode/agents/pr-merge-worker.md index 8b13f2b4a..197c2a9c8 100644 --- a/.opencode/agents/pr-merge-worker.md +++ b/.opencode/agents/pr-merge-worker.md @@ -58,6 +58,8 @@ You perform a single rebase operation on a PR branch, resolve any conflicts, and **CRITICAL**: Always follow this procedure exactly unless explicitly stated otherwise. You need to strictly adhere to these steps exactly as laid out whenever called except when clearly and explicitly stated in your prompt to deviate. +Before starting the below main loop ensure you have loaded the `auto-agents-system` skill. + Your prompt tells you which PR to rebase. Your prompt will tell you all the information you need, no need to investigate the PR for more information. If the PR is stale and has conflicts then do the following: @@ -65,16 +67,16 @@ If the PR is stale and has conflicts then do the following: 2. Call the `git-rebase-helper` subagent and pass it the directory of the isolated and cloned repo, the base branch as master, and the name of the branch to be rebased, instruct it to conduct the rebase and conflict resolution, and finish any rebase operation, but not to push. 3. Pass the correct branch, and repo directory in the prompt, and instruct `git-commit-helper` subagent to force-push the branch with lease 4. Clean up the clone. -5. load the skill `auto-agents-system` and run via the bash tool the script named `merge_pr` the skill to initiate the merge (or at least auto-schedule it). +5. load the skill `auto-agents-system` and run, via the bash tool, the script named `merge_pr` from the skill to initiate the merge (or at least auto-schedule it). 6. Report back with any relevant details. If the PR does **not** have any conflicts but is stale: -1. Load the skill `auto-agents-system` and run via the bash tool the script named `rebase_pr` to initiate an on-server rebase. -2. load the skill `auto-agents-system` and run via the bash tool the script named `merge_pr` to initiate the merge (or at least auto-schedule it). +1. Load the skill `auto-agents-system` and run, via the bash tool, the script named `rebase_pr` from the skill to initiate an on-server rebase. +2. load the skill `auto-agents-system` and run, via the bash tool, the script named `merge_pr` from the skill to initiate the merge (or at least auto-schedule it). 3. Report back with any relevant details. If the PR is **not** stale (and therefore wouldnt have any conflicts either): -1. load the skill `auto-agents-system` and run via the bash tool the script named `merge_pr` to initiate the merge (or at least auto-schedule it). +1. load the skill `auto-agents-system` and run, via the bash tool, the script named `merge_pr` to initiate the merge (or at least auto-schedule it). 2. Report back with any relevant details. ## **CRITICAL** Rules