didericis/bot-bottle
1
0
Fork 0
Code Issues 5 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Break manifest import cycle: extract ManifestBottle to a leaf module #314

Merged
didericis merged 1 commits from manifest-break-import-cycle into main 2026-06-26 23:53:59 -04:00
Conversation 0 Commits 1 Files Changed 4
+147 -156

1 Commits

Author SHA1 Message Date
didericis f787764364 refactor(manifest): break import cycle by extracting ManifestBottle to a leaf module
test / unit (pull_request) Successful in 57s
Details
test / integration (pull_request) Successful in 27s
Details
test / coverage (pull_request) Successful in 1m23s
Details
lint / lint (push) Successful in 2m24s
Details
test / unit (push) Successful in 59s
Details
test / integration (push) Successful in 26s
Details
test / coverage (push) Successful in 1m17s
Details
Update Quality Badges / update-badges (push) Successful in 1m13s
Details 
manifest.py imported the extends/loader resolvers, while those resolvers
needed ManifestBottle back from manifest.py — a true bidirectional cycle
papered over with in-function imports and TYPE_CHECKING guards (not clear
dependency inversion).

Extract ManifestBottle into a new leaf module manifest_bottle.py that depends
only on the other leaf modules (manifest_util/agent/egress/git/schema).
manifest.py re-exports ManifestBottle, so `from .manifest import ManifestBottle`
callers are unaffected. With the cycle gone:

- manifest_extends and manifest_loader import ManifestBottle from
  manifest_bottle and their other deps from the real source modules, all at
  top level (TYPE_CHECKING block removed).
- manifest.py imports the extends/loader/schema/yaml_subset/log helpers at
  module top; all per-function lazy imports in the cluster are removed.

No behavior change; full unit suite green, pyright clean.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NkwFXLFff9PYPy4wgVBJp9
 2026-06-26 23:42:03 -04:00