Merge branch 'main' into fix/rename-refusal-mv-hint

Author: kvlonge

.github/workflows/verify.yml

@@ -305,10 +305,13 @@ jobs:
           if-no-files-found: warn
           retention-days: 30
       - name: Compare generated seeds and the failure corpus (python vs shipped native)
-        run: make compiler-differential-shipped
+        run: >-
+          make compiler-differential-shipped
+          COMPILER_DIFFERENTIAL_ARGS="--stage-captures --require-discovery-coverage
+          --require-render-coverage"
 
   compiler_differential_python_versions:
-    name: Native discovery on Python ${{ matrix.python }}
+    name: Native compiler on Python ${{ matrix.python }}
     needs: [changes, lockfile]
     if: needs.changes.outputs.compiler_differential == 'true'
     runs-on: ubuntu-24.04
@@ -351,9 +354,15 @@ jobs:
           uv run --no-sync python -m scripts.run_compiler_differential
           --engines python native-preview
           --corpus fixtures examples failures seeds --seeds 4 --jobs 4
+      - name: Compare python with shipped native on the failure corpus and a few seeds
+        env:
+          PYTHONUNBUFFERED: "1"
+        run: >-
+          uv run --no-sync python -m scripts.run_compiler_differential
+          --engines python native --corpus failures seeds --seeds 4 --jobs 4
 
   native_discovery_windows:
-    name: Native discovery on Windows
+    name: Native compiler on Windows
     needs: [changes, lockfile]
     if: needs.changes.outputs.compiler_differential == 'true'
     runs-on: windows-2025
@@ -388,12 +397,22 @@ jobs:
           tests/integration/src/sqlbuild/compiler/discovery/test_native_yaml_oracle.py
           tests/integration/src/sqlbuild/compiler/discovery/test_native_toml_oracle.py
           -n auto --dist loadfile
-      - name: Compile and build playground projects
+      - name: Compile playground projects on the default and Python engines, and build
         run: |
           project="${RUNNER_TEMP}/waffle-shop"
+          oracle="${RUNNER_TEMP}/waffle-shop-python"
           uv run --no-sync sqb playground "${project}"
+          cp -r "${project}" "${oracle}"
           uv run --no-sync sqb --project-dir "${project}" --no-color compile
-          SQLBUILD_COMPILER_ENGINE=python uv run --no-sync sqb --project-dir "${project}" --no-color compile
+          SQLBUILD_COMPILER_ENGINE=python uv run --no-sync sqb --project-dir "${oracle}" --no-color compile
+          diff -r "${oracle}/target/compiled" "${project}/target/compiled"
+          if ! test -f "${project}/target/cache/compiler-native-v1/macro-calls.bin"; then
+            echo "The default compile did not write the macro-call store; macro bridge debug log:"
+            rm -rf "${oracle}/target"
+            uv run --no-sync sqb --project-dir "${oracle}" --no-color --debug compile 2>&1 \
+              | grep "macro_bridge" || true
+            exit 1
+          fi
           uv run --no-sync sqb --project-dir "${project}" --no-color build
           nodes="${RUNNER_TEMP}/python-nodes"
           uv run --no-sync sqb playground --template python_nodes "${nodes}"
@@ -561,15 +580,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Temporary: a one-model edit recompiles the edited model uncached until native
-        # rendering becomes the default; tighten edit_max_ratio back to max_ratio then.
         include:
           - kind: dense
             max_ratio: "1.10"
-            edit_max_ratio: "1.25"
           - kind: fresh
             max_ratio: "1.10"
-            edit_max_ratio: "1.20"
     steps:
       - uses: actions/checkout@v4
       - name: Check out the comparison base
@@ -600,13 +615,11 @@ jobs:
         env:
           KIND: ${{ matrix.kind }}
           MAX_RATIO: ${{ matrix.max_ratio }}
-          EDIT_MAX_RATIO: ${{ matrix.edit_max_ratio }}
         run: |
           uv run python -m scripts.compare_compile_performance \
             --kind "${KIND}" \
             --modes cold warm edit \
             --max-ratio "${MAX_RATIO}" \
-            --edit-max-ratio "${EDIT_MAX_RATIO}" \
             --models 3000 \
             --base-root base \
             --base-python base/.venv/bin/python \

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.145.0"
+  ".": "0.147.0"
 }

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.147.0](https://github.com/chio-labs/sqlbuild/compare/v0.146.0...v0.147.0) (2026-10-09)
+
+
+### Features
+
+* **native:** make native rendering the default compiler path ([#1043](https://github.com/chio-labs/sqlbuild/issues/1043)) ([95491e1](https://github.com/chio-labs/sqlbuild/commit/95491e1ed70afe8c834da7841297f7d9663699fc))
+* **native:** report SQL test and scenario errors natively ([#1046](https://github.com/chio-labs/sqlbuild/issues/1046)) ([0e87c96](https://github.com/chio-labs/sqlbuild/commit/0e87c96b2e940e025bf2bb771d48ee7f317eadb1))
+
+## [0.146.0](https://github.com/chio-labs/sqlbuild/compare/v0.145.0...v0.146.0) (2026-10-08)
+
+
+### Features
+
+* **native:** report reference extraction errors natively ([#1037](https://github.com/chio-labs/sqlbuild/issues/1037)) ([8dc2d1e](https://github.com/chio-labs/sqlbuild/commit/8dc2d1e203e3fd3a7cc411d9b4d583435ab911dc))
+
 ## [0.145.0](https://github.com/chio-labs/sqlbuild/compare/v0.144.0...v0.145.0) (2026-10-08)
 
 

Cargo.lock

@@ -37,7 +37,7 @@ python-boundary = "sqlbuild-python"
 polyglot-floor = "sqlbuild-analysis"
 
 [workspace.package]
-version = "0.145.0"
+version = "0.147.0"
 edition = "2024"
 license = "Apache-2.0"
 publish = false

Cargo.toml

@@ -300,7 +300,7 @@ compiler-differential:
 		$(COMPILER_DIFFERENTIAL_ARGS)
 
 # python vs native-preview above covers every native stage; this keeps the shipped `native` default
-# covered on a bounded corpus.
+# (native discovery and rendering) covered on a bounded corpus.
 compiler-differential-shipped:
 	env PYTHONUNBUFFERED=1 uv run python -m scripts.run_compiler_differential \
 		--engines python native --corpus seeds failures \

Makefile

@@ -11,11 +11,11 @@ that can be tested and benchmarked with `cargo test` alone.
 | `sqlbuild-sqltext` | Lexical SQL text without polyglot: comment, quote and parenthesis scanning, the rules quote policy, model header tokenization and matching, static variable substitution, static reference extraction, and the general reference scan with table-function call arguments under each adapter's lexical rules. |
 | `sqlbuild-config` | Configuration file reading without Python: `tomllib`-compatible TOML, PyYAML `safe_load`-compatible YAML 1.1, and typed project and local config readers for the fields discovery needs. Errors carry their kind and position; YAML outside the supported subset is an `Unsupported` error. |
 | `sqlbuild-discovery` | Native project discovery and the only implementation of the model, SQL test, scenario, source and schema file collections and the declaration layout: the shared directory walk with Python's glob and sort semantics, file reading with Python's newline handling and read errors, and parsing of authored files with Python's exact discovery messages. Results are plain data the Python discovery facade materialises. |
-| `sqlbuild-scopes` | Declaration scopes: the scope index with Python's record orders and diagnostics, declaration visibility, relationship grants, the scope lookup groups, and the dialect-aware scan of SQL tests and scenarios for their expected models. Anything it cannot reproduce exactly defers to Python. |
+| `sqlbuild-scopes` | Declaration scopes: the scope index with Python's record orders and diagnostics, declaration visibility, relationship grants, the scope lookup groups, and the dialect-aware scan of SQL tests and scenarios for their expected models and top-level CTEs, with Python's scanner errors. Anything it cannot reproduce exactly defers to Python. |
 | `sqlbuild-model-config` | Model configuration: MODEL header columns and audits, `${...}` template expansion with its environment and context reads, and the template and macro presence scans over authored config values, all read through a trait over the caller's values. Anything it cannot reproduce exactly defers to Python, which also raises every model config error. |
 | `sqlbuild-render` | Native rendering: the macro call scanner (a byte-for-byte port of Python's), splicing of rendered calls with code-point spans, and the in-compile memo of recorded macro calls and their replayable events, which can carry results across compiles through the shared native store. Anything it cannot reproduce exactly defers to Python. |
 | `sqlbuild-attachments` | Compile attachments for tests, audits, sources, functions, scenarios and seeds: attached generic audit argument merge, raw and quoted argument rendering, and severity and run scope resolution. Anything it cannot reproduce exactly defers to Python, which also raises every attachment error. |
-| `sqlbuild-analysis` | SQL analysis over polyglot: SQL tokens, query analysis, the binding catalog, semantic validation and usage, column references, type normalization, and SQL-test extraction, planning and rendering. Type normalization defers to Python for anything it cannot reproduce exactly. |
+| `sqlbuild-analysis` | SQL analysis over polyglot: SQL tokens, query analysis, the binding catalog, semantic validation and usage, column references, type normalization, and SQL-test and scenario extraction, planning and rendering. Type normalization defers to Python for anything it cannot reproduce exactly. |
 | `sqlbuild-rules` | Built-in rules and the rules engine, the custom-rule host, SQL lint, quality checks and formatting, rules configuration and the request models. It also owns the build identity script. |
 | `sqlbuild-python` | The only PyO3 crate: the `_native` module, its Python classes and functions, conversions from Python objects, and the process allocator. |
 
@@ -31,7 +31,7 @@ sqlbuild-python
 ```
 
 `sqlbuild-config` and `sqlbuild-model-config` do not depend on the crates below them today, and
-`sqlbuild-scopes` uses only `sqlbuild-sqltext`; their place in the order fixes which crates may
+`sqlbuild-scopes` uses only `sqlbuild-sqltext` and `sqlbuild-core`; their place in the order fixes which crates may
 use them. The JSON emitter
 lives in `sqlbuild-core` so that any layer can produce text that must equal Python's
 `json.dumps` output.
@@ -62,6 +62,15 @@ stages run natively:
 | `native` | The default: native stages that passed their flip gate (`shipped` tier). |
 | `native-preview` | Opt-in: shipped stages plus stages still in development (`preview` tier). |
 
+The shipped tier covers discovery and rendering: declaration files and scopes, model config,
+reference extraction, the model loop, macro calls and the macro-call store, and attachments. SQL
+analysis, contracts, lineage, SQL-test glue and project assembly are still `preview`. A failing
+render raises its first error directly, as the Python stage would, and runs each macro call at
+most once; a divergence the bridge detects is reported as a native stage mismatch. Because the
+macro-call store is shipped, the
+[macro determinism contract](../website/src/content/docs/docs/concepts/macros.mdx) applies to
+every default compile; `SQLBUILD_COMPILER_ENGINE=python` runs every macro call each time.
+
 Each native stage declares its tier once, in `NATIVE_STAGE_TIERS` in
 `src/sqlbuild/compiler/frontier/constants.py`. A stage moves from `preview` to `shipped` by
 changing that line, after its flip gate passes: a byte-identical real project, a green
@@ -70,8 +79,10 @@ its own compiler, Rules and compile-reuse stores, so preview output is never reu
 
 `make compiler-differential` compares `python` with `native-preview` on the full per-PR corpus.
 `make compiler-differential-shipped` compares `python` with `native` on the generated seeds and
-the failure corpus, so the shipped default stays covered on its own. CI runs both, and compares
-`python` with `native` on Python 3.13 and 3.14 as well.
+the failure corpus, so the shipped default stays covered on its own; CI runs it with stage
+captures and requires full discovery and render coverage. CI runs both, compares `python` with
+`native` and `native-preview` on Python 3.13 and 3.14 as well, and on Windows checks that the
+default compiles a playground project to the same files as `python`.
 
 ## Working on the crates
 

crates/README.md

@@ -21,6 +21,7 @@ serde.workspace = true
 serde_json.workspace = true
 sha2.workspace = true
 sqlbuild-core.workspace = true
+sqlbuild-scopes.workspace = true
 sqlbuild-sqltext.workspace = true
 
 [lints]