straylight-software · b7r6 · Mar 2, 2026 · Mar 2, 2026 · Mar 2, 2026 · Mar 2, 2026
diff --git a/.buckconfig b/.buckconfig
@@ -5,8 +5,8 @@
 
 [cells]
 root = .
-prelude = nix/build/prelude
-toolchains = toolchains
+prelude = build/prelude
+toolchains = build/toolchains
 none = none
 
 [cell_aliases]

diff --git a/HACKING.md b/HACKING.md
diff --git a/TEST_COVERAGE.md b/TEST_COVERAGE.md
diff --git a/rules/aaa-make-shared.yml → build/lint/aaa-make-shared.yml b/rules/aaa-make-shared.yml → build/lint/aaa-make-shared.yml
diff --git a/rules/aaa-make-unique.yml → build/lint/aaa-make-unique.yml b/rules/aaa-make-unique.yml → build/lint/aaa-make-unique.yml
diff --git a/rules/aaa-static-cast.yml → build/lint/aaa-static-cast.yml b/rules/aaa-static-cast.yml → build/lint/aaa-static-cast.yml
diff --git a/rules/c-style-cast.yml → build/lint/c-style-cast.yml b/rules/c-style-cast.yml → build/lint/c-style-cast.yml
diff --git a/rules/no-assert.yml → build/lint/no-assert.yml b/rules/no-assert.yml → build/lint/no-assert.yml
diff --git a/rules/no-class-keyword.yml → build/lint/no-class-keyword.yml b/rules/no-class-keyword.yml → build/lint/no-class-keyword.yml
diff --git a/rules/no-dangerous-member-names.yml → build/lint/no-dangerous-member-names.yml b/rules/no-dangerous-member-names.yml → build/lint/no-dangerous-member-names.yml
diff --git a/rules/no-implicit-bool-conversion.yml → build/lint/no-implicit-bool-conversion.yml b/rules/no-implicit-bool-conversion.yml → build/lint/no-implicit-bool-conversion.yml
diff --git a/rules/no-magic-numbers.yml → build/lint/no-magic-numbers.yml b/rules/no-magic-numbers.yml → build/lint/no-magic-numbers.yml
diff --git a/rules/no-nodiscard-missing.yml → build/lint/no-nodiscard-missing.yml b/rules/no-nodiscard-missing.yml → build/lint/no-nodiscard-missing.yml
diff --git a/rules/no-short-identifier.yml → build/lint/no-short-identifier.yml b/rules/no-short-identifier.yml → build/lint/no-short-identifier.yml
diff --git a/rules/no-sstream.yml → build/lint/no-sstream.yml b/rules/no-sstream.yml → build/lint/no-sstream.yml
diff --git a/rules/no-std-endl.yml → build/lint/no-std-endl.yml b/rules/no-std-endl.yml → build/lint/no-std-endl.yml
diff --git a/rules/no-typedef.yml → build/lint/no-typedef.yml b/rules/no-typedef.yml → build/lint/no-typedef.yml
diff --git a/rules/no-using-namespace.yml → build/lint/no-using-namespace.yml b/rules/no-using-namespace.yml → build/lint/no-using-namespace.yml
diff --git a/rules/prefer-nullptr.yml → build/lint/prefer-nullptr.yml b/rules/prefer-nullptr.yml → build/lint/prefer-nullptr.yml
diff --git a/rules/prefer-span-over-vector-ref.yml → build/lint/prefer-span-over-vector-ref.yml b/rules/prefer-span-over-vector-ref.yml → build/lint/prefer-span-over-vector-ref.yml
diff --git a/rules/prefer-span.yml → build/lint/prefer-span.yml b/rules/prefer-span.yml → build/lint/prefer-span.yml
diff --git a/rules/prefer-string-view.yml → build/lint/prefer-string-view.yml b/rules/prefer-string-view.yml → build/lint/prefer-string-view.yml
diff --git a/rules/raw-new.yml → build/lint/raw-new.yml b/rules/raw-new.yml → build/lint/raw-new.yml
diff --git a/rules/trailing-return-type.yml → build/lint/trailing-return-type.yml b/rules/trailing-return-type.yml → build/lint/trailing-return-type.yml
diff --git a/rules/uppercase-literal-suffix.yml → build/lint/uppercase-literal-suffix.yml b/rules/uppercase-literal-suffix.yml → build/lint/uppercase-literal-suffix.yml
diff --git a/build/prelude b/build/prelude
@@ -0,0 +1 @@
+/nix/store/ldxch4nfnjzw4qf0ignzyqs0zdl107fb-source
diff --git a/sgconfig.yml → build/sgconfig.yml b/sgconfig.yml → build/sgconfig.yml
@@ -1,7 +1,7 @@
 # ast-grep configuration for straylight/nix
 # Hypermodern C++ house style enforcement
 ruleDirs:
-  - rules
+  - build/lint
 # Exclude vendor and build directories
 ignores:
   - vendor/

diff --git a/toolchains/BUCK → build/toolchains/BUCK b/toolchains/BUCK → build/toolchains/BUCK
diff --git a/toolchains/cxx.bzl → build/toolchains/cxx.bzl b/toolchains/cxx.bzl → build/toolchains/cxx.bzl
diff --git a/toolchains/execution.bzl → build/toolchains/execution.bzl b/toolchains/execution.bzl → build/toolchains/execution.bzl
diff --git a/toolchains/haskell.bzl → build/toolchains/haskell.bzl b/toolchains/haskell.bzl → build/toolchains/haskell.bzl
diff --git a/toolchains/lean.bzl → build/toolchains/lean.bzl b/toolchains/lean.bzl → build/toolchains/lean.bzl
diff --git a/toolchains/nix.bzl → build/toolchains/nix.bzl b/toolchains/nix.bzl → build/toolchains/nix.bzl
diff --git a/toolchains/nix_analyze.bzl → build/toolchains/nix_analyze.bzl b/toolchains/nix_analyze.bzl → build/toolchains/nix_analyze.bzl
diff --git a/toolchains/nv.bzl → build/toolchains/nv.bzl b/toolchains/nv.bzl → build/toolchains/nv.bzl
diff --git a/toolchains/purescript.bzl → build/toolchains/purescript.bzl b/toolchains/purescript.bzl → build/toolchains/purescript.bzl
diff --git a/toolchains/python.bzl → build/toolchains/python.bzl b/toolchains/python.bzl → build/toolchains/python.bzl
diff --git a/toolchains/rust.bzl → build/toolchains/rust.bzl b/toolchains/rust.bzl → build/toolchains/rust.bzl
diff --git a/toolchains/rust_crate.bzl → build/toolchains/rust_crate.bzl b/toolchains/rust_crate.bzl → build/toolchains/rust_crate.bzl
diff --git a/toolchains/test.bzl → build/toolchains/test.bzl b/toolchains/test.bzl → build/toolchains/test.bzl
diff --git a/compile_commands_gen.py b/compile_commands_gen.py
diff --git a/cppcheck.cfg b/cppcheck.cfg
diff --git a/dhall/pre-commit.dhall b/dhall/pre-commit.dhall
@@ -51,7 +51,7 @@ let local-hooks =
         Hook::{
         , id = "ast-grep"
         , name = "ast-grep (errors)"
-        , entry = "ast-grep scan --config sgconfig.yml"
+        , entry = "ast-grep scan --config build/sgconfig.yml"
         , language = "system"
         , types_or = Some [ "c", "c++" ]
         , files = Some "^src/straylight/"

diff --git a/ARCHITECTURE.md → docs/ARCHITECTURE.md b/ARCHITECTURE.md → docs/ARCHITECTURE.md
@@ -133,8 +133,7 @@ src/
     │   ├── compile/          # Binaryen codegen
     │   ├── eval/             # Tree-walking interpreter
     │   ├── runtime/          # WASM execution (wasmtime)
-    │   ├── cli/              # Evaluation CLI tools
-    │   └── tests/            # Property-based tests
+    │   └── cli/              # Evaluation CLI tools
     │
     ├── nix/                  # Modern utility modules (crypto, text, url, async, sync, data, etc.)
     │   ├── NIH.md            # NIH replacement tracking
@@ -145,12 +144,20 @@ src/
     │   ├── store.h           # Daemonless store
     │   └── async/            # taskflow-backed concurrency
     │
-    └── protocol/             # Formal protocol specs (Kaitai)
-        ├── README.md         # Protocol documentation
-        ├── nix_daemon.ksy    # Daemon protocol schema (48 ops)
-        ├── nar.ksy           # NAR format schema
-        ├── captures/         # Binary test vectors
-        └── hs/, src/         # Haskell, Rust implementations
+    ├── protocol/             # Formal protocol specs (Kaitai)
+    │   ├── README.md         # Protocol documentation
+    │   ├── nix_daemon.ksy    # Daemon protocol schema (48 ops)
+    │   ├── nar.ksy           # NAR format schema
+    │   ├── captures/         # Binary test vectors
+    │   └── hs/, src/         # Haskell, Rust implementations
+    │
+    ├── test/                 # Centralized tests
+    │   ├── unit/             # Unit tests by module
+    │   ├── fuzz/             # Fuzz targets
+    │   ├── property/         # Property-based tests
+    │   └── integration/      # Integration tests
+    │
+    └── bench/                # Benchmarks by module
 ```
 
 ______________________________________________________________________
@@ -459,7 +466,7 @@ buck2 build //src/nix/util:util
 buck2 test //src/straylight/...
 
 # Run specific test
-buck2 test //src/straylight/nix/compiler/tests:execution_test
+buck2 test //src/straylight/test/unit/compiler:compiler_test
 ```
 
 ### Build Targets
@@ -543,11 +550,11 @@ primitives | 34+ files | 1,251 | - | | protocol | 3 languages | 42+ | - | | evri
 buck2 test //src/straylight/...
 
 # Specific component
-buck2 test //src/straylight/nix/compiler/tests:...
-buck2 test //src/straylight/nix/...
+buck2 test //src/straylight/test/unit/compiler:...
+buck2 test //src/straylight/test/unit/...
 
 # Specific test file
-buck2 test //src/straylight/nix/compiler/tests:execution_test
+buck2 test //src/straylight/test/unit/compiler:compiler_test
 ```
 
 ______________________________________________________________________
@@ -698,7 +705,7 @@ ______________________________________________________________________
 `src/straylight/nix/protocol/README.md` | Protocol specifications | | NIH Tracking |
 `src/straylight/nix/docs/NIH.md` | Primitive replacement status | | Store Design |
 `src/straylight/nix/store/docs/ARCHITECTURE.md` | Log-structured store | | C++ Style Guide |
-`docs/cpp-style-guide.md` | Code conventions | | Contributing | `CONTRIBUTING.md` | Development
+`docs/cpp-style-guide.md` | Code conventions | | Contributing | `docs/CONTRIBUTING.md` | Development
 workflow |
 
 ______________________________________________________________________

diff --git a/CONTRIBUTING.md → docs/CONTRIBUTING.md b/CONTRIBUTING.md → docs/CONTRIBUTING.md
@@ -29,10 +29,15 @@ src/
 ├── nix/                      # core nix fork (C++23)
 └── straylight/
     ├── evring/               # deterministic async I/O (io_uring)
-    └── nix/
-        ├── compiler/         # nix → wasm compiler
-        ├── protocol/         # formal protocol specs (kaitai)
-        └── {crypto,text,url,async,sync,store,...}/  # modern utility modules
+    ├── nix/
+    │   ├── compiler/         # nix → wasm compiler
+    │   ├── protocol/         # formal protocol specs (kaitai)
+    │   └── {crypto,text,url,async,sync,store,...}/  # modern utility modules
+    └── test/                 # all straylight tests
+        ├── unit/
+        ├── integration/
+        ├── property/
+        └── fuzz/
 ```
 
 ## // style
@@ -57,7 +62,7 @@ Key points:
 buck2 test //src/straylight/...
 
 # run specific test target
-buck2 test //src/straylight/nix/compiler/tests:execution_test
+buck2 test //src/straylight/test/unit:compiler_test
 ```
 
 ## // commits

diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md
@@ -424,13 +424,13 @@ buck2 build --prefer-remote //...
 buck2 test //src/straylight/...
 
 # Specific component
-buck2 test //src/straylight/nix/compiler/tests:...
+buck2 test //src/straylight/test/unit/compiler:...
 
 # Single test file
-buck2 test //src/straylight/nix/compiler/tests:execution_test
+buck2 test //src/straylight/test/unit/compiler:compiler_test
 
 # Run with output
-buck2 test //src/straylight/nix/compiler/tests:execution_test -- --verbose
+buck2 test //src/straylight/test/unit/compiler:compiler_test -- --verbose
 ```
 
 ### Formatting
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/nix/store/ldxch4nfnjzw4qf0ignzyqs0zdl107fb-source