# agentty CMake redesign Goal: turn the 2716-line root `CMakeLists.txt` — whose test section alone is ~1200 lines and whose every test-name lives in up to **four** hand-maintained lists — into a small, layered, drift-proof build where **one declaration per test** derives every downstream set, and **each repo runs only its own tests**. This is a *structural* refactor. The compiler/linker flags, the object-library layout, the doctest consolidation, ccache, and the per-platform hardening are all good and are **preserved byte-for-byte in effect**. We are moving code, not changing what it produces. --- ## 1. What's wrong today (measured) | Smell | Evidence | |-------|----------| | **Multi-list name drift** | A test name appears in up to 4 places: the `agentty_add_full_test()` call (70×), `AGENTTY_MIGRATED_TESTS` (56×), the `add_custom_target(tests DEPENDS)` aggregate (25×), and sometimes the explicit `agentty_tests` source list. Forgetting one silently breaks CI ("Not Run" → exit 8 — hit this session). | | **God file** | One 2716-line `CMakeLists.txt` mixes toolchain probing, standalone/static plumbing, submodule pulls, source groups, hardening, PGO, and the whole test suite. | | **Prose bloat** | ~1200 test lines are mostly 5-15 line comments. Valuable, but they bury the 1-2 lines of actual build logic and make the file feel unnavigable. | | **Cross-repo test bleed** | agentty rebuilds 6 maya-owned tests (`reveal_pacing_test`, …) as its OWN ctest entries. maya already gates them in its own CI. Each repo should run only its own tests. | | **Two "fast iteration" answers** | maya has `MAYA_FAST_TESTS` (a no-LTO `-O1` test lib). agentty has nothing — you hand-make a Debug `build-dev/`. Should be one consistent knob. | | **Magic ordering** | `agentty_tests` MUST be defined after every `agentty_add_full_test` call (it reads a GLOBAL property they append to). Nothing enforces it; a misplaced call silently drops a test. | ## 2. Target architecture Split the root file into focused, `include()`-d modules under `cmake/`. The root `CMakeLists.txt` becomes a ~120-line *table of contents* that includes them in order. ``` cmake/ AgenttyOptions.cmake # all option()/set(... CACHE ...) — the knobs, in one place AgenttyToolchain.cmake # ccache, C++26→23 fallback, IPO probe, MSVC /Ob tweaks, Android API AgenttyStandalone.cmake # STANDALONE / FULLY_STATIC / STATIC_PIE / arch / OpenSSL fallback AgenttySubmodules.cmake # auto-pull + add_subdirectory(maya/mcp/acp/rag) + toggles AgenttyDeps.cmake # FetchContent: mimalloc, (doctest lives in tests module) AgenttySources.cmake # the AGENTTY_*_SOURCES groups + objlib() + AGENTTY_SHARED_OBJECTS AgenttyHardening.cmake # apply_compile_flags(), sanitizer axes, security flags, strip, PGO AgenttyTests.cmake # the registry (see §3) + agentty_tests + aggregates AgenttyTestRegistry.cmake # the reusable registry FUNCTIONS (shared design, see §3/§5) ``` Root `CMakeLists.txt` (sketch): ```cmake cmake_minimum_required(VERSION 3.28) project(agentty VERSION 0.3.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(AgenttyOptions) # knobs first — everything else reads them include(AgenttyToolchain) include(AgenttyStandalone) include(AgenttySubmodules) include(AgenttyDeps) include(AgenttySources) include(AgenttyHardening) add_executable(agentty ${AGENTTY_RUNTIME_SOURCES}) # … link + hardening applied via functions from the modules … if(AGENTTY_BUILD_TESTS) include(AgenttyTests) endif() ``` Nothing about *what gets compiled or how* changes. This is pure relocation + naming, and it makes each concern independently readable and greppable. ## 3. The test registry (the core win) Replace the 4 parallel lists + 2 helper functions with **one declaration per test** that records into a single global registry; the aggregates are then *computed*, never hand-listed. ### API — one call per test ```cmake agentty_test( MODE consolidated|standalone # default consolidated [SRCS extra1.cpp ...] # extra TUs beyond tests/.cpp [LIBS acp::acp ...] # extra link libs [OBJS $ ...] # extra object libs [TIMEOUT ] # default 60 [LABELS sanitizer perf ...] # ctest labels; drives derived sets [PLATFORM_LIBS_UNIX util] # e.g. openpty in libutil [NO_TEST] # build but don't register a ctest entry (probes/benches) [ENV "K=V" ...] [GATE AGENTTY_MCP] # only define when this var is truthy ) ``` - `MODE consolidated` → the source is appended to the `agentty_tests` binary (the doctest single-binary). No standalone exe. **This replaces `AGENTTY_MIGRATED_TESTS` entirely** — membership is a property of the call, not a separate list to keep in sync. - `MODE standalone` → its own `EXCLUDE_FROM_ALL` exe (for forkers, PTY, fuzzers, sanitizer-isolated, benches) with the shared-object link boilerplate applied ONCE inside the function (today it's copy-pasted). - Every call appends `` to a `GLOBAL PROPERTY AGENTTY_ALL_TESTS` and, if labelled, to `AGENTTY_TESTS_