cleveragents/cleveragents-core
4
0
Fork 3
Code Issues 6.0k Pull Requests 115 Actions Packages Projects Releases Wiki Activity
Files
d4e1219577e01f270aca90e2706cfdcd523100cd
cleveragents-core/tools
T
History
drew d4e1219577 fix(controller): scope conflict-marker check to resolved files 
finalize_conflict_resolution grepped every file in the PR's
origin/<base>..HEAD diff for committed conflict markers. On a large
sentinel PR (478-file diff) that includes .opencode/agents/
git-rebase-util.md — an agent def that *documents* conflict markers
with literal "<<<<<<< HEAD" lines — so the check false-positived and
rejected every resolution, looping the conflict-resolver indefinitely
(run-9: 185 attempts in ~4h, 125 on this exact error).

Scope the grep to the files the resolution actually touched
(resolved_files = prep-time conflicted set + the agent's reported
files_modified). A leftover marker can only be in a file the agent
resolved; a clean rebase/merge resolves nothing so the check is
skipped. Adds a regression test with a marker-documenting file in the
PR diff that is not a resolved file.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-21 21:33:44 -04:00
..
controller
fix(controller): scope conflict-marker check to resolved files
2026-05-21 21:33:44 -04:00
_attempt_history.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_backoff.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_block_prompt.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_block_store.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_bot_logins.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_canvas_pdf_shim.js
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
_ci_logs.py
refactor(ci-logs): retire the dead legacy {sha}.json cache layer
2026-05-20 23:02:07 -04:00
_claim_runtime.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_commit_lint.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_controller_db_bridge.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_cycle_cap.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_diff_aware_gate.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_dispatch_runtime.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_compliance_apply.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_compliance.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_escalation_helpers.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_escalation.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_gate_preflight.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_label_state.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_metadata_classifier.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_prefetch.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_implementer_prompt.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_loader.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_mcp_common.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_opencode_worker.py
fix(worker): correct misleading "model override" log line
2026-05-21 00:29:11 -04:00
_phase4_telemetry.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pipeline_cache.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_classification_cache.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_clone_creds.py
feat(controller): rebase-default conflict resolution with merge fallback
2026-05-21 17:17:16 -04:00
_pr_clone.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_comments_cache.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_context_sentinel.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_diff.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_prompt.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_pr_state_cache.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_prefetch_section.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_recent_push_cache.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_context.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_fetch.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_finalize.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_parser.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_pipeline.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_post.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_prompt.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_slim.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_validate_helpers.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_review_views.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_session_pattern_checks.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_status_comments.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_validate_cli_common.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_verify_common.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_watchdog_helpers.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
_worker_infra_manifest.txt
fix(auto-agents): per-cycle worker-infra seed to /tmp/local_tools
2026-05-11 17:39:23 -04:00
_worker_infra_seed.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
audit_branch_protection.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
backfill_llm_activity_pr.py
feat(controller): RUN_CI_LOCAL verdict source, ci-not-ready outcome, escalation hardening
2026-05-20 11:49:05 -04:00
CHANGELOG
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
conflict_drive.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
count-master-merges.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
dispatch_implementer.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
dispatch_review.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
duplicate_prs_to_fork.py
fix(sentinel): bake the CI OOM-prevention fix into duplicated test PRs
2026-05-20 15:18:23 -04:00
export-canvas-pdf.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
flag_stale_prs.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
forgejo_audit.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
forgejo-sync.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
groom_label_inference.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
implementer_pr_context.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
implementer_validate.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
implementer_workspace.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
inject_synthetic_conflict.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
launch_fork.sh
feat(auto-agents): PR State Warmer substrate + supporting infra
2026-05-17 10:02:53 -04:00
live_log_writer.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
llm_activity_scraper.py
feat(controller): RUN_CI_LOCAL verdict source, ci-not-ready outcome, escalation hardening
2026-05-20 11:49:05 -04:00
local_ci_gate.sh
feat(auto-agents): local_ci_gate.sh pass-through + uvx nox fallback
2026-05-11 23:19:18 -04:00
mcp_block_store_server.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
mcp_ci_server.py
refactor(ci-logs): unify CI-log cache — one fetch path, run-aware freeze
2026-05-20 22:55:09 -04:00
mcp_forgejo_server.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
mcp_git_server.py
feat(controller): rebase-default conflict resolution with merge fallback
2026-05-21 17:17:16 -04:00
mcp_graphify_server.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
mcp_handoff_server.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
merge_drive.py
fix(merge): bypass stale-label veto for controller-managed PRs
2026-05-20 17:42:33 -04:00
migrate_to_new_driver.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
milestones-notes.example.toml
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
milestones.canvas.template.tsx
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
park_other_prs.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
pr_state_warmer.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
pr-stats.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
pr-velocity-notes.example.toml
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
pr-velocity.canvas.template.tsx
feat(auto-agents): Phase A — conflict_drive.py deterministic conflict-resolution driver
2026-05-06 01:28:41 -04:00
preflight_phase01.sh
Fix sentinel rollout: head-ref filter, cursor partitioning, deterministic tests
2026-05-04 13:13:52 -04:00
render-milestones.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
render-pr-velocity.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
reports.sh
Auto-agents pipeline: enforce merge invariant with deterministic driver
2026-05-03 21:31:16 -04:00
review_validate.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
run-ci-full-local.sh
feat(controller): RUN_CI_LOCAL verdict source, ci-not-ready outcome, escalation hardening
2026-05-20 11:49:05 -04:00
run-controller-state-machine-pipeline.sh
fix(ci): cap test parallelism to prevent OOM-kills + extend CI-wait timeout
2026-05-20 12:25:50 -04:00
setup_auto_labels.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
setup_branch_protection.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
setup_test_fork.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
sync_tier_models.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
token_usage_audit.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
verify_implementer_invariant.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
verify_invariant.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
verify_review_invariant.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00
watchdog_check.py
style: ruff format the controller-state-machine branch (288 files)
2026-05-20 00:09:17 -04:00