feat: discover non-canonical worktrees by branch matching (Closes #528) #568

2026-07-08T21:53:59-05:00

jcwalker3 commented

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

Teaches merged cleanup to discover local worktrees by branch/ref relationship instead of assuming a derived path naming convention.

Closes #528

Teaches merged cleanup to discover local worktrees by branch/ref relationship instead of assuming a derived path naming convention. Closes #528

jcwalker3 added 1 commit 2026-07-08 21:53:59 -05:00

feat: discover non-canonical worktrees by branch matching (Closes #528 ) 7a0de4a8e9

sysadmin commented

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

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #568
issue: #528
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 10371-cdffcddc83c2
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming
phase: claimed
candidate_head: 7a0de4a8e9
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T02:59:18Z
expires_at: 2026-07-09T04:59:18Z
blocker: none

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #568 issue: #528 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 10371-cdffcddc83c2 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming phase: claimed candidate_head: 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034 target_branch: master target_branch_sha: none last_activity: 2026-07-09T02:59:18Z expires_at: 2026-07-09T04:59:18Z blocker: none

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

Dismissed

sysadmin left a comment

Review: APPROVE

Scope: Closes #528 — discover local worktrees via git worktree list --porcelain branch matching instead of path-name convention only.

Diff summary (3 files):

merged_cleanup_reconcile.py — discover_local_worktrees(), prefer branch-matched path over derived path; match_type proof field; remove_local_worktree uses discovery
tests/test_merged_cleanup_reconcile.py — discovery + report + remove coverage (11/11 focused tests passed)
webui/lease_loader.py — re-export of ISSUE_LOCK_FILE from issue_lock_provenance (already present on current prgs/master; no functional delta at tip)

Validation

Checkout: branches/review-feat-issue-528-reconcile-worktree-naming @ 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034 (matches pinned head)
Worktree dirty: no
Secret sweep: no matches
Tests: pytest tests/test_merged_cleanup_reconcile.py -q → 11 passed
Live recheck: open, mergeable, head still 7a0de4a…

Notes (non-blocking)

PR #570 is also open for the same lease_loader import; if #568 merges first, #570 may become already-landed / noop at tip.
Test file ends without trailing newline (style only).

Review Metadata:

LLM-Agent-SHA: llm-7a0de4a8e9b9
LLM-Role: reviewer
Authenticated-Gitea-User: sysadmin
MCP-Profile: prgs-reviewer

Ready for merger (not merging from this session).

## Review: APPROVE **Scope:** Closes #528 — discover local worktrees via `git worktree list --porcelain` branch matching instead of path-name convention only. **Diff summary (3 files):** - `merged_cleanup_reconcile.py` — `discover_local_worktrees()`, prefer branch-matched path over derived path; `match_type` proof field; `remove_local_worktree` uses discovery - `tests/test_merged_cleanup_reconcile.py` — discovery + report + remove coverage (11/11 focused tests passed) - `webui/lease_loader.py` — re-export of `ISSUE_LOCK_FILE` from `issue_lock_provenance` (already present on current `prgs/master`; no functional delta at tip) **Validation** - Checkout: `branches/review-feat-issue-528-reconcile-worktree-naming` @ `7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034` (matches pinned head) - Worktree dirty: no - Secret sweep: no matches - Tests: `pytest tests/test_merged_cleanup_reconcile.py -q` → **11 passed** - Live recheck: open, mergeable, head still `7a0de4a…` **Notes (non-blocking)** - PR #570 is also open for the same lease_loader import; if #568 merges first, #570 may become already-landed / noop at tip. - Test file ends without trailing newline (style only). Review Metadata: - LLM-Agent-SHA: llm-7a0de4a8e9b9 - LLM-Role: reviewer - Authenticated-Gitea-User: sysadmin - MCP-Profile: prgs-reviewer Ready for merger (not merging from this session).

sysadmin commented

2026-07-08 22:00:33 -05:00

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #568
issue: #528
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 10371-cdffcddc83c2
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming
phase: released
candidate_head: 7a0de4a8e9
target_branch: master
target_branch_sha: none
last_activity: 2026-07-09T03:00:33Z
expires_at: 2026-07-09T05:00:33Z
blocker: manual-release

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #568 issue: #528 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 10371-cdffcddc83c2 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming phase: released candidate_head: 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034 target_branch: master target_branch_sha: none last_activity: 2026-07-09T03:00:33Z expires_at: 2026-07-09T05:00:33Z blocker: manual-release

sysadmin commented

2026-07-08 22:01:25 -05:00

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #568
issue: #528
reviewer_identity: sysadmin
profile: prgs-reviewer
session_id: 10371-cdffcddc83c2
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming
phase: claimed
candidate_head: 7a0de4a8e9
target_branch: master
target_branch_sha: 719de6fb7a
last_activity: 2026-07-09T03:01:25Z
expires_at: 2026-07-09T05:01:25Z
blocker: none

repo: Scaled-Tech-Consulting/Gitea-Tools pr: #568 issue: #528 reviewer_identity: sysadmin profile: prgs-reviewer session_id: 10371-cdffcddc83c2 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/review-feat-issue-528-reconcile-worktree-naming phase: claimed candidate_head: 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034 target_branch: master target_branch_sha: 719de6fb7ad316321eb367b8f5a05e931a2c4f32 last_activity: 2026-07-09T03:01:25Z expires_at: 2026-07-09T05:01:25Z blocker: none

sysadmin approved these changes 2026-07-08 22:01:41 -05:00

sysadmin left a comment

Review: PR #568 / #528

Scope: Adds discover_local_worktrees() via git worktree list --porcelain so merged cleanup finds non-canonical worktree folder names by branch ref, with path-derivation fallback. Includes ISSUE_LOCK_FILE import fix (already on master via #570).

Checks:

Eligible as sysadmin/prgs-reviewer (author jcwalker3)
Live head 7a0de4a mergeable into master
Branch-map preferred; derived path fallback; dict/string head handling preserved
tests/test_merged_cleanup_reconcile.py: 11 passed

Verdict: APPROVE

Pinned head: 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034

LLM Handoff Metadata

LLM-Role: reviewer
Authenticated-Gitea-User: sysadmin
MCP-Profile: prgs-reviewer
Worktree: branches/review-feat-issue-528-reconcile-worktree-naming
Session-Lease: 10371-cdffcddc83c2

Ready for merger at pinned head.

## Review: PR #568 / #528 **Scope:** Adds `discover_local_worktrees()` via `git worktree list --porcelain` so merged cleanup finds non-canonical worktree folder names by branch ref, with path-derivation fallback. Includes `ISSUE_LOCK_FILE` import fix (already on master via #570). **Checks:** - Eligible as sysadmin/prgs-reviewer (author jcwalker3) - Live head `7a0de4a` mergeable into master - Branch-map preferred; derived path fallback; dict/string head handling preserved - `tests/test_merged_cleanup_reconcile.py`: 11 passed **Verdict:** APPROVE Pinned head: `7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034` ## LLM Handoff Metadata - LLM-Role: reviewer - Authenticated-Gitea-User: sysadmin - MCP-Profile: prgs-reviewer - Worktree: branches/review-feat-issue-528-reconcile-worktree-naming - Session-Lease: 10371-cdffcddc83c2 Ready for merger at pinned head.

sysadmin commented

2026-07-08 22:03:08 -05:00

adopted_at: 2026-07-09T03:03:08Z
adopted_by_identity: sysadmin
adopted_by_profile: prgs-merger
adopted_from_session_id: 10371-cdffcddc83c2
adopted_from_profile: prgs-reviewer
adopted_from_reviewer_identity: sysadmin
adopted_from_comment_id: 7603
adoption_reason: merger-handoff-approved-head

repo: Scaled-Tech-Consulting/Gitea-Tools
pr: #568
issue: #528
reviewer_identity: sysadmin
profile: prgs-merger
session_id: 10369-7904ebfd98d0
worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr568
phase: adopted
candidate_head: 7a0de4a8e9
target_branch: master
target_branch_sha: 719de6fb7a
last_activity: 2026-07-09T03:03:08Z
expires_at: 2026-07-09T05:03:08Z
blocker: none

adopted_at: 2026-07-09T03:03:08Z adopted_by_identity: sysadmin adopted_by_profile: prgs-merger adopted_from_session_id: 10371-cdffcddc83c2 adopted_from_profile: prgs-reviewer adopted_from_reviewer_identity: sysadmin adopted_from_comment_id: 7603 adoption_reason: merger-handoff-approved-head  repo: Scaled-Tech-Consulting/Gitea-Tools pr: #568 issue: #528 reviewer_identity: sysadmin profile: prgs-merger session_id: 10369-7904ebfd98d0 worktree: /Users/jasonwalker/Development/Gitea-Tools/branches/merge-pr568 phase: adopted candidate_head: 7a0de4a8e9b98ad80f84b18ece6c2b211a2c4034 target_branch: master target_branch_sha: 719de6fb7ad316321eb367b8f5a05e931a2c4f32 last_activity: 2026-07-09T03:03:08Z expires_at: 2026-07-09T05:03:08Z blocker: none

sysadmin merged commit f6b2adac4d into master

2026-07-08 22:03:45 -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#568