feat(merge_configs): expose public merge_configs(*dicts) API per §3.1 deep-merge algorithm #19
Merged
hurui200320
merged 1 commits from 2026-06-03 15:31:41 +00:00
feature/merge-configs-api into master
Labels
Clear labels
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
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.
No Label
Type
Feature
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.
Blocks
#11 feat(merge_configs): expose public merge_configs(*dicts) API per §3.1 deep-merge algorithm
cleveragents/cleveractors-core
Reference: cleveragents/cleveractors-core#19
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 "feature/merge-configs-api"
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
Implements the public
merge_configs(*dicts)function per Actor Configuration Standard §3.1, as required by Wave 2 of the CleverActors integration epic (cleveragents/cleveragents-webapp#275).The CleverThis router needs to combine platform base configs with per-actor configs stored in the database (injecting default system prompts, org-level LLM settings, per-tenant overrides) without mutating either input. The existing internal
ReactiveConfigParser._merge_configs()method was unsuitable: it mutates itsbasearg, only accepts two dicts, and is not publicly importable.What Was Done
New module:
src/cleveractors/config_utils.pymerge_configs(*dicts: dict[str, Any]) -> dict[str, Any]— variadic, immutable, public.TypeErrorimmediately (fail-fast per CONTRIBUTING.md)._apply_merge()internal helper:dict→ deep-merged (via explicit stack, not recursion).list→ existing + deep copy of new.{}.copy.deepcopyused for all stored values).logger.debug()calls on all three merge branches (dict merge, list append, value replacement) for operational traceability.RecursionErroron deeply nested configs.deepcopysecurity note, O(k²·m) list concatenation complexity.Export:
src/cleveractors/__init__.pymerge_configsadded to the module import and__all__.from cleveractors import merge_configs.Tests
features/merge_configs.feature— 20 scenarios covering: zero-args, single-dict deep copy (including nested identity check), empty-dict transparency (both positions), TypeError on None (as second arg, first arg, and only arg), absent-key insertion, scalar override, recursive mapping merge, sequence append, lists inside nested dicts, three-dict chained merge, deep nesting, input mutation guard, result-to-input mutation independence, list→scalar and dict→scalar type-mismatch replacements, and scalar→list and scalar→dict reverse type-mismatch replacements.robot/config.robotincluding an end-to-end pipeline test that loads YAML viaConfigurationManagerand merges an overlay throughmerge_configs.benchmarks/merge_configs_benchmark.py— flat merge, nested merge, sequence append, three-way merge (50 keys each with overlap), and zero-arg baseline.Project Files
CONTRIBUTORS.mdwith contributor entry per CONTRIBUTING.md.CHANGELOG.mdunder[Unreleased] > Added.Quality Gates
ruff checkpyright(strict)config_utils.py: 100%)Known Limitations
config_utils.pynow uses plain/minimal docstrings consistent with the rest of the codebase.Design Notes
_merge_configsinstance method onReactiveConfigParseris unchanged to avoid breaking the existing file-parsing path._apply_mergehelper is intentionally private (module-level_prefix) — onlymerge_configsis part of the public contract._apply_mergewith explicit stack-based iteration and addedlogger.debug()calls across all merge branches.import sysfromrobot/CleverActorsLib.py.teardownmethod from benchmarks.Closes #11
5825a643f5tofe37c4cdb3fe37c4cdb3tobf991b32c2bf991b32c2toba439b3920ba439b3920to7f5cd145a6Note on the implementation: The ticket description mentioned a method
_merge_configs, however, this PR didn't remove or reuse it despite they implement the same merge rule. The reason is: the existing_merge_configsmethod will perform merge in-place, which means the input will be changed, and it's an internal method to the file based actor yaml parser. The new method is a public method and is targeting the general use. In the long run, I'd prefer to have the library get rid of theReactiveConfigParser, and provide a pydantic model for the config, and a series of method to process it: for example, the client will read the yaml files either from disk, HTTP request or database, then call this merge method to merge into one dict, then call validate to verify the config, etc.To not break the cleveragents-core, I didn't touch the existing merge method and it's processing path.
Design Note:
merge_configsvs_merge_configsA natural question when reviewing this PR is: why add a new
merge_configsfunction instead of reusing or removing the existingReactiveConfigParser._merge_configs()instance method? They implement the same §3.1 rules, but with two meaningful behavioural differences that make them unsuitable to share an implementation.The Two Differences
1. Mutation vs. Immutability
_merge_configs(internal)merge_configs(public)basedictbase[key] = value)copy.deepcopy(value)Noneinputif new is None: return)TypeError_merge_configsis designed to be called in a loop insideparse_files()wherecombined_configis an internal accumulator that the parser owns. Mutating it in-place is safe there. The public function cannot make that assumption — callers own their dicts and must not see them modified.2. List append:
extendvs. concatenationBoth produce the same final content. The difference is that
extendmutates the list already sitting in the accumulator, while the new version creates a new list. For the public API, this ensures the result is fully independent from all inputs.Why Not Reuse or Remove
_merge_configs?The two functions serve different contracts:
_merge_configsis a parser-internal tool — an instance method called only byparse_files(), operating on a mutable accumulator it owns. ItsNoneguard exists becauseyaml.safe_loadlegitimately returnsNoneon an empty or comment-only YAML file, which is a normal condition during file loading.merge_configsis a public API — it must be safe to call from any external code, must never mutate caller-owned dicts, and should fail loudly on bad input rather than silently swallowingNone.Reusing
_merge_configsas the backing implementation would have required either changing its mutation semantics (breaking the existing parse path) or wrapping it with an awkward deep-copy layer. A clean, dedicated function inconfig_utils.pyis the correct separation.In short: same algorithm, different ownership model. Both are intentionally kept.
Note posted by Rui's AI agent (Claude Sonnet 4.6) during self-QA of this PR.
Reviewed by a human, some comments, but no major objection
@@ -0,0 +79,4 @@if key not in base:# Rule: key absent → add it (deep-copy to preserve immutability).base[key] = copy.deepcopy(new_value)else:a debug logging could be useful to know that we are replacing some item with a specific key
Reply: Good catch. Added
logger.debug()calls in all three merge branches of_apply_merge:"Deep-merging key %r (both sides are mappings)""Appending %d items to list at key %r""Replacing value for key %r: %s -> %s"with the old and new type namesThe logger follows the project convention:
logging.getLogger(__name__)at module level. All debug messages fire at the affected key, which gives enough context for diagnosing merge behavior without being noisy.@@ -0,0 +83,4 @@existing = base[key]if isinstance(existing, dict) and isinstance(new_value, dict):# Rule: both mappings → deep-merge recursively._apply_merge(existing, new_value)Okay, it works, but recursion is not the most perfomant solution. If do not expect very large entries, this could be fine. Othwerwise it could make sense to re-write the implementation to not be recursive.
Reply: Converted
_apply_mergefrom recursion to an explicit stack. The complexity analysis was straightforward — when both sides of a key are dicts, the different subtrees map to independent keys, so traversal order is irrelevant. A LIFO stack produces identical results to recursion.The change: instead of
_apply_merge(existing, new_value)(recursive call), the sub-dict pair is pushed onto a stack. Awhile stack:loop pops and processes each pair. This eliminates the risk of hitting Python's recursion limit on deeply nested configs, and matches the non-recursive pattern used in the internal_merge_configsloop inparse_files(). All 1676 unit tests and 53 integration tests pass with identical results.7f5cd145a6toebbb167c99ebbb167c99to8ebdcda1778ebdcda177tof2359c3604f2359c3604to6b80be2117