chore(merge_configs): remove bot-introduced duplicate from runtime.py and restore canonical import #21

Merged
hurui200320 merged 1 commits from chore/remove-duplicate-merge-configs into master 2026-06-05 06:17:14 +00:00

1 Commits

Author SHA1 Message Date
hurui200320 a79c74b9cb chore(merge_configs): remove bot-introduced duplicate from runtime.py and restore canonical import
CI / quality (pull_request) Successful in 37s
CI / build (pull_request) Successful in 41s
CI / lint (pull_request) Failing after 53s
CI / security (pull_request) Failing after 58s
CI / integration_tests (pull_request) Successful in 59s
CI / typecheck (pull_request) Successful in 1m3s
CI / unit_tests (pull_request) Successful in 3m54s
CI / coverage (pull_request) Has been skipped
CI / status-check (pull_request) Failing after 4s
CI / lint (push) Failing after 56s
CI / quality (push) Successful in 57s
CI / typecheck (push) Successful in 1m2s
CI / security (push) Failing after 1m3s
CI / integration_tests (push) Successful in 1m2s
CI / build (push) Successful in 38s
CI / unit_tests (push) Successful in 3m56s
CI / coverage (push) Has been skipped
CI / status-check (push) Failing after 3s
The bot commit e7a7d39 introduced a duplicate merge_configs() function and a
_deep_merge_two() helper inside runtime.py under a '# Config merging' section.
It also renamed the canonical import in __init__.py to _legacy_merge_configs and
re-exported merge_configs from runtime instead.

This commit undoes those changes:
- Removes merge_configs() and _deep_merge_two() from runtime.py entirely.
- Restores 'from cleveractors.config_utils import merge_configs' (no alias) in __init__.py.
- Removes merge_configs from the 'from cleveractors.runtime import (...)' block.
- merge_configs remains in __all__ — now correctly backed by config_utils.
- Also fixes a pre-existing ruff B007 lint violation in runtime.py
  (_build_factory_config loop variable agent_name → _agent_name).

The canonical implementation in config_utils.py is unchanged.

ISSUES CLOSED: #11
2026-06-05 05:58:56 +00:00