From 8aa7e2a9a98a7fda6665fb352b674d656ed16542 Mon Sep 17 00:00:00 2001 From: AIOSAI Date: Tue, 17 Mar 2026 19:45:12 -0700 Subject: [PATCH] =?UTF-8?q?chore(system):=20update=20global=20prompt=20?= =?UTF-8?q?=E2=80=94=20drone=20@git=20pr=20replaces=20raw=20git=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Branches now use drone @git pr for all PR operations. Raw git checkout -b, git commit, and git push are blocked by deny rules. Only devpulse and drone retain raw git access. This prevents the data loss from uncommitted work being wiped by branch switches in a shared repo. Co-Authored-By: @devpulse Co-Authored-By: Claude Opus 4.6 (1M context) --- .aipass/aipass_global_prompt.md | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.aipass/aipass_global_prompt.md b/.aipass/aipass_global_prompt.md index d6b9f997..7f85f8ab 100644 --- a/.aipass/aipass_global_prompt.md +++ b/.aipass/aipass_global_prompt.md @@ -99,29 +99,24 @@ from aipass.prax import logger ## Git Workflow -Only commit files inside your own branch directory (`src/aipass/{your_branch}/`). When your task is complete and you're satisfied with the work, commit, push, and open a PR. Not per-file — per task. +**All PR workflow goes through drone.** Never use raw git commands for commits, branches, or pushes. Drone handles everything atomically with a lockfile that prevents concurrent PR collisions. + +**Always work on main.** Edit files in your branch directory on the main branch. When ready to submit: ``` -git checkout -b feat/{branch}-short-description # create git branch -git add src/aipass/{branch}/... # stage your files only -git commit -m "feat(branch): description" # commit (see signature below) -git push -u origin feat/{branch}-short-description -gh pr create --title "feat(branch): ..." --body "..." +drone @git pr "short description" # Full PR workflow (lock, branch, commit, push, PR, back to main) +drone @git status # What changed in my branch directory? +drone @git sync # Pull latest main +drone @git lock # Who has the PR lock? ``` -**Sign your work.** End every commit message with: -``` -Co-Authored-By: @{branch} <{branch}@aipass> -``` +`drone @git pr` does everything: acquires a lock (so no other branch can PR simultaneously), creates a feature branch, stages only your files, commits with your Co-Authored-By signature, pushes, creates the PR on GitHub, returns to main, and releases the lock. One command. -**Stage from git, not from memory.** Use `git diff --stat` or `git status` to see what's actually changed, then stage those files. Never manually list files to commit from memory — you'll try to add gitignored files or miss real changes. Trust `.gitignore` and let git tell you what changed. +**You may NOT run these directly:** `git checkout -b`, `git commit`, `git push`, `gh pr create`. These are blocked by deny rules. Only devpulse and drone have raw git access. -**Return to main after PR.** Git branches are repo-wide — when you create a feature branch, every citizen in the repo is on that branch, not just you. After your PR is created (or merged), switch back to main so you don't strand other citizens on your stale branch: -``` -git checkout main && git pull # always do this after PR creation -``` +**You CAN still use:** `git status`, `git diff`, `git log` — read-only operations are fine for checking your work. -**Never merge.** Only devpulse or Patrick merge PRs. If your PR gets feedback, fix the issues, commit, and push to the same git branch — the PR updates automatically. +**Never merge.** Only devpulse or Patrick merge PRs. If your PR gets feedback, fix the issues and run `drone @git pr` again. ## Context Guardrail