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

zara-coding: reject mixed-state diff snapshots #445

Open
nsaspy wants to merge 3 commits from rage/1-zara-coding-diff-snapshot into main
pull from: rage/1-zara-coding-diff-snapshot
merge into: nsaspy:main
Conversation 0 Commits 3 Files changed 3 +52 -2
nsaspy commented 2026-09-08 02:19:57 +00:00
Owner
Copy link

Advances #1 by making coding.git.diff fail closed if repository HEAD moves while the bounded diff evidence is being collected.

RAGE transaction

  • RED-first 8fe8cf8: proves a HEAD change during diff collection must be rejected.
  • implementation e845473: snapshots HEAD before/after git diff --numstat and rejects mixed-state evidence instead of returning it as current.

No shell mode, authority expansion, truncation, or cross-plugin duplication. Exact-head CI must pass compatibility, full registry/plugin Nix checks, and package builds before merge.

Advances #1 by making `coding.git.diff` fail closed if repository HEAD moves while the bounded diff evidence is being collected. ## RAGE transaction - RED-first `8fe8cf8`: proves a HEAD change during diff collection must be rejected. - implementation `e845473`: snapshots HEAD before/after `git diff --numstat` and rejects mixed-state evidence instead of returning it as current. No shell mode, authority expansion, truncation, or cross-plugin duplication. Exact-head CI must pass compatibility, full registry/plugin Nix checks, and package builds before merge.
test(zara-coding): preserve diff argv assertion with snapshot guard
Some checks failed
CI / test (pull_request) Failing after 17s
Details
6ec7143171
Some checks failed
CI / test (pull_request) Failing after 17s
Details
This pull request has changes conflicting with the target branch.
  • plugins/zara-coding/lib/zara_coding/domain.py
  • plugins/zara-coding/test/test_diff_snapshot_identity.py
  • plugins/zara-coding/test/test_domain.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-diff-snapshot:rage/1-zara-coding-diff-snapshot
git switch rage/1-zara-coding-diff-snapshot

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-diff-snapshot
git switch rage/1-zara-coding-diff-snapshot
git rebase main
git switch main
git merge --ff-only rage/1-zara-coding-diff-snapshot
git switch rage/1-zara-coding-diff-snapshot
git rebase main
git switch main
git merge --no-ff rage/1-zara-coding-diff-snapshot
git switch main
git merge --squash rage/1-zara-coding-diff-snapshot
git switch main
git merge --ff-only rage/1-zara-coding-diff-snapshot
git switch main
git merge rage/1-zara-coding-diff-snapshot
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!445
No description provided.