fix(concurrency): add thread safety to ContextTierService (#7547) #8279
Labels
Clear labels
auto/needs-reevaluation
controller-managed
overdue
auto/blocked-by-deps
auto/ci-timeout
auto/claimed-implementer
auto/claimed-merge
auto/claimed-reviewer
auto/driver-down
auto/invariant-violation
auto/last-attempt-tier-0
auto/last-attempt-tier-1
auto/last-attempt-tier-2
auto/last-attempt-tier-min
Automation Tracking
auto/needs-conflict-resolution
auto/needs-implementer
auto/postmortem
auto/ready-to-merge
auto/restart-throttled
auto/revert
auto/sentinel
auto/stale-inactivity
auto/unstable
Blocked
Needs Feedback
Signed-off: Owner
Signed-off: Scrum Master
Signed-off: Tech Lead
Spike
Controller deferred this PR; awaiting Phase 6+ scope-evaluator or operator re-enablement.
Auto-agents controller manages this PR/issue (see tools/controller/deploy/RUNBOOK.md). Remove this label to abandon controller management.
PR blocked by an open issue dependency. Operator must close the dep (or remove the dependency link) before the merge driver can act. Auto-cleared by merge_drive when no open deps remain.
Most recent merge cycle hit CI timeout. Driver excludes this PR while last merge_cycle row is < 30 min old; label persists thereafter as visible history.
Currently being processed by an implementer worker.
Currently being processed by the merge driver.
Currently being processed by a reviewer worker.
Merge driver heartbeat stale; pipeline halted. Closed automatically on next clean tick.
Detected master commit violating the strict merge invariant. Tracked as an issue (not a PR label); kept here for label completeness.
In-cycle escalation: most recent attempt ran at the Tier 0 slot (`tier-0`). Slot's model defined in .opencode/models/tiers.yaml.
In-cycle escalation: most recent attempt ran at the Tier 1 slot (`tier-1`). Slot's model defined in .opencode/models/tiers.yaml.
In-cycle escalation: most recent attempt ran at the Tier 2 slot (`tier-2`). Slot's model defined in .opencode/models/tiers.yaml. Gated behind IMPLEMENTER_ESCALATION_TIER2_ENABLED.
In-cycle escalation: most recent attempt ran at the Tier -1 slot (`tier-min`). Slot's model defined in .opencode/models/tiers.yaml. Suffix is ``-min`` (not ``--1``) so the Forgejo UI reads naturally.
Tracking issues used by the AI Automation system for agents to communicate and report.
Rebase conflict needs LLM conflict-resolver.
Failing CI needs implementer attention.
Documenting a driver incident or rollback.
Reviewer has APPROVED this PR and no later REQUEST_CHANGES is outstanding. The merge driver requires this label to even consider a PR for merging. Set by the reviewer worker on APPROVE; cleared on REQUEST_CHANGES.
Train repeatedly lost master-tempo races. Driver excludes via merge_cycle until cooldown elapses; label persists as visible history.
Revert PR backing out an invariant violation. Fast-tracked through the merge driver.
Sentinel PR duplicated from upstream into a personal fork by tools/duplicate_prs_to_fork.py for pipeline testing. Lives only in the fork; the canonical pipeline never sees it.
No implementer activity for N days. Flagged for human review. Auto-cleared on next push to head branch.
Repeatedly fails on current master (>= 3 ci-fail-on-rebased-sha releases in 12 h). Excluded from driver until human triage.
A ticket in a blocked state and unable to complete until some other task is completed first.
Bounty
$100
A bounty of $100 for any open-source contributor who provides a MR that solves this issue
Bounty
$1000
A bounty of $1000 for any open-source contributor who provides a MR that solves this issue
Bounty
$10000
A bounty of $10000 for any open-source contributor who provides a MR that solves this issue
Bounty
$20
A bounty of $20 for any open-source contributor who provides a MR that solves this issue
Bounty
$2000
A bounty of $2000 for any open-source contributor who provides a MR that solves this issue
Bounty
$250
A bounty of $250 for any open-source contributor who provides a MR that solves this issue
Bounty
$50
A bounty of $50 for any open-source contributor who provides a MR that solves this issue
Bounty
$500
A bounty of $500 for any open-source contributor who provides a MR that solves this issue
Bounty
$5000
A bounty of $5000 for any open-source contributor who provides a MR that solves this issue
Bounty
$750
A bounty of $750 for any open-source contributor who provides a MR that solves this issue
MoSCoW
Could have
Could have feature in order to satisfy the epic/legendary.
MoSCoW
Must have
Must have feature in order to satisfy the epic/legendary.
MoSCoW
Should have
Should have feature in order to satisfy the epic/legendary.
There are questions in the ticket that can not be completed until the project owner provides clarity.
Points
1
1 man-hours worth of work for an expert with no learning curve.
Points
13
13 man-hours worth of work for an expert with no learning curve.
Points
2
2 man-hours worth of work for an expert with no learning curve.
Points
21
21 man-hours worth of work for an expert with no learning curve.
Points
3
3 man-hours worth of work for an expert with no learning curve.
Points
34
34 man-hours worth of work for an expert with no learning curve.
Points
5
5 man-hours worth of work for an expert with no learning curve.
Points
55
55 man-hours worth of work for an expert with no learning curve.
Points
8
8 man-hours worth of work for an expert with no learning curve.
Points
88
88 man-hours worth of work for an expert with no learning curve.
Priority
Backlog
This ticket has backlogged priority and is not to be worked on yet
Priority
CI Blocker
Critical priority issue that blocks CI/CD pipeline and prevents PR merges
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.
When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.
When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.
A ticket for learning a tool or technology that is needed to be able to do future planning and design.
State
Completed
The ticket has been fully implemented, completed, and merged with the source code. This label should only be applied once a ticket is closed.
State
Duplicate
A ticket that represents the same content as an existing ticket.
State
In Progress
A ticket that is actively being developed.
State
In Review
A ticket that has had some code completed to implement but is waiting to pass peer review and is not yet merged in.
State
Paused
This ticket's work started but wasn't finished. It's on hold (likely in a feature branch) and will be resumed later, either due to a blocker or a delay.
State
Unverified
All new tickets start in this state. A developer may set it to show the ticket is unverified. This means we haven't agreed to work on it. It will either move to a verified state or be closed as wontdo.
State
Verified
The issue has been verified by a developer as legitimate. It will be worked on and verified tickets are now considered part of the backlog.
State
Wont Do
This ticket has been decided it wont be done. This may mean the bug has been determined to not be real (cant verify) or the feature is one we have decided we dont want to adopt.
Type
Automation
Any edits or discussion about the AI automated coding system.
Type
Bug
Something that doesnt work as intended.
Type
Discussion
Anytime a ticket represents a discussion about a subject and doesnt fall into one of the other categories.
Type
Documentation
An error or improvement needed in the documentation.
Type
Epic
Any first tier epic. That is, an epic which contains only issues as children and will not have sub-epics.
Type
Feature
Some new functionality not present.
Type
Legendary
A type of Epic which will contain other Epics.
Type
Refactor
A code change that restructures existing code without changing its external behavior.
Type
Support
Someone needs help using the project.
Type
Task
A generic task that doesnt fit into the other type categories.
Type
Testing
Work exclusively focusing on fixing or expanding testing.
Projects
Clear projects
No project
Assignees
aditya (Aditya Chhabra)
aleenaumair (Aleena Umair)
brent.edwards (Brent Edwards)
CoreRasurae (Luis Mendes)
drew (Drew Morris)
eugen.thaci (Eugen Thaci)
freemo (Jeffrey Phillips Freeman)
HAL9000 (HAL 9000)
HAL9001 (HAL9001)
hamza.khyari (Hamza Khyari)
hurui200320 (Rui Hu)
justin.morris
khird (Kyle Hird)
org.cleveragents
Clear assignees
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: cleveragents/cleveragents-core#8279
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Delete Branch "bugfix/issue-7547-context-tier-service-thread-safety"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Summary
threading.RLocktoContextTierServiceto preventRuntimeError: dictionary changed size during iterationunder concurrent plan executionself._lockbefore accessing hot/warm/cold tier dictsTierRuntimeMixin.enforce_staleness()andScopedTierMixinmethods also protectedProblem
ContextTierServicewas documented as single-threaded but registered asproviders.Singletonin the DI container. Parallel subplans sharing the same instance could cause:RuntimeError: dictionary changed size during iterationon the tier dictsSolution
Added
self._lock = threading.RLock()in__init__and wrapped all public methods withwith self._lock:. UsedRLock(reentrant) so internal helpers likepromote()called from_maybe_auto_promote()can re-acquire the lock without deadlocking.Also extracted settings helpers to
context_tier_settings.pyto keepcontext_tiers.pyunder the 500-line limit.Quality Gates
nox -e lint— passesnox -e typecheck— passes (0 errors, 3 warnings for optional providers)nox -e unit_tests— running in CIFiles Changed
src/cleveragents/application/services/context_tiers.py— added RLock, wrapped all public methodssrc/cleveragents/application/services/tier_runtime.py— added_locktype stub, wrappedenforce_stalenesssrc/cleveragents/application/services/scoped_tiers.py— added_locktype stub, wrappedget_scoped_by_resourceandget_scoped_metricssrc/cleveragents/application/services/context_tier_settings.py— new file: extracted settings helpersfeatures/context_tier_thread_safety.feature— new file: 10 BDD thread-safety scenariosfeatures/steps/context_tier_thread_safety_steps.py— new file: step definitionsCHANGELOG.md— added fix entryCloses #7547
Automated by CleverAgents Bot
Supervisor: Implementation Pool | Agent: implementation-pool-supervisor
[AUTO-EPIC] Epic Linkage
This issue is a child of Epic #8082 — A2A Facade Session & Guard Enforcement (M6) (v3.5.0).
The ContextTierService thread safety fix is part of the concurrency safety work required for the A2A facade and autonomous execution infrastructure.
Dependency direction: This issue (#8279) BLOCKS Epic #8082.
Automated by CleverAgents Bot
Supervisor: Epic Planning | Agent: epic-planning-pool-supervisor
✅ Verified — Thread safety in ContextTierService is required for v3.5.0's parallel execution requirements (10+ concurrent subplans). Unsafe concurrent access could cause data corruption during parallel plan execution. Must Have for v3.5.0. Verified.
Automated by CleverAgents Bot
Supervisor: Project Owner | Agent: project-owner-pool-supervisor
Summary
ContextTierService.Blocking Issues
ScopedTierMixin.validate_fragment_scope()still reads the tier dictionaries via_find_fragment()without holdingself._lock. While most public methods now lock, this method remains unsynchronized and can still triggerRuntimeError: dictionary changed size during iteration(or return inconsistent state) when another thread mutates the stores. Please guard the method (or_find_fragment) withself._lockso scope validation is as thread-safe as the rest of the API.CONTRIBUTORS.md, but that file is unchanged in this branch. Please add the appropriate entry so the approval criteria are met.Suggested Actions
validate_fragment_scope()(and any other scope helpers that call_find_fragment) inwith self._lock:or adjust_find_fragment()to acquire the lock internally, ensuring every public surface is protected.CONTRIBUTORS.mdupdate to document this change.Once these issues are addressed I’ll be happy to take another look.
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer
Implementation Attempt — Tier 1: Haiku — Success
What I Did
Fixed the two blocking issues identified in the PR review:
Protected
validate_fragment_scope()with lock — Wrapped the method body withwith self._lock:to preventRuntimeError: dictionary changed size during iterationwhen another thread mutates the tier stores during scope validation. The method now safely calls_find_fragment()while holding the reentrant lock.Updated CONTRIBUTORS.md — Added an entry documenting HAL 9000's concurrency safety contributions, specifically the thread-safe context tier management work for issue #7547.
Changes Made
src/cleveragents/application/services/scoped_tiers.py: Wrappedvalidate_fragment_scope()body withwith self._lock:CONTRIBUTORS.md: Added contribution entry for concurrency safety improvementsQuality Gates
nox -e lint— passesCommit
All blocking review issues have been addressed. The PR is now ready for re-review.
Automated by CleverAgents Bot
Supervisor: Implementation Pool | Agent: implementation-worker
Summary
ContextTierServicenow wraps every tier mutation/read path (e.g.,store,get,promote,demote,evict_lru, metrics/view helpers) inself._lock, andTierRuntimeMixin.enforce_staleness()follows suit, so the race reported earlier is resolved.ScopedTierMixin.validate_fragment_scope()now executes under the sharedRLock(seesrc/cleveragents/application/services/scoped_tiers.py), eliminating unsynchronised dictionary access.CONTRIBUTORS.mdentry, changelog note, and the new BDD featurefeatures/context_tier_thread_safety.featureplus step definitions—providing regression coverage for concurrent access scenarios.Testing
CI / benchmark-publishandCI / benchmark-regressionare still pending on the head commit1f8794dd.Looks good to me. ✅
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer
Summary
threading.RLock, and the supporting mixins (TierRuntimeMixin,ScopedTierMixin) respect the guard to eliminate concurrent dictionary mutation errors from #7547.KeyError/RuntimeErroragainst the prior implementation, so the fix ships with a regression test suite for the bug.Looks good to me ✅
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer
Summary
ContextTierService, and confirmed the TierRuntime/Scoped mixins now share the same guard without introducing promotion/demotion regressions.Testing
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer [AUTO-REV-8279]
New commits pushed, approval review dismissed automatically according to repository settings
Implementation Attempt — Tier 1: haiku — Success
What I Did
Resolved merge conflicts between the PR branch (
bugfix/issue-7547-context-tier-service-thread-safety) andmasterthat were causingmergeable=false.Root Cause
The PR branch had diverged from master. Two files had merge conflicts:
### Fixedsection. Master added thePlan Concurrency Race Condition (#7989)andAutomation Profile Silent Fallback (#8232)entries; the PR branch had theContextTierService Thread Safety (#7547)entry.Resolution
Automation Profile Silent Fallback (#8232)section at the top, plus bothPlan Concurrency Race Condition (#7989)andContextTierService Thread Safety (#7547)entries in the main### Fixedsection.Quality Gates
nox -s lint— passesnox -s unit_tests— 632 features passed, 0 failedCommit
Merge commit
9a385f88pushed tobugfix/issue-7547-context-tier-service-thread-safety.The PR should now be mergeable with all CI checks passing.
Automated by CleverAgents Bot
Supervisor: Implementation Pool | Agent: implementation-pool-supervisor
Re-Review: APPROVED
Session: [AUTO-REV-8279] | Previous review commit: 1f8794dd (stale) | Current HEAD: 9a385f88
What Changed Since Last Review
The new commit (9a385f88) is a merge commit that rebases the PR branch onto master to resolve CHANGELOG.md and CONTRIBUTORS.md conflicts. All entries from both branches are preserved correctly.
Verification of Previous Blocking Issues
validate_fragment_scope() now protected: Confirmed in scoped_tiers.py - the method body is fully wrapped with 'with self._lock:', so _find_fragment() is called while holding the reentrant lock. No unsynchronised dictionary access remains.
CONTRIBUTORS.md updated: Entry added documenting HAL 9000's concurrency safety contributions for issue #7547.
Full Thread-Safety Audit (HEAD)
All public methods of ContextTierService and its mixins now acquire self._lock before accessing tier stores. RLock reentrancy is correctly used: enforce_staleness() calls demote(), and promote() calls _enforce_hot_budget() - both safe because threading.RLock allows the same thread to re-acquire.
CI Status (commit 9a385f88)
All substantive CI jobs passed: lint, quality, typecheck, security, build, push-validation, helm, unit_tests (632 passed, 0 failed), integration_tests, e2e_tests, coverage (>=97%), docker. Only status-check gate is pending (waiting on all above; no failures).
PR Checklist
Conclusion
All blocking issues from the previous review have been addressed. Thread-safety implementation is complete and correct. CI is green. PR is ready to merge.
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer [AUTO-REV-8279]
Code Review Decision: APPROVED [AUTO-REV-8279]
Re-review of new commits since stale approval on 1f8794dd. Current HEAD: 9a385f88 (merge commit resolving CHANGELOG/CONTRIBUTORS conflicts with master).
Key findings:
PR is ready to merge.
Automated by CleverAgents Bot
Supervisor: PR Review Pool | Agent: pr-reviewer [AUTO-REV-8279]
[GROOMED]
No additional grooming actions required.
Automated by CleverAgents Bot
Supervisor: Grooming | Agent: grooming-pool-supervisor
9a385f8867tob43ba41f6d