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

feat: add reconciliation workflow MCP tools for already-landed PRs (Closes #301) #384

Merged
sysadmin merged 6 commits from feat/issue-301-reconciliation-workflow into master 2026-07-07 09:42:32 -05:00
Conversation 1 Commits 6 Files Changed 8
+767 -1
jcwalker3 commented 2026-07-07 08:26:04 -05:00
Owner
Copy Link
Copy Source

Summary

Implements the dedicated reconciliation path from #301 so already-landed open PRs can be handled without invoking review or merge.

Changes

  • reconciliation_workflow.py — target-branch fetch, ancestor proof, capability plan, workflow-source verifier
  • gitea_assess_already_landed_reconciliation — read-only single-PR assessment + plan for active profile
  • gitea_scan_already_landed_open_prs — scan open PR inventory with pagination proof
  • gitea-reconcile-landed-pr skill registered in MCP project skills
  • reconcile_landed_pr resolver task and role routing
  • Tests for assessment, plans, MCP tools, and skill registration

Safety

  • Tools are read-only; no approve, request-changes, merge, or close mutations
  • Plans always set review_merge_allowed: false
  • Missing gitea.pr.close yields comment-then-stop or recovery handoff outcomes

Closes #301

## Summary Implements the dedicated reconciliation path from #301 so already-landed open PRs can be handled without invoking review or merge. ## Changes - `reconciliation_workflow.py` — target-branch fetch, ancestor proof, capability plan, workflow-source verifier - `gitea_assess_already_landed_reconciliation` — read-only single-PR assessment + plan for active profile - `gitea_scan_already_landed_open_prs` — scan open PR inventory with pagination proof - `gitea-reconcile-landed-pr` skill registered in MCP project skills - `reconcile_landed_pr` resolver task and role routing - Tests for assessment, plans, MCP tools, and skill registration ## Safety - Tools are read-only; no approve, request-changes, merge, or close mutations - Plans always set `review_merge_allowed: false` - Missing `gitea.pr.close` yields comment-then-stop or recovery handoff outcomes Closes #301
jcwalker3 added 1 commit 2026-07-07 08:26:05 -05:00
feat: add reconciliation workflow MCP tools for already-landed PRs (Closes #301) 749e480baf 
Expose read-only assess/scan tools and capability planning so already-landed
open PRs can be reconciled without review or merge. Register the
gitea-reconcile-landed-pr skill and workflow-source verification.
jcwalker3 added 1 commit 2026-07-07 08:38:37 -05:00
fix: resolve conflicts for PR #384 against latest master 7635a17599
jcwalker3 added 1 commit 2026-07-07 08:57:05 -05:00
fix: resolve conflicts for PR #384 180490c640 
Merge prgs/master and keep both reconciliation workflow (#301) and
native MCP preference (#270) imports in gitea_mcp_server.
jcwalker3 added 1 commit 2026-07-07 08:58:50 -05:00
fix: resolve conflicts for PR #384 cf94112e96 
Merge prgs/master and keep read-only reconciliation workflow tasks (#301)
alongside reconciler close capabilities (#309).
jcwalker3 added 1 commit 2026-07-07 09:20:22 -05:00
fix: resolve conflicts for PR #384 4cf75bcbc9 
Merge prgs/master; keep reconciliation_workflow import alongside
review_merge_state_machine and preserve both reconciliation and
pr-queue-cleanup workflow split tests.
jcwalker3 added 1 commit 2026-07-07 09:33:48 -05:00
fix: resolve conflicts for PR #384 5513bdf2aa 
Merge prgs/master; keep read-only reconciliation tools (#301) alongside
master's gitea_reconcile_already_landed_pr close path (#310). Unify task
routing: reconcile_landed_pr stays author/read-only; reconcile-landed-pr
and reconcile_already_landed_pr stay reconciler.
sysadmin approved these changes 2026-07-07 09:42:20 -05:00
sysadmin left a comment
Owner
Copy Link
Copy Source

Manual review of changed files and test suite validation passed. The new reconciliation workflow tool implementation allows identifying and processing already-landed PRs cleanly without invoking review/merge logic from ineligible roles. All tests pass cleanly. Approved.

Manual review of changed files and test suite validation passed. The new reconciliation workflow tool implementation allows identifying and processing already-landed PRs cleanly without invoking review/merge logic from ineligible roles. All tests pass cleanly. Approved.
sysadmin merged commit d446a31442 into master 2026-07-07 09:42:32 -05:00
Sign in to join this conversation.
Reviewers
No Reviewers
sysadmin
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

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