feat: classify merge simulation as worktree/index mutations (Closes #317) #356

2026-07-07T04:13:36-05:00

jcwalker3 commented

2026-07-07 04:13:36 -05:00

Summary

Adds assess_merge_simulation_report so reviewer final reports cannot classify local merge simulations as read-only diagnostics (#317).

Changes

New reviewer_merge_simulation.py detects git merge --no-commit / --abort commands and requires Worktree/index mutations documentation
Rejects merge simulation listed under read-only diagnostics
Requires worktree path, pre-simulation clean status, merge result, abort proof, and post-abort clean status when simulation runs
Re-export from review_proofs.py
10 tests covering detection, read-only rejection, conflict simulation, and aborted simulation proof

Verification

pytest tests/test_reviewer_merge_simulation.py tests/test_git_ref_mutation_report.py tests/test_review_proofs.py -q

170 passed

Closes #317

## Summary Adds `assess_merge_simulation_report` so reviewer final reports cannot classify local merge simulations as read-only diagnostics (#317). ## Changes - New `reviewer_merge_simulation.py` detects `git merge --no-commit` / `--abort` commands and requires `Worktree/index mutations` documentation - Rejects merge simulation listed under read-only diagnostics - Requires worktree path, pre-simulation clean status, merge result, abort proof, and post-abort clean status when simulation runs - Re-export from `review_proofs.py` - 10 tests covering detection, read-only rejection, conflict simulation, and aborted simulation proof ## Verification ``` pytest tests/test_reviewer_merge_simulation.py tests/test_git_ref_mutation_report.py tests/test_review_proofs.py -q ``` 170 passed Closes #317

jcwalker3 added 1 commit 2026-07-07 04:13:36 -05:00

feat: classify merge simulation as worktree/index mutations (Closes #317 ) 71b8d00897

Add assess_merge_simulation_report to reject local merge simulations listed
as read-only diagnostics and require Worktree/index mutations documentation
with worktree path, pre/merge/abort/post-clean proof when simulation
commands appear in the session log.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

jcwalker3 commented

2026-07-07 04:13:37 -05:00

Ready for review.

reviewer_merge_simulation.py + assess_merge_simulation_report export
10 new tests; full verification suite — 170 passed

Ready for review. - `reviewer_merge_simulation.py` + `assess_merge_simulation_report` export - 10 new tests; full verification suite — 170 passed

jcwalker3 referenced this issue from a commit

2026-07-07 04:35:19 -05:00

fix: resolve conflicts for PR #356

jcwalker3 added 1 commit 2026-07-07 04:35:19 -05:00

fix: resolve conflicts for PR #356 c278e16053

jcwalker3 referenced this issue from a commit

2026-07-07 08:14:36 -05:00

fix: resolve conflicts for PR #356 against current master

jcwalker3 added 1 commit 2026-07-07 08:14:36 -05:00

fix: resolve conflicts for PR #356 against current master 42cd0f9f4a

sysadmin approved these changes 2026-07-07 08:20:28 -05:00

sysadmin left a comment

All tests pass successfully after merging master (1281 passed, 1 failed [pre-existing]). Reviewed the implementation of assess_merge_simulation_report in reviewer_merge_simulation.py and the test coverage in tests/test_reviewer_merge_simulation.py. It correctly classifies merge simulation commands as worktree mutations and requires appropriate documentation. Verified that the remaining failure is pre-existing on master.

All tests pass successfully after merging master (1281 passed, 1 failed [pre-existing]). Reviewed the implementation of `assess_merge_simulation_report` in `reviewer_merge_simulation.py` and the test coverage in `tests/test_reviewer_merge_simulation.py`. It correctly classifies merge simulation commands as worktree mutations and requires appropriate documentation. Verified that the remaining failure is pre-existing on master.

sysadmin merged commit 0fe8f57dda into master

2026-07-07 08:20:40 -05:00

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Scaled-Tech-Consulting/Gitea-Tools#356