From fd4f5248954e442841dc60cc7e75cc2818875971 Mon Sep 17 00:00:00 2001 From: AIOSAI Date: Sun, 26 Apr 2026 00:30:45 -0700 Subject: [PATCH] =?UTF-8?q?feat(system):=20fix:=20add=20PR=20lock=20retry?= =?UTF-8?q?=20instruction=20to=20global=20prompt=20=E2=80=94=20agents=20mu?= =?UTF-8?q?st=20wait=20and=20retry,=20never=20skip=20PRs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: @devpulse --- .aipass/aipass_global_prompt.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.aipass/aipass_global_prompt.md b/.aipass/aipass_global_prompt.md index 42441ad5..61eb6f61 100644 --- a/.aipass/aipass_global_prompt.md +++ b/.aipass/aipass_global_prompt.md @@ -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.