Scaled-Tech-Consulting/Gitea-Tools
2
0
Fork 0
Code Issues 73 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

Reviewer reports must classify local merge simulations as worktree mutations #317

New Issue
Closed
opened 2026-07-07 01:23:13 -05:00 by jcwalker3 · 1 comment
jcwalker3 commented 2026-07-07 01:23:13 -05:00
Owner
Copy Link
Copy Source

A reviewer workflow for PR #281 ran a local merge simulation:

  • git merge prgs/master --no-commit --no-ff
  • git status
  • git merge --abort

The final report listed this as read-only diagnostics.

Problem

A local merge simulation mutates the worktree and index temporarily, even if it is later aborted. It must not be classified as read-only.

Required behavior

  1. Any command that modifies the worktree, index, merge state, or rebase state must be reported as a worktree/index mutation.
  2. This includes:
    • git merge --no-commit
    • git merge --abort
    • git reset
    • git checkout
    • git clean
    • git worktree add/remove
  3. If a merge simulation is performed, the report must include:
    • command run
    • worktree path
    • pre-simulation clean status
    • merge result
    • abort/reset command
    • post-abort clean status
  4. Merge simulation results must not be called read-only diagnostics.

Acceptance criteria

  • Final-report validator rejects merge simulation under read-only diagnostics.
  • Reports must classify merge simulation under Worktree/index mutations.
  • Tests cover successful simulation, conflict simulation, aborted simulation, failed abort, and clean post-abort proof.
A reviewer workflow for PR #281 ran a local merge simulation: - `git merge prgs/master --no-commit --no-ff` - `git status` - `git merge --abort` The final report listed this as read-only diagnostics. ## Problem A local merge simulation mutates the worktree and index temporarily, even if it is later aborted. It must not be classified as read-only. ## Required behavior 1. Any command that modifies the worktree, index, merge state, or rebase state must be reported as a worktree/index mutation. 2. This includes: - `git merge --no-commit` - `git merge --abort` - `git reset` - `git checkout` - `git clean` - `git worktree add/remove` 3. If a merge simulation is performed, the report must include: - command run - worktree path - pre-simulation clean status - merge result - abort/reset command - post-abort clean status 4. Merge simulation results must not be called read-only diagnostics. ## Acceptance criteria - [ ] Final-report validator rejects merge simulation under read-only diagnostics. - [ ] Reports must classify merge simulation under `Worktree/index mutations`. - [ ] Tests cover successful simulation, conflict simulation, aborted simulation, failed abort, and clean post-abort proof.
jcwalker3 added the status:in-progress label 2026-07-07 04:13:07 -05:00
jcwalker3 commented 2026-07-07 04:13:37 -05:00
Author
Owner
Copy Link
Copy Source

PR opened with merge-simulation worktree mutation verifier.

  • Entry point: assess_merge_simulation_report(report_text, command_log=[...])
  • Blocks read-only classification; requires Worktree/index mutations proof

Verification: pytest tests/test_reviewer_merge_simulation.py tests/test_git_ref_mutation_report.py tests/test_review_proofs.py -q — 170 passed

PR opened with merge-simulation worktree mutation verifier. - Entry point: `assess_merge_simulation_report(report_text, command_log=[...])` - Blocks read-only classification; requires Worktree/index mutations proof Verification: `pytest tests/test_reviewer_merge_simulation.py tests/test_git_ref_mutation_report.py tests/test_review_proofs.py -q` — 170 passed
sysadmin removed the status:in-progress label 2026-07-07 08:20:42 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
allocator
Controller-owned work allocator
 anti-stomp
Prevent concurrent LLM session stomping
 architecture
Architecture / structural design
 bug
chore
codex
OpenAI Codex client / workflow session surface
 concurrency
Concurrent session safety
 contamination
Workflow or session contamination incident
 control-plane
MCP control-plane coordination and allocation authority
 dashboard
MCP operational dashboard/queue view
 database
Internal coordination storage (SQLite/Postgres)
 design
Design / investigation, no implementation
 documentation
Docs / runbooks
 enhancement
New feature or improvement
 gitea
Gitea MCP workflow
 glitchtip
GlitchTip integration
 important
incident
Operational or process incident requiring durable audit trail
 incident-bridge
Sentry-to-Gitea incident bridging
 integration
Integration testing
 jenkins
Jenkins integration
 labels
Label taxonomy management
 leases
Lease adopt/release/expire lifecycle
 mcp
MCP server / tooling
 mcp-health
MCP namespace and runtime health
 mcp-menu
MCP menu surface
 multi-project
Work spanning multiple monitoring projects or Gitea repos
 mutating
Mutating action; requires gating
 nice-to-have
observability
Observability, metrics, traces, error reporting
 portability
Cross-platform / portability
 preflight
Shared preflight gates before mutation
 protected-branch
Protected branch / stable-branch policy concern
 queue
Work queue visibility and allocation
 read-only
Read-only, no mutation
 reconnect
MCP client reconnect/reload recovery path
 recovery
Recovery paths for stale/foreign leases
 refactor
Code refactor / restructure
 release
Release / versioning
 reliability
Reliability / failure handling
 resumable-review
Persist and resume prepared review verdicts across sessions
 reviewer
Reviewer workflow tooling
 roadmap
Roadmap / umbrella issue
 safety
Safety rails and fail-closed mutation guards
 security
Security / trust boundary
 self-hosted
Self-hosted infrastructure integration
 sentry
Sentry error monitoring integration
 stale-runtime
Stale backend daemon / runtime-vs-master parity failures
 status:blocked
Issue is blocked
 status:in-progress
Issue is being worked on
 status:pr-open
Issue has an open pull request
 status:ready
Issue is ready for work
 terminal-lock
Terminal review lock (#332) path
 testing
Tests / test coverage
 tracker
Issue tracker hygiene / meta
 type:bug
Bug or defect
 type:feature
Feature or enhancement
 type:feature
Feature or enhancement
 type:guardrail
Safety gate or guardrail
 visibility
Workflow state visibility for LLMs/operators
 workflow
Cross-tool workflow
 workflow-hardening
LLM workflow coordination hardening
 workflow-hardening
LLM workflow coordination hardening
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jcwalker3 sysadmin
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

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