slaguru666/AIPass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #454 from AIOSAI/system/devpulse-fix-add-pr-lock-retry-instruction-to-global-prompt

Browse Source 
feat(system): fix: add PR lock retry instruction to global prompt — agents must wait and retry, never skip PRs
This commit is contained in:
AIPass
2026-04-26 00:33:06 -07:00
committed by GitHub
parent 9b03fbadd0 fd4f524895
commit e1fa18c9d6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.aipass/aipass_global_prompt.md
+2
View File
@@ -201,6 +201,8 @@ Always work on main. Edit files in your branch directory on the main branch. Whe
**Allowed read-only:** `git status`, `git diff`, `git log`, `git stash` (safe transient save).
**If `drone @git pr` fails because the PR lock is held**, wait 30 seconds and retry. Keep retrying until the lock clears — do not skip the PR step, do not commit directly to main, do not give up. The lock means another agent is mid-PR; it will release shortly. `drone @git lock` shows the current lock state.
Never merge. Only devpulse or the user merges PRs. If your PR gets feedback, fix it and run `drone @git pr` again.
Local main is always ahead of origin — that's normal. `drone @git pr` commits on local main first, then pushes a feature branch for the PR. Don't `git pull` to fix it. The user merges and pulls when they choose.