fix: return structured conflict-fix push assessment errors (Closes #519) #520

2026-07-08T03:34:24-05:00

jcwalker3 commented

2026-07-08 03:34:24 -05:00

Summary

Fix gitea_assess_conflict_fix_push returning HTTP 500 "issue does not exist" on valid conflict-fix pushes (observed during PR #508 conflict resolution).

Changes

Resolve PR via GET /pulls/{n} before fetching lease comments
Add _fetch_pr_lease_comments_safe() for structured failure instead of uncaught RuntimeError
Return {push_allowed: false, assessment_failed: true, pr_lookup, resolved_repo, reasons} on lookup failure
Preserve #485 behavior in _list_pr_lease_comments() (returns [] on failure)
Add regression tests in tests/test_assess_conflict_fix_push_tool.py
Document assessment_failed handoff in work-issue workflow

Validation

venv/bin/python -m pytest tests/test_assess_conflict_fix_push_tool.py \
  tests/test_pr_lease_comments_non_list_guard.py tests/test_pr_work_lease.py -q
# 24 passed

Closes #519

## Summary Fix `gitea_assess_conflict_fix_push` returning HTTP 500 `"issue does not exist"` on valid conflict-fix pushes (observed during PR #508 conflict resolution). ## Changes - Resolve PR via `GET /pulls/{n}` before fetching lease comments - Add `_fetch_pr_lease_comments_safe()` for structured failure instead of uncaught `RuntimeError` - Return `{push_allowed: false, assessment_failed: true, pr_lookup, resolved_repo, reasons}` on lookup failure - Preserve #485 behavior in `_list_pr_lease_comments()` (returns `[]` on failure) - Add regression tests in `tests/test_assess_conflict_fix_push_tool.py` - Document `assessment_failed` handoff in work-issue workflow ## Validation ``` venv/bin/python -m pytest tests/test_assess_conflict_fix_push_tool.py \ tests/test_pr_lease_comments_non_list_guard.py tests/test_pr_work_lease.py -q # 24 passed ``` Closes #519

sysadmin referenced this pull request

2026-07-08 13:05:00 -05:00

Detect stale MCP runtime before mutation tools execute #545

sysadmin commented

2026-07-08 21:04:22 -05:00

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #520
issue: #519
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 34817-e991aad7677c
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520-220300
phase: claimed
candidate_head: 1e76ce267c
target_branch: master
target_branch_sha: 18e7d7b6e1
last_activity: 2026-07-09T02:04:22Z
expires_at: 2026-07-09T04:04:22Z
blocker: none

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #520 issue: #519 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 34817-e991aad7677c worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520-220300 phase: claimed candidate_head: 1e76ce267cfafc02680ae265cb18bfa41b24b273 target_branch: master target_branch_sha: 18e7d7b6e18cfb8d3941f3fd780601e5b87f854b last_activity: 2026-07-09T02:04:22Z expires_at: 2026-07-09T04:04:22Z blocker: none

sysadmin commented

2026-07-08 21:05:02 -05:00

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #520
issue: #519
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 34817-e991aad7677c
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520-220300
phase: released
candidate_head: 1e76ce267c
target_branch: master
target_branch_sha: 18e7d7b6e1
last_activity: 2026-07-09T02:05:01Z
expires_at: 2026-07-09T04:05:01Z
blocker: manual-release

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #520 issue: #519 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 34817-e991aad7677c worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520-220300 phase: released candidate_head: 1e76ce267cfafc02680ae265cb18bfa41b24b273 target_branch: master target_branch_sha: 18e7d7b6e18cfb8d3941f3fd780601e5b87f854b last_activity: 2026-07-09T02:05:01Z expires_at: 2026-07-09T04:05:01Z blocker: manual-release

jcwalker3 added 2 commits 2026-07-08 21:09:05 -05:00

fix: return structured conflict-fix push assessment errors (Closes #519 ) 08bcc03f17

Resolve PR via pulls API before fetching lease comments so
gitea_assess_conflict_fix_push fails closed with actionable reasons
instead of surfacing HTTP 500 when Gitea returns not-found errors.

Add regression tests and document assessment-failure handoff in work-issue.

fix: isolate #519 PR lookup from shared lease comment listing f1449ff5c8

Keep _fetch_pr_lease_comments_safe for gitea_assess_conflict_fix_push
only. Restore _list_pr_lease_comments to a single comments GET so merge
approval feedback and #485 non-list handling keep stable API call order.

Closes #519

jcwalker3 force-pushed feat/issue-519-conflict-fix-push-assessment from 1e76ce267c to f1449ff5c8

2026-07-08 21:09:05 -05:00

Compare

sysadmin commented

2026-07-08 21:10:59 -05:00

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #520
issue: #519
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 34817-e991aad7677c
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520
phase: claimed
candidate_head: f1449ff5c8
target_branch: master
target_branch_sha: 8db26c9a15
last_activity: 2026-07-09T02:10:59Z
expires_at: 2026-07-09T04:10:59Z
blocker: none

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #520 issue: #519 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 34817-e991aad7677c worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-pr520 phase: claimed candidate_head: f1449ff5c8107789c7f2614ffe9875ef4eeaa28b target_branch: master target_branch_sha: 8db26c9a15c305ae44dc3ecdecfa19a88639c641 last_activity: 2026-07-09T02:10:59Z expires_at: 2026-07-09T04:10:59Z blocker: none

sysadmin approved these changes 2026-07-08 21:11:11 -05:00

sysadmin left a comment

Review PR #520 / Issue #519

Verdict: APPROVE

Scope

Structured fail-closed path for gitea_assess_conflict_fix_push when PR lookup/comment fetch fails
New _fetch_pr_lease_comments_safe (PR GET first, then issue comments)
Returns assessment_failed: true with pr_lookup / resolved_repo diagnostics instead of HTTP 500
Work-issue workflow documents handoff for assessment_failed
Regression tests for 404/lookup/comment failures

Live head

f1449ff5c8107789c7f2614ffe9875ef4eeaa28b (includes follow-up isolate PR lookup commit)
mergeable: true; author jcwalker3

Validation

git diff --check prgs/master...HEAD: clean
Targeted lease/assess suite: 24 passed
Full suite: 1977 passed, 2 known master-baseline failures

No REQUEST_CHANGES findings. Ready for merger.

## Review PR #520 / Issue #519 **Verdict: APPROVE** ### Scope - Structured fail-closed path for `gitea_assess_conflict_fix_push` when PR lookup/comment fetch fails - New `_fetch_pr_lease_comments_safe` (PR GET first, then issue comments) - Returns `assessment_failed: true` with `pr_lookup` / `resolved_repo` diagnostics instead of HTTP 500 - Work-issue workflow documents handoff for assessment_failed - Regression tests for 404/lookup/comment failures ### Live head - `f1449ff5c8107789c7f2614ffe9875ef4eeaa28b` (includes follow-up isolate PR lookup commit) - mergeable: true; author `jcwalker3` ### Validation - `git diff --check prgs/master...HEAD`: clean - Targeted lease/assess suite: **24 passed** - Full suite: **1977 passed**, 2 known master-baseline failures No REQUEST_CHANGES findings. Ready for merger.

sysadmin commented

2026-07-08 21:11:22 -05:00

adopted_at: 2026-07-09T02:11:22Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 34817-e991aad7677c
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 7373
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #520
issue: #519
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 34819-0482ce170b2f
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr520
phase: adopted
candidate_head: f1449ff5c8
target_branch: master
target_branch_sha: 8db26c9a15
last_activity: 2026-07-09T02:11:22Z
expires_at: 2026-07-09T04:11:22Z
blocker: none

adopted_at: 2026-07-09T02:11:22Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 34817-e991aad7677c adopted_from_profile: prgs-reviewer adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 7373 adoption_reason: merger-handoff-approved-head  repo: Scaled-Tech-Consulting/Gitea-Tools pr: #520 issue: #519 reviewer_identity: sysadmin profile: prgs-merger session_id: 34819-0482ce170b2f worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr520 phase: adopted candidate_head: f1449ff5c8107789c7f2614ffe9875ef4eeaa28b target_branch: master target_branch_sha: 8db26c9a15c305ae44dc3ecdecfa19a88639c641 last_activity: 2026-07-09T02:11:22Z expires_at: 2026-07-09T04:11:22Z blocker: none

sysadmin merged commit 9d86fc44e4 into master

2026-07-08 21:11:29 -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#520