From 099a0dde736270a6d801cd28c032f77ce9ebb14d Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 15 Jan 2026 02:07:53 -0300
Subject: [PATCH] refactor: Split plotnik-lib into bytecode, vm, compiler
 crates

---
 Cargo.lock                                    |  57 +-
 Cargo.toml                                    |  13 +-
 crates/plotnik-bytecode/Cargo.toml            |  18 +
 .../src/bytecode/aligned_vec.rs               |   0
 .../src/bytecode/aligned_vec_tests.rs         |   0
 .../src/bytecode/constants.rs                 |   0
 .../src/bytecode/dump.rs                      |  19 +-
 .../src/bytecode/effects.rs                   |  11 +-
 .../src/bytecode/effects_tests.rs             |  10 +-
 .../src/bytecode/entrypoint.rs                |   8 +-
 .../src/bytecode/entrypoint_tests.rs          |   0
 .../src/bytecode/format.rs                    |   0
 .../src/bytecode/format_tests.rs              |   0
 .../src/bytecode/header.rs                    |   4 +-
 .../src/bytecode/header_tests.rs              |   0
 .../src/bytecode/ids.rs                       |   0
 .../src/bytecode/instructions.rs              |  18 +-
 .../src/bytecode/instructions_tests.rs        |  80 ++
 .../src/bytecode/mod.rs                       |  11 +-
 .../src/bytecode/module.rs                    |   2 +-
 .../src/bytecode/module_tests.rs              |  42 ++
 .../src/bytecode/nav.rs                       |   0
 .../src/bytecode/nav_tests.rs                 |   0
 .../src/bytecode/node_type_ir.rs              |  78 ++
 .../src/bytecode/node_type_ir_tests.rs        |  73 ++
 .../src/bytecode/sections.rs                  |  28 +-
 .../src/bytecode/sections_tests.rs            |   0
 .../src/bytecode/type_meta.rs                 |  22 +-
 .../src/bytecode/type_meta_tests.rs           |   0
 crates/plotnik-bytecode/src/dfa.rs            |  17 +
 crates/plotnik-bytecode/src/lib.rs            |  28 +
 crates/plotnik-bytecode/src/predicate_op.rs   | 112 +++
 .../src/type_system/arity.rs                  |   0
 .../src/type_system/arity_tests.rs            |   0
 .../src/type_system/kind.rs                   |   0
 .../src/type_system/kind_tests.rs             |   0
 .../src/type_system/mod.rs                    |   0
 .../src/type_system/primitives.rs             |   0
 .../src/type_system/primitives_tests.rs       |   0
 .../src/type_system/quantifier.rs             |   0
 .../src/type_system/quantifier_tests.rs       |   0
 crates/plotnik-cli/src/commands/run_common.rs |   2 +-
 crates/plotnik-compiler/Cargo.toml            |  35 +
 .../src/analyze/dependencies.rs               |   0
 .../src/analyze/dependencies_tests.rs         |   0
 .../src/analyze/invariants.rs                 |   0
 .../src/analyze/link.rs                       |   0
 .../src/analyze/link_tests.rs                 |   0
 .../src/analyze/mod.rs                        |   0
 .../src/analyze/recursion.rs                  |   0
 .../src/analyze/refs.rs                       |   0
 .../src/analyze/refs_tests.rs                 |   0
 .../src/analyze/symbol_table.rs               |   0
 .../src/analyze/symbol_table_tests.rs         |   0
 .../src/analyze/type_check/context.rs         |   0
 .../src/analyze/type_check/context_tests.rs   |   0
 .../src/analyze/type_check/infer.rs           |   0
 .../src/analyze/type_check/mod.rs             |   0
 .../src/analyze/type_check/symbol.rs          |   0
 .../src/analyze/type_check/symbol_tests.rs    |   0
 .../analyze/type_check/type_check_tests.rs    |   0
 .../src/analyze/type_check/types.rs           |   4 +-
 .../src/analyze/type_check/unify.rs           |   0
 .../src/analyze/type_check/unify_tests.rs     |   0
 .../src/analyze/utils.rs                      |   0
 .../src/analyze/validation/alt_kinds.rs       |   0
 .../src/analyze/validation/alt_kinds_tests.rs |   0
 .../src/analyze/validation/anchors.rs         |   0
 .../src/analyze/validation/anchors_tests.rs   |   0
 .../analyze/validation/empty_constructs.rs    |   0
 .../validation/empty_constructs_tests.rs      |   0
 .../src/analyze/validation/mod.rs             |   0
 .../src/analyze/validation/predicates.rs      |   0
 .../analyze/validation/predicates_tests.rs    |   0
 .../src/analyze/visitor.rs                    |   0
 .../src/bytecode/ir.rs                        |  20 +-
 .../src/bytecode/ir_tests.rs                  |   3 +-
 crates/plotnik-compiler/src/bytecode/mod.rs   |   8 +
 .../src/compile/capture.rs                    |   2 +-
 .../src/compile/capture_tests.rs              |   3 +-
 .../src/compile/compile_tests.rs              |   0
 .../src/compile/compiler.rs                   |   2 +-
 .../src/compile/error.rs                      |   0
 .../src/compile/expressions.rs                |   4 +-
 .../src/compile/mod.rs                        |   0
 .../src/compile/navigation.rs                 |   2 +-
 .../src/compile/quantifier.rs                 |   2 +-
 .../src/compile/scope.rs                      |   8 +-
 .../src/compile/sequences.rs                  |   2 +-
 .../src/diagnostics/diagnostics_tests.rs      |   0
 .../src/diagnostics/message.rs                |   0
 .../src/diagnostics/mod.rs                    |   0
 .../src/diagnostics/printer.rs                |   0
 .../src/emit/emit_tests.rs                    |   0
 .../src/emit/emitter.rs                       |  10 +-
 .../src/emit/error.rs                         |   0
 .../src/emit/layout.rs                        |   0
 .../src/emit/layout_tests.rs                  |   2 +-
 .../src/emit/mod.rs                           |   0
 .../src/emit/regex_table.rs                   |   2 +-
 .../src/emit/regex_table_tests.rs             |   2 +-
 ...it__emit_tests__alternations_captured.snap |  39 +
 ...t_tests__alternations_captured_tagged.snap |  51 ++
 ...mit_tests__alternations_in_quantifier.snap |  75 ++
 ...mit__emit_tests__alternations_labeled.snap |  52 ++
 ...ts__alternations_no_internal_captures.snap |  41 +
 ...it_tests__alternations_null_injection.snap |  48 ++
 ...ternations_tagged_in_field_constraint.snap |  53 ++
 ...ternations_tagged_with_definition_ref.snap |  66 ++
 ...t__emit_tests__alternations_unlabeled.snap |  48 ++
 ..._emit_tests__anchors_between_siblings.snap |  37 +
 ...emit__emit_tests__anchors_first_child.snap |  35 +
 ..._emit__emit_tests__anchors_last_child.snap |  38 +
 ...__emit__emit_tests__anchors_no_anchor.snap |  37 +
 ...t__emit_tests__anchors_with_anonymous.snap |  37 +
 ...ler__emit__emit_tests__captures_basic.snap |  36 +
 ...t__emit_tests__captures_deeply_nested.snap |  58 ++
 ...s__captures_enum_with_type_annotation.snap |  53 ++
 ...__emit__emit_tests__captures_multiple.snap |  46 ++
 ...mit__emit_tests__captures_nested_flat.snap |  50 ++
 ...sts__captures_optional_wrapper_struct.snap |  57 ++
 ...it__emit_tests__captures_struct_scope.snap |  49 ++
 ..._captures_struct_with_type_annotation.snap |  43 ++
 ...emit_tests__captures_with_type_custom.snap |  39 +
 ...emit_tests__captures_with_type_string.snap |  36 +
 ...__emit_tests__captures_wrapper_struct.snap |  69 ++
 ...tests__comprehensive_multi_definition.snap |  88 +++
 ...mit__emit_tests__definitions_multiple.snap |  49 ++
 ...mit_tests__definitions_nested_capture.snap |  77 ++
 ...it__emit_tests__definitions_reference.snap |  58 ++
 ..._emit__emit_tests__definitions_single.snap |  36 +
 ..._emit__emit_tests__fields_alternation.snap |  51 ++
 ...er__emit__emit_tests__fields_multiple.snap |  46 ++
 ...ler__emit__emit_tests__fields_negated.snap |  40 +
 ...iler__emit__emit_tests__fields_single.snap |  38 +
 ...er__emit__emit_tests__nodes_anonymous.snap |  38 +
 ...mpiler__emit__emit_tests__nodes_error.snap |  35 +
 ...iler__emit__emit_tests__nodes_missing.snap |  35 +
 ...mpiler__emit__emit_tests__nodes_named.snap |  36 +
 ..._emit__emit_tests__nodes_wildcard_any.snap |  37 +
 ...mit__emit_tests__nodes_wildcard_named.snap |  37 +
 ...mit__emit_tests__optional_first_child.snap |  57 ++
 ...__emit_tests__optional_null_injection.snap |  47 ++
 ..._tests__quantifiers_first_child_array.snap |  62 ++
 ...mit__emit_tests__quantifiers_optional.snap |  47 ++
 ...tests__quantifiers_optional_nongreedy.snap |  47 ++
 ...r__emit__emit_tests__quantifiers_plus.snap |  47 ++
 ...mit_tests__quantifiers_plus_nongreedy.snap |  47 ++
 ..._tests__quantifiers_repeat_navigation.snap |  53 ++
 ...s__quantifiers_sequence_in_called_def.snap |  83 ++
 ...r__emit__emit_tests__quantifiers_star.snap |  49 ++
 ...mit_tests__quantifiers_star_nongreedy.snap |  49 ++
 ..._emit_tests__quantifiers_struct_array.snap |  68 ++
 ...r__emit__emit_tests__recursion_simple.snap |  67 ++
 ...sts__recursion_with_structured_result.snap |  82 ++
 ...er__emit__emit_tests__sequences_basic.snap |  37 +
 ...__emit_tests__sequences_in_quantifier.snap |  56 ++
 ...r__emit__emit_tests__sequences_nested.snap |  41 +
 ...__emit_tests__sequences_with_captures.snap |  46 ++
 ...it__emit_tests__alternations_captured.snap |   0
 ...t_tests__alternations_captured_tagged.snap |   0
 ...mit_tests__alternations_in_quantifier.snap |   0
 ...mit__emit_tests__alternations_labeled.snap |   0
 ...ts__alternations_no_internal_captures.snap |   0
 ...it_tests__alternations_null_injection.snap |   0
 ...ternations_tagged_in_field_constraint.snap |   0
 ...ternations_tagged_with_definition_ref.snap |   0
 ...t__emit_tests__alternations_unlabeled.snap |   0
 ..._emit_tests__anchors_between_siblings.snap |   0
 ...emit__emit_tests__anchors_first_child.snap |   0
 ..._emit__emit_tests__anchors_last_child.snap |   0
 ...__emit__emit_tests__anchors_no_anchor.snap |   0
 ...t__emit_tests__anchors_with_anonymous.snap |   0
 ...lib__emit__emit_tests__captures_basic.snap |   0
 ...t__emit_tests__captures_deeply_nested.snap |   0
 ...s__captures_enum_with_type_annotation.snap |   0
 ...__emit__emit_tests__captures_multiple.snap |   0
 ...mit__emit_tests__captures_nested_flat.snap |   0
 ...sts__captures_optional_wrapper_struct.snap |   0
 ...it__emit_tests__captures_struct_scope.snap |   0
 ..._captures_struct_with_type_annotation.snap |   0
 ...emit_tests__captures_with_type_custom.snap |   0
 ...emit_tests__captures_with_type_string.snap |   0
 ...__emit_tests__captures_wrapper_struct.snap |   0
 ...tests__comprehensive_multi_definition.snap |   0
 ...mit__emit_tests__definitions_multiple.snap |   0
 ...mit_tests__definitions_nested_capture.snap |   0
 ...it__emit_tests__definitions_reference.snap |   0
 ..._emit__emit_tests__definitions_single.snap |   0
 ..._emit__emit_tests__fields_alternation.snap |   0
 ...ib__emit__emit_tests__fields_multiple.snap |   0
 ...lib__emit__emit_tests__fields_negated.snap |   0
 ..._lib__emit__emit_tests__fields_single.snap |   0
 ...ib__emit__emit_tests__nodes_anonymous.snap |   0
 ...ik_lib__emit__emit_tests__nodes_error.snap |   0
 ..._lib__emit__emit_tests__nodes_missing.snap |   0
 ...ik_lib__emit__emit_tests__nodes_named.snap |   0
 ..._emit__emit_tests__nodes_wildcard_any.snap |   0
 ...mit__emit_tests__nodes_wildcard_named.snap |   0
 ...mit__emit_tests__optional_first_child.snap |   0
 ...__emit_tests__optional_null_injection.snap |   0
 ..._tests__quantifiers_first_child_array.snap |   0
 ...mit__emit_tests__quantifiers_optional.snap |   0
 ...tests__quantifiers_optional_nongreedy.snap |   0
 ...b__emit__emit_tests__quantifiers_plus.snap |   0
 ...mit_tests__quantifiers_plus_nongreedy.snap |   0
 ..._tests__quantifiers_repeat_navigation.snap |   0
 ...s__quantifiers_sequence_in_called_def.snap |   0
 ...b__emit__emit_tests__quantifiers_star.snap |   0
 ...mit_tests__quantifiers_star_nongreedy.snap |   0
 ..._emit_tests__quantifiers_struct_array.snap |   0
 ...b__emit__emit_tests__recursion_simple.snap |   0
 ...sts__recursion_with_structured_result.snap |   0
 ...ib__emit__emit_tests__sequences_basic.snap |   0
 ...__emit_tests__sequences_in_quantifier.snap |   0
 ...b__emit__emit_tests__sequences_nested.snap |   0
 ...__emit_tests__sequences_with_captures.snap |   0
 .../src/emit/string_table.rs                  |   2 +-
 .../src/emit/string_table_tests.rs            |   0
 .../src/emit/type_table.rs                    |   5 +-
 .../src/emit/type_table_tests.rs              |   0
 crates/plotnik-compiler/src/lib.rs            |  52 ++
 .../src/parser/ast.rs                         |  93 +--
 .../src/parser/ast_tests.rs                   |   0
 .../src/parser/core.rs                        |   0
 .../src/parser/cst.rs                         |   0
 .../src/parser/cst_tests.rs                   |   0
 .../src/parser/grammar/atoms.rs               |   0
 .../src/parser/grammar/expressions.rs         |   0
 .../src/parser/grammar/fields.rs              |   0
 .../src/parser/grammar/items.rs               |   0
 .../src/parser/grammar/mod.rs                 |   0
 .../src/parser/grammar/structures.rs          |   0
 .../src/parser/grammar/utils.rs               |   0
 .../src/parser/grammar/validation.rs          |   0
 .../src/parser/invariants.rs                  |   0
 .../src/parser/lexer.rs                       |   0
 .../src/parser/lexer_tests.rs                 |   0
 .../src/parser/mod.rs                         |   0
 .../tests/grammar/alternations_tests.rs       |   0
 .../src/parser/tests/grammar/anchors_tests.rs |   0
 .../parser/tests/grammar/captures_tests.rs    |   0
 .../parser/tests/grammar/definitions_tests.rs |   0
 .../src/parser/tests/grammar/fields_tests.rs  |   0
 .../src/parser/tests/grammar/mod.rs           |   0
 .../src/parser/tests/grammar/nodes_tests.rs   |   0
 .../parser/tests/grammar/quantifiers_tests.rs |   0
 .../parser/tests/grammar/sequences_tests.rs   |   0
 .../src/parser/tests/grammar/special_tests.rs |   0
 .../src/parser/tests/grammar/trivia_tests.rs  |   0
 .../src/parser/tests/mod.rs                   |   0
 .../parser/tests/recovery/coverage_tests.rs   |   0
 .../parser/tests/recovery/incomplete_tests.rs |   0
 .../src/parser/tests/recovery/mod.rs          |   0
 .../parser/tests/recovery/unclosed_tests.rs   |   0
 .../parser/tests/recovery/unexpected_tests.rs |   0
 .../parser/tests/recovery/validation_tests.rs |   0
 .../src/query/dump.rs                         |   0
 .../src/query/mod.rs                          |   0
 .../src/query/printer.rs                      |   0
 .../src/query/printer_tests.rs                |   0
 .../src/query/query_tests.rs                  |   6 +-
 .../src/query/source_map.rs                   |   0
 .../src/query/source_map_tests.rs             |   0
 .../src/query/stages.rs                       |   0
 .../src/typegen/mod.rs                        |   0
 .../src/typegen/typescript/analysis.rs        |  12 +-
 .../src/typegen/typescript/config.rs          |   2 +-
 .../src/typegen/typescript/convert.rs         |  12 +-
 .../src/typegen/typescript/emitter.rs         |   4 +-
 .../src/typegen/typescript/mod.rs             |   2 +-
 .../src/typegen/typescript/naming.rs          |  12 +-
 .../src/typegen/typescript/render.rs          |  18 +-
 .../src/colors.rs                             |   0
 crates/plotnik-core/src/lib.rs                |   2 +
 crates/plotnik-lib/Cargo.toml                 |  16 +-
 .../src/bytecode/instructions_tests.rs        | 175 -----
 .../plotnik-lib/src/bytecode/module_tests.rs  | 229 ------
 ...ecode__dump_tests__dump_comprehensive.snap |  79 --
 crates/plotnik-lib/src/engine/engine_tests.rs | 714 ------------------
 crates/plotnik-lib/src/engine/verify_tests.rs | 208 -----
 crates/plotnik-lib/src/lib.rs                 |  64 +-
 crates/plotnik-vm/Cargo.toml                  |  21 +
 .../src/engine/checkpoint.rs                  |   0
 .../src/engine/cursor.rs                      |   2 +-
 .../src/engine/effect.rs                      |   0
 crates/plotnik-vm/src/engine/engine_tests.rs  |   5 +
 .../src/engine/error.rs                       |   2 +-
 .../src/engine/frame.rs                       |   0
 .../src/engine/materializer.rs                |   6 +-
 .../src/engine/mod.rs                         |   2 +
 ...engine_tests__alternation_merge_ident.snap |   0
 ...__engine_tests__alternation_merge_num.snap |   0
 ...ation_tagged_definition_ref_backtrack.snap |   0
 ...ngine_tests__alternation_tagged_ident.snap |   0
 ..._engine_tests__alternation_tagged_num.snap |   0
 ...ngine__engine_tests__anchor_adjacency.snap |   0
 ...ine__engine_tests__anchor_first_child.snap |   0
 ...gine__engine_tests__anchor_last_child.snap |   0
 ...e_tests__anchor_last_child_multi_item.snap |   0
 ...ngine_tests__anchor_last_child_single.snap |   0
 ..._tests__anchor_last_child_with_trivia.snap |   0
 ...ngine__engine_tests__capture_multiple.snap |   0
 ..._engine__engine_tests__capture_single.snap |   0
 ...gine_tests__capture_string_annotation.snap |   0
 ...e__engine_tests__field_negated_absent.snap |   0
 ...gine_tests__quantifier_nongreedy_star.snap |   0
 ...ine_tests__quantifier_optional_absent.snap |   0
 ...ne_tests__quantifier_optional_present.snap |   0
 ...engine__engine_tests__quantifier_plus.snap |   0
 ...uantifier_plus_with_string_annotation.snap |   0
 ...engine__engine_tests__quantifier_star.snap |   0
 ...uantifier_star_with_string_annotation.snap |   0
 ...engine_tests__quantifier_struct_array.snap |   0
 ..._engine_tests__recursion_member_chain.snap |   0
 ..._engine_tests__recursion_nested_calls.snap |   0
 ...gression_call_searches_among_siblings.snap |   0
 ...on_call_searches_for_field_constraint.snap |   0
 ...on_childless_node_with_inner_optional.snap |   0
 ...ession_childless_node_with_inner_star.snap |   0
 ...s__regression_empty_captured_sequence.snap |   0
 ...ression_enum_tag_with_definition_refs.snap |   0
 ...on_enum_variant_array_capture_payload.snap |   0
 ..._nested_quantifiers_empty_inner_array.snap |   0
 ...ted_quantifiers_struct_captures_mixed.snap |   0
 ..._node_capture_on_parent_with_children.snap |   0
 ...sion_optional_empty_captured_sequence.snap |   0
 ...ecursive_alternation_uncaptured_array.snap |   0
 ...sion_recursive_captures_nest_properly.snap |   0
 ...egression_scalar_array_captures_nodes.snap |   0
 ...ssion_tagged_alternation_materializes.snap |   0
 ...beled_alternation_5_branches_captures.snap |   0
 ...beled_alternation_8_branches_captures.snap |   0
 ...e__engine_tests__search_skip_siblings.snap |   0
 ..._tests__suppressive_capture_anonymous.snap |   0
 ...gine_tests__suppressive_capture_named.snap |   0
 ..._suppressive_capture_suppresses_inner.snap |   0
 ...pressive_capture_with_regular_sibling.snap |   0
 ..._tests__suppressive_capture_with_wrap.snap |   0
 ...ests__wildcard_bare_matches_anonymous.snap |   0
 ...tests__wildcard_named_skips_anonymous.snap |   0
 .../src/engine/trace.rs                       |   9 +-
 .../src/engine/value.rs                       |   2 +-
 .../src/engine/verify.rs                      |  32 +-
 crates/plotnik-vm/src/engine/verify_tests.rs  |   4 +
 .../src/engine/vm.rs                          |   7 +-
 crates/plotnik-vm/src/lib.rs                  |  14 +
 347 files changed, 3717 insertions(+), 1739 deletions(-)
 create mode 100644 crates/plotnik-bytecode/Cargo.toml
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/aligned_vec.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/aligned_vec_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/constants.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/dump.rs (97%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/effects.rs (89%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/effects_tests.rs (75%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/entrypoint.rs (90%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/entrypoint_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/format.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/format_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/header.rs (98%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/header_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/ids.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/instructions.rs (98%)
 create mode 100644 crates/plotnik-bytecode/src/bytecode/instructions_tests.rs
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/mod.rs (89%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/module.rs (99%)
 create mode 100644 crates/plotnik-bytecode/src/bytecode/module_tests.rs
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/nav.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/nav_tests.rs (100%)
 create mode 100644 crates/plotnik-bytecode/src/bytecode/node_type_ir.rs
 create mode 100644 crates/plotnik-bytecode/src/bytecode/node_type_ir_tests.rs
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/sections.rs (77%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/sections_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/type_meta.rs (94%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/bytecode/type_meta_tests.rs (100%)
 create mode 100644 crates/plotnik-bytecode/src/dfa.rs
 create mode 100644 crates/plotnik-bytecode/src/lib.rs
 create mode 100644 crates/plotnik-bytecode/src/predicate_op.rs
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/arity.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/arity_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/kind.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/kind_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/primitives.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/primitives_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/quantifier.rs (100%)
 rename crates/{plotnik-lib => plotnik-bytecode}/src/type_system/quantifier_tests.rs (100%)
 create mode 100644 crates/plotnik-compiler/Cargo.toml
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/dependencies.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/dependencies_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/invariants.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/link.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/link_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/recursion.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/refs.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/refs_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/symbol_table.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/symbol_table_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/context.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/context_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/infer.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/symbol.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/symbol_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/type_check_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/types.rs (96%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/unify.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/type_check/unify_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/utils.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/alt_kinds.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/alt_kinds_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/anchors.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/anchors_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/empty_constructs.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/empty_constructs_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/predicates.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/validation/predicates_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/analyze/visitor.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/bytecode/ir.rs (97%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/bytecode/ir_tests.rs (98%)
 create mode 100644 crates/plotnik-compiler/src/bytecode/mod.rs
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/capture.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/capture_tests.rs (96%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/compile_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/compiler.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/error.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/expressions.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/navigation.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/quantifier.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/scope.rs (98%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/compile/sequences.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/diagnostics/diagnostics_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/diagnostics/message.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/diagnostics/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/diagnostics/printer.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/emit_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/emitter.rs (96%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/error.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/layout.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/layout_tests.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/regex_table.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/regex_table_tests.rs (98%)
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured_tagged.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_in_quantifier.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_labeled.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_no_internal_captures.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_null_injection.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_in_field_constraint.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_with_definition_ref.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_unlabeled.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_between_siblings.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_first_child.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_last_child.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_no_anchor.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_with_anonymous.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_basic.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_deeply_nested.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_enum_with_type_annotation.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_multiple.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_nested_flat.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_optional_wrapper_struct.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_scope.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_with_type_annotation.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_custom.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_string.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_wrapper_struct.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__comprehensive_multi_definition.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_multiple.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_nested_capture.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_reference.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_single.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_alternation.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_multiple.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_negated.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_single.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_anonymous.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_error.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_missing.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_named.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_any.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_named.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_first_child.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_null_injection.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_first_child_array.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional_nongreedy.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus_nongreedy.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_repeat_navigation.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_sequence_in_called_def.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star_nongreedy.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_struct_array.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_simple.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_with_structured_result.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_basic.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_in_quantifier.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_nested.snap
 create mode 100644 crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_with_captures.snap
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/string_table.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/string_table_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/type_table.rs (99%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/emit/type_table_tests.rs (100%)
 create mode 100644 crates/plotnik-compiler/src/lib.rs
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/ast.rs (87%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/ast_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/core.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/cst.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/cst_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/atoms.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/expressions.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/fields.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/items.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/structures.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/utils.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/grammar/validation.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/invariants.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/lexer.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/lexer_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/alternations_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/anchors_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/captures_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/definitions_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/fields_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/nodes_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/quantifiers_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/sequences_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/special_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/grammar/trivia_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/coverage_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/incomplete_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/unclosed_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/unexpected_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/parser/tests/recovery/validation_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/dump.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/printer.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/printer_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/query_tests.rs (98%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/source_map.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/source_map_tests.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/query/stages.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/mod.rs (100%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/analysis.rs (96%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/config.rs (98%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/convert.rs (95%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/emitter.rs (97%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/mod.rs (95%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/naming.rs (93%)
 rename crates/{plotnik-lib => plotnik-compiler}/src/typegen/typescript/render.rs (94%)
 rename crates/{plotnik-lib => plotnik-core}/src/colors.rs (100%)
 delete mode 100644 crates/plotnik-lib/src/bytecode/instructions_tests.rs
 delete mode 100644 crates/plotnik-lib/src/bytecode/module_tests.rs
 delete mode 100644 crates/plotnik-lib/src/bytecode/snapshots/plotnik_lib__bytecode__dump_tests__dump_comprehensive.snap
 delete mode 100644 crates/plotnik-lib/src/engine/engine_tests.rs
 delete mode 100644 crates/plotnik-lib/src/engine/verify_tests.rs
 create mode 100644 crates/plotnik-vm/Cargo.toml
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/checkpoint.rs (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/cursor.rs (99%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/effect.rs (100%)
 create mode 100644 crates/plotnik-vm/src/engine/engine_tests.rs
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/error.rs (95%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/frame.rs (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/materializer.rs (98%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/mod.rs (95%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_ident.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_num.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_definition_ref_backtrack.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_ident.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_num.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_adjacency.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_first_child.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_multi_item.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_single.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_with_trivia.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_multiple.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_single.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_string_annotation.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__field_negated_absent.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_nongreedy_star.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_absent.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_present.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus_with_string_annotation.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star_with_string_annotation.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_struct_array.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_member_chain.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_nested_calls.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_among_siblings.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_for_field_constraint.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_optional.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_star.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_empty_captured_sequence.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_tag_with_definition_refs.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_variant_array_capture_payload.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_empty_inner_array.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_struct_captures_mixed.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_node_capture_on_parent_with_children.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_optional_empty_captured_sequence.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_alternation_uncaptured_array.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_captures_nest_properly.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_scalar_array_captures_nodes.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_tagged_alternation_materializes.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_5_branches_captures.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_8_branches_captures.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__search_skip_siblings.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_anonymous.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_named.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_suppresses_inner.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_regular_sibling.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_wrap.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_bare_matches_anonymous.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_named_skips_anonymous.snap (100%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/trace.rs (99%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/value.rs (99%)
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/verify.rs (93%)
 create mode 100644 crates/plotnik-vm/src/engine/verify_tests.rs
 rename crates/{plotnik-lib => plotnik-vm}/src/engine/vm.rs (99%)
 create mode 100644 crates/plotnik-vm/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 329ce936..c6a75730 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1656,6 +1656,40 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "plotnik-bytecode"
+version = "0.2.2"
+dependencies = [
+ "insta",
+ "plotnik-core",
+ "regex-automata",
+ "thiserror",
+]
+
+[[package]]
+name = "plotnik-compiler"
+version = "0.2.2"
+dependencies = [
+ "annotate-snippets",
+ "arborium-tree-sitter",
+ "crc32fast",
+ "indexmap",
+ "indoc",
+ "insta",
+ "logos",
+ "memmap2",
+ "plotnik-bytecode",
+ "plotnik-core",
+ "plotnik-langs",
+ "regex-automata",
+ "regex-syntax",
+ "rowan",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror",
+]
+
 [[package]]
 name = "plotnik-core"
 version = "0.2.2"
@@ -1784,22 +1818,29 @@ dependencies = [
 name = "plotnik-lib"
 version = "0.2.2"
 dependencies = [
- "annotate-snippets",
  "arborium-tree-sitter",
- "crc32fast",
- "indexmap",
  "indoc",
  "insta",
- "logos",
- "memmap2",
+ "plotnik-bytecode",
+ "plotnik-compiler",
  "plotnik-core",
  "plotnik-langs",
- "regex-automata",
- "regex-syntax",
- "rowan",
+ "plotnik-vm",
  "serde",
  "serde_json",
  "tempfile",
+]
+
+[[package]]
+name = "plotnik-vm"
+version = "0.2.2"
+dependencies = [
+ "arborium-tree-sitter",
+ "insta",
+ "plotnik-bytecode",
+ "plotnik-core",
+ "regex-automata",
+ "serde",
  "thiserror",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 73eec191..a384225e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,14 @@
 [workspace]
 resolver = "2"
-members = ["crates/plotnik-cli", "crates/plotnik-lib", "crates/plotnik-langs", "crates/plotnik-core"]
+members = [
+    "crates/plotnik-bytecode",
+    "crates/plotnik-cli",
+    "crates/plotnik-compiler",
+    "crates/plotnik-core",
+    "crates/plotnik-langs",
+    "crates/plotnik-lib",
+    "crates/plotnik-vm",
+]
 
 [workspace.package]
 version = "0.2.2"
@@ -9,6 +17,9 @@ repository = "https://github.com/plotnik-lang/plotnik"
 edition = "2024"
 
 [workspace.dependencies]
+plotnik-bytecode = { path = "crates/plotnik-bytecode", version = "0.2.2" }
+plotnik-compiler = { path = "crates/plotnik-compiler", version = "0.2.2" }
 plotnik-core = { path = "crates/plotnik-core", version = "0.2.2" }
 plotnik-langs = { path = "crates/plotnik-langs", version = "0.2.2" }
 plotnik-lib = { path = "crates/plotnik-lib", version = "0.2.2" }
+plotnik-vm = { path = "crates/plotnik-vm", version = "0.2.2" }
diff --git a/crates/plotnik-bytecode/Cargo.toml b/crates/plotnik-bytecode/Cargo.toml
new file mode 100644
index 00000000..471bdf7a
--- /dev/null
+++ b/crates/plotnik-bytecode/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "plotnik-bytecode"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Bytecode format and runtime types for Plotnik"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+
+[dependencies]
+plotnik-core.workspace = true
+regex-automata = { version = "0.4", features = ["dfa-search"] }
+thiserror = "2.0.17"
+
+[dev-dependencies]
+insta = { version = "=1.46.0", features = ["yaml"] }
diff --git a/crates/plotnik-lib/src/bytecode/aligned_vec.rs b/crates/plotnik-bytecode/src/bytecode/aligned_vec.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/aligned_vec.rs
rename to crates/plotnik-bytecode/src/bytecode/aligned_vec.rs
diff --git a/crates/plotnik-lib/src/bytecode/aligned_vec_tests.rs b/crates/plotnik-bytecode/src/bytecode/aligned_vec_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/aligned_vec_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/aligned_vec_tests.rs
diff --git a/crates/plotnik-lib/src/bytecode/constants.rs b/crates/plotnik-bytecode/src/bytecode/constants.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/constants.rs
rename to crates/plotnik-bytecode/src/bytecode/constants.rs
diff --git a/crates/plotnik-lib/src/bytecode/dump.rs b/crates/plotnik-bytecode/src/bytecode/dump.rs
similarity index 97%
rename from crates/plotnik-lib/src/bytecode/dump.rs
rename to crates/plotnik-bytecode/src/bytecode/dump.rs
index 7487a2b1..c14b671f 100644
--- a/crates/plotnik-lib/src/bytecode/dump.rs
+++ b/crates/plotnik-bytecode/src/bytecode/dump.rs
@@ -5,15 +5,14 @@
 use std::collections::BTreeMap;
 use std::fmt::Write as _;
 
-use crate::colors::Colors;
-
-use crate::parser::PredicateOp;
+use plotnik_core::Colors;
+use crate::predicate_op::PredicateOp;
 
 use super::format::{LineBuilder, Symbol, format_effect, nav_symbol, width_for_count};
 use super::ids::TypeId;
 use super::instructions::StepId;
-use super::ir::NodeTypeIR;
 use super::module::{Instruction, Module};
+use super::node_type_ir::NodeTypeIR;
 use super::nav::Nav;
 use super::type_meta::{TypeData, TypeKind};
 use super::{Call, Match, Return, Trampoline};
@@ -78,13 +77,13 @@ impl DumpContext {
         let mut node_type_names = BTreeMap::new();
         for i in 0..node_types.len() {
             let t = node_types.get(i);
-            node_type_names.insert(t.id(), strings.get(t.name()).to_string());
+            node_type_names.insert(t.id, strings.get(t.name).to_string());
         }
 
         let mut node_field_names = BTreeMap::new();
         for i in 0..node_fields.len() {
             let f = node_fields.get(i);
-            node_field_names.insert(f.id(), strings.get(f.name()).to_string());
+            node_field_names.insert(f.id, strings.get(f.name).to_string());
         }
 
         // Collect all strings for unlinked mode lookups
@@ -210,14 +209,14 @@ fn dump_types_defs(out: &mut String, module: &Module, ctx: &DumpContext) {
                     TypeKind::Struct => {
                         let fields: Vec<_> = types
                             .members_of(&def)
-                            .map(|m| strings.get(m.name()).to_string())
+                            .map(|m| strings.get(m.name).to_string())
                             .collect();
                         format!("{}  ; {{ {} }}{}", c.dim, fields.join(", "), c.reset)
                     }
                     TypeKind::Enum => {
                         let variants: Vec<_> = types
                             .members_of(&def)
-                            .map(|m| strings.get(m.name()).to_string())
+                            .map(|m| strings.get(m.name).to_string())
                             .collect();
                         format!("{}  ; {}{}", c.dim, variants.join(" | "), c.reset)
                     }
@@ -293,8 +292,8 @@ fn format_type_name(type_id: TypeId, module: &Module, ctx: &DumpContext) -> Stri
     // Try to find a name in types.names
     for i in 0..types.names_count() {
         let entry = types.get_name(i);
-        if entry.type_id() == type_id {
-            return strings.get(entry.name()).to_string();
+        if entry.type_id == type_id {
+            return strings.get(entry.name).to_string();
         }
     }
 
diff --git a/crates/plotnik-lib/src/bytecode/effects.rs b/crates/plotnik-bytecode/src/bytecode/effects.rs
similarity index 89%
rename from crates/plotnik-lib/src/bytecode/effects.rs
rename to crates/plotnik-bytecode/src/bytecode/effects.rs
index c4adad9c..a9400169 100644
--- a/crates/plotnik-lib/src/bytecode/effects.rs
+++ b/crates/plotnik-bytecode/src/bytecode/effects.rs
@@ -43,8 +43,8 @@ impl EffectOpcode {
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct EffectOp {
-    pub(crate) opcode: EffectOpcode,
-    pub(crate) payload: usize,
+    pub opcode: EffectOpcode,
+    pub payload: usize,
 }
 
 impl EffectOp {
@@ -69,11 +69,4 @@ impl EffectOp {
         let raw = ((self.opcode as u16) << 10) | ((self.payload as u16) & 0x3FF);
         raw.to_le_bytes()
     }
-
-    pub fn opcode(&self) -> EffectOpcode {
-        self.opcode
-    }
-    pub fn payload(&self) -> usize {
-        self.payload
-    }
 }
diff --git a/crates/plotnik-lib/src/bytecode/effects_tests.rs b/crates/plotnik-bytecode/src/bytecode/effects_tests.rs
similarity index 75%
rename from crates/plotnik-lib/src/bytecode/effects_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/effects_tests.rs
index dac1b114..10ea56ce 100644
--- a/crates/plotnik-lib/src/bytecode/effects_tests.rs
+++ b/crates/plotnik-bytecode/src/bytecode/effects_tests.rs
@@ -5,8 +5,8 @@ fn roundtrip_with_payload() {
     let op = EffectOp::new(EffectOpcode::Set, 42);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.opcode(), EffectOpcode::Set);
-    assert_eq!(decoded.payload(), 42);
+    assert_eq!(decoded.opcode, EffectOpcode::Set);
+    assert_eq!(decoded.payload, 42);
 }
 
 #[test]
@@ -14,8 +14,8 @@ fn roundtrip_no_payload() {
     let op = EffectOp::new(EffectOpcode::Node, 0);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.opcode(), EffectOpcode::Node);
-    assert_eq!(decoded.payload(), 0);
+    assert_eq!(decoded.opcode, EffectOpcode::Node);
+    assert_eq!(decoded.payload, 0);
 }
 
 #[test]
@@ -23,7 +23,7 @@ fn max_payload() {
     let op = EffectOp::new(EffectOpcode::Enum, 1023);
     let bytes = op.to_bytes();
     let decoded = EffectOp::from_bytes(bytes);
-    assert_eq!(decoded.payload(), 1023);
+    assert_eq!(decoded.payload, 1023);
 }
 
 #[test]
diff --git a/crates/plotnik-lib/src/bytecode/entrypoint.rs b/crates/plotnik-bytecode/src/bytecode/entrypoint.rs
similarity index 90%
rename from crates/plotnik-lib/src/bytecode/entrypoint.rs
rename to crates/plotnik-bytecode/src/bytecode/entrypoint.rs
index 0536de5d..a15b4315 100644
--- a/crates/plotnik-lib/src/bytecode/entrypoint.rs
+++ b/crates/plotnik-bytecode/src/bytecode/entrypoint.rs
@@ -8,12 +8,12 @@ use super::{StringId, TypeId};
 #[repr(C)]
 pub struct Entrypoint {
     /// Definition name.
-    pub(crate) name: StringId,
+    pub name: StringId,
     /// Starting instruction address.
-    pub(crate) target: StepAddr,
+    pub target: StepAddr,
     /// Result type.
-    pub(crate) result_type: TypeId,
-    pub(crate) _pad: u16,
+    pub result_type: TypeId,
+    _pad: u16,
 }
 
 const _: () = assert!(std::mem::size_of::<Entrypoint>() == 8);
diff --git a/crates/plotnik-lib/src/bytecode/entrypoint_tests.rs b/crates/plotnik-bytecode/src/bytecode/entrypoint_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/entrypoint_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/entrypoint_tests.rs
diff --git a/crates/plotnik-lib/src/bytecode/format.rs b/crates/plotnik-bytecode/src/bytecode/format.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/format.rs
rename to crates/plotnik-bytecode/src/bytecode/format.rs
diff --git a/crates/plotnik-lib/src/bytecode/format_tests.rs b/crates/plotnik-bytecode/src/bytecode/format_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/format_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/format_tests.rs
diff --git a/crates/plotnik-lib/src/bytecode/header.rs b/crates/plotnik-bytecode/src/bytecode/header.rs
similarity index 98%
rename from crates/plotnik-lib/src/bytecode/header.rs
rename to crates/plotnik-bytecode/src/bytecode/header.rs
index cbdf277e..139611bf 100644
--- a/crates/plotnik-lib/src/bytecode/header.rs
+++ b/crates/plotnik-bytecode/src/bytecode/header.rs
@@ -42,8 +42,8 @@ pub struct Header {
     pub entrypoints_count: u16,
     pub transitions_count: u16,
 
-    // Bytes 44-63: Reserved
-    pub(crate) _reserved: [u8; 20],
+    // Bytes 44-63: Reserved (public for cross-crate struct initialization)
+    pub _reserved: [u8; 20],
 }
 
 const _: () = assert!(std::mem::size_of::<Header>() == 64);
diff --git a/crates/plotnik-lib/src/bytecode/header_tests.rs b/crates/plotnik-bytecode/src/bytecode/header_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/header_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/header_tests.rs
diff --git a/crates/plotnik-lib/src/bytecode/ids.rs b/crates/plotnik-bytecode/src/bytecode/ids.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/ids.rs
rename to crates/plotnik-bytecode/src/bytecode/ids.rs
diff --git a/crates/plotnik-lib/src/bytecode/instructions.rs b/crates/plotnik-bytecode/src/bytecode/instructions.rs
similarity index 98%
rename from crates/plotnik-lib/src/bytecode/instructions.rs
rename to crates/plotnik-bytecode/src/bytecode/instructions.rs
index 6545258f..009f058f 100644
--- a/crates/plotnik-lib/src/bytecode/instructions.rs
+++ b/crates/plotnik-bytecode/src/bytecode/instructions.rs
@@ -7,8 +7,8 @@ use std::num::NonZeroU16;
 
 use super::constants::{SECTION_ALIGN, STEP_SIZE};
 use super::effects::EffectOp;
-use super::ir::NodeTypeIR;
 use super::nav::Nav;
+use super::node_type_ir::NodeTypeIR;
 
 /// Step address in bytecode (raw u16).
 ///
@@ -338,15 +338,15 @@ impl<'a> Match<'a> {
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct Call {
     /// Segment index (0-3).
-    pub(crate) segment: u8,
+    pub segment: u8,
     /// Navigation to apply before jumping to target.
-    pub(crate) nav: Nav,
+    pub nav: Nav,
     /// Field constraint (None = no constraint).
-    pub(crate) node_field: Option<NonZeroU16>,
+    pub node_field: Option<NonZeroU16>,
     /// Return address (current segment).
-    pub(crate) next: StepId,
+    pub next: StepId,
     /// Callee entry point (target segment from type_id).
-    pub(crate) target: StepId,
+    pub target: StepId,
 }
 
 impl Call {
@@ -416,7 +416,7 @@ impl Call {
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct Return {
     /// Segment index (0-3).
-    pub(crate) segment: u8,
+    pub segment: u8,
 }
 
 impl Return {
@@ -468,9 +468,9 @@ impl Default for Return {
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct Trampoline {
     /// Segment index (0-3).
-    pub(crate) segment: u8,
+    pub segment: u8,
     /// Return address (where to continue after entrypoint returns).
-    pub(crate) next: StepId,
+    pub next: StepId,
 }
 
 impl Trampoline {
diff --git a/crates/plotnik-bytecode/src/bytecode/instructions_tests.rs b/crates/plotnik-bytecode/src/bytecode/instructions_tests.rs
new file mode 100644
index 00000000..c0a70ef7
--- /dev/null
+++ b/crates/plotnik-bytecode/src/bytecode/instructions_tests.rs
@@ -0,0 +1,80 @@
+//! Tests for bytecode instructions.
+
+use std::num::NonZeroU16;
+
+use super::instructions::{Call, Opcode, Return, StepId, align_to_section, select_match_opcode};
+use super::nav::Nav;
+
+#[test]
+fn opcode_sizes() {
+    assert_eq!(Opcode::Match8.size(), 8);
+    assert_eq!(Opcode::Match16.size(), 16);
+    assert_eq!(Opcode::Match24.size(), 24);
+    assert_eq!(Opcode::Match32.size(), 32);
+    assert_eq!(Opcode::Match48.size(), 48);
+    assert_eq!(Opcode::Match64.size(), 64);
+    assert_eq!(Opcode::Call.size(), 8);
+    assert_eq!(Opcode::Return.size(), 8);
+}
+
+#[test]
+fn opcode_step_counts() {
+    assert_eq!(Opcode::Match8.step_count(), 1);
+    assert_eq!(Opcode::Match16.step_count(), 2);
+    assert_eq!(Opcode::Match32.step_count(), 4);
+    assert_eq!(Opcode::Match64.step_count(), 8);
+}
+
+#[test]
+fn opcode_payload_slots() {
+    assert_eq!(Opcode::Match8.payload_slots(), 0);
+    assert_eq!(Opcode::Match16.payload_slots(), 4);
+    assert_eq!(Opcode::Match24.payload_slots(), 8);
+    assert_eq!(Opcode::Match32.payload_slots(), 12);
+    assert_eq!(Opcode::Match48.payload_slots(), 20);
+    assert_eq!(Opcode::Match64.payload_slots(), 28);
+}
+
+#[test]
+fn select_match_opcode_picks_smallest() {
+    assert_eq!(select_match_opcode(0), Some(Opcode::Match8));
+    assert_eq!(select_match_opcode(1), Some(Opcode::Match16));
+    assert_eq!(select_match_opcode(4), Some(Opcode::Match16));
+    assert_eq!(select_match_opcode(5), Some(Opcode::Match24));
+    assert_eq!(select_match_opcode(12), Some(Opcode::Match32));
+    assert_eq!(select_match_opcode(20), Some(Opcode::Match48));
+    assert_eq!(select_match_opcode(28), Some(Opcode::Match64));
+    assert_eq!(select_match_opcode(29), None);
+}
+
+#[test]
+fn align_to_section_works() {
+    assert_eq!(align_to_section(0), 0);
+    assert_eq!(align_to_section(1), 64);
+    assert_eq!(align_to_section(64), 64);
+    assert_eq!(align_to_section(65), 128);
+    assert_eq!(align_to_section(100), 128);
+}
+
+#[test]
+fn call_roundtrip() {
+    let c = Call::new(
+        Nav::Down,
+        NonZeroU16::new(42),
+        StepId::new(100),
+        StepId::new(500),
+    );
+
+    let bytes = c.to_bytes();
+    let decoded = Call::from_bytes(bytes);
+    assert_eq!(decoded, c);
+}
+
+#[test]
+fn return_roundtrip() {
+    let r = Return::new();
+
+    let bytes = r.to_bytes();
+    let decoded = Return::from_bytes(bytes);
+    assert_eq!(decoded, r);
+}
diff --git a/crates/plotnik-lib/src/bytecode/mod.rs b/crates/plotnik-bytecode/src/bytecode/mod.rs
similarity index 89%
rename from crates/plotnik-lib/src/bytecode/mod.rs
rename to crates/plotnik-bytecode/src/bytecode/mod.rs
index 430714c9..1f972dd9 100644
--- a/crates/plotnik-lib/src/bytecode/mod.rs
+++ b/crates/plotnik-bytecode/src/bytecode/mod.rs
@@ -11,9 +11,9 @@ mod format;
 mod header;
 mod ids;
 mod instructions;
-mod ir;
 mod module;
 mod nav;
+mod node_type_ir;
 mod sections;
 mod type_meta;
 
@@ -54,10 +54,7 @@ pub use format::{
     width_for_count,
 };
 
-pub use ir::{
-    CallIR, EffectIR, InstructionIR, Label, LayoutResult, MatchIR, MemberRef, NodeTypeIR,
-    PredicateIR, PredicateValueIR, ReturnIR, TrampolineIR,
-};
+pub use node_type_ir::NodeTypeIR;
 
 #[cfg(test)]
 mod aligned_vec_tests;
@@ -72,12 +69,12 @@ mod header_tests;
 #[cfg(test)]
 mod instructions_tests;
 #[cfg(test)]
-mod ir_tests;
-#[cfg(test)]
 mod module_tests;
 #[cfg(test)]
 mod nav_tests;
 #[cfg(test)]
+mod node_type_ir_tests;
+#[cfg(test)]
 mod sections_tests;
 #[cfg(test)]
 mod type_meta_tests;
diff --git a/crates/plotnik-lib/src/bytecode/module.rs b/crates/plotnik-bytecode/src/bytecode/module.rs
similarity index 99%
rename from crates/plotnik-lib/src/bytecode/module.rs
rename to crates/plotnik-bytecode/src/bytecode/module.rs
index 5ebea12b..554fb8db 100644
--- a/crates/plotnik-lib/src/bytecode/module.rs
+++ b/crates/plotnik-bytecode/src/bytecode/module.rs
@@ -448,7 +448,7 @@ impl<'a> TriviaView<'a> {
 
     /// Check if a node type is trivia.
     pub fn contains(&self, node_type: u16) -> bool {
-        (0..self.count).any(|i| self.get(i).node_type() == node_type)
+        (0..self.count).any(|i| self.get(i).node_type == node_type)
     }
 }
 
diff --git a/crates/plotnik-bytecode/src/bytecode/module_tests.rs b/crates/plotnik-bytecode/src/bytecode/module_tests.rs
new file mode 100644
index 00000000..84b31009
--- /dev/null
+++ b/crates/plotnik-bytecode/src/bytecode/module_tests.rs
@@ -0,0 +1,42 @@
+//! Tests for the bytecode module.
+
+use super::module::{ByteStorage, ModuleError};
+use super::AlignedVec;
+
+#[test]
+fn byte_storage_copy_from_slice() {
+    let data = [1u8, 2, 3, 4, 5];
+    let storage = ByteStorage::copy_from_slice(&data);
+
+    assert_eq!(&*storage, &data[..]);
+    assert_eq!(storage.len(), 5);
+    assert_eq!(storage[2], 3);
+}
+
+#[test]
+fn byte_storage_from_aligned() {
+    let vec = AlignedVec::copy_from_slice(&[1, 2, 3, 4, 5]);
+    let storage = ByteStorage::from_aligned(vec);
+
+    assert_eq!(&*storage, &[1, 2, 3, 4, 5]);
+    assert_eq!(storage.len(), 5);
+}
+
+#[test]
+fn module_error_display() {
+    let err = ModuleError::InvalidMagic;
+    assert_eq!(err.to_string(), "invalid magic: expected PTKQ");
+
+    let err = ModuleError::UnsupportedVersion(99);
+    assert!(err.to_string().contains("99"));
+
+    let err = ModuleError::FileTooSmall(32);
+    assert!(err.to_string().contains("32"));
+
+    let err = ModuleError::SizeMismatch {
+        header: 100,
+        actual: 50,
+    };
+    assert!(err.to_string().contains("100"));
+    assert!(err.to_string().contains("50"));
+}
diff --git a/crates/plotnik-lib/src/bytecode/nav.rs b/crates/plotnik-bytecode/src/bytecode/nav.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/nav.rs
rename to crates/plotnik-bytecode/src/bytecode/nav.rs
diff --git a/crates/plotnik-lib/src/bytecode/nav_tests.rs b/crates/plotnik-bytecode/src/bytecode/nav_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/nav_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/nav_tests.rs
diff --git a/crates/plotnik-bytecode/src/bytecode/node_type_ir.rs b/crates/plotnik-bytecode/src/bytecode/node_type_ir.rs
new file mode 100644
index 00000000..306048d6
--- /dev/null
+++ b/crates/plotnik-bytecode/src/bytecode/node_type_ir.rs
@@ -0,0 +1,78 @@
+//! Node type constraint for Match instructions.
+//!
+//! Extracted from ir.rs for use by runtime instruction decoding.
+
+use std::num::NonZeroU16;
+
+/// Node type constraint for Match instructions.
+///
+/// Distinguishes between named nodes (`(identifier)`), anonymous nodes (`"text"`),
+/// and wildcards (`_`, `(_)`). Encoded in bytecode header byte bits 5-4.
+///
+/// | `node_kind` | Value | Meaning      | `node_type=0`       | `node_type>0`     |
+/// | ----------- | ----- | ------------ | ------------------- | ----------------- |
+/// | `00`        | Any   | `_` pattern  | No check            | (invalid)         |
+/// | `01`        | Named | `(_)`/`(t)`  | Check `is_named()`  | Check `kind_id()` |
+/// | `10`        | Anon  | `"text"`     | Check `!is_named()` | Check `kind_id()` |
+/// | `11`        | -     | Reserved     | Error               | Error             |
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
+pub enum NodeTypeIR {
+    /// Any node (`_` pattern) - no type check performed.
+    #[default]
+    Any,
+    /// Named node constraint (`(_)` or `(identifier)`).
+    /// - `None` = any named node (check `is_named()`)
+    /// - `Some(id)` = specific named type (check `kind_id()`)
+    Named(Option<NonZeroU16>),
+    /// Anonymous node constraint (`"text"` literals).
+    /// - `None` = any anonymous node (check `!is_named()`)
+    /// - `Some(id)` = specific anonymous type (check `kind_id()`)
+    Anonymous(Option<NonZeroU16>),
+}
+
+impl NodeTypeIR {
+    /// Encode to bytecode: returns (node_kind bits, node_type value).
+    ///
+    /// `node_kind` is 2 bits for header byte bits 5-4.
+    /// `node_type` is u16 for bytes 2-3.
+    pub fn to_bytes(self) -> (u8, u16) {
+        match self {
+            Self::Any => (0b00, 0),
+            Self::Named(opt) => (0b01, opt.map(|n| n.get()).unwrap_or(0)),
+            Self::Anonymous(opt) => (0b10, opt.map(|n| n.get()).unwrap_or(0)),
+        }
+    }
+
+    /// Decode from bytecode: node_kind bits (2 bits) and node_type value (u16).
+    pub fn from_bytes(node_kind: u8, node_type: u16) -> Self {
+        match node_kind {
+            0b00 => Self::Any,
+            0b01 => Self::Named(NonZeroU16::new(node_type)),
+            0b10 => Self::Anonymous(NonZeroU16::new(node_type)),
+            _ => panic!("invalid node_kind: {node_kind}"),
+        }
+    }
+
+    /// Check if this represents a specific type ID (not a wildcard).
+    pub fn type_id(&self) -> Option<NonZeroU16> {
+        match self {
+            Self::Any => None,
+            Self::Named(opt) | Self::Anonymous(opt) => *opt,
+        }
+    }
+
+    /// Check if this is the Any wildcard.
+    pub fn is_any(&self) -> bool {
+        matches!(self, Self::Any)
+    }
+
+    /// Check if this is a Named constraint (wildcard or specific).
+    pub fn is_named(&self) -> bool {
+        matches!(self, Self::Named(_))
+    }
+
+    /// Check if this is an Anonymous constraint (wildcard or specific).
+    pub fn is_anonymous(&self) -> bool {
+        matches!(self, Self::Anonymous(_))
+    }
+}
diff --git a/crates/plotnik-bytecode/src/bytecode/node_type_ir_tests.rs b/crates/plotnik-bytecode/src/bytecode/node_type_ir_tests.rs
new file mode 100644
index 00000000..c281c4e3
--- /dev/null
+++ b/crates/plotnik-bytecode/src/bytecode/node_type_ir_tests.rs
@@ -0,0 +1,73 @@
+use std::num::NonZeroU16;
+
+use super::node_type_ir::NodeTypeIR;
+
+#[test]
+fn roundtrip_any() {
+    let orig = NodeTypeIR::Any;
+    let (kind, type_val) = orig.to_bytes();
+    let decoded = NodeTypeIR::from_bytes(kind, type_val);
+    assert_eq!(decoded, orig);
+}
+
+#[test]
+fn roundtrip_named_wildcard() {
+    let orig = NodeTypeIR::Named(None);
+    let (kind, type_val) = orig.to_bytes();
+    let decoded = NodeTypeIR::from_bytes(kind, type_val);
+    assert_eq!(decoded, orig);
+}
+
+#[test]
+fn roundtrip_named_specific() {
+    let orig = NodeTypeIR::Named(NonZeroU16::new(42));
+    let (kind, type_val) = orig.to_bytes();
+    let decoded = NodeTypeIR::from_bytes(kind, type_val);
+    assert_eq!(decoded, orig);
+}
+
+#[test]
+fn roundtrip_anonymous_wildcard() {
+    let orig = NodeTypeIR::Anonymous(None);
+    let (kind, type_val) = orig.to_bytes();
+    let decoded = NodeTypeIR::from_bytes(kind, type_val);
+    assert_eq!(decoded, orig);
+}
+
+#[test]
+fn roundtrip_anonymous_specific() {
+    let orig = NodeTypeIR::Anonymous(NonZeroU16::new(100));
+    let (kind, type_val) = orig.to_bytes();
+    let decoded = NodeTypeIR::from_bytes(kind, type_val);
+    assert_eq!(decoded, orig);
+}
+
+#[test]
+fn type_id_extraction() {
+    assert_eq!(NodeTypeIR::Any.type_id(), None);
+    assert_eq!(NodeTypeIR::Named(None).type_id(), None);
+    assert_eq!(
+        NodeTypeIR::Named(NonZeroU16::new(5)).type_id(),
+        NonZeroU16::new(5)
+    );
+    assert_eq!(NodeTypeIR::Anonymous(None).type_id(), None);
+    assert_eq!(
+        NodeTypeIR::Anonymous(NonZeroU16::new(7)).type_id(),
+        NonZeroU16::new(7)
+    );
+}
+
+#[test]
+fn kind_checks() {
+    assert!(NodeTypeIR::Any.is_any());
+    assert!(!NodeTypeIR::Any.is_named());
+    assert!(!NodeTypeIR::Any.is_anonymous());
+
+    assert!(!NodeTypeIR::Named(None).is_any());
+    assert!(NodeTypeIR::Named(None).is_named());
+    assert!(!NodeTypeIR::Named(None).is_anonymous());
+
+    assert!(!NodeTypeIR::Anonymous(None).is_any());
+    assert!(!NodeTypeIR::Anonymous(None).is_named());
+    assert!(NodeTypeIR::Anonymous(None).is_anonymous());
+}
diff --git a/crates/plotnik-lib/src/bytecode/sections.rs b/crates/plotnik-bytecode/src/bytecode/sections.rs
similarity index 77%
rename from crates/plotnik-lib/src/bytecode/sections.rs
rename to crates/plotnik-bytecode/src/bytecode/sections.rs
index 0d950e9e..be9187f8 100644
--- a/crates/plotnik-lib/src/bytecode/sections.rs
+++ b/crates/plotnik-bytecode/src/bytecode/sections.rs
@@ -27,9 +27,9 @@ impl Slice {
 #[repr(C)]
 pub struct NodeSymbol {
     /// Tree-sitter node type ID
-    pub(crate) id: u16,
+    pub id: u16,
     /// StringId for the node kind name
-    pub(crate) name: StringId,
+    pub name: StringId,
 }
 
 impl NodeSymbol {
@@ -37,13 +37,6 @@ impl NodeSymbol {
     pub fn new(id: u16, name: StringId) -> Self {
         Self { id, name }
     }
-
-    pub fn id(&self) -> u16 {
-        self.id
-    }
-    pub fn name(&self) -> StringId {
-        self.name
-    }
 }
 
 /// Maps tree-sitter NodeFieldId to its string name.
@@ -51,9 +44,9 @@ impl NodeSymbol {
 #[repr(C)]
 pub struct FieldSymbol {
     /// Tree-sitter field ID
-    pub(crate) id: u16,
+    pub id: u16,
     /// StringId for the field name
-    pub(crate) name: StringId,
+    pub name: StringId,
 }
 
 impl FieldSymbol {
@@ -61,20 +54,13 @@ impl FieldSymbol {
     pub fn new(id: u16, name: StringId) -> Self {
         Self { id, name }
     }
-
-    pub fn id(&self) -> u16 {
-        self.id
-    }
-    pub fn name(&self) -> StringId {
-        self.name
-    }
 }
 
 /// A node type ID that counts as trivia (whitespace, comments).
 #[derive(Clone, Copy, Debug)]
 #[repr(C)]
 pub struct TriviaEntry {
-    pub(crate) node_type: u16,
+    pub node_type: u16,
 }
 
 impl TriviaEntry {
@@ -82,8 +68,4 @@ impl TriviaEntry {
     pub fn new(node_type: u16) -> Self {
         Self { node_type }
     }
-
-    pub fn node_type(&self) -> u16 {
-        self.node_type
-    }
 }
diff --git a/crates/plotnik-lib/src/bytecode/sections_tests.rs b/crates/plotnik-bytecode/src/bytecode/sections_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/sections_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/sections_tests.rs
diff --git a/crates/plotnik-lib/src/bytecode/type_meta.rs b/crates/plotnik-bytecode/src/bytecode/type_meta.rs
similarity index 94%
rename from crates/plotnik-lib/src/bytecode/type_meta.rs
rename to crates/plotnik-bytecode/src/bytecode/type_meta.rs
index 81aa893f..4ca82de0 100644
--- a/crates/plotnik-lib/src/bytecode/type_meta.rs
+++ b/crates/plotnik-bytecode/src/bytecode/type_meta.rs
@@ -166,9 +166,9 @@ impl TypeDef {
 #[repr(C)]
 pub struct TypeName {
     /// StringId of the type name.
-    pub(crate) name: StringId,
+    pub name: StringId,
     /// TypeId this name refers to.
-    pub(crate) type_id: TypeId,
+    pub type_id: TypeId,
 }
 
 const _: () = assert!(std::mem::size_of::<TypeName>() == 4);
@@ -186,13 +186,6 @@ impl TypeName {
         bytes[2..4].copy_from_slice(&self.type_id.0.to_le_bytes());
         bytes
     }
-
-    pub fn name(&self) -> StringId {
-        self.name
-    }
-    pub fn type_id(&self) -> TypeId {
-        self.type_id
-    }
 }
 
 /// Field or variant entry (4 bytes).
@@ -200,9 +193,9 @@ impl TypeName {
 #[repr(C)]
 pub struct TypeMember {
     /// Field/variant name.
-    pub(crate) name: StringId,
+    pub name: StringId,
     /// Type of this field/variant.
-    pub(crate) type_id: TypeId,
+    pub type_id: TypeId,
 }
 
 const _: () = assert!(std::mem::size_of::<TypeMember>() == 4);
@@ -220,11 +213,4 @@ impl TypeMember {
         bytes[2..4].copy_from_slice(&self.type_id.0.to_le_bytes());
         bytes
     }
-
-    pub fn name(&self) -> StringId {
-        self.name
-    }
-    pub fn type_id(&self) -> TypeId {
-        self.type_id
-    }
 }
diff --git a/crates/plotnik-lib/src/bytecode/type_meta_tests.rs b/crates/plotnik-bytecode/src/bytecode/type_meta_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/bytecode/type_meta_tests.rs
rename to crates/plotnik-bytecode/src/bytecode/type_meta_tests.rs
diff --git a/crates/plotnik-bytecode/src/dfa.rs b/crates/plotnik-bytecode/src/dfa.rs
new file mode 100644
index 00000000..146f153c
--- /dev/null
+++ b/crates/plotnik-bytecode/src/dfa.rs
@@ -0,0 +1,17 @@
+//! DFA deserialization for regex predicates.
+//!
+//! Extracted from emit for use by the runtime.
+
+use regex_automata::dfa::sparse::DFA;
+
+/// Deserialize a sparse DFA from bytecode.
+///
+/// # Safety
+/// The bytes must have been produced by `DFA::to_bytes_little_endian()`.
+pub fn deserialize_dfa(bytes: &[u8]) -> Result<DFA<&[u8]>, String> {
+    // SAFETY: We only serialize DFAs we built, and the format is stable
+    // within the same regex-automata version.
+    DFA::from_bytes(bytes)
+        .map(|(dfa, _)| dfa)
+        .map_err(|e| e.to_string())
+}
diff --git a/crates/plotnik-bytecode/src/lib.rs b/crates/plotnik-bytecode/src/lib.rs
new file mode 100644
index 00000000..116a85ba
--- /dev/null
+++ b/crates/plotnik-bytecode/src/lib.rs
@@ -0,0 +1,28 @@
+//! Bytecode format and runtime types for Plotnik.
+//!
+//! This crate contains:
+//! - Bytecode format definitions (Module, Header, instructions)
+//! - Type system primitives (TypeKind, Arity, QuantifierKind)
+//! - Runtime helpers (Colors, PredicateOp, DFA deserialization)
+
+#![allow(clippy::comparison_chain)]
+
+pub mod bytecode;
+pub mod dfa;
+pub mod predicate_op;
+pub mod type_system;
+
+// Re-export commonly used items at crate root
+pub use bytecode::{
+    AlignedVec, ByteStorage, Call, EffectOp, EffectOpcode, Entrypoint, EntrypointsView,
+    FieldSymbol, Header, Instruction, LineBuilder, MAGIC, MAX_MATCH_PAYLOAD_SLOTS,
+    MAX_PRE_EFFECTS, Match, Module, ModuleError, Nav, NodeSymbol, NodeTypeIR, Opcode, RegexView,
+    Return, SECTION_ALIGN, STEP_SIZE, SectionOffsets, Slice, StepAddr, StepId, StringId,
+    StringsView, Symbol, SymbolsView, Trampoline, TriviaEntry, TriviaView, TypeData, TypeDef,
+    TypeId, TypeKind, TypeMember, TypeName, TypesView, VERSION, align_to_section, cols, dump,
+    format_effect, nav_symbol, select_match_opcode, superscript, trace, truncate_text,
+    width_for_count,
+};
+pub use dfa::deserialize_dfa;
+pub use predicate_op::PredicateOp;
+pub use type_system::{Arity, PrimitiveType, QuantifierKind};
diff --git a/crates/plotnik-bytecode/src/predicate_op.rs b/crates/plotnik-bytecode/src/predicate_op.rs
new file mode 100644
index 00000000..0853daa5
--- /dev/null
+++ b/crates/plotnik-bytecode/src/predicate_op.rs
@@ -0,0 +1,112 @@
+//! Predicate operators for bytecode.
+//!
+//! Extracted from parser for use by both compiler and runtime.
+//! The runtime needs to decode predicate operators from bytecode.
+
+/// Predicate operator for node text filtering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum PredicateOp {
+    /// `==` - equals
+    Eq,
+    /// `!=` - not equals
+    Ne,
+    /// `^=` - starts with
+    StartsWith,
+    /// `$=` - ends with
+    EndsWith,
+    /// `*=` - contains
+    Contains,
+    /// `=~` - regex match
+    RegexMatch,
+    /// `!~` - regex no match
+    RegexNoMatch,
+}
+
+impl PredicateOp {
+    /// Decode from bytecode representation.
+    pub fn from_byte(b: u8) -> Self {
+        match b {
+            0 => Self::Eq,
+            1 => Self::Ne,
+            2 => Self::StartsWith,
+            3 => Self::EndsWith,
+            4 => Self::Contains,
+            5 => Self::RegexMatch,
+            6 => Self::RegexNoMatch,
+            _ => panic!("invalid predicate op byte: {b}"),
+        }
+    }
+
+    /// Encode for bytecode.
+    pub fn to_byte(self) -> u8 {
+        match self {
+            Self::Eq => 0,
+            Self::Ne => 1,
+            Self::StartsWith => 2,
+            Self::EndsWith => 3,
+            Self::Contains => 4,
+            Self::RegexMatch => 5,
+            Self::RegexNoMatch => 6,
+        }
+    }
+
+    /// Operator as display string.
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Self::Eq => "==",
+            Self::Ne => "!=",
+            Self::StartsWith => "^=",
+            Self::EndsWith => "$=",
+            Self::Contains => "*=",
+            Self::RegexMatch => "=~",
+            Self::RegexNoMatch => "!~",
+        }
+    }
+
+    /// Check if this is a regex operator.
+    pub fn is_regex_op(&self) -> bool {
+        matches!(self, Self::RegexMatch | Self::RegexNoMatch)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn byte_roundtrip() {
+        for op in [
+            PredicateOp::Eq,
+            PredicateOp::Ne,
+            PredicateOp::StartsWith,
+            PredicateOp::EndsWith,
+            PredicateOp::Contains,
+            PredicateOp::RegexMatch,
+            PredicateOp::RegexNoMatch,
+        ] {
+            assert_eq!(PredicateOp::from_byte(op.to_byte()), op);
+        }
+    }
+
+    #[test]
+    fn as_str() {
+        assert_eq!(PredicateOp::Eq.as_str(), "==");
+        assert_eq!(PredicateOp::Ne.as_str(), "!=");
+        assert_eq!(PredicateOp::StartsWith.as_str(), "^=");
+        assert_eq!(PredicateOp::EndsWith.as_str(), "$=");
+        assert_eq!(PredicateOp::Contains.as_str(), "*=");
+        assert_eq!(PredicateOp::RegexMatch.as_str(), "=~");
+        assert_eq!(PredicateOp::RegexNoMatch.as_str(), "!~");
+    }
+
+    #[test]
+    fn is_regex_op() {
+        assert!(!PredicateOp::Eq.is_regex_op());
+        assert!(!PredicateOp::Ne.is_regex_op());
+        assert!(!PredicateOp::StartsWith.is_regex_op());
+        assert!(!PredicateOp::EndsWith.is_regex_op());
+        assert!(!PredicateOp::Contains.is_regex_op());
+        assert!(PredicateOp::RegexMatch.is_regex_op());
+        assert!(PredicateOp::RegexNoMatch.is_regex_op());
+    }
+}
diff --git a/crates/plotnik-lib/src/type_system/arity.rs b/crates/plotnik-bytecode/src/type_system/arity.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/arity.rs
rename to crates/plotnik-bytecode/src/type_system/arity.rs
diff --git a/crates/plotnik-lib/src/type_system/arity_tests.rs b/crates/plotnik-bytecode/src/type_system/arity_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/arity_tests.rs
rename to crates/plotnik-bytecode/src/type_system/arity_tests.rs
diff --git a/crates/plotnik-lib/src/type_system/kind.rs b/crates/plotnik-bytecode/src/type_system/kind.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/kind.rs
rename to crates/plotnik-bytecode/src/type_system/kind.rs
diff --git a/crates/plotnik-lib/src/type_system/kind_tests.rs b/crates/plotnik-bytecode/src/type_system/kind_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/kind_tests.rs
rename to crates/plotnik-bytecode/src/type_system/kind_tests.rs
diff --git a/crates/plotnik-lib/src/type_system/mod.rs b/crates/plotnik-bytecode/src/type_system/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/mod.rs
rename to crates/plotnik-bytecode/src/type_system/mod.rs
diff --git a/crates/plotnik-lib/src/type_system/primitives.rs b/crates/plotnik-bytecode/src/type_system/primitives.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/primitives.rs
rename to crates/plotnik-bytecode/src/type_system/primitives.rs
diff --git a/crates/plotnik-lib/src/type_system/primitives_tests.rs b/crates/plotnik-bytecode/src/type_system/primitives_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/primitives_tests.rs
rename to crates/plotnik-bytecode/src/type_system/primitives_tests.rs
diff --git a/crates/plotnik-lib/src/type_system/quantifier.rs b/crates/plotnik-bytecode/src/type_system/quantifier.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/quantifier.rs
rename to crates/plotnik-bytecode/src/type_system/quantifier.rs
diff --git a/crates/plotnik-lib/src/type_system/quantifier_tests.rs b/crates/plotnik-bytecode/src/type_system/quantifier_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/type_system/quantifier_tests.rs
rename to crates/plotnik-bytecode/src/type_system/quantifier_tests.rs
diff --git a/crates/plotnik-cli/src/commands/run_common.rs b/crates/plotnik-cli/src/commands/run_common.rs
index ee386321..50b7ae03 100644
--- a/crates/plotnik-cli/src/commands/run_common.rs
+++ b/crates/plotnik-cli/src/commands/run_common.rs
@@ -122,7 +122,7 @@ pub fn validate(
 pub fn build_trivia_types(module: &Module) -> Vec<u16> {
     let trivia_view = module.trivia();
     (0..trivia_view.len())
-        .map(|i| trivia_view.get(i).node_type())
+        .map(|i| trivia_view.get(i).node_type)
         .collect()
 }
 
diff --git a/crates/plotnik-compiler/Cargo.toml b/crates/plotnik-compiler/Cargo.toml
new file mode 100644
index 00000000..7d771eae
--- /dev/null
+++ b/crates/plotnik-compiler/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "plotnik-compiler"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Compiler for Plotnik query language (parser, analyzer, bytecode emitter)"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+
+[dependencies]
+plotnik-bytecode.workspace = true
+plotnik-core.workspace = true
+plotnik-langs = { workspace = true, optional = true }
+annotate-snippets = "0.12.9"
+logos = "0.16.0"
+indexmap = "2"
+rowan = "0.16.1"
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "2.0.17"
+arborium-tree-sitter = "2.10.0"
+crc32fast = "1.4"
+memmap2 = "0.9"
+regex-automata = { version = "0.4", features = ["dfa-build", "dfa-search"] }
+regex-syntax = "0.8"
+
+[features]
+default = ["plotnik-langs"]
+
+[dev-dependencies]
+insta = { version = "=1.46.0", features = ["yaml"] }
+indoc = "=2.0.7"
+serde_json = "=1.0.149"
+tempfile = "=3.24.0"
diff --git a/crates/plotnik-lib/src/analyze/dependencies.rs b/crates/plotnik-compiler/src/analyze/dependencies.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/dependencies.rs
rename to crates/plotnik-compiler/src/analyze/dependencies.rs
diff --git a/crates/plotnik-lib/src/analyze/dependencies_tests.rs b/crates/plotnik-compiler/src/analyze/dependencies_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/dependencies_tests.rs
rename to crates/plotnik-compiler/src/analyze/dependencies_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/invariants.rs b/crates/plotnik-compiler/src/analyze/invariants.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/invariants.rs
rename to crates/plotnik-compiler/src/analyze/invariants.rs
diff --git a/crates/plotnik-lib/src/analyze/link.rs b/crates/plotnik-compiler/src/analyze/link.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/link.rs
rename to crates/plotnik-compiler/src/analyze/link.rs
diff --git a/crates/plotnik-lib/src/analyze/link_tests.rs b/crates/plotnik-compiler/src/analyze/link_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/link_tests.rs
rename to crates/plotnik-compiler/src/analyze/link_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/mod.rs b/crates/plotnik-compiler/src/analyze/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/mod.rs
rename to crates/plotnik-compiler/src/analyze/mod.rs
diff --git a/crates/plotnik-lib/src/analyze/recursion.rs b/crates/plotnik-compiler/src/analyze/recursion.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/recursion.rs
rename to crates/plotnik-compiler/src/analyze/recursion.rs
diff --git a/crates/plotnik-lib/src/analyze/refs.rs b/crates/plotnik-compiler/src/analyze/refs.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/refs.rs
rename to crates/plotnik-compiler/src/analyze/refs.rs
diff --git a/crates/plotnik-lib/src/analyze/refs_tests.rs b/crates/plotnik-compiler/src/analyze/refs_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/refs_tests.rs
rename to crates/plotnik-compiler/src/analyze/refs_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/symbol_table.rs b/crates/plotnik-compiler/src/analyze/symbol_table.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/symbol_table.rs
rename to crates/plotnik-compiler/src/analyze/symbol_table.rs
diff --git a/crates/plotnik-lib/src/analyze/symbol_table_tests.rs b/crates/plotnik-compiler/src/analyze/symbol_table_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/symbol_table_tests.rs
rename to crates/plotnik-compiler/src/analyze/symbol_table_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/context.rs b/crates/plotnik-compiler/src/analyze/type_check/context.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/context.rs
rename to crates/plotnik-compiler/src/analyze/type_check/context.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/context_tests.rs b/crates/plotnik-compiler/src/analyze/type_check/context_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/context_tests.rs
rename to crates/plotnik-compiler/src/analyze/type_check/context_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/infer.rs b/crates/plotnik-compiler/src/analyze/type_check/infer.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/infer.rs
rename to crates/plotnik-compiler/src/analyze/type_check/infer.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/mod.rs b/crates/plotnik-compiler/src/analyze/type_check/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/mod.rs
rename to crates/plotnik-compiler/src/analyze/type_check/mod.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/symbol.rs b/crates/plotnik-compiler/src/analyze/type_check/symbol.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/symbol.rs
rename to crates/plotnik-compiler/src/analyze/type_check/symbol.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/symbol_tests.rs b/crates/plotnik-compiler/src/analyze/type_check/symbol_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/symbol_tests.rs
rename to crates/plotnik-compiler/src/analyze/type_check/symbol_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/type_check_tests.rs b/crates/plotnik-compiler/src/analyze/type_check/type_check_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/type_check_tests.rs
rename to crates/plotnik-compiler/src/analyze/type_check/type_check_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/types.rs b/crates/plotnik-compiler/src/analyze/type_check/types.rs
similarity index 96%
rename from crates/plotnik-lib/src/analyze/type_check/types.rs
rename to crates/plotnik-compiler/src/analyze/type_check/types.rs
index 45938248..5a6b30b6 100644
--- a/crates/plotnik-lib/src/analyze/type_check/types.rs
+++ b/crates/plotnik-compiler/src/analyze/type_check/types.rs
@@ -9,8 +9,8 @@ use std::collections::BTreeMap;
 use super::symbol::{DefId, Symbol};
 
 // Re-export shared type system components
-pub use crate::type_system::{Arity, QuantifierKind};
-use crate::type_system::{PrimitiveType, TYPE_STRING as PRIM_TYPE_STRING};
+pub use plotnik_bytecode::type_system::{Arity, QuantifierKind};
+use plotnik_bytecode::type_system::{PrimitiveType, TYPE_STRING as PRIM_TYPE_STRING};
 
 /// Interned type identifier.
 ///
diff --git a/crates/plotnik-lib/src/analyze/type_check/unify.rs b/crates/plotnik-compiler/src/analyze/type_check/unify.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/unify.rs
rename to crates/plotnik-compiler/src/analyze/type_check/unify.rs
diff --git a/crates/plotnik-lib/src/analyze/type_check/unify_tests.rs b/crates/plotnik-compiler/src/analyze/type_check/unify_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/type_check/unify_tests.rs
rename to crates/plotnik-compiler/src/analyze/type_check/unify_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/utils.rs b/crates/plotnik-compiler/src/analyze/utils.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/utils.rs
rename to crates/plotnik-compiler/src/analyze/utils.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/alt_kinds.rs b/crates/plotnik-compiler/src/analyze/validation/alt_kinds.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/alt_kinds.rs
rename to crates/plotnik-compiler/src/analyze/validation/alt_kinds.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/alt_kinds_tests.rs b/crates/plotnik-compiler/src/analyze/validation/alt_kinds_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/alt_kinds_tests.rs
rename to crates/plotnik-compiler/src/analyze/validation/alt_kinds_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/anchors.rs b/crates/plotnik-compiler/src/analyze/validation/anchors.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/anchors.rs
rename to crates/plotnik-compiler/src/analyze/validation/anchors.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/anchors_tests.rs b/crates/plotnik-compiler/src/analyze/validation/anchors_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/anchors_tests.rs
rename to crates/plotnik-compiler/src/analyze/validation/anchors_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/empty_constructs.rs b/crates/plotnik-compiler/src/analyze/validation/empty_constructs.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/empty_constructs.rs
rename to crates/plotnik-compiler/src/analyze/validation/empty_constructs.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/empty_constructs_tests.rs b/crates/plotnik-compiler/src/analyze/validation/empty_constructs_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/empty_constructs_tests.rs
rename to crates/plotnik-compiler/src/analyze/validation/empty_constructs_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/mod.rs b/crates/plotnik-compiler/src/analyze/validation/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/mod.rs
rename to crates/plotnik-compiler/src/analyze/validation/mod.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/predicates.rs b/crates/plotnik-compiler/src/analyze/validation/predicates.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/predicates.rs
rename to crates/plotnik-compiler/src/analyze/validation/predicates.rs
diff --git a/crates/plotnik-lib/src/analyze/validation/predicates_tests.rs b/crates/plotnik-compiler/src/analyze/validation/predicates_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/validation/predicates_tests.rs
rename to crates/plotnik-compiler/src/analyze/validation/predicates_tests.rs
diff --git a/crates/plotnik-lib/src/analyze/visitor.rs b/crates/plotnik-compiler/src/analyze/visitor.rs
similarity index 100%
rename from crates/plotnik-lib/src/analyze/visitor.rs
rename to crates/plotnik-compiler/src/analyze/visitor.rs
diff --git a/crates/plotnik-lib/src/bytecode/ir.rs b/crates/plotnik-compiler/src/bytecode/ir.rs
similarity index 97%
rename from crates/plotnik-lib/src/bytecode/ir.rs
rename to crates/plotnik-compiler/src/bytecode/ir.rs
index 035a3061..aedae9ce 100644
--- a/crates/plotnik-lib/src/bytecode/ir.rs
+++ b/crates/plotnik-compiler/src/bytecode/ir.rs
@@ -7,13 +7,11 @@
 use std::collections::BTreeMap;
 use std::num::NonZeroU16;
 
-use super::effects::{EffectOp, EffectOpcode};
-use super::instructions::{
-    Call, Opcode, Return, StepAddr, StepId, Trampoline, select_match_opcode,
+use plotnik_bytecode::{
+    Call, EffectOp, EffectOpcode, Nav, Opcode, PredicateOp, Return, StepAddr, StepId, Trampoline,
+    select_match_opcode,
 };
-use super::nav::Nav;
 use crate::analyze::type_check::TypeId;
-use crate::parser::PredicateOp;
 
 /// Node type constraint for Match instructions.
 ///
@@ -295,9 +293,9 @@ impl EffectIR {
 #[derive(Clone, Debug)]
 pub enum PredicateValueIR {
     /// String comparison value.
-    String(crate::bytecode::StringId),
+    String(plotnik_bytecode::StringId),
     /// Regex pattern (StringId for pattern, compiled to DFA during emit).
-    Regex(crate::bytecode::StringId),
+    Regex(plotnik_bytecode::StringId),
 }
 
 /// Predicate IR for node text filtering.
@@ -312,7 +310,7 @@ pub struct PredicateIR {
 
 impl PredicateIR {
     /// Create a string predicate (==, !=, ^=, $=, *=).
-    pub fn string(op: PredicateOp, value: crate::bytecode::StringId) -> Self {
+    pub fn string(op: PredicateOp, value: plotnik_bytecode::StringId) -> Self {
         Self {
             op,
             value: PredicateValueIR::String(value),
@@ -320,7 +318,7 @@ impl PredicateIR {
     }
 
     /// Create a regex predicate (=~, !~).
-    pub fn regex(op: PredicateOp, pattern_id: crate::bytecode::StringId) -> Self {
+    pub fn regex(op: PredicateOp, pattern_id: plotnik_bytecode::StringId) -> Self {
         Self {
             op,
             value: PredicateValueIR::Regex(pattern_id),
@@ -387,7 +385,7 @@ impl InstructionIR {
     where
         F: Fn(plotnik_core::Symbol, TypeId) -> Option<u16>,
         G: Fn(TypeId) -> Option<u16>,
-        R: Fn(crate::bytecode::StringId) -> Option<u16>,
+        R: Fn(plotnik_bytecode::StringId) -> Option<u16>,
     {
         match self {
             Self::Match(m) => m.resolve(map, lookup_member, get_member_base, lookup_regex),
@@ -559,7 +557,7 @@ impl MatchIR {
     where
         F: Fn(plotnik_core::Symbol, TypeId) -> Option<u16>,
         G: Fn(TypeId) -> Option<u16>,
-        R: Fn(crate::bytecode::StringId) -> Option<u16>,
+        R: Fn(plotnik_bytecode::StringId) -> Option<u16>,
     {
         let can_use_match8 = self.pre_effects.is_empty()
             && self.neg_fields.is_empty()
diff --git a/crates/plotnik-lib/src/bytecode/ir_tests.rs b/crates/plotnik-compiler/src/bytecode/ir_tests.rs
similarity index 98%
rename from crates/plotnik-lib/src/bytecode/ir_tests.rs
rename to crates/plotnik-compiler/src/bytecode/ir_tests.rs
index 6a65b7ac..3bddc9d5 100644
--- a/crates/plotnik-lib/src/bytecode/ir_tests.rs
+++ b/crates/plotnik-compiler/src/bytecode/ir_tests.rs
@@ -1,11 +1,10 @@
 use std::collections::BTreeMap;
 use std::num::NonZeroU16;
 
+use plotnik_bytecode::{EffectOpcode, Nav};
 use plotnik_core::Symbol;
 
-use super::effects::EffectOpcode;
 use super::ir::{CallIR, EffectIR, InstructionIR, Label, MatchIR, MemberRef, NodeTypeIR, ReturnIR};
-use super::nav::Nav;
 use crate::analyze::type_check::TypeId;
 
 #[test]
diff --git a/crates/plotnik-compiler/src/bytecode/mod.rs b/crates/plotnik-compiler/src/bytecode/mod.rs
new file mode 100644
index 00000000..bdfa4025
--- /dev/null
+++ b/crates/plotnik-compiler/src/bytecode/mod.rs
@@ -0,0 +1,8 @@
+//! Compile-time IR for bytecode emission.
+
+mod ir;
+
+#[cfg(test)]
+mod ir_tests;
+
+pub use ir::*;
diff --git a/crates/plotnik-lib/src/compile/capture.rs b/crates/plotnik-compiler/src/compile/capture.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/capture.rs
rename to crates/plotnik-compiler/src/compile/capture.rs
index 35dbf1ed..8c399e1b 100644
--- a/crates/plotnik-lib/src/compile/capture.rs
+++ b/crates/plotnik-compiler/src/compile/capture.rs
@@ -7,7 +7,7 @@ use std::collections::HashSet;
 
 use crate::analyze::type_check::{TypeContext, TypeId, TypeShape};
 use crate::bytecode::EffectIR;
-use crate::bytecode::EffectOpcode;
+use plotnik_bytecode::EffectOpcode;
 use crate::parser::ast::{self, Expr};
 
 use super::Compiler;
diff --git a/crates/plotnik-lib/src/compile/capture_tests.rs b/crates/plotnik-compiler/src/compile/capture_tests.rs
similarity index 96%
rename from crates/plotnik-lib/src/compile/capture_tests.rs
rename to crates/plotnik-compiler/src/compile/capture_tests.rs
index b2e3ac31..b6e50510 100644
--- a/crates/plotnik-lib/src/compile/capture_tests.rs
+++ b/crates/plotnik-compiler/src/compile/capture_tests.rs
@@ -1,5 +1,6 @@
 use super::capture::CaptureEffects;
-use crate::bytecode::{EffectIR, EffectOpcode, MemberRef};
+use plotnik_bytecode::EffectOpcode;
+use crate::bytecode::{EffectIR, MemberRef};
 
 #[test]
 fn nest_scope_preserves_outer_and_nests_inner() {
diff --git a/crates/plotnik-lib/src/compile/compile_tests.rs b/crates/plotnik-compiler/src/compile/compile_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/compile/compile_tests.rs
rename to crates/plotnik-compiler/src/compile/compile_tests.rs
diff --git a/crates/plotnik-lib/src/compile/compiler.rs b/crates/plotnik-compiler/src/compile/compiler.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/compiler.rs
rename to crates/plotnik-compiler/src/compile/compiler.rs
index 33ce415b..93a465a3 100644
--- a/crates/plotnik-lib/src/compile/compiler.rs
+++ b/crates/plotnik-compiler/src/compile/compiler.rs
@@ -5,7 +5,7 @@ use plotnik_core::{Interner, NodeFieldId, NodeTypeId, Symbol};
 
 use crate::analyze::symbol_table::SymbolTable;
 use crate::analyze::type_check::{DefId, TypeContext};
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 use crate::bytecode::{InstructionIR, Label, ReturnIR, TrampolineIR};
 use crate::emit::StringTableBuilder;
 use crate::parser::Expr;
diff --git a/crates/plotnik-lib/src/compile/error.rs b/crates/plotnik-compiler/src/compile/error.rs
similarity index 100%
rename from crates/plotnik-lib/src/compile/error.rs
rename to crates/plotnik-compiler/src/compile/error.rs
diff --git a/crates/plotnik-lib/src/compile/expressions.rs b/crates/plotnik-compiler/src/compile/expressions.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/expressions.rs
rename to crates/plotnik-compiler/src/compile/expressions.rs
index 891a4715..92fc0d0e 100644
--- a/crates/plotnik-lib/src/compile/expressions.rs
+++ b/crates/plotnik-compiler/src/compile/expressions.rs
@@ -10,7 +10,7 @@
 use std::num::NonZeroU16;
 
 use crate::analyze::type_check::TypeShape;
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 use crate::bytecode::{EffectIR, InstructionIR, Label, MatchIR, NodeTypeIR, PredicateIR};
 use crate::parser::ast::{self, Expr};
 
@@ -79,7 +79,7 @@ impl Compiler<'_> {
         // right after match), other effects go on final_exit (after children processing).
         // Node/Text capture effects use matched_node which is only valid immediately after the match,
         // before descending into children (which may clobber matched_node via backtracking).
-        use crate::bytecode::EffectOpcode;
+        use plotnik_bytecode::EffectOpcode;
 
         // Find Node/Text effects and their following Set effects (they come in pairs: Node Set)
         let mut entry_effects = Vec::new();
diff --git a/crates/plotnik-lib/src/compile/mod.rs b/crates/plotnik-compiler/src/compile/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/compile/mod.rs
rename to crates/plotnik-compiler/src/compile/mod.rs
diff --git a/crates/plotnik-lib/src/compile/navigation.rs b/crates/plotnik-compiler/src/compile/navigation.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/navigation.rs
rename to crates/plotnik-compiler/src/compile/navigation.rs
index 864d1b67..19d45cb9 100644
--- a/crates/plotnik-lib/src/compile/navigation.rs
+++ b/crates/plotnik-compiler/src/compile/navigation.rs
@@ -3,7 +3,7 @@
 //! Handles anchor-based navigation modes and navigation transformations
 //! for quantifier repeat iterations.
 
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 use crate::parser::{Expr, SeqItem};
 
 // Re-export from parser for compile module consumers
diff --git a/crates/plotnik-lib/src/compile/quantifier.rs b/crates/plotnik-compiler/src/compile/quantifier.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/quantifier.rs
rename to crates/plotnik-compiler/src/compile/quantifier.rs
index 8548f3c0..a2fc8438 100644
--- a/crates/plotnik-lib/src/compile/quantifier.rs
+++ b/crates/plotnik-compiler/src/compile/quantifier.rs
@@ -7,7 +7,7 @@
 //! - Whether skip/match need separate exits
 
 use crate::analyze::type_check::TypeId;
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 use crate::bytecode::{EffectIR, Label};
 use crate::parser::SyntaxKind;
 use crate::parser::ast::{self, Expr};
diff --git a/crates/plotnik-lib/src/compile/scope.rs b/crates/plotnik-compiler/src/compile/scope.rs
similarity index 98%
rename from crates/plotnik-lib/src/compile/scope.rs
rename to crates/plotnik-compiler/src/compile/scope.rs
index 073ebc94..67484b56 100644
--- a/crates/plotnik-lib/src/compile/scope.rs
+++ b/crates/plotnik-compiler/src/compile/scope.rs
@@ -6,7 +6,7 @@ use std::num::NonZeroU16;
 
 use crate::analyze::type_check::TypeId;
 use crate::bytecode::{CallIR, EffectIR, Label, MatchIR, MemberRef};
-use crate::bytecode::{EffectOpcode, Nav};
+use plotnik_bytecode::{EffectOpcode, Nav};
 use crate::parser::Expr;
 
 use super::Compiler;
@@ -397,7 +397,7 @@ impl Compiler<'_> {
     /// If there are more successors than fit in a single Match instruction,
     /// this creates a cascade of epsilon transitions to preserve NFA semantics.
     pub(super) fn emit_epsilon(&mut self, label: Label, successors: Vec<Label>) {
-        use crate::bytecode::MAX_MATCH_PAYLOAD_SLOTS;
+        use plotnik_bytecode::MAX_MATCH_PAYLOAD_SLOTS;
 
         if successors.len() <= MAX_MATCH_PAYLOAD_SLOTS {
             self.push_epsilon(label, successors);
@@ -430,7 +430,7 @@ impl Compiler<'_> {
     ///
     /// Returns the entry label (same as `instr.label`).
     pub(super) fn emit_match_with_cascade(&mut self, mut instr: MatchIR) -> Label {
-        use crate::bytecode::MAX_PRE_EFFECTS;
+        use plotnik_bytecode::MAX_PRE_EFFECTS;
 
         let entry = instr.label;
 
@@ -458,7 +458,7 @@ impl Compiler<'_> {
     /// Splits effects into batches of `MAX_PRE_EFFECTS` (7), emitting epsilon
     /// transitions: `entry → intermediate1 → ... → exit`.
     fn emit_effects_chain(&mut self, entry: Label, exit: Label, mut effects: Vec<EffectIR>) {
-        use crate::bytecode::MAX_PRE_EFFECTS;
+        use plotnik_bytecode::MAX_PRE_EFFECTS;
 
         if effects.is_empty() {
             // Just link entry to exit
diff --git a/crates/plotnik-lib/src/compile/sequences.rs b/crates/plotnik-compiler/src/compile/sequences.rs
similarity index 99%
rename from crates/plotnik-lib/src/compile/sequences.rs
rename to crates/plotnik-compiler/src/compile/sequences.rs
index 26f3f553..898a6c22 100644
--- a/crates/plotnik-lib/src/compile/sequences.rs
+++ b/crates/plotnik-compiler/src/compile/sequences.rs
@@ -10,7 +10,7 @@ use plotnik_core::Symbol;
 
 use crate::analyze::type_check::{TypeId, TypeShape};
 use crate::bytecode::{EffectIR, Label, MemberRef};
-use crate::bytecode::{EffectOpcode, Nav};
+use plotnik_bytecode::{EffectOpcode, Nav};
 use crate::parser::ast::{self, Expr, SeqItem};
 
 use super::Compiler;
diff --git a/crates/plotnik-lib/src/diagnostics/diagnostics_tests.rs b/crates/plotnik-compiler/src/diagnostics/diagnostics_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/diagnostics/diagnostics_tests.rs
rename to crates/plotnik-compiler/src/diagnostics/diagnostics_tests.rs
diff --git a/crates/plotnik-lib/src/diagnostics/message.rs b/crates/plotnik-compiler/src/diagnostics/message.rs
similarity index 100%
rename from crates/plotnik-lib/src/diagnostics/message.rs
rename to crates/plotnik-compiler/src/diagnostics/message.rs
diff --git a/crates/plotnik-lib/src/diagnostics/mod.rs b/crates/plotnik-compiler/src/diagnostics/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/diagnostics/mod.rs
rename to crates/plotnik-compiler/src/diagnostics/mod.rs
diff --git a/crates/plotnik-lib/src/diagnostics/printer.rs b/crates/plotnik-compiler/src/diagnostics/printer.rs
similarity index 100%
rename from crates/plotnik-lib/src/diagnostics/printer.rs
rename to crates/plotnik-compiler/src/diagnostics/printer.rs
diff --git a/crates/plotnik-lib/src/emit/emit_tests.rs b/crates/plotnik-compiler/src/emit/emit_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/emit_tests.rs
rename to crates/plotnik-compiler/src/emit/emit_tests.rs
diff --git a/crates/plotnik-lib/src/emit/emitter.rs b/crates/plotnik-compiler/src/emit/emitter.rs
similarity index 96%
rename from crates/plotnik-lib/src/emit/emitter.rs
rename to crates/plotnik-compiler/src/emit/emitter.rs
index d1e2dc04..74ef4ad5 100644
--- a/crates/plotnik-lib/src/emit/emitter.rs
+++ b/crates/plotnik-compiler/src/emit/emitter.rs
@@ -3,10 +3,8 @@
 use plotnik_core::Symbol;
 
 use crate::analyze::type_check::TypeId;
-use crate::bytecode::{
-    Entrypoint, FieldSymbol, Header, InstructionIR, Label, NodeSymbol, PredicateValueIR,
-    SECTION_ALIGN, TriviaEntry,
-};
+use crate::bytecode::{InstructionIR, Label, PredicateValueIR};
+use plotnik_bytecode::{Entrypoint, FieldSymbol, Header, NodeSymbol, SECTION_ALIGN, TriviaEntry};
 use crate::compile::Compiler;
 use crate::query::LinkedQuery;
 
@@ -184,7 +182,7 @@ fn emit_transitions(
     let get_member_base = |type_id: TypeId| types.get_member_base(type_id);
 
     // Predicate regex resolution closure.
-    let lookup_regex = |string_id: crate::bytecode::StringId| regexes.get(string_id);
+    let lookup_regex = |string_id: plotnik_bytecode::StringId| regexes.get(string_id);
 
     for instr in instructions {
         let label = instr.label();
@@ -260,7 +258,7 @@ fn emit_entrypoints(entrypoints: &[Entrypoint]) -> Vec<u8> {
         bytes.extend_from_slice(&ep.name.get().to_le_bytes());
         bytes.extend_from_slice(&ep.target.to_le_bytes());
         bytes.extend_from_slice(&ep.result_type.0.to_le_bytes());
-        bytes.extend_from_slice(&ep._pad.to_le_bytes());
+        bytes.extend_from_slice(&0u16.to_le_bytes()); // _pad is always 0
     }
     bytes
 }
diff --git a/crates/plotnik-lib/src/emit/error.rs b/crates/plotnik-compiler/src/emit/error.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/error.rs
rename to crates/plotnik-compiler/src/emit/error.rs
diff --git a/crates/plotnik-lib/src/emit/layout.rs b/crates/plotnik-compiler/src/emit/layout.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/layout.rs
rename to crates/plotnik-compiler/src/emit/layout.rs
diff --git a/crates/plotnik-lib/src/emit/layout_tests.rs b/crates/plotnik-compiler/src/emit/layout_tests.rs
similarity index 99%
rename from crates/plotnik-lib/src/emit/layout_tests.rs
rename to crates/plotnik-compiler/src/emit/layout_tests.rs
index 9387b473..ec7d9bc5 100644
--- a/crates/plotnik-lib/src/emit/layout_tests.rs
+++ b/crates/plotnik-compiler/src/emit/layout_tests.rs
@@ -1,7 +1,7 @@
 use std::num::NonZeroU16;
 
 use super::layout::CacheAligned;
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 use crate::bytecode::{CallIR, EffectIR, Label, MatchIR, NodeTypeIR, ReturnIR};
 
 #[test]
diff --git a/crates/plotnik-lib/src/emit/mod.rs b/crates/plotnik-compiler/src/emit/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/mod.rs
rename to crates/plotnik-compiler/src/emit/mod.rs
diff --git a/crates/plotnik-lib/src/emit/regex_table.rs b/crates/plotnik-compiler/src/emit/regex_table.rs
similarity index 99%
rename from crates/plotnik-lib/src/emit/regex_table.rs
rename to crates/plotnik-compiler/src/emit/regex_table.rs
index cb810985..ffc44896 100644
--- a/crates/plotnik-lib/src/emit/regex_table.rs
+++ b/crates/plotnik-compiler/src/emit/regex_table.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use regex_automata::dfa::dense;
 use regex_automata::dfa::sparse::DFA;
 
-use crate::bytecode::StringId;
+use plotnik_bytecode::StringId;
 
 use super::EmitError;
 
diff --git a/crates/plotnik-lib/src/emit/regex_table_tests.rs b/crates/plotnik-compiler/src/emit/regex_table_tests.rs
similarity index 98%
rename from crates/plotnik-lib/src/emit/regex_table_tests.rs
rename to crates/plotnik-compiler/src/emit/regex_table_tests.rs
index 557e9614..9fd5b132 100644
--- a/crates/plotnik-lib/src/emit/regex_table_tests.rs
+++ b/crates/plotnik-compiler/src/emit/regex_table_tests.rs
@@ -1,5 +1,5 @@
 use super::regex_table::{deserialize_dfa, RegexTableBuilder};
-use crate::bytecode::StringId;
+use plotnik_bytecode::StringId;
 use regex_automata::dfa::Automaton;
 use regex_automata::Input;
 
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured.snap
new file mode 100644
index 00000000..685be832
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured.snap
@@ -0,0 +1,39 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [(identifier) (number)] @value
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "value"
+S2 "Test"
+S3 "identifier"
+S4 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { value }
+
+[type_members]
+M0: S1 → T0  ; value: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    11, 13
+  10                                        ▶
+  11   !   (identifier) [Node Set(M0)]      10
+  13   !   (number) [Node Set(M0)]          10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured_tagged.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured_tagged.snap
new file mode 100644
index 00000000..832a8ddf
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_captured_tagged.snap
@@ -0,0 +1,51 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [A: (identifier) @a  B: (number) @b] @item
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "A"
+S4 "B"
+S5 "item"
+S6 "Test"
+S7 "identifier"
+S8 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { a }
+T2 = Struct  M1:1  ; { b }
+T3 = Enum    M2:2  ; A | B
+T4 = Struct  M4:1  ; { item }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T1  ; A: T1
+M3: S4 → T2  ; B: T2
+M4: S5 → T3  ; item: T3
+
+[type_names]
+N0: S6 → T4  ; Test
+
+[entrypoints]
+Test = 06 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    13, 16
+  10                                        ▶
+  11   ε   [Set(M4)]                        10
+  13   !   [Enum(M2)] (identifier) [Node Set(M0) EndEnum]  11
+  16   !   [Enum(M3)] (number) [Node Set(M1) EndEnum]  11
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_in_quantifier.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_in_quantifier.snap
new file mode 100644
index 00000000..37d78bf8
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_in_quantifier.snap
@@ -0,0 +1,75 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (object { [A: (pair) @a  B: (shorthand_property_identifier) @b] @item }* @items)
+---
+[strings]
+S00 "Beauty will save the world"
+S01 "a"
+S02 "b"
+S03 "A"
+S04 "B"
+S05 "item"
+S06 "items"
+S07 "Test"
+S08 "object"
+S09 "pair"
+S10 "shorthand_property_identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { a }
+T2 = Struct  M1:1  ; { b }
+T3 = Enum    M2:2  ; A | B
+T4 = Struct  M4:1  ; { item }
+T5 = ArrayStar(T4)  ; T4*
+T6 = Struct  M5:1  ; { items }
+
+[type_members]
+M0: S01 → T0  ; a: <Node>
+M1: S02 → T0  ; b: <Node>
+M2: S03 → T1  ; A: T1
+M3: S04 → T2  ; B: T2
+M4: S05 → T3  ; item: T3
+M5: S06 → T5  ; items: T5
+
+[type_names]
+N0: S07 → T6  ; Test
+
+[entrypoints]
+Test = 06 :: T6
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (object)                         08
+  08   ε   [Arr]                            10
+  10   ε                                    42, 21
+  12   ε   [EndArr Set(M5)]                 14
+  14   △   _                                20
+  15  ...  
+  16   ε   [EndObj Push]                    18
+  18   ε                                    48, 12
+  20                                        ▶
+  21   ε   [EndArr Set(M5)]                 20
+  23  ...  
+  24   ε   [Set(M4)]                        16
+  26   !   [Enum(M2)] (pair) [Node Set(M0) EndEnum]  24
+  29   !   [Enum(M3)] (shorthand_property_identifier) [Node Set(M1) EndEnum]  24
+  32   ε                                    26, 29
+  34   ε   [Obj]                            32
+  36   ▷   _                                40
+  37   ε                                    36, 12
+  39  ...  
+  40   ε                                    34, 37
+  42   ▽   _                                40
+  43   ▷   _                                46
+  44   ε                                    43, 12
+  46   ε                                    34, 44
+  48   ▷   _                                46
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_labeled.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_labeled.snap
new file mode 100644
index 00000000..318de28a
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_labeled.snap
@@ -0,0 +1,52 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [
+    A: (identifier) @a
+    B: (number) @b
+]
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "A"
+S4 "B"
+S5 "Test"
+S6 "identifier"
+S7 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { a }
+T2 = Struct  M1:1  ; { b }
+T3 = Enum    M2:2  ; A | B
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T1  ; A: T1
+M3: S4 → T2  ; B: T2
+
+[type_names]
+N0: S5 → T3  ; Test
+
+[entrypoints]
+Test = 06 :: T3
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    11, 16
+  10                                        ▶
+  11   !   [Enum(M2)] (identifier) [Node Set(M0) EndEnum]  10
+  14  ...  
+  15  ...  
+  16   !   [Enum(M3)] (number) [Node Set(M1) EndEnum]  10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_no_internal_captures.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_no_internal_captures.snap
new file mode 100644
index 00000000..85da4ce2
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_no_internal_captures.snap
@@ -0,0 +1,41 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (program [(identifier) (number)] @x)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "x"
+S2 "Test"
+S3 "program"
+S4 "identifier"
+S5 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { x }
+
+[type_members]
+M0: S1 → T0  ; x: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (program)                        08
+  08   ε                                    11, 13
+  10                                        ▶
+  11 !!▽   (identifier) [Node Set(M0)]      15
+  13 !!▽   (number) [Node Set(M0)]          15
+  15   △   _                                10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_null_injection.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_null_injection.snap
new file mode 100644
index 00000000..44d6f57e
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_null_injection.snap
@@ -0,0 +1,48 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [(identifier) @x (number) @y]
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "x"
+S2 "y"
+S3 "Test"
+S4 "identifier"
+S5 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { x, y }
+T2 = Struct  M2:1  ; { x }
+T3 = Struct  M3:1  ; { y }
+T4 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T4  ; x: T4
+M1: S2 → T4  ; y: T4
+M2: S1 → T0  ; x: <Node>
+M3: S2 → T0  ; y: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    11, 16
+  10                                        ▶
+  11   !   [Null Set(M1)] (identifier) [Node Set(M0)]  10
+  14  ...  
+  15  ...  
+  16   !   [Null Set(M0)] (number) [Node Set(M1)]  10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_in_field_constraint.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_in_field_constraint.snap
new file mode 100644
index 00000000..0658e26c
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_in_field_constraint.snap
@@ -0,0 +1,53 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (pair key: [A: (identifier) @a B: (number)] @kind)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "A"
+S3 "B"
+S4 "kind"
+S5 "Test"
+S6 "pair"
+S7 "identifier"
+S8 "number"
+S9 "key"
+
+[type_defs]
+T0 = <Void>
+T1 = <Node>
+T2 = Struct  M0:1  ; { a }
+T3 = Enum    M1:2  ; A | B
+T4 = Struct  M3:1  ; { kind }
+
+[type_members]
+M0: S1 → T1  ; a: <Node>
+M1: S2 → T2  ; A: T2
+M2: S3 → T0  ; B: <Void>
+M3: S4 → T3  ; kind: T3
+
+[type_names]
+N0: S5 → T4  ; Test
+
+[entrypoints]
+Test = 06 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (pair)                           08
+  08   ▽   key: _                           09
+  09   ε                                    12, 16
+  11                                        ▶
+  12   !   [Enum(M1)] (identifier) [Node Set(M0) EndEnum Set(M3)]  18
+  15  ...  
+  16   !   [Enum(M2)] (number) [EndEnum Set(M3)]  18
+  18   △   _                                11
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_with_definition_ref.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_with_definition_ref.snap
new file mode 100644
index 00000000..de5ce919
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_tagged_with_definition_ref.snap
@@ -0,0 +1,66 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Inner = (identifier) @name
+Test = [A: (Inner)  B: (number) @b] @item
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "b"
+S3 "A"
+S4 "B"
+S5 "item"
+S6 "Inner"
+S7 "Test"
+S8 "identifier"
+S9 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { name }
+T2 = Struct  M1:1  ; { b }
+T3 = Enum    M2:2  ; A | B
+T4 = Struct  M4:1  ; { item }
+
+[type_members]
+M0: S1 → T0  ; name: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T1  ; A: Inner
+M3: S4 → T2  ; B: T2
+M4: S5 → T3  ; item: T3
+
+[type_names]
+N0: S6 → T1  ; Inner
+N1: S7 → T4  ; Test
+
+[entrypoints]
+Inner = 06 :: T1
+Test  = 11 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Inner:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
+
+Test:
+  11   ε                                    12
+  12   ε                                    26, 28
+  14                                        ▶
+  15  ...  
+  16   ε   [Set(M4)]                        14
+  18   ε   [EndEnum]                        16
+  20   ε   [EndObj]                         18
+  22   !   (Inner)                          06 : 20
+  23  ...  
+  24   ε   [Obj]                            22
+  26   ε   [Enum(M2)]                       24
+  28   !   [Enum(M3)] (number) [Node Set(M1) EndEnum]  16
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_unlabeled.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_unlabeled.snap
new file mode 100644
index 00000000..0200d2f1
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__alternations_unlabeled.snap
@@ -0,0 +1,48 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [(identifier) @id (string) @str]
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "str"
+S3 "Test"
+S4 "identifier"
+S5 "string"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { id, str }
+T2 = Struct  M2:1  ; { id }
+T3 = Struct  M3:1  ; { str }
+T4 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T4  ; id: T4
+M1: S2 → T4  ; str: T4
+M2: S1 → T0  ; id: <Node>
+M3: S2 → T0  ; str: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    11, 16
+  10                                        ▶
+  11   !   [Null Set(M1)] (identifier) [Node Set(M0)]  10
+  14  ...  
+  15  ...  
+  16   !   [Null Set(M0)] (string) [Node Set(M1)]  10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_between_siblings.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_between_siblings.snap
new file mode 100644
index 00000000..f50ec90c
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_between_siblings.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (identifier) . (number))
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+S4 "number"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   (identifier)                     09
+  09  !▷   (number)                         10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_first_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_first_child.snap
new file mode 100644
index 00000000..5d8a8ddf
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_first_child.snap
@@ -0,0 +1,35 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array . (identifier))
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08  !▽   (identifier)                     09
+  09   △   _                                10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_last_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_last_child.snap
new file mode 100644
index 00000000..4e643177
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_last_child.snap
@@ -0,0 +1,38 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (identifier) .)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   _                                13
+  09                                        ▶
+  10  !△   _                                09
+  11   !   (identifier)                     10
+  12   ▷   _                                13
+  13   ε                                    11, 12
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_no_anchor.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_no_anchor.snap
new file mode 100644
index 00000000..1f5f0320
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_no_anchor.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (identifier) (number))
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+S4 "number"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   (identifier)                     09
+  09   ▷   (number)                         10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_with_anonymous.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_with_anonymous.snap
new file mode 100644
index 00000000..908e94e1
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__anchors_with_anonymous.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (binary_expression "+" . (identifier))
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "binary_expression"
+S3 "+"
+S4 "identifier"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (binary_expression)              08
+  08   ▽   "+"                              09
+  09 !!▷   (identifier)                     10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_basic.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_basic.snap
new file mode 100644
index 00000000..2e9b2212
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_basic.snap
@@ -0,0 +1,36 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier) @name
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { name }
+
+[type_members]
+M0: S1 → T0  ; name: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_deeply_nested.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_deeply_nested.snap
new file mode 100644
index 00000000..579fe498
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_deeply_nested.snap
@@ -0,0 +1,58 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (array (array (identifier) @d) @c) @b) @a
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "c"
+S4 "d"
+S5 "Test"
+S6 "array"
+S7 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:4  ; { a, b, c, d }
+T2 = Struct  M4:1  ; { d }
+T3 = Struct  M5:2  ; { c, d }
+T4 = Struct  M7:3  ; { b, c, d }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T0  ; c: <Node>
+M3: S4 → T0  ; d: <Node>
+M4: S4 → T0  ; d: <Node>
+M5: S3 → T0  ; c: <Node>
+M6: S4 → T0  ; d: <Node>
+M7: S2 → T0  ; b: <Node>
+M8: S3 → T0  ; c: <Node>
+M9: S4 → T0  ; d: <Node>
+
+[type_names]
+N0: S5 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (array) [Node Set(M0)]           10
+  10   ▽   (array) [Node Set(M1)]           12
+  12   ▽   (array) [Node Set(M2)]           14
+  14   ▽   (identifier) [Node Set(M3)]      16
+  16   △   _                                17
+  17   △   _                                18
+  18   △   _                                19
+  19                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_enum_with_type_annotation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_enum_with_type_annotation.snap
new file mode 100644
index 00000000..bb976533
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_enum_with_type_annotation.snap
@@ -0,0 +1,53 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = [A: (identifier) @id B: (number) @num] @expr :: Expression
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "num"
+S3 "A"
+S4 "B"
+S5 "expr"
+S6 "Test"
+S7 "Expression"
+S8 "identifier"
+S9 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { id }
+T2 = Struct  M1:1  ; { num }
+T3 = Enum    M2:2  ; A | B
+T4 = Struct  M4:1  ; { expr }
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+M1: S2 → T0  ; num: <Node>
+M2: S3 → T1  ; A: T1
+M3: S4 → T2  ; B: T2
+M4: S5 → T3  ; expr: Expression
+
+[type_names]
+N0: S6 → T4  ; Test
+N1: S7 → T3  ; Expression
+
+[entrypoints]
+Test = 06 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    13, 16
+  10                                        ▶
+  11   ε   [Set(M4)]                        10
+  13   !   [Enum(M2)] (identifier) [Node Set(M0) EndEnum]  11
+  16   !   [Enum(M3)] (number) [Node Set(M1) EndEnum]  11
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_multiple.snap
new file mode 100644
index 00000000..4fb204ba
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_multiple.snap
@@ -0,0 +1,46 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (binary_expression (identifier) @a (number) @b)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "Test"
+S4 "binary_expression"
+S5 "identifier"
+S6 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { a, b }
+T2 = Struct  M2:1  ; { a }
+T3 = Struct  M3:1  ; { b }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S1 → T0  ; a: <Node>
+M3: S2 → T0  ; b: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (binary_expression)              08
+  08   ▽   (identifier) [Node Set(M0)]      10
+  10   ▷   (number) [Node Set(M1)]          12
+  12   △   _                                13
+  13                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_nested_flat.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_nested_flat.snap
new file mode 100644
index 00000000..b914d6d2
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_nested_flat.snap
@@ -0,0 +1,50 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (array (identifier) @c) @b) @a
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "c"
+S4 "Test"
+S5 "array"
+S6 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:3  ; { a, b, c }
+T2 = Struct  M3:1  ; { c }
+T3 = Struct  M4:2  ; { b, c }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T0  ; c: <Node>
+M3: S3 → T0  ; c: <Node>
+M4: S2 → T0  ; b: <Node>
+M5: S3 → T0  ; c: <Node>
+
+[type_names]
+N0: S4 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (array) [Node Set(M0)]           10
+  10   ▽   (array) [Node Set(M1)]           12
+  12   ▽   (identifier) [Node Set(M2)]      14
+  14   △   _                                15
+  15   △   _                                16
+  16                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_optional_wrapper_struct.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_optional_wrapper_struct.snap
new file mode 100644
index 00000000..a8c20b65
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_optional_wrapper_struct.snap
@@ -0,0 +1,57 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = {{(identifier) @id} @inner}? @outer
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "inner"
+S3 "outer"
+S4 "Test"
+S5 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { id }
+T2 = Struct  M1:1  ; { inner }
+T3 = Struct  M2:1  ; { outer }
+T4 = Struct  M3:1  ; { inner }
+T5 = Optional(T1)  ; T1?
+T6 = Optional(T2)  ; T2?
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+M1: S2 → T5  ; inner: T5
+M2: S3 → T6  ; outer: T6
+M3: S2 → T1  ; inner: T1
+
+[type_names]
+N0: S4 → T3  ; Test
+
+[entrypoints]
+Test = 06 :: T3
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Obj]                            10
+  10   ε                                    29, 22
+  12                                        ▶
+  13   ε   [EndObj Set(M2)]                 12
+  15  ...  
+  16   ε   [EndObj Set(M1)]                 13
+  18   !   (identifier) [Node Set(M0)]      16
+  20   ε   [Obj]                            18
+  22   ε   [Null Set(M1)]                   13
+  24   ▷   _                                27
+  25   ε                                    24, 22
+  27   ε                                    20, 25
+  29   !   _                                27
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_scope.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_scope.snap
new file mode 100644
index 00000000..c3957682
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_scope.snap
@@ -0,0 +1,49 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = {(identifier) @a (number) @b} @item
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "item"
+S4 "Test"
+S5 "identifier"
+S6 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { a, b }
+T2 = Struct  M2:1  ; { item }
+T3 = Struct  M3:1  ; { a }
+T4 = Struct  M4:1  ; { b }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T1  ; item: T1
+M3: S1 → T0  ; a: <Node>
+M4: S2 → T0  ; b: <Node>
+
+[type_names]
+N0: S4 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Obj]                            10
+  10   !   (identifier) [Node Set(M0)]      12
+  12   ▷   (number) [Node Set(M1)]          14
+  14   ε   [EndObj Set(M2)]                 16
+  16                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_with_type_annotation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_with_type_annotation.snap
new file mode 100644
index 00000000..3b5695a4
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_struct_with_type_annotation.snap
@@ -0,0 +1,43 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = {(identifier) @fn} @outer :: FunctionInfo
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "fn"
+S2 "outer"
+S3 "Test"
+S4 "FunctionInfo"
+S5 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { fn }
+T2 = Struct  M1:1  ; { outer }
+
+[type_members]
+M0: S1 → T0  ; fn: <Node>
+M1: S2 → T1  ; outer: FunctionInfo
+
+[type_names]
+N0: S3 → T2  ; Test
+N1: S4 → T1  ; FunctionInfo
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Obj]                            10
+  10   !   (identifier) [Node Set(M0)]      12
+  12   ε   [EndObj Set(M1)]                 14
+  14                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_custom.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_custom.snap
new file mode 100644
index 00000000..03da2246
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_custom.snap
@@ -0,0 +1,39 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier) @name :: Identifier
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Identifier"
+S2 "name"
+S3 "Test"
+S4 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Alias(T0)
+T2 = Struct  M0:1  ; { name }
+
+[type_members]
+M0: S2 → T1  ; name: Identifier
+
+[type_names]
+N0: S1 → T1  ; Identifier
+N1: S3 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_string.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_string.snap
new file mode 100644
index 00000000..03434cc0
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_with_type_string.snap
@@ -0,0 +1,36 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier) @name :: string
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <String>
+T1 = Struct  M0:1  ; { name }
+
+[type_members]
+M0: S1 → T0  ; name: <String>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Text Set(M0)]      10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_wrapper_struct.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_wrapper_struct.snap
new file mode 100644
index 00000000..f11c39c6
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__captures_wrapper_struct.snap
@@ -0,0 +1,69 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = {{(identifier) @id (number) @num} @row}* @rows
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "num"
+S3 "row"
+S4 "rows"
+S5 "Test"
+S6 "identifier"
+S7 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { id, num }
+T2 = Struct  M2:1  ; { row }
+T3 = ArrayStar(T2)  ; T2*
+T4 = Struct  M3:1  ; { rows }
+T5 = Struct  M4:1  ; { id }
+T6 = Struct  M5:1  ; { num }
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+M1: S2 → T0  ; num: <Node>
+M2: S3 → T1  ; row: T1
+M3: S4 → T3  ; rows: T3
+M4: S1 → T0  ; id: <Node>
+M5: S2 → T0  ; num: <Node>
+
+[type_names]
+N0: S5 → T4  ; Test
+
+[entrypoints]
+Test = 06 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Arr]                            10
+  10   ε                                    36, 17
+  12   ε   [EndObj Push]                    14
+  14   ε                                    42, 17
+  16                                        ▶
+  17   ε   [EndArr Set(M3)]                 16
+  19   ε   [EndObj Set(M2)]                 12
+  21   ▷   (number) [Node Set(M1)]          19
+  23  ...  
+  24   !   (identifier) [Node Set(M0)]      21
+  26   ε   [Obj]                            24
+  28   ε   [Obj]                            26
+  30   ▷   _                                34
+  31  ...  
+  32   ε                                    30, 17
+  34   ε                                    28, 32
+  36   !   _                                34
+  37   ▷   _                                40
+  38   ε                                    37, 17
+  40   ε                                    28, 38
+  42   ▷   _                                40
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__comprehensive_multi_definition.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__comprehensive_multi_definition.snap
new file mode 100644
index 00000000..26b8b29d
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__comprehensive_multi_definition.snap
@@ -0,0 +1,88 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Ident = (identifier) @name :: string
+Expression = [
+    Literal: (number) @value
+    Variable: (identifier) @name
+]
+Assignment = (assignment_expression
+    left: (identifier) @target
+    right: (Expression) @value)
+---
+[strings]
+S00 "Beauty will save the world"
+S01 "name"
+S02 "value"
+S03 "Literal"
+S04 "Variable"
+S05 "target"
+S06 "Ident"
+S07 "Expression"
+S08 "Assignment"
+S09 "identifier"
+S10 "number"
+S11 "assignment_expression"
+S12 "left"
+S13 "right"
+
+[type_defs]
+T00 = <Node>
+T01 = <String>
+T02 = Struct  M0:1  ; { name }
+T03 = Struct  M1:1  ; { value }
+T04 = Struct  M2:1  ; { name }
+T05 = Enum    M3:2  ; Literal | Variable
+T06 = Struct  M5:2  ; { value, target }
+T07 = Struct  M7:1  ; { target }
+T08 = Struct  M8:1  ; { value }
+
+[type_members]
+M0: S01 → T01  ; name: <String>
+M1: S02 → T00  ; value: <Node>
+M2: S01 → T00  ; name: <Node>
+M3: S03 → T03  ; Literal: T03
+M4: S04 → T04  ; Variable: T04
+M5: S02 → T05  ; value: Expression
+M6: S05 → T00  ; target: <Node>
+M7: S05 → T00  ; target: <Node>
+M8: S02 → T05  ; value: Expression
+
+[type_names]
+N0: S06 → T02  ; Ident
+N1: S07 → T05  ; Expression
+N2: S08 → T06  ; Assignment
+
+[entrypoints]
+Assignment = 14 :: T06
+Expression = 11 :: T05
+Ident      = 06 :: T02
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Ident:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Text Set(M0)]      10
+  10                                        ▶
+
+Expression:
+  11   ε                                    12
+  12   ε                                    24, 27
+
+Assignment:
+  14   ε                                    15
+  15   !   (assignment_expression)          16
+  16   ▽   left: (identifier) [Node Set(M6)]  18
+  18   ▷   right: (Expression)              11 : 19
+  19   ε   [Set(M5)]                        21
+  21   △   _                                22
+  22                                        ▶
+  23                                        ▶
+  24   !   [Enum(M3)] (number) [Node Set(M1) EndEnum]  23
+  27   !   [Enum(M4)] (identifier) [Node Set(M2) EndEnum]  23
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_multiple.snap
new file mode 100644
index 00000000..19b1e0bb
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_multiple.snap
@@ -0,0 +1,49 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Foo = (identifier) @id
+Bar = (string) @str
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "str"
+S3 "Foo"
+S4 "Bar"
+S5 "identifier"
+S6 "string"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { id }
+T2 = Struct  M1:1  ; { str }
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+M1: S2 → T0  ; str: <Node>
+
+[type_names]
+N0: S3 → T1  ; Foo
+N1: S4 → T2  ; Bar
+
+[entrypoints]
+Bar = 11 :: T2
+Foo = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Foo:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
+
+Bar:
+  11   ε                                    12
+  12   !   (string) [Node Set(M1)]          14
+  14                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_nested_capture.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_nested_capture.snap
new file mode 100644
index 00000000..271ba524
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_nested_capture.snap
@@ -0,0 +1,77 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Inner = (call_expression (identifier) @name)
+Outer = (array {(Inner) @item}* @items)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "item"
+S3 "items"
+S4 "Inner"
+S5 "Outer"
+S6 "call_expression"
+S7 "identifier"
+S8 "array"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { name }
+T2 = Struct  M1:1  ; { item }
+T3 = ArrayStar(T2)  ; T2*
+T4 = Struct  M2:1  ; { items }
+
+[type_members]
+M0: S1 → T0  ; name: <Node>
+M1: S2 → T1  ; item: Inner
+M2: S3 → T3  ; items: T3
+
+[type_names]
+N0: S4 → T1  ; Inner
+N1: S5 → T4  ; Outer
+
+[entrypoints]
+Inner = 06 :: T1
+Outer = 12 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Inner:
+  06   ε                                    07
+  07   !   (call_expression)                08
+  08   ▽   (identifier) [Node Set(M0)]      10
+  10   △   _                                11
+  11                                        ▶
+
+Outer:
+  12   ε                                    13
+  13   !   (array)                          14
+  14   ε   [Arr]                            16
+  16   ε                                    44, 27
+  18   ε   [EndArr Set(M2)]                 20
+  20   △   _                                26
+  21   ε   [EndObj Push]                    24
+  23  ...  
+  24   ε                                    50, 18
+  26                                        ▶
+  27   ε   [EndArr Set(M2)]                 26
+  29   ε   [Set(M1)]                        21
+  31  ...  
+  32   ε   [EndObj]                         29
+  34   !   (Inner)                          06 : 32
+  35   ε   [Obj]                            34
+  37   ε   [Obj]                            35
+  39   ▷   _                                42
+  40   ε                                    39, 18
+  42   ε                                    37, 40
+  44   ▽   _                                42
+  45   ▷   _                                48
+  46   ε                                    45, 18
+  48   ε                                    37, 46
+  50   ▷   _                                48
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_reference.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_reference.snap
new file mode 100644
index 00000000..5690d115
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_reference.snap
@@ -0,0 +1,58 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Expression = [(identifier) @name (number) @value]
+Root = (function_declaration name: (identifier) @name)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "value"
+S3 "Expression"
+S4 "Root"
+S5 "identifier"
+S6 "number"
+S7 "function_declaration"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { name, value }
+T2 = Struct  M2:1  ; { name }
+T3 = Struct  M3:1  ; { value }
+T4 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T4  ; name: T4
+M1: S2 → T4  ; value: T4
+M2: S1 → T0  ; name: <Node>
+M3: S2 → T0  ; value: <Node>
+
+[type_names]
+N0: S3 → T1  ; Expression
+N1: S4 → T2  ; Root
+
+[entrypoints]
+Expression = 06 :: T1
+Root       = 10 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Expression:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    17, 20
+
+Root:
+  10   ε                                    11
+  11   !   (function_declaration)           12
+  12   ▽   name: (identifier) [Node Set(M2)]  14
+  14   △   _                                15
+  15                                        ▶
+  16                                        ▶
+  17   !   [Null Set(M1)] (identifier) [Node Set(M0)]  16
+  20   !   [Null Set(M0)] (number) [Node Set(M1)]  16
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_single.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_single.snap
new file mode 100644
index 00000000..e9e2c901
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__definitions_single.snap
@@ -0,0 +1,36 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Foo = (identifier) @id
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "Foo"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { id }
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+
+[type_names]
+N0: S2 → T1  ; Foo
+
+[entrypoints]
+Foo = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Foo:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_alternation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_alternation.snap
new file mode 100644
index 00000000..81b4aa8c
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_alternation.snap
@@ -0,0 +1,51 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (call_expression function: [(identifier) @fn (number) @num])
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "fn"
+S2 "num"
+S3 "Test"
+S4 "call_expression"
+S5 "identifier"
+S6 "number"
+S7 "function"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { fn, num }
+T2 = Struct  M2:1  ; { fn }
+T3 = Struct  M3:1  ; { num }
+T4 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T4  ; fn: T4
+M1: S2 → T4  ; num: T4
+M2: S1 → T0  ; fn: <Node>
+M3: S2 → T0  ; num: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (call_expression)                08
+  08   ▽   function: _                      09
+  09   ε                                    12, 16
+  11                                        ▶
+  12   !   [Null Set(M1)] (identifier) [Node Set(M0)]  19
+  15  ...  
+  16   !   [Null Set(M0)] (number) [Node Set(M1)]  19
+  19   △   _                                11
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_multiple.snap
new file mode 100644
index 00000000..0f9ef7cf
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_multiple.snap
@@ -0,0 +1,46 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (binary_expression
+    left: (_) @left
+    right: (_) @right)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "left"
+S2 "right"
+S3 "Test"
+S4 "binary_expression"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { left, right }
+T2 = Struct  M2:1  ; { left }
+T3 = Struct  M3:1  ; { right }
+
+[type_members]
+M0: S1 → T0  ; left: <Node>
+M1: S2 → T0  ; right: <Node>
+M2: S1 → T0  ; left: <Node>
+M3: S2 → T0  ; right: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (binary_expression)              08
+  08   ▽   left: (_) [Node Set(M0)]         10
+  10   ▷   right: (_) [Node Set(M1)]        12
+  12   △   _                                13
+  13                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_negated.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_negated.snap
new file mode 100644
index 00000000..eae61e7a
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_negated.snap
@@ -0,0 +1,40 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (pair key: (property_identifier) @key -value)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "key"
+S2 "Test"
+S3 "pair"
+S4 "property_identifier"
+S5 "value"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { key }
+
+[type_members]
+M0: S1 → T0  ; key: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   -value (pair)                    10
+  10   ▽   key: (property_identifier) [Node Set(M0)]  12
+  12   △   _                                13
+  13                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_single.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_single.snap
new file mode 100644
index 00000000..e58282ce
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__fields_single.snap
@@ -0,0 +1,38 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (function_declaration name: (identifier) @name)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "Test"
+S3 "function_declaration"
+S4 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { name }
+
+[type_members]
+M0: S1 → T0  ; name: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (function_declaration)           08
+  08   ▽   name: (identifier) [Node Set(M0)]  10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_anonymous.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_anonymous.snap
new file mode 100644
index 00000000..21a5d697
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_anonymous.snap
@@ -0,0 +1,38 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (binary_expression "+" @op)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "op"
+S2 "Test"
+S3 "binary_expression"
+S4 "+"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { op }
+
+[type_members]
+M0: S1 → T0  ; op: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (binary_expression)              08
+  08   ▽   "+" [Node Set(M0)]               10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_error.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_error.snap
new file mode 100644
index 00000000..f40606ba
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_error.snap
@@ -0,0 +1,35 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (ERROR) @err
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "err"
+S2 "Test"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { err }
+
+[type_members]
+M0: S1 → T0  ; err: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (_) [Node Set(M0)]               10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_missing.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_missing.snap
new file mode 100644
index 00000000..fb1d0399
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_missing.snap
@@ -0,0 +1,35 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (MISSING) @m
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "m"
+S2 "Test"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { m }
+
+[type_members]
+M0: S1 → T0  ; m: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (_) [Node Set(M0)]               10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_named.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_named.snap
new file mode 100644
index 00000000..ef7b2bf3
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_named.snap
@@ -0,0 +1,36 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier) @id
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { id }
+
+[type_members]
+M0: S1 → T0  ; id: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_any.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_any.snap
new file mode 100644
index 00000000..e53bbd49
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_any.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (pair key: _ @key)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "key"
+S2 "Test"
+S3 "pair"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { key }
+
+[type_members]
+M0: S1 → T0  ; key: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (pair)                           08
+  08   ▽   key: _ [Node Set(M0)]            10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_named.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_named.snap
new file mode 100644
index 00000000..1e706ce7
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__nodes_wildcard_named.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (pair key: (_) @key)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "key"
+S2 "Test"
+S3 "pair"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { key }
+
+[type_members]
+M0: S1 → T0  ; key: <Node>
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (pair)                           08
+  08   ▽   key: (_) [Node Set(M0)]          10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_first_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_first_child.snap
new file mode 100644
index 00000000..75163df7
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_first_child.snap
@@ -0,0 +1,57 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (program (identifier)? @id (number) @n)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "id"
+S2 "n"
+S3 "Test"
+S4 "program"
+S5 "identifier"
+S6 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { id, n }
+T2 = Struct  M2:1  ; { id }
+T3 = Struct  M3:1  ; { n }
+T4 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T4  ; id: T4
+M1: S2 → T0  ; n: <Node>
+M2: S1 → T4  ; id: T4
+M3: S2 → T0  ; n: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (program)                        08
+  08   ε                                    28, 16
+  10                                        ▶
+  11   ▽   (number) [Node Set(M1)]          29
+  13   ▷   (number) [Node Set(M1)]          29
+  15  ...  
+  16   ε   [Null Set(M0)]                   11
+  18   !   (identifier) [Node Set(M0)]      13
+  20   ε   [Null Set(M0)]                   13
+  22   ▷   _                                26
+  23  ...  
+  24   ε                                    22, 20
+  26   ε                                    18, 24
+  28   ▽   _                                26
+  29   △   _                                10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_null_injection.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_null_injection.snap
new file mode 100644
index 00000000..b10e4bbe
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__optional_null_injection.snap
@@ -0,0 +1,47 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (function_declaration (decorator)? @dec)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "dec"
+S2 "Test"
+S3 "function_declaration"
+S4 "decorator"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { dec }
+T2 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T2  ; dec: T2
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (function_declaration)           08
+  08   ε                                    23, 11
+  10                                        ▶
+  11   ε   [Null Set(M0)]                   10
+  13   !   (decorator) [Node Set(M0)]       24
+  15  ...  
+  16   ε   [Null Set(M0)]                   24
+  18   ▷   _                                21
+  19   ε                                    18, 16
+  21   ε                                    13, 19
+  23   ▽   _                                21
+  24   △   _                                10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_first_child_array.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_first_child_array.snap
new file mode 100644
index 00000000..c36d4384
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_first_child_array.snap
@@ -0,0 +1,62 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array (identifier)* @ids (number) @n)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "ids"
+S2 "n"
+S3 "Test"
+S4 "array"
+S5 "identifier"
+S6 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayStar(T0)  ; <Node>*
+T2 = Struct  M0:2  ; { ids, n }
+T3 = Struct  M2:1  ; { ids }
+T4 = Struct  M3:1  ; { n }
+
+[type_members]
+M0: S1 → T1  ; ids: T1
+M1: S2 → T0  ; n: <Node>
+M2: S1 → T1  ; ids: T1
+M3: S2 → T0  ; n: <Node>
+
+[type_names]
+N0: S3 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ε   [Arr]                            10
+  10   ε                                    31, 24
+  12   !   (identifier) [Node Push]         14
+  14   ε                                    37, 21
+  16                                        ▶
+  17   ▽   (number) [Node Set(M1)]          38
+  19   ▷   (number) [Node Set(M1)]          38
+  21   ε   [EndArr Set(M0)]                 19
+  23  ...  
+  24   ε   [EndArr Set(M0)]                 17
+  26   ▷   _                                29
+  27   ε                                    26, 21
+  29   ε                                    12, 27
+  31   ▽   _                                29
+  32   ▷   _                                35
+  33   ε                                    32, 21
+  35   ε                                    12, 33
+  37   ▷   _                                35
+  38   △   _                                16
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional.snap
new file mode 100644
index 00000000..b10e4bbe
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional.snap
@@ -0,0 +1,47 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (function_declaration (decorator)? @dec)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "dec"
+S2 "Test"
+S3 "function_declaration"
+S4 "decorator"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { dec }
+T2 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T2  ; dec: T2
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (function_declaration)           08
+  08   ε                                    23, 11
+  10                                        ▶
+  11   ε   [Null Set(M0)]                   10
+  13   !   (decorator) [Node Set(M0)]       24
+  15  ...  
+  16   ε   [Null Set(M0)]                   24
+  18   ▷   _                                21
+  19   ε                                    18, 16
+  21   ε                                    13, 19
+  23   ▽   _                                21
+  24   △   _                                10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional_nongreedy.snap
new file mode 100644
index 00000000..7fabbca3
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_optional_nongreedy.snap
@@ -0,0 +1,47 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (function_declaration (decorator)?? @dec)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "dec"
+S2 "Test"
+S3 "function_declaration"
+S4 "decorator"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { dec }
+T2 = Optional(T0)  ; <Node>?
+
+[type_members]
+M0: S1 → T2  ; dec: T2
+
+[type_names]
+N0: S2 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (function_declaration)           08
+  08   ε                                    11, 23
+  10                                        ▶
+  11   ε   [Null Set(M0)]                   10
+  13   !   (decorator) [Node Set(M0)]       24
+  15  ...  
+  16   ε   [Null Set(M0)]                   24
+  18   ▷   _                                21
+  19   ε                                    16, 18
+  21   ε                                    19, 13
+  23   ▽   _                                21
+  24   △   _                                10
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus.snap
new file mode 100644
index 00000000..94757493
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus.snap
@@ -0,0 +1,47 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier)+ @items
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "items"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayPlus(T0)  ; <Node>+
+T2 = Struct  M0:1  ; { items }
+
+[type_members]
+M0: S1 → T1  ; items: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Arr]                            10
+  10   !   _                                19
+  11   !   (identifier) [Node Push]         13
+  13   ε                                    26, 16
+  15                                        ▶
+  16   ε   [EndArr Set(M0)]                 15
+  18   ▷   _                                19
+  19   ε                                    11, 18
+  21   ▷   _                                24
+  22   ε                                    21, 16
+  24   ε                                    11, 22
+  26   ▷   _                                24
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus_nongreedy.snap
new file mode 100644
index 00000000..789bbb01
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_plus_nongreedy.snap
@@ -0,0 +1,47 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier)+? @items
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "items"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayPlus(T0)  ; <Node>+
+T2 = Struct  M0:1  ; { items }
+
+[type_members]
+M0: S1 → T1  ; items: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Arr]                            10
+  10   !   _                                19
+  11   !   (identifier) [Node Push]         13
+  13   ε                                    16, 26
+  15                                        ▶
+  16   ε   [EndArr Set(M0)]                 15
+  18   ▷   _                                19
+  19   ε                                    18, 11
+  21   ▷   _                                24
+  22   ε                                    16, 21
+  24   ε                                    22, 11
+  26   ▷   _                                24
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_repeat_navigation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_repeat_navigation.snap
new file mode 100644
index 00000000..3491b6c9
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_repeat_navigation.snap
@@ -0,0 +1,53 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (function_declaration (decorator)* @decs)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "decs"
+S2 "Test"
+S3 "function_declaration"
+S4 "decorator"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayStar(T0)  ; <Node>*
+T2 = Struct  M0:1  ; { decs }
+
+[type_members]
+M0: S1 → T1  ; decs: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (function_declaration)           08
+  08   ε   [Arr]                            10
+  10   ε                                    28, 21
+  12   ε   [EndArr Set(M0)]                 14
+  14   △   _                                20
+  15  ...  
+  16   !   (decorator) [Node Push]          18
+  18   ε                                    34, 12
+  20                                        ▶
+  21   ε   [EndArr Set(M0)]                 20
+  23   ▷   _                                26
+  24   ε                                    23, 12
+  26   ε                                    16, 24
+  28   ▽   _                                26
+  29   ▷   _                                32
+  30   ε                                    29, 12
+  32   ε                                    16, 30
+  34   ▷   _                                32
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_sequence_in_called_def.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_sequence_in_called_def.snap
new file mode 100644
index 00000000..67b14e64
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_sequence_in_called_def.snap
@@ -0,0 +1,83 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Item = (identifier) @name
+Collect = {(Item) @item}* @items
+Test = (array (Collect))
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "name"
+S2 "item"
+S3 "items"
+S4 "Item"
+S5 "Collect"
+S6 "Test"
+S7 "identifier"
+S8 "array"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:1  ; { name }
+T2 = Struct  M1:1  ; { item }
+T3 = ArrayStar(T2)  ; T2*
+T4 = Struct  M2:1  ; { items }
+
+[type_members]
+M0: S1 → T0  ; name: <Node>
+M1: S2 → T1  ; item: Item
+M2: S3 → T3  ; items: T3
+
+[type_names]
+N0: S4 → T1  ; Item
+N1: S5 → T4  ; Collect
+N2: S6 → T4  ; Test
+
+[entrypoints]
+Collect = 11 :: T4
+Item    = 06 :: T1
+Test    = 16 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Item:
+  06   ε                                    08
+  07  ...  
+  08   !   (identifier) [Node Set(M0)]      10
+  10                                        ▶
+
+Collect:
+  11   ε                                    12
+  12   ε   [Arr]                            14
+  14   ε                                    44, 27
+
+Test:
+  16   ε                                    17
+  17   !   (array)                          18
+  18   ▽   (Collect)                        11 : 19
+  19   △   _                                20
+  20                                        ▶
+  21   ε   [EndObj Push]                    24
+  23  ...  
+  24   ε                                    50, 27
+  26                                        ▶
+  27   ε   [EndArr Set(M2)]                 26
+  29   ε   [Set(M1)]                        21
+  31  ...  
+  32   ε   [EndObj]                         29
+  34   !   (Item)                           06 : 32
+  35   ε   [Obj]                            34
+  37   ε   [Obj]                            35
+  39   ▷   _                                42
+  40   ε                                    39, 27
+  42   ε                                    37, 40
+  44   !   _                                42
+  45   ▷   _                                48
+  46   ε                                    45, 27
+  48   ε                                    37, 46
+  50   ▷   _                                48
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star.snap
new file mode 100644
index 00000000..7741aa4b
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star.snap
@@ -0,0 +1,49 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier)* @items
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "items"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayStar(T0)  ; <Node>*
+T2 = Struct  M0:1  ; { items }
+
+[type_members]
+M0: S1 → T1  ; items: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Arr]                            10
+  10   ε                                    24, 17
+  12   !   (identifier) [Node Push]         14
+  14   ε                                    30, 17
+  16                                        ▶
+  17   ε   [EndArr Set(M0)]                 16
+  19   ▷   _                                22
+  20   ε                                    19, 17
+  22   ε                                    12, 20
+  24   !   _                                22
+  25   ▷   _                                28
+  26   ε                                    25, 17
+  28   ε                                    12, 26
+  30   ▷   _                                28
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star_nongreedy.snap
new file mode 100644
index 00000000..5bb48f22
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_star_nongreedy.snap
@@ -0,0 +1,49 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (identifier)*? @items
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "items"
+S2 "Test"
+S3 "identifier"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayStar(T0)  ; <Node>*
+T2 = Struct  M0:1  ; { items }
+
+[type_members]
+M0: S1 → T1  ; items: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    08
+  07  ...  
+  08   ε   [Arr]                            10
+  10   ε                                    17, 24
+  12   !   (identifier) [Node Push]         14
+  14   ε                                    17, 30
+  16                                        ▶
+  17   ε   [EndArr Set(M0)]                 16
+  19   ▷   _                                22
+  20   ε                                    17, 19
+  22   ε                                    20, 12
+  24   !   _                                22
+  25   ▷   _                                28
+  26   ε                                    17, 25
+  28   ε                                    26, 12
+  30   ▷   _                                28
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_struct_array.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_struct_array.snap
new file mode 100644
index 00000000..17bca106
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__quantifiers_struct_array.snap
@@ -0,0 +1,68 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array {(identifier) @a (number) @b}* @items)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "items"
+S4 "Test"
+S5 "array"
+S6 "identifier"
+S7 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { a, b }
+T2 = ArrayStar(T1)  ; T1*
+T3 = Struct  M2:1  ; { items }
+T4 = Struct  M3:1  ; { a }
+T5 = Struct  M4:1  ; { b }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S3 → T2  ; items: T2
+M3: S1 → T0  ; a: <Node>
+M4: S2 → T0  ; b: <Node>
+
+[type_names]
+N0: S4 → T3  ; Test
+
+[entrypoints]
+Test = 06 :: T3
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ε   [Arr]                            10
+  10   ε                                    36, 21
+  12   ε   [EndArr Set(M2)]                 14
+  14   △   _                                20
+  15  ...  
+  16   ε   [EndObj Push]                    18
+  18   ε                                    42, 12
+  20                                        ▶
+  21   ε   [EndArr Set(M2)]                 20
+  23  ...  
+  24   ▷   (number) [Node Set(M1)]          16
+  26   !   (identifier) [Node Set(M0)]      24
+  28   ε   [Obj]                            26
+  30   ▷   _                                34
+  31  ...  
+  32   ε                                    30, 12
+  34   ε                                    28, 32
+  36   ▽   _                                34
+  37   ▷   _                                40
+  38   ε                                    37, 12
+  40   ε                                    28, 38
+  42   ▷   _                                40
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_simple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_simple.snap
new file mode 100644
index 00000000..b5c56f30
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_simple.snap
@@ -0,0 +1,67 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Expr = [
+    Lit: (number) @value :: string
+    Rec: (call_expression function: (identifier) @fn arguments: (Expr) @inner)
+]
+---
+[strings]
+S00 "Beauty will save the world"
+S01 "value"
+S02 "fn"
+S03 "inner"
+S04 "Lit"
+S05 "Rec"
+S06 "Expr"
+S07 "number"
+S08 "call_expression"
+S09 "identifier"
+S10 "function"
+S11 "arguments"
+
+[type_defs]
+T0 = <Node>
+T1 = <String>
+T2 = Struct  M0:1  ; { value }
+T3 = Struct  M1:2  ; { fn, inner }
+T4 = Enum    M3:2  ; Lit | Rec
+T5 = Struct  M5:1  ; { fn }
+T6 = Struct  M6:1  ; { inner }
+
+[type_members]
+M0: S01 → T1  ; value: <String>
+M1: S02 → T0  ; fn: <Node>
+M2: S03 → T4  ; inner: Expr
+M3: S04 → T2  ; Lit: T2
+M4: S05 → T3  ; Rec: T3
+M5: S02 → T0  ; fn: <Node>
+M6: S03 → T4  ; inner: Expr
+
+[type_names]
+N0: S06 → T4  ; Expr
+
+[entrypoints]
+Expr = 06 :: T4
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Expr:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    16, 24
+  10   ε   [Set(M2)]                        12
+  12   △   _                                19
+  13                                        ▶
+  14  ...  
+  15  ...  
+  16   !   [Enum(M3)] (number) [Text Set(M0) EndEnum]  13
+  19   ε   [EndEnum]                        13
+  21   ▷   arguments: (Expr)                06 : 10
+  22   ▽   function: (identifier) [Node Set(M1)]  21
+  24   !   [Enum(M4)] (call_expression)     22
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_with_structured_result.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_with_structured_result.snap
new file mode 100644
index 00000000..d9f25767
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__recursion_with_structured_result.snap
@@ -0,0 +1,82 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Expr = [
+  Lit: (number) @value :: string
+  Nested: (call_expression function: (identifier) @fn arguments: (Expr) @inner)
+]
+
+Test = (program (Expr) @expr)
+---
+[strings]
+S00 "Beauty will save the world"
+S01 "value"
+S02 "fn"
+S03 "inner"
+S04 "Lit"
+S05 "Nested"
+S06 "expr"
+S07 "Expr"
+S08 "Test"
+S09 "number"
+S10 "call_expression"
+S11 "identifier"
+S12 "program"
+S13 "function"
+S14 "arguments"
+
+[type_defs]
+T00 = <Node>
+T01 = <String>
+T02 = Struct  M0:1  ; { value }
+T03 = Struct  M1:2  ; { fn, inner }
+T04 = Enum    M3:2  ; Lit | Nested
+T05 = Struct  M5:1  ; { expr }
+T06 = Struct  M6:1  ; { fn }
+T07 = Struct  M7:1  ; { inner }
+
+[type_members]
+M0: S01 → T01  ; value: <String>
+M1: S02 → T00  ; fn: <Node>
+M2: S03 → T04  ; inner: Expr
+M3: S04 → T02  ; Lit: T02
+M4: S05 → T03  ; Nested: T03
+M5: S06 → T04  ; expr: Expr
+M6: S02 → T00  ; fn: <Node>
+M7: S03 → T04  ; inner: Expr
+
+[type_names]
+N0: S07 → T04  ; Expr
+N1: S08 → T05  ; Test
+
+[entrypoints]
+Expr = 06 :: T04
+Test = 10 :: T05
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Expr:
+  06   ε                                    08
+  07  ...  
+  08   ε                                    21, 29
+
+Test:
+  10   ε                                    11
+  11   !   (program)                        12
+  12   ▽   (Expr)                           06 : 13
+  13   ε   [Set(M5)]                        15
+  15   △   _                                16
+  16                                        ▶
+  17   ε   [Set(M2)]                        19
+  19   △   _                                24
+  20                                        ▶
+  21   !   [Enum(M3)] (number) [Text Set(M0) EndEnum]  20
+  24   ε   [EndEnum]                        20
+  26   ▷   arguments: (Expr)                06 : 17
+  27   ▽   function: (identifier) [Node Set(M1)]  26
+  29   !   [Enum(M4)] (call_expression)     27
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_basic.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_basic.snap
new file mode 100644
index 00000000..bed43238
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_basic.snap
@@ -0,0 +1,37 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array {(identifier) (number)})
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+S4 "number"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   (identifier)                     09
+  09   ▷   (number)                         10
+  10   △   _                                11
+  11                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_in_quantifier.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_in_quantifier.snap
new file mode 100644
index 00000000..d9ef2c87
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_in_quantifier.snap
@@ -0,0 +1,56 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array {(identifier) (number)}* @items)
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "items"
+S2 "Test"
+S3 "array"
+S4 "identifier"
+S5 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = ArrayStar(T0)  ; <Node>*
+T2 = Struct  M0:1  ; { items }
+
+[type_members]
+M0: S1 → T1  ; items: T1
+
+[type_names]
+N0: S2 → T2  ; Test
+
+[entrypoints]
+Test = 06 :: T2
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ε   [Arr]                            10
+  10   ε                                    29, 21
+  12   ε   [EndArr Set(M0)]                 14
+  14   △   _                                20
+  15  ...  
+  16   ▷   (number) [Node Push]             18
+  18   ε                                    36, 12
+  20                                        ▶
+  21   ε   [EndArr Set(M0)]                 20
+  23   !   (identifier)                     16
+  24   ▷   _                                27
+  25   ε                                    24, 12
+  27   ε                                    23, 25
+  29   ▽   _                                27
+  30   ▷   _                                34
+  31  ...  
+  32   ε                                    30, 12
+  34   ε                                    23, 32
+  36   ▷   _                                34
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_nested.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_nested.snap
new file mode 100644
index 00000000..acafb0e7
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_nested.snap
@@ -0,0 +1,41 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array {(identifier) {(number) (string)} (null)})
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "Test"
+S2 "array"
+S3 "identifier"
+S4 "number"
+S5 "string"
+S6 "null"
+
+[type_defs]
+T0 = <Void>
+
+[type_members]
+
+[type_names]
+N0: S1 → T0  ; Test
+
+[entrypoints]
+Test = 06 :: T0
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   (identifier)                     09
+  09   ▷   (number)                         10
+  10   ▷   (string)                         11
+  11   ▷   (null)                           12
+  12   △   _                                13
+  13                                        ▶
diff --git a/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_with_captures.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_with_captures.snap
new file mode 100644
index 00000000..d41634df
--- /dev/null
+++ b/crates/plotnik-compiler/src/emit/snapshots/plotnik_compiler__emit__emit_tests__sequences_with_captures.snap
@@ -0,0 +1,46 @@
+---
+source: crates/plotnik-compiler/src/emit/emit_tests.rs
+---
+Test = (array {(identifier) @a (number) @b})
+---
+[strings]
+S0 "Beauty will save the world"
+S1 "a"
+S2 "b"
+S3 "Test"
+S4 "array"
+S5 "identifier"
+S6 "number"
+
+[type_defs]
+T0 = <Node>
+T1 = Struct  M0:2  ; { a, b }
+T2 = Struct  M2:1  ; { a }
+T3 = Struct  M3:1  ; { b }
+
+[type_members]
+M0: S1 → T0  ; a: <Node>
+M1: S2 → T0  ; b: <Node>
+M2: S1 → T0  ; a: <Node>
+M3: S2 → T0  ; b: <Node>
+
+[type_names]
+N0: S3 → T1  ; Test
+
+[entrypoints]
+Test = 06 :: T1
+
+[transitions]
+_ObjWrap:
+  00   ε   [Obj]                            02
+  02       Trampoline                       03
+  03   ε   [EndObj]                         05
+  05                                        ▶
+
+Test:
+  06   ε                                    07
+  07   !   (array)                          08
+  08   ▽   (identifier) [Node Set(M0)]      10
+  10   ▷   (number) [Node Set(M1)]          12
+  12   △   _                                13
+  13                                        ▶
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap b/crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
similarity index 100%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
rename to crates/plotnik-compiler/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
diff --git a/crates/plotnik-lib/src/emit/string_table.rs b/crates/plotnik-compiler/src/emit/string_table.rs
similarity index 99%
rename from crates/plotnik-lib/src/emit/string_table.rs
rename to crates/plotnik-compiler/src/emit/string_table.rs
index 3c3b2d2d..fe36232e 100644
--- a/crates/plotnik-lib/src/emit/string_table.rs
+++ b/crates/plotnik-compiler/src/emit/string_table.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
 
 use plotnik_core::{Interner, Symbol};
 
-use crate::bytecode::StringId;
+use plotnik_bytecode::StringId;
 
 use super::EmitError;
 
diff --git a/crates/plotnik-lib/src/emit/string_table_tests.rs b/crates/plotnik-compiler/src/emit/string_table_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/string_table_tests.rs
rename to crates/plotnik-compiler/src/emit/string_table_tests.rs
diff --git a/crates/plotnik-lib/src/emit/type_table.rs b/crates/plotnik-compiler/src/emit/type_table.rs
similarity index 99%
rename from crates/plotnik-lib/src/emit/type_table.rs
rename to crates/plotnik-compiler/src/emit/type_table.rs
index 6f0756dd..e74bc883 100644
--- a/crates/plotnik-lib/src/emit/type_table.rs
+++ b/crates/plotnik-compiler/src/emit/type_table.rs
@@ -9,10 +9,9 @@ use plotnik_core::{Interner, Symbol};
 use crate::analyze::type_check::{
     FieldInfo, TYPE_NODE, TYPE_STRING, TYPE_VOID, TypeContext, TypeId, TypeShape,
 };
-use crate::bytecode::{
-    StringId, TypeData, TypeDef, TypeId as BytecodeTypeId, TypeMember, TypeName,
+use plotnik_bytecode::{
+    StringId, TypeData, TypeDef, TypeId as BytecodeTypeId, TypeKind, TypeMember, TypeName,
 };
-use crate::type_system::TypeKind;
 
 use super::{EmitError, StringTableBuilder};
 
diff --git a/crates/plotnik-lib/src/emit/type_table_tests.rs b/crates/plotnik-compiler/src/emit/type_table_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/emit/type_table_tests.rs
rename to crates/plotnik-compiler/src/emit/type_table_tests.rs
diff --git a/crates/plotnik-compiler/src/lib.rs b/crates/plotnik-compiler/src/lib.rs
new file mode 100644
index 00000000..d5920208
--- /dev/null
+++ b/crates/plotnik-compiler/src/lib.rs
@@ -0,0 +1,52 @@
+//! Plotnik compiler: parser, analyzer, and bytecode emitter.
+//!
+//! This crate provides the compilation pipeline for Plotnik queries:
+//! - `parser` - lexer, CST, and AST construction
+//! - `analyze` - semantic analysis (symbol table, type checking, validation)
+//! - `compile` - Thompson NFA construction
+//! - `emit` - bytecode emission
+//! - `diagnostics` - error reporting
+//! - `query` - high-level Query facade
+//! - `typegen` - TypeScript type generation
+
+#![cfg_attr(coverage_nightly, feature(coverage_attribute))]
+
+pub mod analyze;
+pub mod bytecode;
+pub mod compile;
+pub mod diagnostics;
+pub mod emit;
+pub mod parser;
+pub mod query;
+pub mod typegen;
+
+/// Result type for analysis passes that produce both output and diagnostics.
+///
+/// Each pass returns its typed output alongside any diagnostics it collected.
+/// Fatal errors (like fuel exhaustion) use the outer `Result`.
+pub type PassResult<T> = std::result::Result<(T, Diagnostics), Error>;
+
+pub use diagnostics::{Diagnostics, DiagnosticsPrinter, Severity, Span};
+pub use query::{Query, QueryBuilder};
+pub use query::{SourceId, SourceMap};
+
+/// Errors that can occur during query parsing.
+#[derive(Debug, Clone, thiserror::Error)]
+pub enum Error {
+    /// Execution fuel exhausted (too many parser operations).
+    #[error("execution limit exceeded")]
+    ExecFuelExhausted,
+
+    /// Recursion fuel exhausted (input nested too deeply).
+    #[error("recursion limit exceeded")]
+    RecursionLimitExceeded,
+
+    #[error("query parsing failed with {} errors", .0.error_count())]
+    QueryParseError(Diagnostics),
+
+    #[error("query analysis failed with {} errors", .0.error_count())]
+    QueryAnalyzeError(Diagnostics),
+}
+
+/// Result type for query operations.
+pub type Result<T> = std::result::Result<T, Error>;
diff --git a/crates/plotnik-lib/src/parser/ast.rs b/crates/plotnik-compiler/src/parser/ast.rs
similarity index 87%
rename from crates/plotnik-lib/src/parser/ast.rs
rename to crates/plotnik-compiler/src/parser/ast.rs
index 9c3a8e73..7dcf4b87 100644
--- a/crates/plotnik-lib/src/parser/ast.rs
+++ b/crates/plotnik-compiler/src/parser/ast.rs
@@ -188,81 +188,20 @@ pub enum AltKind {
     Mixed,
 }
 
-/// Predicate operator for node text filtering.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum PredicateOp {
-    /// `==` - equals
-    Eq,
-    /// `!=` - not equals
-    Ne,
-    /// `^=` - starts with
-    StartsWith,
-    /// `$=` - ends with
-    EndsWith,
-    /// `*=` - contains
-    Contains,
-    /// `=~` - regex match
-    RegexMatch,
-    /// `!~` - regex no match
-    RegexNoMatch,
-}
-
-impl PredicateOp {
-    pub fn from_syntax_kind(kind: SyntaxKind) -> Option<Self> {
-        match kind {
-            SyntaxKind::OpEq => Some(Self::Eq),
-            SyntaxKind::OpNe => Some(Self::Ne),
-            SyntaxKind::OpStartsWith => Some(Self::StartsWith),
-            SyntaxKind::OpEndsWith => Some(Self::EndsWith),
-            SyntaxKind::OpContains => Some(Self::Contains),
-            SyntaxKind::OpRegexMatch => Some(Self::RegexMatch),
-            SyntaxKind::OpRegexNoMatch => Some(Self::RegexNoMatch),
-            _ => None,
-        }
-    }
-
-    /// Decode from bytecode representation.
-    pub fn from_byte(b: u8) -> Self {
-        match b {
-            0 => Self::Eq,
-            1 => Self::Ne,
-            2 => Self::StartsWith,
-            3 => Self::EndsWith,
-            4 => Self::Contains,
-            5 => Self::RegexMatch,
-            6 => Self::RegexNoMatch,
-            _ => panic!("invalid predicate op byte: {b}"),
-        }
-    }
-
-    /// Encode for bytecode.
-    pub fn to_byte(self) -> u8 {
-        match self {
-            Self::Eq => 0,
-            Self::Ne => 1,
-            Self::StartsWith => 2,
-            Self::EndsWith => 3,
-            Self::Contains => 4,
-            Self::RegexMatch => 5,
-            Self::RegexNoMatch => 6,
-        }
-    }
-
-    /// Operator as display string.
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Self::Eq => "==",
-            Self::Ne => "!=",
-            Self::StartsWith => "^=",
-            Self::EndsWith => "$=",
-            Self::Contains => "*=",
-            Self::RegexMatch => "=~",
-            Self::RegexNoMatch => "!~",
-        }
-    }
-
-    pub fn is_regex_op(&self) -> bool {
-        matches!(self, Self::RegexMatch | Self::RegexNoMatch)
+// Re-export PredicateOp from bytecode crate
+pub use plotnik_bytecode::PredicateOp;
+
+/// Convert SyntaxKind to PredicateOp.
+pub fn predicate_op_from_syntax_kind(kind: SyntaxKind) -> Option<PredicateOp> {
+    match kind {
+        SyntaxKind::OpEq => Some(PredicateOp::Eq),
+        SyntaxKind::OpNe => Some(PredicateOp::Ne),
+        SyntaxKind::OpStartsWith => Some(PredicateOp::StartsWith),
+        SyntaxKind::OpEndsWith => Some(PredicateOp::EndsWith),
+        SyntaxKind::OpContains => Some(PredicateOp::Contains),
+        SyntaxKind::OpRegexMatch => Some(PredicateOp::RegexMatch),
+        SyntaxKind::OpRegexNoMatch => Some(PredicateOp::RegexNoMatch),
+        _ => None,
     }
 }
 
@@ -390,13 +329,13 @@ impl NodePredicate {
         self.0
             .children_with_tokens()
             .filter_map(|it| it.into_token())
-            .find(|t| PredicateOp::from_syntax_kind(t.kind()).is_some())
+            .find(|t| predicate_op_from_syntax_kind(t.kind()).is_some())
     }
 
     /// Returns the operator kind.
     pub fn operator(&self) -> Option<PredicateOp> {
         self.operator_token()
-            .and_then(|t| PredicateOp::from_syntax_kind(t.kind()))
+            .and_then(|t| predicate_op_from_syntax_kind(t.kind()))
     }
 
     /// Returns the string value if the predicate uses a string.
diff --git a/crates/plotnik-lib/src/parser/ast_tests.rs b/crates/plotnik-compiler/src/parser/ast_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/ast_tests.rs
rename to crates/plotnik-compiler/src/parser/ast_tests.rs
diff --git a/crates/plotnik-lib/src/parser/core.rs b/crates/plotnik-compiler/src/parser/core.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/core.rs
rename to crates/plotnik-compiler/src/parser/core.rs
diff --git a/crates/plotnik-lib/src/parser/cst.rs b/crates/plotnik-compiler/src/parser/cst.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/cst.rs
rename to crates/plotnik-compiler/src/parser/cst.rs
diff --git a/crates/plotnik-lib/src/parser/cst_tests.rs b/crates/plotnik-compiler/src/parser/cst_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/cst_tests.rs
rename to crates/plotnik-compiler/src/parser/cst_tests.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/atoms.rs b/crates/plotnik-compiler/src/parser/grammar/atoms.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/atoms.rs
rename to crates/plotnik-compiler/src/parser/grammar/atoms.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/expressions.rs b/crates/plotnik-compiler/src/parser/grammar/expressions.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/expressions.rs
rename to crates/plotnik-compiler/src/parser/grammar/expressions.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/fields.rs b/crates/plotnik-compiler/src/parser/grammar/fields.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/fields.rs
rename to crates/plotnik-compiler/src/parser/grammar/fields.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/items.rs b/crates/plotnik-compiler/src/parser/grammar/items.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/items.rs
rename to crates/plotnik-compiler/src/parser/grammar/items.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/mod.rs b/crates/plotnik-compiler/src/parser/grammar/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/mod.rs
rename to crates/plotnik-compiler/src/parser/grammar/mod.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/structures.rs b/crates/plotnik-compiler/src/parser/grammar/structures.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/structures.rs
rename to crates/plotnik-compiler/src/parser/grammar/structures.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/utils.rs b/crates/plotnik-compiler/src/parser/grammar/utils.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/utils.rs
rename to crates/plotnik-compiler/src/parser/grammar/utils.rs
diff --git a/crates/plotnik-lib/src/parser/grammar/validation.rs b/crates/plotnik-compiler/src/parser/grammar/validation.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/grammar/validation.rs
rename to crates/plotnik-compiler/src/parser/grammar/validation.rs
diff --git a/crates/plotnik-lib/src/parser/invariants.rs b/crates/plotnik-compiler/src/parser/invariants.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/invariants.rs
rename to crates/plotnik-compiler/src/parser/invariants.rs
diff --git a/crates/plotnik-lib/src/parser/lexer.rs b/crates/plotnik-compiler/src/parser/lexer.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/lexer.rs
rename to crates/plotnik-compiler/src/parser/lexer.rs
diff --git a/crates/plotnik-lib/src/parser/lexer_tests.rs b/crates/plotnik-compiler/src/parser/lexer_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/lexer_tests.rs
rename to crates/plotnik-compiler/src/parser/lexer_tests.rs
diff --git a/crates/plotnik-lib/src/parser/mod.rs b/crates/plotnik-compiler/src/parser/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/mod.rs
rename to crates/plotnik-compiler/src/parser/mod.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/alternations_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/alternations_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/alternations_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/alternations_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/anchors_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/anchors_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/anchors_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/anchors_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/captures_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/captures_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/captures_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/captures_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/definitions_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/definitions_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/definitions_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/definitions_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/fields_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/fields_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/fields_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/fields_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/mod.rs b/crates/plotnik-compiler/src/parser/tests/grammar/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/mod.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/mod.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/nodes_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/nodes_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/nodes_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/nodes_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/quantifiers_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/quantifiers_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/quantifiers_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/quantifiers_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/sequences_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/sequences_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/sequences_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/sequences_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/special_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/special_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/special_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/special_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/grammar/trivia_tests.rs b/crates/plotnik-compiler/src/parser/tests/grammar/trivia_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/grammar/trivia_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/grammar/trivia_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/mod.rs b/crates/plotnik-compiler/src/parser/tests/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/mod.rs
rename to crates/plotnik-compiler/src/parser/tests/mod.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/coverage_tests.rs b/crates/plotnik-compiler/src/parser/tests/recovery/coverage_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/coverage_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/coverage_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/incomplete_tests.rs b/crates/plotnik-compiler/src/parser/tests/recovery/incomplete_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/incomplete_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/incomplete_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/mod.rs b/crates/plotnik-compiler/src/parser/tests/recovery/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/mod.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/mod.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/unclosed_tests.rs b/crates/plotnik-compiler/src/parser/tests/recovery/unclosed_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/unclosed_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/unclosed_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/unexpected_tests.rs b/crates/plotnik-compiler/src/parser/tests/recovery/unexpected_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/unexpected_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/unexpected_tests.rs
diff --git a/crates/plotnik-lib/src/parser/tests/recovery/validation_tests.rs b/crates/plotnik-compiler/src/parser/tests/recovery/validation_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/parser/tests/recovery/validation_tests.rs
rename to crates/plotnik-compiler/src/parser/tests/recovery/validation_tests.rs
diff --git a/crates/plotnik-lib/src/query/dump.rs b/crates/plotnik-compiler/src/query/dump.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/dump.rs
rename to crates/plotnik-compiler/src/query/dump.rs
diff --git a/crates/plotnik-lib/src/query/mod.rs b/crates/plotnik-compiler/src/query/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/mod.rs
rename to crates/plotnik-compiler/src/query/mod.rs
diff --git a/crates/plotnik-lib/src/query/printer.rs b/crates/plotnik-compiler/src/query/printer.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/printer.rs
rename to crates/plotnik-compiler/src/query/printer.rs
diff --git a/crates/plotnik-lib/src/query/printer_tests.rs b/crates/plotnik-compiler/src/query/printer_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/printer_tests.rs
rename to crates/plotnik-compiler/src/query/printer_tests.rs
diff --git a/crates/plotnik-lib/src/query/query_tests.rs b/crates/plotnik-compiler/src/query/query_tests.rs
similarity index 98%
rename from crates/plotnik-lib/src/query/query_tests.rs
rename to crates/plotnik-compiler/src/query/query_tests.rs
index 0cbf193d..13f4d44a 100644
--- a/crates/plotnik-lib/src/query/query_tests.rs
+++ b/crates/plotnik-compiler/src/query/query_tests.rs
@@ -1,6 +1,8 @@
+use plotnik_bytecode::{Module, dump};
+use plotnik_core::Colors;
 use plotnik_langs::{Lang, from_name};
 
-use crate::{SourceMap, bytecode::Module};
+use crate::SourceMap;
 
 use super::{LinkedQuery, QueryAnalyzed, QueryBuilder};
 
@@ -118,7 +120,7 @@ impl QueryAnalyzed {
         }
         let bytecode = query.emit().expect("bytecode emission should succeed");
         let module = Module::load(&bytecode).expect("module loading should succeed");
-        crate::bytecode::dump(&module, crate::Colors::OFF)
+        dump(&module, Colors::OFF)
     }
 
     #[track_caller]
diff --git a/crates/plotnik-lib/src/query/source_map.rs b/crates/plotnik-compiler/src/query/source_map.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/source_map.rs
rename to crates/plotnik-compiler/src/query/source_map.rs
diff --git a/crates/plotnik-lib/src/query/source_map_tests.rs b/crates/plotnik-compiler/src/query/source_map_tests.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/source_map_tests.rs
rename to crates/plotnik-compiler/src/query/source_map_tests.rs
diff --git a/crates/plotnik-lib/src/query/stages.rs b/crates/plotnik-compiler/src/query/stages.rs
similarity index 100%
rename from crates/plotnik-lib/src/query/stages.rs
rename to crates/plotnik-compiler/src/query/stages.rs
diff --git a/crates/plotnik-lib/src/typegen/mod.rs b/crates/plotnik-compiler/src/typegen/mod.rs
similarity index 100%
rename from crates/plotnik-lib/src/typegen/mod.rs
rename to crates/plotnik-compiler/src/typegen/mod.rs
diff --git a/crates/plotnik-lib/src/typegen/typescript/analysis.rs b/crates/plotnik-compiler/src/typegen/typescript/analysis.rs
similarity index 96%
rename from crates/plotnik-lib/src/typegen/typescript/analysis.rs
rename to crates/plotnik-compiler/src/typegen/typescript/analysis.rs
index 83aa16fc..184fc03f 100644
--- a/crates/plotnik-lib/src/typegen/typescript/analysis.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/analysis.rs
@@ -2,7 +2,7 @@
 
 use std::collections::{HashMap, HashSet};
 
-use crate::bytecode::{TypeData, TypeId, TypeKind};
+use plotnik_bytecode::{TypeData, TypeId, TypeKind};
 
 use super::Emitter;
 
@@ -42,7 +42,7 @@ impl Emitter<'_> {
                 let member_types: Vec<_> = self
                     .types
                     .members_of(&type_def)
-                    .map(|m| m.type_id())
+                    .map(|m| m.type_id)
                     .collect();
                 for ty in member_types {
                     self.collect_refs_recursive(ty);
@@ -124,7 +124,7 @@ impl Emitter<'_> {
             } => {
                 out.insert(type_id);
                 for member in self.types.members_of(&type_def) {
-                    self.collect_reachable_types(member.type_id(), out);
+                    self.collect_reachable_types(member.type_id, out);
                 }
             }
             TypeData::Composite {
@@ -133,7 +133,7 @@ impl Emitter<'_> {
             } => {
                 out.insert(type_id);
                 for member in self.types.members_of(&type_def) {
-                    self.collect_enum_variant_refs(member.type_id(), out);
+                    self.collect_enum_variant_refs(member.type_id, out);
                 }
             }
             TypeData::Composite { .. } => {}
@@ -157,7 +157,7 @@ impl Emitter<'_> {
             }
         ) {
             for member in self.types.members_of(&type_def) {
-                self.collect_reachable_types(member.type_id(), out);
+                self.collect_reachable_types(member.type_id, out);
             }
         } else {
             // For non-struct payloads, fall back to regular collection.
@@ -180,7 +180,7 @@ impl Emitter<'_> {
             TypeData::Composite { .. } => self
                 .types
                 .members_of(&type_def)
-                .flat_map(|member| self.unwrap_for_deps(member.type_id()))
+                .flat_map(|member| self.unwrap_for_deps(member.type_id))
                 .collect(),
         }
     }
diff --git a/crates/plotnik-lib/src/typegen/typescript/config.rs b/crates/plotnik-compiler/src/typegen/typescript/config.rs
similarity index 98%
rename from crates/plotnik-lib/src/typegen/typescript/config.rs
rename to crates/plotnik-compiler/src/typegen/typescript/config.rs
index c19241cb..6f171cde 100644
--- a/crates/plotnik-lib/src/typegen/typescript/config.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/config.rs
@@ -1,6 +1,6 @@
 //! Configuration types for TypeScript emission.
 
-use crate::Colors;
+use plotnik_core::Colors;
 
 /// How to represent the void type in TypeScript.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
diff --git a/crates/plotnik-lib/src/typegen/typescript/convert.rs b/crates/plotnik-compiler/src/typegen/typescript/convert.rs
similarity index 95%
rename from crates/plotnik-lib/src/typegen/typescript/convert.rs
rename to crates/plotnik-compiler/src/typegen/typescript/convert.rs
index f6240ec1..92b3751b 100644
--- a/crates/plotnik-lib/src/typegen/typescript/convert.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/convert.rs
@@ -1,6 +1,6 @@
 //! Type to TypeScript string conversion.
 
-use crate::bytecode::{TypeData, TypeDef, TypeId, TypeKind};
+use plotnik_bytecode::{TypeData, TypeDef, TypeId, TypeKind};
 
 use super::Emitter;
 use super::config::VoidType;
@@ -87,8 +87,8 @@ impl Emitter<'_> {
             .types
             .members_of(type_def)
             .map(|member| {
-                let field_name = self.strings.get(member.name()).to_string();
-                let (inner_type, optional) = self.types.unwrap_optional(member.type_id());
+                let field_name = self.strings.get(member.name).to_string();
+                let (inner_type, optional) = self.types.unwrap_optional(member.type_id);
                 (field_name, inner_type, optional)
             })
             .collect();
@@ -123,15 +123,15 @@ impl Emitter<'_> {
             .types
             .members_of(type_def)
             .map(|member| {
-                let name = self.strings.get(member.name());
-                if self.is_void_type(member.type_id()) {
+                let name = self.strings.get(member.name);
+                if self.is_void_type(member.type_id) {
                     // Void payload: omit $data
                     format!(
                         "{}{{{} $tag{}:{} {}\"{}\"{}{}}}{}",
                         c.dim, c.reset, c.dim, c.reset, c.green, name, c.reset, c.dim, c.reset
                     )
                 } else {
-                    let data_type = self.type_to_ts(member.type_id());
+                    let data_type = self.type_to_ts(member.type_id);
                     format!(
                         "{}{{{} $tag{}:{} {}\"{}\"{}{}; $data{}:{} {} {}}}{}",
                         c.dim,
diff --git a/crates/plotnik-lib/src/typegen/typescript/emitter.rs b/crates/plotnik-compiler/src/typegen/typescript/emitter.rs
similarity index 97%
rename from crates/plotnik-lib/src/typegen/typescript/emitter.rs
rename to crates/plotnik-compiler/src/typegen/typescript/emitter.rs
index 5c7491e0..555d50db 100644
--- a/crates/plotnik-lib/src/typegen/typescript/emitter.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/emitter.rs
@@ -3,8 +3,8 @@
 use std::collections::hash_map::Entry;
 use std::collections::{BTreeSet, HashMap, HashSet};
 
-use crate::Colors;
-use crate::bytecode::{EntrypointsView, Module, StringsView, TypeId, TypesView};
+use plotnik_bytecode::{EntrypointsView, Module, StringsView, TypeId, TypesView};
+use plotnik_core::Colors;
 
 use super::Config;
 
diff --git a/crates/plotnik-lib/src/typegen/typescript/mod.rs b/crates/plotnik-compiler/src/typegen/typescript/mod.rs
similarity index 95%
rename from crates/plotnik-lib/src/typegen/typescript/mod.rs
rename to crates/plotnik-compiler/src/typegen/typescript/mod.rs
index 0225ada9..d0ad26fc 100644
--- a/crates/plotnik-lib/src/typegen/typescript/mod.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/mod.rs
@@ -13,7 +13,7 @@ mod render;
 pub use config::{Config, VoidType};
 pub use emitter::Emitter;
 
-use crate::bytecode::Module;
+use plotnik_bytecode::Module;
 
 /// Emit TypeScript from a bytecode module.
 pub fn emit(module: &Module) -> String {
diff --git a/crates/plotnik-lib/src/typegen/typescript/naming.rs b/crates/plotnik-compiler/src/typegen/typescript/naming.rs
similarity index 93%
rename from crates/plotnik-lib/src/typegen/typescript/naming.rs
rename to crates/plotnik-compiler/src/typegen/typescript/naming.rs
index f2908b50..254ffb14 100644
--- a/crates/plotnik-lib/src/typegen/typescript/naming.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/naming.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use plotnik_core::utils::to_pascal_case;
 
-use crate::bytecode::{TypeData, TypeId, TypeKind};
+use plotnik_bytecode::{TypeData, TypeId, TypeKind};
 
 use super::Emitter;
 
@@ -21,7 +21,7 @@ impl Emitter<'_> {
 
         for i in 0..self.entrypoints.len() {
             let ep = self.entrypoints.get(i);
-            let def_name = self.strings.get(ep.name());
+            let def_name = self.strings.get(ep.name);
             self.collect_naming_contexts(
                 ep.result_type(),
                 &NamingContext {
@@ -82,8 +82,8 @@ impl Emitter<'_> {
             } => {
                 contexts.entry(type_id).or_insert_with(|| ctx.clone());
                 for member in self.types.members_of(&type_def) {
-                    let field_name = self.strings.get(member.name());
-                    let (inner_type, _) = self.types.unwrap_optional(member.type_id());
+                    let field_name = self.strings.get(member.name);
+                    let (inner_type, _) = self.types.unwrap_optional(member.type_id);
                     let field_ctx = NamingContext {
                         def_name: ctx.def_name.clone(),
                         field_name: Some(field_name.to_string()),
@@ -101,7 +101,7 @@ impl Emitter<'_> {
         }
     }
 
-    pub(super) fn needs_generated_name(&self, type_def: &crate::bytecode::TypeDef) -> bool {
+    pub(super) fn needs_generated_name(&self, type_def: &plotnik_bytecode::TypeDef) -> bool {
         matches!(
             type_def.classify(),
             TypeData::Composite {
@@ -120,7 +120,7 @@ impl Emitter<'_> {
         self.unique_name(&base)
     }
 
-    pub(super) fn generate_fallback_name(&mut self, type_def: &crate::bytecode::TypeDef) -> String {
+    pub(super) fn generate_fallback_name(&mut self, type_def: &plotnik_bytecode::TypeDef) -> String {
         let base = match type_def.classify() {
             TypeData::Composite {
                 kind: TypeKind::Struct,
diff --git a/crates/plotnik-lib/src/typegen/typescript/render.rs b/crates/plotnik-compiler/src/typegen/typescript/render.rs
similarity index 94%
rename from crates/plotnik-lib/src/typegen/typescript/render.rs
rename to crates/plotnik-compiler/src/typegen/typescript/render.rs
index 570fa07b..2ba3f8cc 100644
--- a/crates/plotnik-lib/src/typegen/typescript/render.rs
+++ b/crates/plotnik-compiler/src/typegen/typescript/render.rs
@@ -2,7 +2,7 @@
 
 use plotnik_core::utils::to_pascal_case;
 
-use crate::bytecode::{TypeData, TypeDef, TypeId, TypeKind};
+use plotnik_bytecode::{TypeData, TypeDef, TypeId, TypeKind};
 
 use super::Emitter;
 
@@ -11,16 +11,16 @@ impl Emitter<'_> {
         // Reserve entrypoint names to avoid collisions
         for i in 0..self.entrypoints.len() {
             let ep = self.entrypoints.get(i);
-            let name = self.strings.get(ep.name());
+            let name = self.strings.get(ep.name);
             self.used_names.insert(to_pascal_case(name));
         }
 
         // Assign names to named types from TypeNames section
         for i in 0..self.types.names_count() {
             let type_name = self.types.get_name(i);
-            let name = self.strings.get(type_name.name());
+            let name = self.strings.get(type_name.name);
             self.type_names
-                .insert(type_name.type_id(), to_pascal_case(name));
+                .insert(type_name.type_id, to_pascal_case(name));
         }
 
         // Assign names to struct/enum types that need them but don't have names
@@ -143,8 +143,8 @@ impl Emitter<'_> {
             .types
             .members_of(type_def)
             .map(|member| {
-                let field_name = self.strings.get(member.name()).to_string();
-                let (inner_type, optional) = self.types.unwrap_optional(member.type_id());
+                let field_name = self.strings.get(member.name).to_string();
+                let (inner_type, optional) = self.types.unwrap_optional(member.type_id);
                 (field_name, inner_type, optional)
             })
             .collect();
@@ -167,11 +167,11 @@ impl Emitter<'_> {
         let mut variant_types = Vec::new();
 
         for member in self.types.members_of(type_def) {
-            let variant_name = self.strings.get(member.name());
+            let variant_name = self.strings.get(member.name);
             let variant_type_name = format!("{}{}", name, to_pascal_case(variant_name));
             variant_types.push(variant_type_name.clone());
 
-            let is_void = self.is_void_type(member.type_id());
+            let is_void = self.is_void_type(member.type_id);
 
             // Header: export interface NameVariant {
             if self.config.export {
@@ -189,7 +189,7 @@ impl Emitter<'_> {
             ));
             // $data field (omit for Void payloads)
             if !is_void {
-                let data_str = self.inline_data_type(member.type_id());
+                let data_str = self.inline_data_type(member.type_id);
                 self.output.push_str(&format!(
                     "  $data{}:{} {}{};\n",
                     c.dim, c.reset, data_str, c.dim
diff --git a/crates/plotnik-lib/src/colors.rs b/crates/plotnik-core/src/colors.rs
similarity index 100%
rename from crates/plotnik-lib/src/colors.rs
rename to crates/plotnik-core/src/colors.rs
diff --git a/crates/plotnik-core/src/lib.rs b/crates/plotnik-core/src/lib.rs
index f1ac8433..e1ee778f 100644
--- a/crates/plotnik-core/src/lib.rs
+++ b/crates/plotnik-core/src/lib.rs
@@ -13,6 +13,7 @@
 use std::collections::HashMap;
 use std::num::NonZeroU16;
 
+pub mod colors;
 pub mod grammar;
 mod interner;
 mod invariants;
@@ -25,6 +26,7 @@ mod lib_tests;
 #[cfg(test)]
 mod utils_tests;
 
+pub use colors::Colors;
 pub use interner::{Interner, Symbol};
 
 /// Raw node definition from `node-types.json`.
diff --git a/crates/plotnik-lib/Cargo.toml b/crates/plotnik-lib/Cargo.toml
index 5731e10f..d5ce4f1c 100644
--- a/crates/plotnik-lib/Cargo.toml
+++ b/crates/plotnik-lib/Cargo.toml
@@ -14,19 +14,13 @@ categories = ["parsing", "development-tools"]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
 
 [dependencies]
-annotate-snippets = "0.12.9"
-logos = "0.16.0"
-indexmap = "2"
-rowan = "0.16.1"
-serde = { version = "1.0.228", features = ["derive"] }
-thiserror = "2.0.17"
-arborium-tree-sitter = "2.10.0"
-crc32fast = "1.4"
-memmap2 = "0.9"
+plotnik-bytecode.workspace = true
+plotnik-compiler.workspace = true
 plotnik-core.workspace = true
+plotnik-vm.workspace = true
 plotnik-langs = { workspace = true, optional = true }
-regex-automata = { version = "0.4", features = ["dfa-build", "dfa-search"] }
-regex-syntax = "0.8"
+arborium-tree-sitter = "2.10.0"
+serde = { version = "1.0", features = ["derive"] }
 
 [features]
 default = ["plotnik-langs"]
diff --git a/crates/plotnik-lib/src/bytecode/instructions_tests.rs b/crates/plotnik-lib/src/bytecode/instructions_tests.rs
deleted file mode 100644
index d9c0fa4e..00000000
--- a/crates/plotnik-lib/src/bytecode/instructions_tests.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-//! Tests for bytecode instructions.
-
-use std::collections::BTreeMap;
-use std::num::NonZeroU16;
-
-use super::effects::EffectOpcode;
-use super::instructions::{
-    Call, Match, Opcode, Return, StepId, align_to_section, select_match_opcode,
-};
-use super::ir::{EffectIR, Label, MatchIR, NodeTypeIR};
-use super::nav::Nav;
-
-#[test]
-fn opcode_sizes() {
-    assert_eq!(Opcode::Match8.size(), 8);
-    assert_eq!(Opcode::Match16.size(), 16);
-    assert_eq!(Opcode::Match24.size(), 24);
-    assert_eq!(Opcode::Match32.size(), 32);
-    assert_eq!(Opcode::Match48.size(), 48);
-    assert_eq!(Opcode::Match64.size(), 64);
-    assert_eq!(Opcode::Call.size(), 8);
-    assert_eq!(Opcode::Return.size(), 8);
-}
-
-#[test]
-fn opcode_step_counts() {
-    assert_eq!(Opcode::Match8.step_count(), 1);
-    assert_eq!(Opcode::Match16.step_count(), 2);
-    assert_eq!(Opcode::Match32.step_count(), 4);
-    assert_eq!(Opcode::Match64.step_count(), 8);
-}
-
-#[test]
-fn opcode_payload_slots() {
-    assert_eq!(Opcode::Match8.payload_slots(), 0);
-    assert_eq!(Opcode::Match16.payload_slots(), 4);
-    assert_eq!(Opcode::Match24.payload_slots(), 8);
-    assert_eq!(Opcode::Match32.payload_slots(), 12);
-    assert_eq!(Opcode::Match48.payload_slots(), 20);
-    assert_eq!(Opcode::Match64.payload_slots(), 28);
-}
-
-#[test]
-fn select_match_opcode_picks_smallest() {
-    assert_eq!(select_match_opcode(0), Some(Opcode::Match8));
-    assert_eq!(select_match_opcode(1), Some(Opcode::Match16));
-    assert_eq!(select_match_opcode(4), Some(Opcode::Match16));
-    assert_eq!(select_match_opcode(5), Some(Opcode::Match24));
-    assert_eq!(select_match_opcode(12), Some(Opcode::Match32));
-    assert_eq!(select_match_opcode(20), Some(Opcode::Match48));
-    assert_eq!(select_match_opcode(28), Some(Opcode::Match64));
-    assert_eq!(select_match_opcode(29), None);
-}
-
-#[test]
-fn align_to_section_works() {
-    assert_eq!(align_to_section(0), 0);
-    assert_eq!(align_to_section(1), 64);
-    assert_eq!(align_to_section(64), 64);
-    assert_eq!(align_to_section(65), 128);
-    assert_eq!(align_to_section(100), 128);
-}
-
-#[test]
-fn call_roundtrip() {
-    let c = Call::new(
-        Nav::Down,
-        NonZeroU16::new(42),
-        StepId::new(100),
-        StepId::new(500),
-    );
-
-    let bytes = c.to_bytes();
-    let decoded = Call::from_bytes(bytes);
-    assert_eq!(decoded, c);
-}
-
-#[test]
-fn return_roundtrip() {
-    let r = Return::new();
-
-    let bytes = r.to_bytes();
-    let decoded = Return::from_bytes(bytes);
-    assert_eq!(decoded, r);
-}
-
-fn label_map(pairs: &[(u32, u16)]) -> BTreeMap<Label, u16> {
-    pairs.iter().map(|&(l, s)| (Label(l), s)).collect()
-}
-
-#[test]
-fn match_basic() {
-    let map = label_map(&[(0, 1), (1, 10)]);
-
-    let bytes = MatchIR::at(Label(0))
-        .nav(Nav::Down)
-        .node_type(NodeTypeIR::Named(NonZeroU16::new(42)))
-        .node_field(NonZeroU16::new(7))
-        .next(Label(1))
-        .resolve(&map, |_, _| None, |_| None, |_| None);
-
-    assert_eq!(bytes.len(), 8);
-
-    let m = Match::from_bytes(&bytes);
-    assert_eq!(m.nav, Nav::Down);
-    assert_eq!(m.node_type, NodeTypeIR::Named(NonZeroU16::new(42)));
-    assert_eq!(m.node_field, NonZeroU16::new(7));
-    assert!(!m.is_terminal());
-    assert!(!m.is_epsilon());
-    assert_eq!(m.succ_count(), 1);
-    assert_eq!(m.successor(0), StepId::new(10));
-    assert_eq!(m.pre_effects().count(), 0);
-    assert_eq!(m.neg_fields().count(), 0);
-    assert_eq!(m.post_effects().count(), 0);
-}
-
-#[test]
-fn match_terminal() {
-    let map = label_map(&[(0, 1)]);
-
-    let bytes = MatchIR::terminal(Label(0)).resolve(&map, |_, _| None, |_| None, |_| None);
-
-    assert_eq!(bytes.len(), 8);
-
-    let m = Match::from_bytes(&bytes);
-    assert!(m.is_terminal());
-    assert!(m.is_epsilon());
-    assert_eq!(m.succ_count(), 0);
-}
-
-#[test]
-fn match_extended() {
-    let map = label_map(&[(0, 1), (1, 20), (2, 30)]);
-
-    let bytes = MatchIR::at(Label(0))
-        .nav(Nav::Next)
-        .node_type(NodeTypeIR::Named(NonZeroU16::new(100)))
-        .pre_effect(EffectIR::start_obj())
-        .neg_field(5)
-        .neg_field(6)
-        .post_effect(EffectIR::node())
-        .post_effect(EffectIR::with_member(
-            EffectOpcode::Set,
-            super::ir::MemberRef::absolute(42),
-        ))
-        .next_many(vec![Label(1), Label(2)])
-        .resolve(&map, |_, _| None, |_| None, |_| None);
-
-    // 1 pre + 2 neg + 2 post + 2 succ = 7 slots → Match24 (8 slots capacity)
-    assert_eq!(bytes.len(), 24);
-
-    let m = Match::from_bytes(&bytes);
-    assert_eq!(m.nav, Nav::Next);
-    assert_eq!(m.node_type, NodeTypeIR::Named(NonZeroU16::new(100)));
-    assert!(!m.is_terminal());
-
-    let pre: Vec<_> = m.pre_effects().collect();
-    assert_eq!(pre.len(), 1);
-    assert_eq!(pre[0].opcode, EffectOpcode::Obj);
-
-    let neg: Vec<_> = m.neg_fields().collect();
-    assert_eq!(neg, vec![5, 6]);
-
-    let post: Vec<_> = m.post_effects().collect();
-    assert_eq!(post.len(), 2);
-    assert_eq!(post[0].opcode, EffectOpcode::Node);
-    assert_eq!(post[1].opcode, EffectOpcode::Set);
-    assert_eq!(post[1].payload, 42);
-
-    assert_eq!(m.succ_count(), 2);
-    assert_eq!(m.successor(0), StepId::new(20));
-    assert_eq!(m.successor(1), StepId::new(30));
-    let succs: Vec<_> = m.successors().collect();
-    assert_eq!(succs, vec![StepId::new(20), StepId::new(30)]);
-}
diff --git a/crates/plotnik-lib/src/bytecode/module_tests.rs b/crates/plotnik-lib/src/bytecode/module_tests.rs
deleted file mode 100644
index e97a48e1..00000000
--- a/crates/plotnik-lib/src/bytecode/module_tests.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-//! Tests for the bytecode module.
-
-use indoc::indoc;
-
-use crate::Query;
-use crate::bytecode::{Module, ModuleError};
-
-#[test]
-fn module_from_bytes_valid() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    assert!(module.header().validate_magic());
-    assert!(module.header().validate_version());
-}
-
-#[test]
-fn module_from_bytes_too_small() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let truncated = bytes[..32].to_vec();
-
-    let err = Module::load(&truncated).unwrap_err();
-    assert!(matches!(err, ModuleError::FileTooSmall(32)));
-}
-
-#[test]
-fn module_from_bytes_invalid_magic() {
-    let input = "Test = (identifier) @id";
-
-    let mut bytes = Query::expect_valid_bytes(input);
-    bytes[0] = b'X'; // Corrupt magic
-
-    let err = Module::load(&bytes).unwrap_err();
-    assert!(matches!(err, ModuleError::InvalidMagic));
-}
-
-#[test]
-fn module_from_bytes_wrong_version() {
-    let input = "Test = (identifier) @id";
-
-    let mut bytes = Query::expect_valid_bytes(input);
-    bytes[4..8].copy_from_slice(&999u32.to_le_bytes()); // Wrong version
-
-    let err = Module::load(&bytes).unwrap_err();
-    assert!(matches!(err, ModuleError::UnsupportedVersion(999)));
-}
-
-#[test]
-fn module_from_bytes_size_mismatch() {
-    let input = "Test = (identifier) @id";
-
-    let mut bytes = Query::expect_valid_bytes(input);
-    let actual_size = bytes.len() as u32;
-    bytes[12..16].copy_from_slice(&(actual_size + 100).to_le_bytes()); // Wrong total_size
-
-    let err = Module::load(&bytes).unwrap_err();
-    assert!(matches!(
-        err,
-        ModuleError::SizeMismatch {
-            header: h,
-            actual: a
-        } if h == actual_size + 100 && a == actual_size as usize
-    ));
-}
-
-#[test]
-fn module_strings_view() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let strings = module.strings();
-    // String 0 is the easter egg (accessed via raw index, not StringId)
-    assert_eq!(strings.get_by_index(0), "Beauty will save the world");
-    // Other strings include "id", "Test", "identifier"
-    assert!(module.header().str_table_count >= 3);
-}
-
-#[test]
-fn module_node_types_view() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let node_types = module.node_types();
-    assert!(!node_types.is_empty());
-    // Should have "identifier" node type
-    let has_identifier = (0..node_types.len()).any(|i| {
-        let sym = node_types.get(i);
-        module.strings().get(sym.name) == "identifier"
-    });
-    assert!(has_identifier);
-}
-
-#[test]
-fn module_node_fields_view() {
-    let input = "Test = (function_declaration name: (identifier) @name)";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let fields = module.node_fields();
-    assert!(!fields.is_empty());
-    // Should have "name" field
-    let has_name = (0..fields.len()).any(|i| {
-        let sym = fields.get(i);
-        module.strings().get(sym.name) == "name"
-    });
-    assert!(has_name);
-}
-
-#[test]
-fn module_types_view() {
-    let input = indoc! {r#"
-        Test = (function_declaration
-            name: (identifier) @name
-            body: (_) @body)
-    "#};
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let types = module.types();
-    // Should have custom types (struct with fields)
-    assert!(types.defs_count() >= 1);
-    assert!(types.members_count() >= 2); // name and body fields
-}
-
-#[test]
-fn module_entrypoints_view() {
-    let input = indoc! {r#"
-        Foo = (identifier) @id
-        Bar = (string) @str
-    "#};
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let entrypoints = module.entrypoints();
-    assert_eq!(entrypoints.len(), 2);
-    assert!(!entrypoints.is_empty());
-
-    // Should be able to find by name
-    let strings = module.strings();
-    let foo = entrypoints.find_by_name("Foo", &strings);
-    let bar = entrypoints.find_by_name("Bar", &strings);
-    assert!(foo.is_some());
-    assert!(bar.is_some());
-}
-
-#[test]
-fn module_decode_step() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    let instr = module.decode_step(0);
-    assert!(matches!(instr, crate::bytecode::Instruction::Match(_)));
-}
-
-#[test]
-fn module_from_path_mmap() {
-    use std::io::Write;
-
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-
-    // Write to temp file
-    let mut tmpfile = tempfile::NamedTempFile::new().unwrap();
-    tmpfile.write_all(&bytes).unwrap();
-    tmpfile.flush().unwrap();
-
-    // Load via mmap
-    let module = Module::from_path(tmpfile.path()).unwrap();
-
-    assert!(module.header().validate_magic());
-
-    let instr = module.decode_step(0);
-    assert!(matches!(instr, crate::bytecode::Instruction::Match(_)));
-
-    // Verify string lookup works through mmap
-    let strings = module.strings();
-    assert_eq!(strings.get_by_index(0), "Beauty will save the world");
-}
-
-#[test]
-fn byte_storage_copy_from_slice() {
-    use crate::bytecode::ByteStorage;
-
-    let data = [1u8, 2, 3, 4, 5];
-    let storage = ByteStorage::copy_from_slice(&data);
-
-    assert_eq!(&*storage, &data[..]);
-    assert_eq!(storage.len(), 5);
-    assert_eq!(storage[2], 3);
-}
-
-#[test]
-fn byte_storage_from_aligned() {
-    use crate::bytecode::{AlignedVec, ByteStorage};
-
-    let vec = AlignedVec::copy_from_slice(&[1, 2, 3, 4, 5]);
-    let storage = ByteStorage::from_aligned(vec);
-
-    assert_eq!(&*storage, &[1, 2, 3, 4, 5]);
-    assert_eq!(storage.len(), 5);
-}
-
-#[test]
-fn module_load() {
-    let input = "Test = (identifier) @id";
-
-    let bytes = Query::expect_valid_bytes(input);
-    let module = Module::load(&bytes).unwrap();
-
-    assert!(module.header().validate_magic());
-    assert!(module.header().validate_version());
-
-    let strings = module.strings();
-    assert_eq!(strings.get_by_index(0), "Beauty will save the world");
-}
diff --git a/crates/plotnik-lib/src/bytecode/snapshots/plotnik_lib__bytecode__dump_tests__dump_comprehensive.snap b/crates/plotnik-lib/src/bytecode/snapshots/plotnik_lib__bytecode__dump_tests__dump_comprehensive.snap
deleted file mode 100644
index 4afc7c37..00000000
--- a/crates/plotnik-lib/src/bytecode/snapshots/plotnik_lib__bytecode__dump_tests__dump_comprehensive.snap
+++ /dev/null
@@ -1,79 +0,0 @@
----
-source: crates/plotnik-lib/src/bytecode/dump_tests.rs
-expression: res
----
-[header]
-linked = true
-
-[strings]
-S00 "Beauty will save the world"
-S01 "name"
-S02 "value"
-S03 "Literal"
-S04 "Variable"
-S05 "target"
-S06 "Ident"
-S07 "Expression"
-S08 "Assignment"
-S09 "identifier"
-S10 "number"
-S11 "assignment_expression"
-S12 "left"
-S13 "right"
-
-[types.defs]
-T00 = void
-T01 = Node
-T02 = str
-T03 = Struct(M0, 1)  ; { name }
-T04 = Struct(M1, 1)  ; { value }
-T05 = Struct(M2, 1)  ; { name }
-T06 = Enum(M3, 2)  ; Literal | Variable
-T07 = Struct(M5, 2)  ; { value, target }
-
-[types.members]
-M0 = (S01, T02)  ; name: str
-M1 = (S02, T01)  ; value: Node
-M2 = (S01, T01)  ; name: Node
-M3 = (S03, T04)  ; Literal: T04
-M4 = (S04, T05)  ; Variable: T05
-M5 = (S02, T06)  ; value: Expression
-M6 = (S05, T01)  ; target: Node
-
-[types.names]
-N0 = (S06, T03)  ; Ident
-N1 = (S07, T06)  ; Expression
-N2 = (S08, T07)  ; Assignment
-
-[entry]
-Assignment = 08 :: T07
-Expression = 05 :: T06
-Ident      = 01 :: T03
-
-[code]
-  00  𝜀                                     ◼
-
-Ident:
-  01  𝜀                                     02
-  02       (identifier) [Text Set(M0)]      04
-  04                                        ▶
-
-Expression:
-  05  𝜀                                     06
-  06  𝜀                                     22, 28
-
-Assignment:
-  08  𝜀                                     09
-  09       (assignment_expression)          10
-  10  ↓*   left: (identifier) [Node Set(M6)]12
-  12  *  ▶ right: (Expression)              13
-  13  𝜀    [Set(M5)]                        15
-  15 *↑¹                                    16
-  16                                        ▶
-  17                                        ▶
-  18  𝜀    [EndEnum]                        17
-  20       (number) [Node Set(M1)]          18
-  22  𝜀    [Enum(M3)]                       20
-  24  𝜀    [EndEnum]                        17
-  26       (identifier) [Node Set(M2)]      24
-  28  𝜀    [Enum(M4)]                       26
diff --git a/crates/plotnik-lib/src/engine/engine_tests.rs b/crates/plotnik-lib/src/engine/engine_tests.rs
deleted file mode 100644
index 0087b6f6..00000000
--- a/crates/plotnik-lib/src/engine/engine_tests.rs
+++ /dev/null
@@ -1,714 +0,0 @@
-//! VM execution tests with snapshot-based verification.
-//!
-//! Tests are organized by feature and use file-based snapshots.
-//! Each test captures query, source, and JSON output.
-
-use indoc::indoc;
-
-use crate::QueryBuilder;
-use crate::bytecode::Module;
-use crate::emit::emit;
-
-use super::{Materializer, VM, ValueMaterializer};
-
-/// Execute a query against source code and return the JSON output.
-fn execute(query: &str, source: &str) -> String {
-    execute_with_entry(query, source, None)
-}
-
-/// Execute a query against source code with a specific entrypoint.
-fn execute_with_entry(query: &str, source: &str, entry: Option<&str>) -> String {
-    let lang = plotnik_langs::javascript();
-
-    let query_obj = QueryBuilder::one_liner(query)
-        .parse()
-        .expect("parse failed")
-        .analyze()
-        .link(&lang);
-
-    assert!(query_obj.is_valid(), "query should be valid");
-
-    let bytecode = emit(&query_obj).expect("emit failed");
-    let module = Module::load(&bytecode).expect("decode failed");
-
-    let tree = lang.parse(source);
-    let trivia = build_trivia_types(&module);
-    let vm = VM::builder(source, &tree).trivia_types(trivia).build();
-
-    let entrypoint = resolve_entrypoint(&module, entry);
-    let effects = vm
-        .execute(&module, 0, &entrypoint)
-        .expect("execution failed");
-
-    let materializer = ValueMaterializer::new(source, module.types(), module.strings());
-    let value = materializer.materialize(effects.as_slice(), entrypoint.result_type);
-
-    serde_json::to_string_pretty(&value).expect("json serialization failed")
-}
-
-/// Build list of trivia node type IDs from module metadata.
-fn build_trivia_types(module: &Module) -> Vec<u16> {
-    let node_types = module.node_types();
-    let strings = module.strings();
-    let mut trivia = Vec::new();
-    for i in 0..node_types.len() {
-        let t = node_types.get(i);
-        let name = strings.get(t.name);
-        if name == "comment" {
-            trivia.push(t.id);
-        }
-    }
-    trivia
-}
-
-/// Resolve entrypoint by name or use the default.
-fn resolve_entrypoint(module: &Module, name: Option<&str>) -> crate::bytecode::Entrypoint {
-    let entrypoints = module.entrypoints();
-    let strings = module.strings();
-
-    if let Some(name) = name {
-        for i in 0..entrypoints.len() {
-            let e = entrypoints.get(i);
-            if strings.get(e.name) == name {
-                return e;
-            }
-        }
-        panic!("entrypoint not found: {}", name);
-    }
-
-    // Default: first entrypoint
-    entrypoints.get(0)
-}
-
-macro_rules! snap {
-    ($query:expr, $source:expr) => {{
-        let query = $query.trim();
-        let source = $source.trim();
-        let output = execute(query, source);
-        insta::with_settings!({
-            omit_expression => true
-        }, {
-            insta::assert_snapshot!(format!("{query}\n---\n{source}\n---\n{output}"));
-        });
-    }};
-    ($query:expr, $source:expr, entry: $entry:expr) => {{
-        let query = $query.trim();
-        let source = $source.trim();
-        let output = execute_with_entry(query, source, Some($entry));
-        insta::with_settings!({
-            omit_expression => true
-        }, {
-            insta::assert_snapshot!(format!("{query}\n---\n{source}\n---\n{output}"));
-        });
-    }};
-}
-
-// Simple captures
-
-#[test]
-fn capture_single() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name)))",
-        "let x = 1"
-    );
-}
-
-#[test]
-fn capture_multiple() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name value: (number) @value)))",
-        "let x = 42"
-    );
-}
-
-#[test]
-fn capture_string_annotation() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name :: string)))",
-        "let myVar = 1"
-    );
-}
-
-// Quantifiers
-
-#[test]
-fn quantifier_star() {
-    snap!(
-        "Q = (program (expression_statement (array (number)* @nums)))",
-        "[1, 2, 3]"
-    );
-}
-
-#[test]
-fn quantifier_plus() {
-    snap!(
-        "Q = (program (expression_statement (array (number)+ @nums)))",
-        "[1, 2, 3]"
-    );
-}
-
-#[test]
-fn quantifier_optional_present() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name value: (number)? @value)))",
-        "let x = 42"
-    );
-}
-
-#[test]
-fn quantifier_optional_absent() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name value: (number)? @value)))",
-        "let x"
-    );
-}
-
-#[test]
-fn quantifier_nongreedy_star() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator)*? @decls))",
-        "let a, b"
-    );
-}
-
-#[test]
-fn quantifier_struct_array() {
-    snap!(
-        "Q = (program (lexical_declaration {(variable_declarator name: (identifier) @name) @decl}* @decls))",
-        "let a, b, c"
-    );
-}
-
-/// Regression: string annotation on array capture should extract text.
-/// `(identifier)* @names :: string` should produce string[], not Node[].
-#[test]
-fn quantifier_star_with_string_annotation() {
-    snap!(
-        "Q = (program (expression_statement (array (identifier)* @names :: string)))",
-        "[a, b, c]"
-    );
-}
-
-/// Regression: string annotation on non-empty array capture.
-/// `(identifier)+ @names :: string` should produce [string, ...string[]].
-#[test]
-fn quantifier_plus_with_string_annotation() {
-    snap!(
-        "Q = (program (expression_statement (array (identifier)+ @names :: string)))",
-        "[a, b, c]"
-    );
-}
-
-// Alternations
-
-#[test]
-fn alternation_tagged_num() {
-    snap!(
-        indoc! {r#"
-            Value = [Ident: (identifier) @name  Num: (number) @val]
-            Q = (program (lexical_declaration (variable_declarator value: (Value) @value)))
-        "#},
-        "let x = 42",
-        entry: "Q"
-    );
-}
-
-#[test]
-fn alternation_tagged_ident() {
-    snap!(
-        indoc! {r#"
-            Value = [Ident: (identifier) @name  Num: (number) @val]
-            Q = (program (lexical_declaration (variable_declarator value: (Value) @value)))
-        "#},
-        "let x = y",
-        entry: "Q"
-    );
-}
-
-/// Regression: tagged alternation with named definition reference.
-/// When a definition is parsed before the alternation, Symbol interning order
-/// differs from AST branch order. The variant index must use BTreeMap order
-/// (by Symbol), not AST iteration order.
-#[test]
-fn alternation_tagged_definition_ref_backtrack() {
-    snap!(
-        indoc! {r#"
-            Block = (call_expression function: (identifier) @name)
-            Statement = [Assign: (assignment_expression) @a  Block: (Block) @b]
-            Q = (program (expression_statement (Statement) @stmt))
-        "#},
-        "foo()",
-        entry: "Q"
-    );
-}
-
-#[test]
-fn alternation_merge_num() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator value: [(identifier) @ident (number) @num])))",
-        "let x = 42"
-    );
-}
-
-#[test]
-fn alternation_merge_ident() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator value: [(identifier) @ident (number) @num])))",
-        "let x = y"
-    );
-}
-
-// Recursion
-
-#[test]
-fn recursion_member_chain() {
-    snap!(
-        indoc! {r#"
-            Chain = [Base: (identifier) @name  Access: (member_expression object: (Chain) @base property: (property_identifier) @prop)]
-            Q = (program (expression_statement (Chain) @chain))
-        "#},
-        "a.b.c",
-        entry: "Q"
-    );
-}
-
-#[test]
-fn recursion_nested_calls() {
-    snap!(
-        indoc! {r#"
-            Main = (program (expression_statement (Call)))
-            Call = (call_expression function: (identifier) @name arguments: (arguments (Call)? @inner))
-        "#},
-        "foo(bar())",
-        entry: "Main"
-    );
-}
-
-// Anchors
-
-#[test]
-fn anchor_first_child() {
-    snap!(
-        "Q = (program (lexical_declaration . (variable_declarator) @first))",
-        "let a, b, c"
-    );
-}
-
-#[test]
-fn anchor_adjacency() {
-    snap!(
-        "Q = (program (lexical_declaration {(variable_declarator) @first . (variable_declarator) @second}))",
-        "let a, b, c"
-    );
-}
-
-/// Trailing anchor requires backtracking when first match isn't last.
-/// The skip-retry pattern retries with next sibling until finding the last one.
-#[test]
-fn anchor_last_child() {
-    snap!(
-        "Q = (program (function_declaration) @last .)",
-        "function first() {} function second() {}"
-    );
-}
-
-/// Trailing anchor with only one sibling - trivial case.
-#[test]
-fn anchor_last_child_single() {
-    snap!(
-        "Q = (program (function_declaration) @only .)",
-        "function only() {}"
-    );
-}
-
-/// Trailing anchor skips trivia (comments) when checking last position.
-#[test]
-fn anchor_last_child_with_trivia() {
-    snap!(
-        "Q = (program (function_declaration) @last .)",
-        "function first() {} function second() {} /* trailing comment */"
-    );
-}
-
-/// Multi-item sequence with trailing anchor.
-/// Should find (b, c) not (a, b) because c must be last.
-#[test]
-fn anchor_last_child_multi_item() {
-    snap!(
-        "Q = (program {(function_declaration) @a (function_declaration) @b .})",
-        "function a() {} function b() {} function c() {}"
-    );
-}
-
-// Fields
-
-#[test]
-fn field_negated_absent() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @name !value)))",
-        "let x"
-    );
-}
-
-// Search behavior
-
-#[test]
-fn search_skip_siblings() {
-    snap!(
-        "Q = (program (statement_block (return_statement) @ret))",
-        "{ foo(); bar(); return 1; }"
-    );
-}
-
-// Regression tests
-
-/// BUG #1: Scalar node arrays produced null values.
-/// The issue was that `(identifier)* @args` captured an array of nulls instead
-/// of actual node values because [Node, Push] effects were missing.
-#[test]
-fn regression_scalar_array_captures_nodes() {
-    snap!(
-        indoc! {r#"
-            Q = (program (expression_statement (call_expression
-                function: (identifier) @fn
-                arguments: (arguments (identifier)* @args))))
-        "#},
-        "foo(a, b, c)"
-    );
-}
-
-/// BUG #2: Tagged alternations panicked with "type member index out of bounds".
-/// The issue was that enum types from tagged alternations weren't being collected
-/// for bytecode emission when inside named nodes that don't propagate TypeFlow::Scalar.
-#[test]
-fn regression_tagged_alternation_materializes() {
-    snap!(
-        indoc! {r#"
-            Q = (program (expression_statement [
-                Ident: (identifier) @x
-                Num: (number) @y
-            ]))
-        "#},
-        "42"
-    );
-}
-
-/// BUG #3: Recursive patterns produced invalid JSON with duplicate keys.
-/// The issue was that Call/Return didn't create proper Obj/EndObj scopes, so
-/// recursive calls would flatten their captures into the same scope as the caller.
-#[test]
-fn regression_recursive_captures_nest_properly() {
-    snap!(
-        indoc! {r#"
-            Main = (program (expression_statement (Call)))
-            Call = (call_expression
-                function: (identifier) @name
-                arguments: (arguments (Call)? @inner))
-        "#},
-        "foo(bar())",
-        entry: "Main"
-    );
-}
-
-/// BUG #4: Call instructions didn't search for field constraints.
-/// When a Call instruction has navigation with a field constraint, it should
-/// continue searching (according to skip policy) until finding a node with the
-/// required field, not immediately backtrack on the first mismatch.
-#[test]
-fn regression_call_searches_for_field_constraint() {
-    snap!(
-        indoc! {r#"
-            Expr = [Lit: (number) @val  Binary: (binary_expression left: (Expr) @left right: (Expr) @right)]
-            Q = (program (expression_statement (Expr) @expr))
-        "#},
-        "1 + 2",
-        entry: "Q"
-    );
-}
-
-/// BUG #5: Named definitions didn't search among siblings like inline patterns.
-/// When using a named definition like `(GString)` inside a parent pattern, it
-/// should search among siblings the same way an inline pattern like `(string)`
-/// would. This is the "safe refactoring" promise: extracting a pattern to a
-/// named definition should not change matching behavior.
-#[test]
-fn regression_call_searches_among_siblings() {
-    snap!(
-        indoc! {r#"
-            Num = (number) @n
-            Q = (program (expression_statement (array (Num) @num)))
-        "#},
-        "[1, 2, 3]",
-        entry: "Q"
-    );
-}
-
-/// BUG #6: Tagged alternation used wrong $tag when branches reference named definitions.
-/// The issue was that enum members are emitted in BTreeMap (Symbol interning) order,
-/// but the compiler used AST branch order for member indices. When a definition name
-/// (e.g., "Second") is interned before a branch label (e.g., "First"), the indices mismatch.
-#[test]
-fn regression_enum_tag_with_definition_refs() {
-    // "Second" is interned as a definition name before "First" is seen as a branch label.
-    // This caused the First branch to incorrectly get tagged as "Second".
-    snap!(
-        indoc! {r#"
-            Second = (binary_expression left: (number) @left right: (number) @right)
-            Q = (program (expression_statement [First: (number) @num  Second: (Second) @bin]))
-        "#},
-        "42",
-        entry: "Q"
-    );
-}
-
-// Suppressive captures
-
-/// Suppressive capture (@_) matches structurally but doesn't produce output.
-#[test]
-fn suppressive_capture_anonymous() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @_)))",
-        "let x = 1"
-    );
-}
-
-/// Named suppressive capture (@_name) also suppresses output.
-#[test]
-fn suppressive_capture_named() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @_name value: (number) @value)))",
-        "let x = 42"
-    );
-}
-
-/// Suppressive capture with sibling regular capture - only regular capture appears.
-#[test]
-fn suppressive_capture_with_regular_sibling() {
-    snap!(
-        "Q = (program (lexical_declaration (variable_declarator name: (identifier) @_ value: (number) @value)))",
-        "let x = 42"
-    );
-}
-
-/// Suppressive capture suppresses inner captures from definitions.
-#[test]
-fn suppressive_capture_suppresses_inner() {
-    snap!(
-        indoc! {r#"
-            Expr = (binary_expression left: (number) @left right: (number) @right)
-            Q = (program (expression_statement (Expr) @_))
-        "#},
-        "1 + 2",
-        entry: "Q"
-    );
-}
-
-/// Suppressive capture with wrap pattern: { inner } @_ wraps and suppresses.
-#[test]
-fn suppressive_capture_with_wrap() {
-    snap!(
-        indoc! {r#"
-            Expr = (binary_expression left: (number) @left right: (number) @right)
-            Q = (program (expression_statement {(Expr) @_} @expr))
-        "#},
-        "1 + 2",
-        entry: "Q"
-    );
-}
-
-/// Named wildcard `(_)` matches only named nodes, skipping anonymous nodes.
-/// In `return 42`, `(_)` should match `number`, not the `return` keyword.
-#[test]
-fn wildcard_named_skips_anonymous() {
-    snap!("Q = (program (return_statement (_) @x))", "return 42");
-}
-
-/// Bare wildcard `_` matches any node including anonymous ones.
-/// In `return 42`, `_` should match the first child which is `return` keyword.
-#[test]
-fn wildcard_bare_matches_anonymous() {
-    snap!("Q = (program (return_statement _ @x))", "return 42");
-}
-
-/// BUG: Unlabeled alternation with 5+ branches and unique captures per branch.
-///
-/// Each branch in an unlabeled alternation needs to inject null for captures
-/// it doesn't have. With 5 branches (@a, @b, @c, @d, @e), each branch needs
-/// 8 pre-effects (4 nulls + 4 sets). This exceeds the 3-bit limit (max 7)
-/// and caused bytecode encoding overflow, resulting in garbage addresses.
-///
-/// Fix: Cascade overflow pre-effects into leading epsilon transitions.
-#[test]
-fn regression_unlabeled_alternation_5_branches_captures() {
-    snap!(
-        indoc! {r#"
-            Q = (program (expression_statement [
-                (identifier) @a
-                (number) @b
-                (string) @c
-                (binary_expression) @d
-                (call_expression) @e
-            ]))
-        "#},
-        "foo"
-    );
-}
-
-/// Same bug with 8 branches - even more pre-effects requiring multiple cascade steps.
-#[test]
-fn regression_unlabeled_alternation_8_branches_captures() {
-    snap!(
-        indoc! {r#"
-            Q = (program (expression_statement [
-                (identifier) @a
-                (number) @b
-                (string) @c
-                (binary_expression) @d
-                (call_expression) @e
-                (member_expression) @f
-                (array) @g
-                (object) @h
-            ]))
-        "#},
-        "42"
-    );
-}
-
-/// BUG #7: Node capture on named node with children captured wrong target.
-///
-/// For `(class_declaration body: (class_body ...)) @class`, the @class capture
-/// was capturing `class_body` instead of `class_declaration`. This happened because
-/// Node/Text capture effects were placed on the exit (after children processing),
-/// but matched_node gets clobbered by child matches and backtracking.
-///
-/// Fix: Split Node/Text effects to entry match's post_effects, where matched_node
-/// is still valid from the parent match.
-#[test]
-fn regression_node_capture_on_parent_with_children() {
-    snap!(
-        indoc! {r#"
-            Q = (program (class_declaration
-                body: (class_body (method_definition)* @methods)
-            ) @class)
-        "#},
-        "class A { foo() {} }"
-    );
-}
-
-/// BUG #8: Nested quantifiers with empty inner array found only first outer match.
-///
-/// For `{ (class_declaration ...) @class }* @classes` with multiple classes where
-/// some have empty method arrays, only the first class was captured. The skip path
-/// (zero matches on inner array) was bypassing an Up navigation, leaving the cursor
-/// at the wrong level for the outer loop.
-///
-/// Fix: Remove skip_exit bypass - all paths through children must go through Up,
-/// because even "skip" paths descend to check for matches before backtracking.
-#[test]
-fn regression_nested_quantifiers_empty_inner_array() {
-    snap!(
-        indoc! {r#"
-            Q = (program {(class_declaration
-                body: (class_body (method_definition)* @methods)
-            ) @class}* @classes)
-        "#},
-        "class A { } class B { foo() {} }"
-    );
-}
-
-/// Combined regression test: nested quantifiers with struct captures and mixed empty/non-empty.
-///
-/// This exercises both bugs together: Node capture must capture class_declaration (not class_body),
-/// and all classes must be found regardless of whether their method arrays are empty.
-#[test]
-fn regression_nested_quantifiers_struct_captures_mixed() {
-    snap!(
-        indoc! {r#"
-            Q = (program {(class_declaration
-                name: (identifier) @name
-                body: (class_body {(method_definition
-                    name: (property_identifier) @method_name
-                ) @method}* @methods)
-            ) @class}* @classes)
-        "#},
-        "class Empty { } class One { foo() {} } class Two { bar() {} baz() {} }"
-    );
-}
-
-/// BUG #9: Childless nodes with inner quantifiers caused outer quantifier to miss matches.
-///
-/// For `(identifier (_)* @items)` inside a star quantifier, if `identifier` has zero
-/// children at runtime (tree-sitter identifiers are terminal nodes with no children),
-/// the Down navigation fails. The skip path should NOT execute Up since we never
-/// descended, but currently it does, causing the cursor to ascend one level too high.
-///
-/// This breaks the outer quantifier's iteration: after processing the first match,
-/// the cursor is at the grandparent level instead of sibling level, so Next fails.
-///
-/// Fix: When Down fails immediately (childless node), the skip path should bypass
-/// the Up instruction. Only execute Up when we actually descended into children.
-#[test]
-fn regression_childless_node_with_inner_star() {
-    snap!(
-        indoc! {r#"
-            Q = (program {(expression_statement
-                (identifier (_)* @items) @id
-            ) @stmt}* @stmts)
-        "#},
-        "foo; bar; baz"
-    );
-}
-
-/// Same bug with optional quantifier instead of star.
-/// `(identifier (_)? @item)` should also handle childless nodes correctly.
-#[test]
-fn regression_childless_node_with_inner_optional() {
-    snap!(
-        indoc! {r#"
-            Q = (program {(expression_statement
-                (identifier (_)? @item) @id
-            ) @stmt}* @stmts)
-        "#},
-        "foo; bar; baz"
-    );
-}
-
-/// Regression test: recursive labeled alternation with uncaptured star quantifier
-/// should produce arrays, not nested tagged unions.
-///
-/// When `(RefName)*` is inside a labeled alternation variant (like Descend),
-/// and RefName returns an enum type, the quantifier needs to produce an array
-/// even without an explicit `@capture` annotation.
-#[test]
-fn regression_recursive_alternation_uncaptured_array() {
-    snap!(
-        indoc! {r#"
-            E = [
-                A: (identifier) @x
-                B: (_ (E)*)
-            ]
-            Test = (program (E)* @items)
-        "#},
-        "x; y;",
-        entry: "Test"
-    );
-}
-
-/// Regression test: labeled alternation variant with array capture payload.
-///
-/// When a labeled alternation variant has an array capture as its payload
-/// (e.g., `[First: (E)* @arr]`), the Enum effect must be emitted BEFORE the Arr
-/// effect. Previously, `compile_array_scope` forgot to emit `outer_capture.pre`,
-/// causing a stack mismatch panic in the materializer.
-#[test]
-fn regression_enum_variant_array_capture_payload() {
-    snap!(
-        indoc! {r#"
-            E = [A: (identifier) @x  B: (number) @y]
-            F = [First: (E)* @arr  Second: (E)+ @arr2]
-            Test = (program (expression_statement (F)))
-        "#},
-        "x",
-        entry: "Test"
-    );
-}
diff --git a/crates/plotnik-lib/src/engine/verify_tests.rs b/crates/plotnik-lib/src/engine/verify_tests.rs
deleted file mode 100644
index 0e5c21fd..00000000
--- a/crates/plotnik-lib/src/engine/verify_tests.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-//! Tests for debug type verification.
-
-use crate::Colors;
-use crate::QueryBuilder;
-use crate::bytecode::{Module, TypeId};
-use crate::emit::emit;
-use crate::engine::value::{NodeHandle, Value};
-
-use super::debug_verify_type;
-
-/// Build a module from a query string and return with its first entrypoint's result type.
-fn build_module(query: &str) -> (Module, TypeId) {
-    let lang = plotnik_langs::javascript();
-    let query_obj = QueryBuilder::one_liner(query)
-        .parse()
-        .expect("parse failed")
-        .analyze()
-        .link(&lang);
-    assert!(query_obj.is_valid(), "query should be valid");
-    let bytecode = emit(&query_obj).expect("emit failed");
-    let module = Module::load(&bytecode).expect("decode failed");
-    let declared_type = module.entrypoints().get(0).result_type;
-    (module, declared_type)
-}
-
-fn make_node() -> Value {
-    Value::Node(NodeHandle {
-        kind: "identifier".to_string(),
-        text: "x".to_string(),
-        span: (0, 1),
-    })
-}
-
-#[test]
-fn verify_valid_node() {
-    let (module, declared_type) = build_module("Q = (identifier) @id");
-    let value = Value::Object(vec![("id".to_string(), make_node())]);
-
-    // Should not panic
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_optional_present() {
-    let (module, declared_type) = build_module("Q = (identifier)? @id");
-    let value = Value::Object(vec![("id".to_string(), make_node())]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_optional_null() {
-    let (module, declared_type) = build_module("Q = (identifier)? @id");
-    let value = Value::Object(vec![("id".to_string(), Value::Null)]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_array() {
-    let (module, declared_type) = build_module("Q = (identifier)* @ids");
-    let value = Value::Object(vec![(
-        "ids".to_string(),
-        Value::Array(vec![make_node(), make_node()]),
-    )]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_empty_array() {
-    let (module, declared_type) = build_module("Q = (identifier)* @ids");
-    let value = Value::Object(vec![("ids".to_string(), Value::Array(vec![]))]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_enum() {
-    let (module, declared_type) = build_module("Q = [A: (identifier) @x  B: (number) @y]");
-    let value = Value::Tagged {
-        tag: "A".to_string(),
-        data: Some(Box::new(Value::Object(vec![(
-            "x".to_string(),
-            make_node(),
-        )]))),
-    };
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_enum_void_variant() {
-    let (module, declared_type) = build_module("Q = [A: (identifier) @x  B: (number)]");
-    let value = Value::Tagged {
-        tag: "B".to_string(),
-        data: None,
-    };
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-fn verify_valid_string() {
-    let (module, declared_type) = build_module("Q = (identifier) @id :: string");
-    let value = Value::Object(vec![("id".to_string(), Value::String("foo".to_string()))]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_node_is_string() {
-    let (module, declared_type) = build_module("Q = (identifier) @id");
-
-    // id should be Node, but we provide string
-    let value = Value::Object(vec![("id".to_string(), Value::String("wrong".to_string()))]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_missing_required_field() {
-    let (module, declared_type) = build_module("Q = {(identifier) @a (number) @b}");
-
-    // Missing field 'b'
-    let value = Value::Object(vec![("a".to_string(), make_node())]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_array_element_wrong_type() {
-    let (module, declared_type) = build_module("Q = (identifier)* @ids");
-
-    // Array element is string instead of Node
-    let value = Value::Object(vec![(
-        "ids".to_string(),
-        Value::Array(vec![make_node(), Value::String("oops".to_string())]),
-    )]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_non_empty_array_is_empty() {
-    let (module, declared_type) = build_module("Q = (identifier)+ @ids");
-
-    // Non-empty array but we provide empty
-    let value = Value::Object(vec![("ids".to_string(), Value::Array(vec![]))]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_enum_unknown_variant() {
-    let (module, declared_type) = build_module("Q = [A: (identifier) @x  B: (number) @y]");
-
-    let value = Value::Tagged {
-        tag: "C".to_string(), // Unknown variant
-        data: None,
-    };
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_enum_void_with_data() {
-    let (module, declared_type) = build_module("Q = [A: (identifier) @x  B: (number)]");
-
-    // Void variant B has data when it shouldn't
-    let value = Value::Tagged {
-        tag: "B".to_string(),
-        data: Some(Box::new(Value::Object(vec![]))),
-    };
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_enum_non_void_missing_data() {
-    let (module, declared_type) = build_module("Q = [A: (identifier) @x  B: (number) @y]");
-
-    // Non-void variant A missing data
-    let value = Value::Tagged {
-        tag: "A".to_string(),
-        data: None,
-    };
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
-
-#[test]
-#[should_panic(expected = "BUG:")]
-fn verify_invalid_object_vs_array() {
-    let (module, declared_type) = build_module("Q = (identifier) @id");
-
-    // Type says object, value is array
-    let value = Value::Array(vec![make_node()]);
-
-    debug_verify_type(&value, declared_type, &module, Colors::OFF);
-}
diff --git a/crates/plotnik-lib/src/lib.rs b/crates/plotnik-lib/src/lib.rs
index 8ce6b49e..d46e8863 100644
--- a/crates/plotnik-lib/src/lib.rs
+++ b/crates/plotnik-lib/src/lib.rs
@@ -16,49 +16,39 @@
 
 #![cfg_attr(coverage_nightly, feature(coverage_attribute))]
 
-pub mod analyze;
-pub mod bytecode;
-pub mod colors;
-pub mod compile;
-pub mod diagnostics;
-pub mod emit;
-pub mod engine;
-pub mod parser;
-pub mod query;
-pub mod type_system;
-pub mod typegen;
+// Re-export modules from plotnik-core
+pub use plotnik_core::colors;
 
-/// Result type for analysis passes that produce both output and diagnostics.
-///
-/// Each pass returns its typed output alongside any diagnostics it collected.
-/// Fatal errors (like fuel exhaustion) use the outer `Result`.
-pub type PassResult<T> = std::result::Result<(T, Diagnostics), Error>;
-
-pub use colors::Colors;
-pub use diagnostics::{Diagnostics, DiagnosticsPrinter, Severity, Span};
-pub use query::{Query, QueryBuilder};
-pub use query::{SourceId, SourceMap};
+// Re-export modules from plotnik-bytecode
+pub use plotnik_bytecode::type_system;
+pub use plotnik_bytecode as bytecode;
 
-/// Errors that can occur during query parsing.
-#[derive(Debug, Clone, thiserror::Error)]
-pub enum Error {
-    /// Execution fuel exhausted (too many parser operations).
-    #[error("execution limit exceeded")]
-    ExecFuelExhausted,
+// Re-export modules from plotnik-compiler
+pub use plotnik_compiler::analyze;
+pub use plotnik_compiler::compile;
+pub use plotnik_compiler::diagnostics;
+pub use plotnik_compiler::emit;
+pub use plotnik_compiler::parser;
+pub use plotnik_compiler::query;
+pub use plotnik_compiler::typegen;
 
-    /// Recursion fuel exhausted (input nested too deeply).
-    #[error("recursion limit exceeded")]
-    RecursionLimitExceeded,
+// Re-export modules from plotnik-vm
+pub use plotnik_vm::engine;
 
-    #[error("query parsing failed with {} errors", .0.error_count())]
-    QueryParseError(Diagnostics),
+// Re-export key types from core
+pub use plotnik_core::Colors;
 
-    #[error("query analysis failed with {} errors", .0.error_count())]
-    QueryAnalyzeError(Diagnostics),
-}
+// Re-export key types from compiler
+pub use plotnik_compiler::{
+    Diagnostics, DiagnosticsPrinter, Error, PassResult, Result, Severity, Span,
+};
+pub use plotnik_compiler::{Query, QueryBuilder, SourceId, SourceMap};
 
-/// Result type for query operations.
-pub type Result<T> = std::result::Result<T, Error>;
+// Re-export VM types
+pub use plotnik_vm::{
+    EffectLog, FuelLimits, Materializer, NodeHandle, PrintTracer, RuntimeEffect, RuntimeError,
+    Tracer, Value, ValueMaterializer, Verbosity, VM, debug_verify_type,
+};
 
 /// Embed bytecode with 64-byte alignment (zero-copy loading).
 ///
diff --git a/crates/plotnik-vm/Cargo.toml b/crates/plotnik-vm/Cargo.toml
new file mode 100644
index 00000000..d773fc77
--- /dev/null
+++ b/crates/plotnik-vm/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "plotnik-vm"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Runtime VM for executing compiled Plotnik queries"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+
+[dependencies]
+plotnik-bytecode.workspace = true
+plotnik-core.workspace = true
+arborium-tree-sitter = "2.10.0"
+regex-automata = { version = "0.4", features = ["dfa-search"] }
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "2.0.17"
+
+[dev-dependencies]
+insta = { version = "=1.46.0", features = ["yaml"] }
diff --git a/crates/plotnik-lib/src/engine/checkpoint.rs b/crates/plotnik-vm/src/engine/checkpoint.rs
similarity index 100%
rename from crates/plotnik-lib/src/engine/checkpoint.rs
rename to crates/plotnik-vm/src/engine/checkpoint.rs
diff --git a/crates/plotnik-lib/src/engine/cursor.rs b/crates/plotnik-vm/src/engine/cursor.rs
similarity index 99%
rename from crates/plotnik-lib/src/engine/cursor.rs
rename to crates/plotnik-vm/src/engine/cursor.rs
index 398b6aed..c2f5fc5a 100644
--- a/crates/plotnik-lib/src/engine/cursor.rs
+++ b/crates/plotnik-vm/src/engine/cursor.rs
@@ -7,7 +7,7 @@ use std::num::NonZeroU16;
 
 use arborium_tree_sitter::{Node, TreeCursor};
 
-use crate::bytecode::Nav;
+use plotnik_bytecode::Nav;
 
 /// Skip policy for navigation.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/crates/plotnik-lib/src/engine/effect.rs b/crates/plotnik-vm/src/engine/effect.rs
similarity index 100%
rename from crates/plotnik-lib/src/engine/effect.rs
rename to crates/plotnik-vm/src/engine/effect.rs
diff --git a/crates/plotnik-vm/src/engine/engine_tests.rs b/crates/plotnik-vm/src/engine/engine_tests.rs
new file mode 100644
index 00000000..9564887c
--- /dev/null
+++ b/crates/plotnik-vm/src/engine/engine_tests.rs
@@ -0,0 +1,5 @@
+//! VM engine tests.
+//!
+//! Note: Most VM tests are integration tests that require the full compilation
+//! pipeline. They remain in plotnik-lib. This file contains unit tests that
+//! only need the VM crate.
diff --git a/crates/plotnik-lib/src/engine/error.rs b/crates/plotnik-vm/src/engine/error.rs
similarity index 95%
rename from crates/plotnik-lib/src/engine/error.rs
rename to crates/plotnik-vm/src/engine/error.rs
index 7c992a95..b4862468 100644
--- a/crates/plotnik-lib/src/engine/error.rs
+++ b/crates/plotnik-vm/src/engine/error.rs
@@ -1,6 +1,6 @@
 //! Runtime errors for VM execution.
 
-use crate::bytecode::ModuleError;
+use plotnik_bytecode::ModuleError;
 
 /// Errors during VM execution.
 #[derive(Debug, thiserror::Error)]
diff --git a/crates/plotnik-lib/src/engine/frame.rs b/crates/plotnik-vm/src/engine/frame.rs
similarity index 100%
rename from crates/plotnik-lib/src/engine/frame.rs
rename to crates/plotnik-vm/src/engine/frame.rs
diff --git a/crates/plotnik-lib/src/engine/materializer.rs b/crates/plotnik-vm/src/engine/materializer.rs
similarity index 98%
rename from crates/plotnik-lib/src/engine/materializer.rs
rename to crates/plotnik-vm/src/engine/materializer.rs
index 51018181..4a32949c 100644
--- a/crates/plotnik-lib/src/engine/materializer.rs
+++ b/crates/plotnik-vm/src/engine/materializer.rs
@@ -1,6 +1,6 @@
 //! Materializer transforms effect logs into output values.
 
-use crate::bytecode::{StringsView, TypeData, TypeId, TypeKind, TypesView};
+use plotnik_bytecode::{StringsView, TypeData, TypeId, TypeKind, TypesView};
 
 use super::effect::RuntimeEffect;
 use super::value::{NodeHandle, Value};
@@ -30,11 +30,11 @@ impl<'a> ValueMaterializer<'a> {
 
     fn resolve_member_name(&self, idx: u16) -> String {
         let member = self.types.get_member(idx as usize);
-        self.strings.get(member.name()).to_owned()
+        self.strings.get(member.name).to_owned()
     }
 
     fn resolve_member_type(&self, idx: u16) -> TypeId {
-        self.types.get_member(idx as usize).type_id()
+        self.types.get_member(idx as usize).type_id
     }
 
     fn is_void_type(&self, type_id: TypeId) -> bool {
diff --git a/crates/plotnik-lib/src/engine/mod.rs b/crates/plotnik-vm/src/engine/mod.rs
similarity index 95%
rename from crates/plotnik-lib/src/engine/mod.rs
rename to crates/plotnik-vm/src/engine/mod.rs
index d445002e..5c5e645d 100644
--- a/crates/plotnik-lib/src/engine/mod.rs
+++ b/crates/plotnik-vm/src/engine/mod.rs
@@ -16,6 +16,8 @@ mod vm;
 
 #[cfg(test)]
 mod engine_tests;
+#[cfg(test)]
+mod verify_tests;
 
 pub use effect::{EffectLog, RuntimeEffect};
 pub use error::RuntimeError;
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_ident.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_ident.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_ident.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_ident.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_num.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_num.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_num.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_merge_num.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_definition_ref_backtrack.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_definition_ref_backtrack.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_definition_ref_backtrack.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_definition_ref_backtrack.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_ident.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_ident.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_ident.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_ident.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_num.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_num.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_num.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__alternation_tagged_num.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_adjacency.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_adjacency.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_adjacency.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_adjacency.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_first_child.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_first_child.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_first_child.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_first_child.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_multi_item.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_multi_item.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_multi_item.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_multi_item.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_single.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_single.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_single.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_single.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_with_trivia.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_with_trivia.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_with_trivia.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__anchor_last_child_with_trivia.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_multiple.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_multiple.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_multiple.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_multiple.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_single.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_single.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_single.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_single.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_string_annotation.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_string_annotation.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_string_annotation.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__capture_string_annotation.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__field_negated_absent.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__field_negated_absent.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__field_negated_absent.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__field_negated_absent.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_nongreedy_star.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_nongreedy_star.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_nongreedy_star.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_nongreedy_star.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_absent.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_absent.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_absent.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_absent.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_present.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_present.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_present.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_optional_present.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus_with_string_annotation.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus_with_string_annotation.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus_with_string_annotation.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_plus_with_string_annotation.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star_with_string_annotation.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star_with_string_annotation.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star_with_string_annotation.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_star_with_string_annotation.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_struct_array.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_struct_array.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_struct_array.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__quantifier_struct_array.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_member_chain.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_member_chain.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_member_chain.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_member_chain.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_nested_calls.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_nested_calls.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_nested_calls.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__recursion_nested_calls.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_among_siblings.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_among_siblings.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_among_siblings.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_among_siblings.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_for_field_constraint.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_for_field_constraint.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_for_field_constraint.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_call_searches_for_field_constraint.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_optional.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_optional.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_optional.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_optional.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_star.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_star.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_star.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_childless_node_with_inner_star.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_empty_captured_sequence.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_empty_captured_sequence.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_empty_captured_sequence.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_empty_captured_sequence.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_tag_with_definition_refs.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_tag_with_definition_refs.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_tag_with_definition_refs.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_tag_with_definition_refs.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_variant_array_capture_payload.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_variant_array_capture_payload.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_variant_array_capture_payload.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_enum_variant_array_capture_payload.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_empty_inner_array.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_empty_inner_array.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_empty_inner_array.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_empty_inner_array.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_struct_captures_mixed.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_struct_captures_mixed.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_struct_captures_mixed.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_nested_quantifiers_struct_captures_mixed.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_node_capture_on_parent_with_children.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_node_capture_on_parent_with_children.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_node_capture_on_parent_with_children.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_node_capture_on_parent_with_children.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_optional_empty_captured_sequence.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_optional_empty_captured_sequence.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_optional_empty_captured_sequence.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_optional_empty_captured_sequence.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_alternation_uncaptured_array.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_alternation_uncaptured_array.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_alternation_uncaptured_array.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_alternation_uncaptured_array.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_captures_nest_properly.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_captures_nest_properly.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_captures_nest_properly.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_recursive_captures_nest_properly.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_scalar_array_captures_nodes.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_scalar_array_captures_nodes.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_scalar_array_captures_nodes.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_scalar_array_captures_nodes.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_tagged_alternation_materializes.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_tagged_alternation_materializes.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_tagged_alternation_materializes.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_tagged_alternation_materializes.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_5_branches_captures.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_5_branches_captures.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_5_branches_captures.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_5_branches_captures.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_8_branches_captures.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_8_branches_captures.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_8_branches_captures.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__regression_unlabeled_alternation_8_branches_captures.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__search_skip_siblings.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__search_skip_siblings.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__search_skip_siblings.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__search_skip_siblings.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_anonymous.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_anonymous.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_anonymous.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_anonymous.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_named.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_named.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_named.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_named.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_suppresses_inner.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_suppresses_inner.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_suppresses_inner.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_suppresses_inner.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_regular_sibling.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_regular_sibling.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_regular_sibling.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_regular_sibling.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_wrap.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_wrap.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_wrap.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__suppressive_capture_with_wrap.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_bare_matches_anonymous.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_bare_matches_anonymous.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_bare_matches_anonymous.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_bare_matches_anonymous.snap
diff --git a/crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_named_skips_anonymous.snap b/crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_named_skips_anonymous.snap
similarity index 100%
rename from crates/plotnik-lib/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_named_skips_anonymous.snap
rename to crates/plotnik-vm/src/engine/snapshots/plotnik_lib__engine__engine_tests__wildcard_named_skips_anonymous.snap
diff --git a/crates/plotnik-lib/src/engine/trace.rs b/crates/plotnik-vm/src/engine/trace.rs
similarity index 99%
rename from crates/plotnik-lib/src/engine/trace.rs
rename to crates/plotnik-vm/src/engine/trace.rs
index bb82f82c..1b67bde1 100644
--- a/crates/plotnik-lib/src/engine/trace.rs
+++ b/crates/plotnik-vm/src/engine/trace.rs
@@ -23,12 +23,11 @@ use std::num::NonZeroU16;
 
 use arborium_tree_sitter::Node;
 
-use crate::Colors;
-use crate::bytecode::{
-    EffectOpcode, Instruction, LineBuilder, Match, Module, Nav, NodeTypeIR, Symbol, cols,
-    format_effect, trace, truncate_text, width_for_count,
+use plotnik_bytecode::{
+    EffectOpcode, Instruction, LineBuilder, Match, Module, Nav, NodeTypeIR, PredicateOp, Symbol,
+    cols, format_effect, trace, truncate_text, width_for_count,
 };
-use crate::parser::PredicateOp;
+use plotnik_core::Colors;
 
 use super::effect::RuntimeEffect;
 
diff --git a/crates/plotnik-lib/src/engine/value.rs b/crates/plotnik-vm/src/engine/value.rs
similarity index 99%
rename from crates/plotnik-lib/src/engine/value.rs
rename to crates/plotnik-vm/src/engine/value.rs
index 5d178f7a..4fe48355 100644
--- a/crates/plotnik-lib/src/engine/value.rs
+++ b/crates/plotnik-vm/src/engine/value.rs
@@ -4,7 +4,7 @@ use arborium_tree_sitter::Node;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Serialize, Serializer};
 
-use crate::Colors;
+use plotnik_core::Colors;
 
 /// Lifetime-free node handle for output.
 ///
diff --git a/crates/plotnik-lib/src/engine/verify.rs b/crates/plotnik-vm/src/engine/verify.rs
similarity index 93%
rename from crates/plotnik-lib/src/engine/verify.rs
rename to crates/plotnik-vm/src/engine/verify.rs
index 980a6043..8ee9eecd 100644
--- a/crates/plotnik-lib/src/engine/verify.rs
+++ b/crates/plotnik-vm/src/engine/verify.rs
@@ -3,12 +3,10 @@
 //! Verifies that materialized `Value` matches the declared `result_type` from bytecode.
 //! Zero-cost in release builds.
 
-use crate::Colors;
-use crate::bytecode::{Module, TypeId};
+use plotnik_bytecode::{Module, TypeId};
+use plotnik_core::Colors;
 #[cfg(debug_assertions)]
-use crate::bytecode::{StringsView, TypeData, TypeKind, TypesView};
-#[cfg(debug_assertions)]
-use crate::typegen::typescript::{self, Config, VoidType};
+use plotnik_bytecode::{StringsView, TypeData, TypeKind, TypesView};
 
 use super::Value;
 
@@ -154,8 +152,8 @@ fn verify_type(
             TypeKind::Struct => match value {
                 Value::Object(fields) => {
                     for member in types.members_of(&type_def) {
-                        let field_name = strings.get(member.name());
-                        let (inner_type, is_optional) = types.unwrap_optional(member.type_id());
+                        let field_name = strings.get(member.name);
+                        let (inner_type, is_optional) = types.unwrap_optional(member.type_id);
 
                         let field_value = fields.iter().find(|(k, _)| k == field_name);
                         match field_value {
@@ -191,11 +189,11 @@ fn verify_type(
                 Value::Tagged { tag, data } => {
                     let variant = types
                         .members_of(&type_def)
-                        .find(|m| strings.get(m.name()) == tag);
+                        .find(|m| strings.get(m.name) == tag);
 
                     match variant {
                         Some(member) => {
-                            let is_void = types.get(member.type_id()).is_some_and(|d| {
+                            let is_void = types.get(member.type_id).is_some_and(|d| {
                                 matches!(d.classify(), TypeData::Primitive(TypeKind::Void))
                             });
 
@@ -214,7 +212,7 @@ fn verify_type(
                                         path.push_str(".$data");
                                         verify_type(
                                             d,
-                                            member.type_id(),
+                                            member.type_id,
                                             types,
                                             strings,
                                             path,
@@ -294,7 +292,7 @@ fn append_path(path: &str, suffix: &str) -> String {
     }
 }
 
-/// Create a centered header line with dashes, e.g. "--- Label ---" -> "--------------------------------- Label ----------------------------------"
+/// Create a centered header line with dashes.
 #[cfg(debug_assertions)]
 fn centered_header(label: &str, width: usize) -> String {
     let label_with_spaces = format!(" {} ", label);
@@ -340,13 +338,6 @@ fn panic_with_mismatch(
         })
         .unwrap_or("unknown");
 
-    let config = Config::new()
-        .export(true)
-        .emit_node_type(true)
-        .verbose_nodes(false)
-        .void_type(VoidType::Null)
-        .colored(false);
-    let type_str = typescript::emit_with_config(module, config);
     let value_str = value.format(true, colors);
     let details_str = errors.join("\n");
 
@@ -357,7 +348,6 @@ fn panic_with_mismatch(
         "\n{separator}\n\
          BUG: Type and value do not match\n\
          {separator}\n\n\
-         {type_str}\n\
          {output_header}\n\n\
          {value_str}\n\n\
          {details_header}\n\n\
@@ -365,7 +355,3 @@ fn panic_with_mismatch(
          {separator}\n"
     );
 }
-
-#[cfg(test)]
-#[path = "verify_tests.rs"]
-mod verify_tests;
diff --git a/crates/plotnik-vm/src/engine/verify_tests.rs b/crates/plotnik-vm/src/engine/verify_tests.rs
new file mode 100644
index 00000000..4b8720ef
--- /dev/null
+++ b/crates/plotnik-vm/src/engine/verify_tests.rs
@@ -0,0 +1,4 @@
+//! Tests for debug type verification.
+//!
+//! Note: These tests require the full compilation pipeline to build modules.
+//! They remain in plotnik-lib.
diff --git a/crates/plotnik-lib/src/engine/vm.rs b/crates/plotnik-vm/src/engine/vm.rs
similarity index 99%
rename from crates/plotnik-lib/src/engine/vm.rs
rename to crates/plotnik-vm/src/engine/vm.rs
index a12b24eb..d826c214 100644
--- a/crates/plotnik-lib/src/engine/vm.rs
+++ b/crates/plotnik-vm/src/engine/vm.rs
@@ -2,11 +2,10 @@
 
 use arborium_tree_sitter::{Node, Tree};
 
-use crate::bytecode::{
+use plotnik_bytecode::{
     Call, EffectOp, EffectOpcode, Entrypoint, Instruction, Match, Module, Nav, NodeTypeIR,
-    StepAddr, Trampoline,
+    PredicateOp, StepAddr, Trampoline,
 };
-use crate::parser::PredicateOp;
 
 /// Get the nav for continue_search (always a sibling move).
 /// Up/Stay/Epsilon variants return Next as a default since they don't do sibling search.
@@ -358,7 +357,7 @@ impl<'t> VM<'t> {
                 !regex_bytes.is_empty(),
                 "regex predicate references empty DFA bytes"
             );
-            let dfa = crate::emit::deserialize_dfa(regex_bytes)
+            let dfa = plotnik_bytecode::deserialize_dfa(regex_bytes)
                 .expect("regex DFA deserialization failed");
 
             use regex_automata::dfa::Automaton;
diff --git a/crates/plotnik-vm/src/lib.rs b/crates/plotnik-vm/src/lib.rs
new file mode 100644
index 00000000..b291f333
--- /dev/null
+++ b/crates/plotnik-vm/src/lib.rs
@@ -0,0 +1,14 @@
+//! Runtime VM for executing compiled Plotnik queries.
+//!
+//! This crate provides the virtual machine that executes bytecode against
+//! tree-sitter syntax trees, producing structured output.
+
+#![allow(clippy::comparison_chain)]
+
+pub mod engine;
+
+// Re-export commonly used items at crate root
+pub use engine::{
+    EffectLog, FuelLimits, Materializer, NodeHandle, PrintTracer, RuntimeEffect, RuntimeError,
+    Tracer, VM, Value, ValueMaterializer, Verbosity, debug_verify_type,
+};