sysadmin
f75f2327f5
fix: resolve conflicts for PR #385
...
Merge prgs/master into feat/issue-139-role-aware-work-issue-routing and
keep both work-issue task routing entries and reconcile-landed-pr entries
in task_capability_map.py.
2026-07-07 11:13:45 -04:00
sysadmin
9f4dd4c39b
Merge pull request 'feat: enforce canonical reconciliation handoff schema ( Closes #307 )' ( #387 ) from feat/issue-307-canonical-reconciliation-handoff into master
2026-07-07 10:09:50 -05:00
sysadmin
6e212c0de7
Merge pull request 'feat: enforce author work leases in issue lock preflight ( Closes #267 )' ( #386 ) from feat/issue-267-work-leases into master
2026-07-07 09:52:37 -05:00
sysadmin
d446a31442
Merge pull request 'feat: add reconciliation workflow MCP tools for already-landed PRs ( Closes #301 )' ( #384 ) from feat/issue-301-reconciliation-workflow into master
2026-07-07 09:42:31 -05:00
sysadmin
b11160f236
Merge pull request 'feat: classify already-landed PRs as reconciliation-only ( Closes #295 )' ( #382 ) from feat/issue-295-already-landed-classification into master
2026-07-07 09:37:23 -05:00
sysadmin
10e64f6683
fix: resolve conflicts for PR #385
...
Merge prgs/master; keep work-issue author routing (#139 ) alongside
reconciler task entries from master (#309/#310).
2026-07-07 10:34:23 -04:00
sysadmin
5513bdf2aa
fix: resolve conflicts for PR #384
...
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.
2026-07-07 10:33:42 -04:00
sysadmin
273eba7fb3
Merge pull request 'feat: enforce branches-only author mutation worktree guard ( Closes #274 )' ( #374 ) from feat/issue-274-branches-only-worktrees into master
2026-07-07 09:33:18 -05:00
sysadmin
cd61272837
fix: resolve conflicts for PR #374
...
Merge prgs/master into feat/issue-274-branches-only-worktrees; keep both
already_landed_reconcile and author_mutation_worktree imports. Allow
branches/ worktrees when PROJECT_ROOT is the session worktree; align
commit-payload tests with branches-only guard (#274 ).
2026-07-07 10:31:21 -04:00
sysadmin
7fbb1bf34a
Merge pull request 'feat: require pagination proof in reconciliation PR inventory ( Closes #308 )' ( #376 ) from feat/issue-308-reconcile-inventory-pagination into master
2026-07-07 09:26:02 -05:00
sysadmin
4243b60ca3
Merge pull request 'feat: add prgs-reconciler profile and gated already-landed PR close ( Closes #310 )' ( #381 ) from feat/issue-310-prgs-reconciler-profile into master
2026-07-07 09:22:55 -05:00
sysadmin
f5953549aa
fix: resolve conflicts for PR #376
...
Merge prgs/master; keep reconcile-inventory pagination verifier (#308 )
alongside linked-issue live-proof gates from master (#300 ).
2026-07-07 10:22:35 -04:00
sysadmin
ab6bb593bc
fix: resolve conflicts for PR #382
...
Merge prgs/master; keep already-landed oldest-eligible-PR test from
#295 alongside master already-landed gate and target-branch freshness tests.
2026-07-07 10:20:52 -04:00
sysadmin
4cf75bcbc9
fix: resolve conflicts for PR #384
...
Merge prgs/master; keep reconciliation_workflow import alongside
review_merge_state_machine and preserve both reconciliation and
pr-queue-cleanup workflow split tests.
2026-07-07 10:20:14 -04:00
sysadmin
8d5fa06351
Merge commit 'b5ee6567aade4fdce4c57d826184bfd01ebb522e' into HEAD
...
# Conflicts:
# tests/test_llm_workflow_split.py
2026-07-07 10:19:18 -04:00
sysadmin
7db8298cdd
Merge pull request 'feat: require live linked issue proof in reconciliation handoffs ( Closes #300 )' ( #372 ) from feat/issue-300-linked-issue-live-proof into master
2026-07-07 09:19:01 -05:00
sysadmin
167257b8a3
Merge commit 'b5ee6567aade4fdce4c57d826184bfd01ebb522e' into HEAD
...
# Conflicts:
# tests/test_resolve_task_capability.py
2026-07-07 10:18:20 -04:00
sysadmin
23380d27fe
Merge commit 'b5ee6567aade4fdce4c57d826184bfd01ebb522e' into HEAD
...
# Conflicts:
# review_proofs.py
# tests/test_llm_workflow_split.py
2026-07-07 10:16:59 -04:00
sysadmin
bb525a8f94
Merge pull request 'Enforce already-landed review report state gates' ( #383 ) from feat/issue-294-already-landed-review-gate into master
2026-07-07 09:15:19 -05:00
sysadmin
d5b185ce38
Merge commit 'b5ee6567aade4fdce4c57d826184bfd01ebb522e' into HEAD
...
# Conflicts:
# review_proofs.py
# tests/test_llm_workflow_split.py
2026-07-07 10:15:10 -04:00
sysadmin
b5ee6567aa
Merge pull request 'feat: verify canonical workflow citation and version in review reports ( Closes #296 )' ( #380 ) from feat/issue-296-workflow-version-proof into master
2026-07-07 09:11:13 -05:00
sysadmin
103364aa8d
Merge pull request 'feat: add PR-only queue cleanup mode with per-PR dispatch gates ( Closes #390 )' ( #393 ) from feat/issue-390-pr-queue-cleanup-mode into master
2026-07-07 09:07:51 -05:00
sysadmin and Claude Opus 4.8
a2bd23da14
test: expand PR-queue-cleanup coverage to full acceptance matrix ( #390 )
...
Superset of the initial test slice: adds capability-map and router
routing cases (reviewer-role enforcement, author wrong_role_stop), the
full terminal-chain matrix (comment/skip stop, gates-failed stop, merge
completed/blocker stop, unknown-decision fail-closed), and report
verifier cases for two terminal mutations, missing next-suggested-PR,
branch mutations, and missing workflow citation.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 10:06:50 -04:00
sysadmin and Claude Opus 4.8
91c67930ec
feat: add PR-only queue cleanup mode with per-PR dispatch gates ( Closes #390 )
...
Adds canonical pr-queue-cleanup workflow, report verifier, reviewer-only task
routing, and runbook guidance so operators can drain open PRs one canonical
review at a time with fail-closed boundaries on batching and unauthorized merges.
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 10:02:49 -04:00
sysadmin
0c18d0f54f
Merge pull request 'feat: enforce PR review/merge workflow state machine gates ( Closes #290 )' ( #378 ) from feat/issue-290-review-merge-state-machine into master
2026-07-07 09:02:42 -05:00
sysadmin
ae566d5cd1
Merge pull request 'feat: reject stale already-landed controller handoff fields ( Closes #299 )' ( #371 ) from feat/issue-299-already-landed-handoff into master
2026-07-07 09:00:07 -05:00
sysadmin
d66d465e31
fix: resolve conflicts for PR #385
...
Merge prgs/master and keep work-issue author routing (#139 ) alongside
reconciler close task routing (#309 ).
2026-07-07 09:58:45 -04:00
sysadmin
cf94112e96
fix: resolve conflicts for PR #384
...
Merge prgs/master and keep read-only reconciliation workflow tasks (#301 )
alongside reconciler close capabilities (#309 ).
2026-07-07 09:58:45 -04:00
sysadmin
5a5bc8846f
fix: resolve conflicts for PR #381
...
Merge prgs/master and keep already-landed reconcile close tool routing (#310 )
alongside dedicated reconciler close tasks (#309 ).
2026-07-07 09:58:45 -04:00
sysadmin
60040e789b
Merge remote-tracking branch 'prgs/master' into feat/issue-290-review-merge-state-machine
2026-07-07 09:57:58 -04:00
sysadmin
769f387267
Merge remote-tracking branch 'prgs/master' into feat/issue-308-reconcile-inventory-pagination
2026-07-07 09:57:54 -04:00
sysadmin
202be15764
Merge remote-tracking branch 'prgs/master' into feat/issue-300-linked-issue-live-proof
2026-07-07 09:57:54 -04:00
sysadmin
fbfcc08640
Merge remote-tracking branch 'prgs/master' into feat/issue-299-already-landed-handoff
2026-07-07 09:57:54 -04:00
sysadmin
0bb6cae95a
Merge pull request 'feat: dedicated reconciler capability for closing landed PRs ( Closes #309 )' ( #379 ) from feat/issue-309-reconciler-close-capability into master
2026-07-07 08:57:04 -05:00
sysadmin
180490c640
fix: resolve conflicts for PR #384
...
Merge prgs/master and keep both reconciliation workflow (#301 ) and
native MCP preference (#270 ) imports in gitea_mcp_server.
2026-07-07 09:57:01 -04:00
sysadmin
af064dd06b
fix: resolve conflicts for PR #378
...
Merge prgs/master and keep both review-merge state machine (#290 ) and
native MCP preference (#270 ) imports, skill entries, and MCP tools.
2026-07-07 09:57:01 -04:00
sysadmin
6100187274
fix: resolve conflicts for PR #376
...
Merge prgs/master and keep both reconcile-inventory (#308 ) and
inventory-worktree (#293 ) verifiers wired in build_final_report.
2026-07-07 09:55:33 -04:00
sysadmin
bf002aee2c
fix: resolve conflicts for PR #372
...
Merge prgs/master and keep both reconcile-linked-issue (#300 ) and
inventory-worktree (#293 ) verifiers wired in build_final_report.
2026-07-07 09:55:33 -04:00
sysadmin
b53e3de7cc
fix: resolve conflicts for PR #371
...
Merge prgs/master and keep both already-landed-handoff (#299 ) and
inventory-worktree (#293 ) verifiers wired in build_final_report.
2026-07-07 09:55:33 -04:00
sysadmin
47b4ee4791
Merge pull request 'feat: add native MCP preference gate and shell circuit breaker ( Closes #270 )' ( #377 ) from feat/issue-270-native-mcp-preference into master
2026-07-07 08:54:03 -05:00
sysadmin
1c506fa779
Merge pull request 'feat: comment-then-stop policy for partial PR reconciliation ( Closes #302 )' ( #375 ) from feat/issue-302-partial-reconciliation-policy into master
2026-07-07 08:51:12 -05:00
sysadmin
e7a1e183a0
Merge pull request 'feat: prove inventory pagination and worktree state in reviewer reports ( Closes #293 )' ( #369 ) from feat/issue-293-inventory-worktree-proof into master
2026-07-07 08:47:05 -05:00
sysadmin and Claude Opus 4.8
72f3bc8db8
fix: resolve conflicts for PR #376 against current master
...
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 09:45:21 -04:00
sysadmin and Claude Opus 4.8
e0a1717db2
fix: resolve conflicts for PR #372 against current master
...
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 09:45:03 -04:00
sysadmin and Claude Opus 4.8
3c2dd055fa
fix: resolve conflicts for PR #371 against current master
...
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 09:44:44 -04:00
sysadmin and Claude Opus 4.8
56f8f9eeb4
fix: resolve conflicts for PR #369 against current master
...
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected] >
2026-07-07 09:44:12 -04:00
sysadmin
b6cf32c845
Merge pull request 'feat: add dedicated reconciliation controller-handoff schema ( Closes #303 )' ( #373 ) from feat/issue-303-reconciliation-handoff into master
2026-07-07 08:42:40 -05:00
sysadmin
a17e8561d0
Merge pull request 'feat: require infra_stop repair handoff for blocked reviewers ( Closes #289 )' ( #366 ) from feat/issue-289-infra-stop-handoff into master
2026-07-07 08:39:35 -05:00
sysadmin
e2771dfe9a
fix: resolve conflicts for PR #385 against latest master
2026-07-07 09:38:36 -04:00
sysadmin
7635a17599
fix: resolve conflicts for PR #384 against latest master
2026-07-07 09:38:34 -04:00