nsaspy/zara-plugins
1
0
Fork 0
Code Issues 10 Pull requests 297 Projects Releases Packages Wiki Activity Actions

zara-coding: add stale-safe approval-gated branch deletion #464

Open
nsaspy wants to merge 5 commits from rage/1-zara-coding-branch-delete into main
pull from: rage/1-zara-coding-branch-delete
merge into: nsaspy:main
Conversation 0 Commits 5 Files changed 5 +168 -5
nsaspy commented 2026-09-08 02:20:02 +00:00
Owner
Copy link

Advances #1.

Adds coding.git.branch.delete as a narrowly destructive, canonical-approval-gated Git operation.

Safety contract:

  • requires zara_requires_approval=true;
  • repository stays inside configured allowed roots;
  • validates the branch ref with Git;
  • requires a full 40- or 64-hex expected object ID rather than a symbolic revision;
  • scans the bounded canonical worktree inventory and refuses deletion if the branch is checked out anywhere;
  • uses git update-ref -d <ref> <expected_head> so a moved/stale branch fails closed;
  • exposes no arbitrary Git argv and uses bounded shell=False execution.

The compare-and-set deletion behavior was also checked against a real temporary Git repo: matching expected head deletes; stale expected head is rejected.

RED-first commit 68db4c9d; domain/tool/surface-contract/docs follow. Full registry/plugin/Nix CI required before merge.

Advances #1. Adds `coding.git.branch.delete` as a narrowly destructive, canonical-approval-gated Git operation. Safety contract: - requires `zara_requires_approval=true`; - repository stays inside configured allowed roots; - validates the branch ref with Git; - requires a full 40- or 64-hex expected object ID rather than a symbolic revision; - scans the bounded canonical worktree inventory and refuses deletion if the branch is checked out anywhere; - uses `git update-ref -d <ref> <expected_head>` so a moved/stale branch fails closed; - exposes no arbitrary Git argv and uses bounded `shell=False` execution. The compare-and-set deletion behavior was also checked against a real temporary Git repo: matching expected head deletes; stale expected head is rejected. RED-first commit `68db4c9d`; domain/tool/surface-contract/docs follow. Full registry/plugin/Nix CI required before merge.
docs(zara-coding): document stale-safe branch deletion
Some checks failed
CI / test (pull_request) Failing after 20s
Details
aa28f21045
Some checks failed
CI / test (pull_request) Failing after 20s
Details
This pull request has changes conflicting with the target branch.
  • plugins/zara-coding/README.md
  • plugins/zara-coding/test/test_plugin.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rage/1-zara-coding-branch-delete:rage/1-zara-coding-branch-delete
git switch rage/1-zara-coding-branch-delete

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff rage/1-zara-coding-branch-delete
git switch rage/1-zara-coding-branch-delete
git rebase main
git switch main
git merge --ff-only rage/1-zara-coding-branch-delete
git switch rage/1-zara-coding-branch-delete
git rebase main
git switch main
git merge --no-ff rage/1-zara-coding-branch-delete
git switch main
git merge --squash rage/1-zara-coding-branch-delete
git switch main
git merge --ff-only rage/1-zara-coding-branch-delete
git switch main
git merge rage/1-zara-coding-branch-delete
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
accessibility
Barrier affecting people with disabilities

  
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
security

   
wontfix
This will not be worked on

No labels
accessibility
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
security
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
nsaspy/zara-plugins!464
No description provided.