From 0105fe4dad2c6048af4c9c2f2b178c31b29fa2f9 Mon Sep 17 00:00:00 2001
From: Alejandro Giacometti <alejandro.giacometti@gmail.com>
Date: Wed, 8 Jul 2026 23:51:10 +0100
Subject: [PATCH] Move each language plugin into its own package with .scm
 queries

Each plugin now lives in languages/<lang>/ (plugin.py plus its .scm
file(s)), loaded at import via a small load_query helper instead of
inline Python string literals. SQL's DDL becomes a static sql.scm,
js/ts compose shared .scm fragments, and html's semantic-tag query
resolves to a static file. Extraction output is unchanged: no snapshot
diff, no language_plugin_version bumps. Docs (rbtr-languages skill,
README, ARCHITECTURE) gain a "Where queries live" note.
---
 .agents/skills/rbtr-languages/SKILL.md        |  24 ++-
 packages/rbtr/ARCHITECTURE.md                 |  10 +-
 packages/rbtr/README.md                       |  35 +++--
 packages/rbtr/src/rbtr/languages/__init__.py  |  42 +++---
 packages/rbtr/src/rbtr/languages/_queries.py  |  25 ++++
 .../rbtr/src/rbtr/languages/bash/__init__.py  |   1 +
 .../rbtr/src/rbtr/languages/bash/bash.scm     |  31 ++++
 .../languages/{bash.py => bash/plugin.py}     |  35 +----
 .../rbtr/src/rbtr/languages/c/__init__.py     |   1 +
 packages/rbtr/src/rbtr/languages/c/c.scm      |  61 ++++++++
 .../src/rbtr/languages/{c.py => c/plugin.py}  |  64 +-------
 .../rbtr/src/rbtr/languages/cpp/__init__.py   |   1 +
 .../rbtr/languages/{cpp.py => cpp/cpp.scm}    |  54 -------
 .../rbtr/src/rbtr/languages/cpp/plugin.py     |  55 +++++++
 .../rbtr/src/rbtr/languages/css/__init__.py   |   1 +
 packages/rbtr/src/rbtr/languages/css/css.scm  |  21 +++
 .../rbtr/languages/{css.py => css/plugin.py}  |  25 +---
 .../rbtr/src/rbtr/languages/go/__init__.py    |   1 +
 packages/rbtr/src/rbtr/languages/go/go.scm    |  49 ++++++
 .../rbtr/languages/{go.py => go/plugin.py}    |  53 +------
 .../rbtr/src/rbtr/languages/hcl/__init__.py   |   1 +
 packages/rbtr/src/rbtr/languages/hcl/hcl.scm  |   3 +
 .../rbtr/languages/{hcl.py => hcl/plugin.py}  |   7 +-
 .../rbtr/src/rbtr/languages/html/__init__.py  |   1 +
 .../rbtr/src/rbtr/languages/html/html.scm     |  18 +++
 .../src/rbtr/languages/html/injections.scm    |   8 +
 .../languages/{html.py => html/plugin.py}     |  33 +---
 .../rbtr/src/rbtr/languages/java/__init__.py  |   1 +
 .../rbtr/src/rbtr/languages/java/java.scm     |  42 ++++++
 .../languages/{java.py => java/plugin.py}     |  46 +-----
 .../src/rbtr/languages/javascript/__init__.py |   1 +
 .../rbtr/languages/javascript/javascript.scm  |   4 +
 .../{javascript.py => javascript/plugin.py}   | 135 +----------------
 .../src/rbtr/languages/javascript/shared.scm  |  20 +++
 .../rbtr/languages/javascript/typescript.scm  |  36 +++++
 .../rbtr/languages/javascript/variables.scm   |  54 +++++++
 .../rbtr/src/rbtr/languages/json/__init__.py  |   1 +
 .../rbtr/src/rbtr/languages/json/json.scm     |   2 +
 .../languages/{json.py => json/plugin.py}     |   6 +-
 .../rbtr/src/rbtr/languages/less/__init__.py  |   1 +
 .../rbtr/src/rbtr/languages/less/less.scm     |  20 +++
 .../languages/{less.py => less/plugin.py}     |  25 +---
 .../src/rbtr/languages/markdown/__init__.py   |   1 +
 .../rbtr/languages/markdown/injections.scm    |   4 +
 .../src/rbtr/languages/markdown/links.scm     |   1 +
 .../{markdown.py => markdown/plugin.py}       |  15 +-
 .../src/rbtr/languages/markdown/sections.scm  |   3 +
 .../src/rbtr/languages/python/__init__.py     |   1 +
 .../languages/{python.py => python/plugin.py} |  56 +------
 .../rbtr/src/rbtr/languages/python/python.scm |  52 +++++++
 .../rbtr/src/rbtr/languages/rst/__init__.py   |   1 +
 .../rbtr/languages/{rst.py => rst/plugin.py}  |   9 +-
 .../src/rbtr/languages/rst/references.scm     |   5 +
 .../rbtr/src/rbtr/languages/ruby/__init__.py  |   1 +
 .../languages/{ruby.py => ruby/plugin.py}     |  51 +------
 .../rbtr/src/rbtr/languages/ruby/ruby.scm     |  48 ++++++
 .../rbtr/src/rbtr/languages/rust/__init__.py  |   1 +
 .../languages/{rust.py => rust/plugin.py}     |  48 +-----
 .../rbtr/src/rbtr/languages/rust/rust.scm     |  44 ++++++
 .../rbtr/src/rbtr/languages/scss/__init__.py  |   1 +
 .../languages/{scss.py => scss/plugin.py}     |  34 +----
 .../rbtr/src/rbtr/languages/scss/scss.scm     |  29 ++++
 .../rbtr/src/rbtr/languages/sfc/__init__.py   |   1 +
 .../src/rbtr/languages/sfc/injections.scm     |  41 +++++
 .../rbtr/languages/{sfc.py => sfc/plugin.py}  |  23 +--
 packages/rbtr/src/rbtr/languages/sql.py       | 141 ------------------
 .../rbtr/src/rbtr/languages/sql/__init__.py   |   1 +
 .../rbtr/src/rbtr/languages/sql/plugin.py     |  65 ++++++++
 packages/rbtr/src/rbtr/languages/sql/sql.scm  |  67 +++++++++
 .../rbtr/src/rbtr/languages/toml/__init__.py  |   1 +
 .../languages/{toml.py => toml/plugin.py}     |  21 +--
 .../rbtr/src/rbtr/languages/toml/toml.scm     |  17 +++
 .../rbtr/src/rbtr/languages/yaml/__init__.py  |   1 +
 .../languages/{yaml.py => yaml/plugin.py}     |   9 +-
 .../rbtr/src/rbtr/languages/yaml/yaml.scm     |   5 +
 75 files changed, 966 insertions(+), 886 deletions(-)
 create mode 100644 packages/rbtr/src/rbtr/languages/_queries.py
 create mode 100644 packages/rbtr/src/rbtr/languages/bash/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/bash/bash.scm
 rename packages/rbtr/src/rbtr/languages/{bash.py => bash/plugin.py} (79%)
 create mode 100644 packages/rbtr/src/rbtr/languages/c/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/c/c.scm
 rename packages/rbtr/src/rbtr/languages/{c.py => c/plugin.py} (56%)
 create mode 100644 packages/rbtr/src/rbtr/languages/cpp/__init__.py
 rename packages/rbtr/src/rbtr/languages/{cpp.py => cpp/cpp.scm} (55%)
 create mode 100644 packages/rbtr/src/rbtr/languages/cpp/plugin.py
 create mode 100644 packages/rbtr/src/rbtr/languages/css/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/css/css.scm
 rename packages/rbtr/src/rbtr/languages/{css.py => css/plugin.py} (81%)
 create mode 100644 packages/rbtr/src/rbtr/languages/go/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/go/go.scm
 rename packages/rbtr/src/rbtr/languages/{go.py => go/plugin.py} (64%)
 create mode 100644 packages/rbtr/src/rbtr/languages/hcl/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/hcl/hcl.scm
 rename packages/rbtr/src/rbtr/languages/{hcl.py => hcl/plugin.py} (95%)
 create mode 100644 packages/rbtr/src/rbtr/languages/html/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/html/html.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/html/injections.scm
 rename packages/rbtr/src/rbtr/languages/{html.py => html/plugin.py} (81%)
 create mode 100644 packages/rbtr/src/rbtr/languages/java/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/java/java.scm
 rename packages/rbtr/src/rbtr/languages/{java.py => java/plugin.py} (70%)
 create mode 100644 packages/rbtr/src/rbtr/languages/javascript/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/javascript/javascript.scm
 rename packages/rbtr/src/rbtr/languages/{javascript.py => javascript/plugin.py} (67%)
 create mode 100644 packages/rbtr/src/rbtr/languages/javascript/shared.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/javascript/typescript.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/javascript/variables.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/json/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/json/json.scm
 rename packages/rbtr/src/rbtr/languages/{json.py => json/plugin.py} (91%)
 create mode 100644 packages/rbtr/src/rbtr/languages/less/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/less/less.scm
 rename packages/rbtr/src/rbtr/languages/{less.py => less/plugin.py} (76%)
 create mode 100644 packages/rbtr/src/rbtr/languages/markdown/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/markdown/injections.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/markdown/links.scm
 rename packages/rbtr/src/rbtr/languages/{markdown.py => markdown/plugin.py} (97%)
 create mode 100644 packages/rbtr/src/rbtr/languages/markdown/sections.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/python/__init__.py
 rename packages/rbtr/src/rbtr/languages/{python.py => python/plugin.py} (77%)
 create mode 100644 packages/rbtr/src/rbtr/languages/python/python.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/rst/__init__.py
 rename packages/rbtr/src/rbtr/languages/{rst.py => rst/plugin.py} (98%)
 create mode 100644 packages/rbtr/src/rbtr/languages/rst/references.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/ruby/__init__.py
 rename packages/rbtr/src/rbtr/languages/{ruby.py => ruby/plugin.py} (74%)
 create mode 100644 packages/rbtr/src/rbtr/languages/ruby/ruby.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/rust/__init__.py
 rename packages/rbtr/src/rbtr/languages/{rust.py => rust/plugin.py} (86%)
 create mode 100644 packages/rbtr/src/rbtr/languages/rust/rust.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/scss/__init__.py
 rename packages/rbtr/src/rbtr/languages/{scss.py => scss/plugin.py} (71%)
 create mode 100644 packages/rbtr/src/rbtr/languages/scss/scss.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/sfc/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/sfc/injections.scm
 rename packages/rbtr/src/rbtr/languages/{sfc.py => sfc/plugin.py} (82%)
 delete mode 100644 packages/rbtr/src/rbtr/languages/sql.py
 create mode 100644 packages/rbtr/src/rbtr/languages/sql/__init__.py
 create mode 100644 packages/rbtr/src/rbtr/languages/sql/plugin.py
 create mode 100644 packages/rbtr/src/rbtr/languages/sql/sql.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/toml/__init__.py
 rename packages/rbtr/src/rbtr/languages/{toml.py => toml/plugin.py} (89%)
 create mode 100644 packages/rbtr/src/rbtr/languages/toml/toml.scm
 create mode 100644 packages/rbtr/src/rbtr/languages/yaml/__init__.py
 rename packages/rbtr/src/rbtr/languages/{yaml.py => yaml/plugin.py} (89%)
 create mode 100644 packages/rbtr/src/rbtr/languages/yaml/yaml.scm

diff --git a/.agents/skills/rbtr-languages/SKILL.md b/.agents/skills/rbtr-languages/SKILL.md
index 0cba42ac..04324ed4 100644
--- a/.agents/skills/rbtr-languages/SKILL.md
+++ b/.agents/skills/rbtr-languages/SKILL.md
@@ -115,6 +115,22 @@ at absolute line numbers. Every file also gets a host-language chunk (a
 content-less presence chunk if it would produce none), so dedup works. See
 ARCHITECTURE “Dispatch chain” for the mechanism and rationale.
 
+### Where queries live
+
+Every query — `reg.query`, `reg.injection_query`, and any query a chunker
+compiles — is a `.scm` file in the plugin's own package
+(`languages/<lang>/<name>.scm`), loaded at import via
+`load_query(__package__, "<name>")`. Never inline a query as a Python string
+literal (the house rule against embedding a foreign language). The `uv`
+build backend ships `.scm` as package data with no extra config.
+
+Compose in Python when a query is built from parts — the query language has
+no `#include`: js/ts concatenate shared fragment files with `+`
+(`load_query(pkg, "javascript") + load_query(pkg, "shared") + …`); SQL groups
+its DDL verbs into `[...]` alternations within one `sql.scm`. Prefer these to
+generating query text from Python data. Editing a `.scm` is an extraction
+change — the `language_plugin_version` bump rule (below) applies.
+
 ## Capture conventions
 
 The query's capture names drive the chunk kind (see `_CAPTURE_KIND` in
@@ -188,7 +204,9 @@ captured node, so they work for any language:
 1. Read the grammar: its `queries/tags.scm` (the authors' definition list —
    see the tags reference) **and** the real node structure (parse a snippet,
    print the tree). Never guess node types.
-2. Extend the `_QUERY` (or chunker). Verify against a parsed snippet.
+2. Edit the language's `.scm` query file (or chunker) — queries live in
+   `languages/<lang>/*.scm`, loaded via `load_query`, never inline (see
+   *Where queries live*). Verify against a parsed snippet.
 3. Add the construct to that language's sample in `tests/languages/samples/`
    and regenerate the snapshot with `just snapshots`; review the diff.
 4. Bump `language_plugin_version` — any extraction change triggers
@@ -232,6 +250,10 @@ itself a tree-sitter query, so it is **inspiration for ours, not a drop-in**:
   (ts ← js), and only the 9 code grammars ship one.
 - Running it live would couple extraction to upstream drift. We don't.
 
+Distinct from **rbtr's own** `.scm` files (see *Where queries live*): we load
+those at runtime (`reg.query` / `injection_query`) as the source of truth,
+whereas `tags.scm` we only mine for ideas.
+
 Curated per-language verdicts (take / modify / ignore) and the
 `@definition.* → ChunkKind` mapping live in
 `references/tags-scm-reference.md`.
diff --git a/packages/rbtr/ARCHITECTURE.md b/packages/rbtr/ARCHITECTURE.md
index cefb6c8e..55a2fe4d 100644
--- a/packages/rbtr/ARCHITECTURE.md
+++ b/packages/rbtr/ARCHITECTURE.md
@@ -1070,10 +1070,12 @@ chunks.
 
 ## Language plugins
 
-[pluggy]-based. Each plugin is a Python file under
-`rbtr/languages/` that returns `LanguageRegistration`
-instances. A plugin provides whatever combination of fields
-its language needs - there are no tiers or categories.
+[pluggy]-based. Each plugin is a package under
+`rbtr/languages/<lang>/` (a `plugin.py` plus its tree-sitter
+queries as sibling `.scm` files, loaded via `load_query`)
+that returns `LanguageRegistration` instances. A plugin
+provides whatever combination of fields its language needs -
+there are no tiers or categories.
 
 [pluggy]: https://pluggy.readthedocs.io/
 
diff --git a/packages/rbtr/README.md b/packages/rbtr/README.md
index 70b982b1..91c6760a 100644
--- a/packages/rbtr/README.md
+++ b/packages/rbtr/README.md
@@ -375,30 +375,34 @@ for how the plugin system works.
 
 ## Writing a language plugin
 
-Every plugin is a Python file under `rbtr/languages/`
-with a pluggy hook that returns `LanguageRegistration`
-instances. A plugin provides whatever fields its language
-needs.
+Every plugin is a package under `rbtr/languages/<lang>/` — a
+`plugin.py` with a pluggy hook that returns
+`LanguageRegistration` instances, plus its tree-sitter query
+in a sibling `.scm` file. A plugin provides whatever fields
+its language needs.
 
 ### Query-based plugin (preferred)
 
 Most languages need only a tree-sitter query. The generic
 `extract_symbols` pipeline handles parsing, capture
-matching, scope detection, and chunk construction.
+matching, scope detection, and chunk construction. The query
+lives in its own `.scm` file, loaded with `load_query`:
 
-```python
-# rbtr/languages/swift.py
-from __future__ import annotations
-from rbtr.languages.hookspec import LanguageRegistration, hookimpl
-
-_QUERY = """\
+```scm
+; rbtr/languages/swift/swift.scm
 (function_declaration
   name: (identifier) @_fn_name) @function
 (class_declaration
   name: (type_identifier) @_cls_name) @class
 (import_declaration
   (identifier) @_import_module) @import
-"""
+```
+
+```python
+# rbtr/languages/swift/plugin.py
+from __future__ import annotations
+from rbtr.languages._queries import load_query
+from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 class SwiftPlugin:
     @hookimpl
@@ -408,7 +412,7 @@ class SwiftPlugin:
                 id="swift",
                 extensions=frozenset({".swift"}),
                 grammar_module="tree_sitter_swift",
-                query=_QUERY,
+                query=load_query(__package__, "swift"),
                 scope_types=frozenset({"class_declaration"}),
                 doc_comment_node_types=frozenset({"comment"}),
             ),
@@ -456,7 +460,7 @@ content-minus-children), write a custom chunker. The
 chunker receives the grammar from the manager:
 
 ```python
-# rbtr/languages/example.py
+# rbtr/languages/example/plugin.py
 from __future__ import annotations
 from collections.abc import Iterator
 from typing import TYPE_CHECKING
@@ -496,7 +500,8 @@ class ExamplePlugin:
 
 ### Registration
 
-Built-in plugins: import the class at the top of
+Built-in plugins: add the `<lang>/` package (a `plugin.py`
+and any `.scm` files), then import the class at the top of
 `rbtr/languages/__init__.py` and list it in `_register_builtins`.
 
 External plugins: register via setuptools entry points:
diff --git a/packages/rbtr/src/rbtr/languages/__init__.py b/packages/rbtr/src/rbtr/languages/__init__.py
index b9d17f14..617f287c 100644
--- a/packages/rbtr/src/rbtr/languages/__init__.py
+++ b/packages/rbtr/src/rbtr/languages/__init__.py
@@ -41,28 +41,28 @@
 import pluggy
 from tree_sitter import Language
 
-from rbtr.languages.bash import BashPlugin
-from rbtr.languages.c import CPlugin
-from rbtr.languages.cpp import CppPlugin
-from rbtr.languages.css import CssPlugin
-from rbtr.languages.go import GoPlugin
-from rbtr.languages.hcl import HclPlugin
+from rbtr.languages.bash.plugin import BashPlugin
+from rbtr.languages.c.plugin import CPlugin
+from rbtr.languages.cpp.plugin import CppPlugin
+from rbtr.languages.css.plugin import CssPlugin
+from rbtr.languages.go.plugin import GoPlugin
+from rbtr.languages.hcl.plugin import HclPlugin
 from rbtr.languages.hookspec import PROJECT_NAME, LanguageHookspec, LanguageRegistration
-from rbtr.languages.html import HtmlPlugin
-from rbtr.languages.java import JavaPlugin
-from rbtr.languages.javascript import JavaScriptPlugin
-from rbtr.languages.json import JsonPlugin
-from rbtr.languages.less import LessPlugin
-from rbtr.languages.markdown import MarkdownPlugin
-from rbtr.languages.python import PythonPlugin
-from rbtr.languages.rst import RstPlugin
-from rbtr.languages.ruby import RubyPlugin
-from rbtr.languages.rust import RustPlugin
-from rbtr.languages.scss import ScssPlugin
-from rbtr.languages.sfc import SveltePlugin, VuePlugin
-from rbtr.languages.sql import SqlPlugin
-from rbtr.languages.toml import TomlPlugin
-from rbtr.languages.yaml import YamlPlugin
+from rbtr.languages.html.plugin import HtmlPlugin
+from rbtr.languages.java.plugin import JavaPlugin
+from rbtr.languages.javascript.plugin import JavaScriptPlugin
+from rbtr.languages.json.plugin import JsonPlugin
+from rbtr.languages.less.plugin import LessPlugin
+from rbtr.languages.markdown.plugin import MarkdownPlugin
+from rbtr.languages.python.plugin import PythonPlugin
+from rbtr.languages.rst.plugin import RstPlugin
+from rbtr.languages.ruby.plugin import RubyPlugin
+from rbtr.languages.rust.plugin import RustPlugin
+from rbtr.languages.scss.plugin import ScssPlugin
+from rbtr.languages.sfc.plugin import SveltePlugin, VuePlugin
+from rbtr.languages.sql.plugin import SqlPlugin
+from rbtr.languages.toml.plugin import TomlPlugin
+from rbtr.languages.yaml.plugin import YamlPlugin
 
 
 class LanguageManager:
diff --git a/packages/rbtr/src/rbtr/languages/_queries.py b/packages/rbtr/src/rbtr/languages/_queries.py
new file mode 100644
index 00000000..a25f14f8
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/_queries.py
@@ -0,0 +1,25 @@
+"""Load tree-sitter queries from `.scm` files beside each plugin.
+
+Query text lives in `<name>.scm` inside the plugin's own package,
+loaded at import time via `load_query` — not embedded inline in Python.
+See ARCHITECTURE "Where queries live" for the rationale.
+"""
+
+from __future__ import annotations
+
+from importlib.resources import files
+
+
+def load_query(package: str, name: str) -> str:
+    """Return the text of a `<name>.scm` query file in *package*.
+
+    Args:
+        package: The plugin package to resolve against, normally the
+            caller's own `__package__` (e.g. `"rbtr.languages.python"`).
+        name: Query filename without the `.scm` extension (e.g.
+            `"python"`, `"injections"`).
+
+    Returns:
+        The file's contents verbatim.
+    """
+    return (files(package) / f"{name}.scm").read_text(encoding="utf-8")
diff --git a/packages/rbtr/src/rbtr/languages/bash/__init__.py b/packages/rbtr/src/rbtr/languages/bash/__init__.py
new file mode 100644
index 00000000..db66ecff
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/bash/__init__.py
@@ -0,0 +1 @@
+"""Bash language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/bash/bash.scm b/packages/rbtr/src/rbtr/languages/bash/bash.scm
new file mode 100644
index 00000000..037ec36b
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/bash/bash.scm
@@ -0,0 +1,31 @@
+(function_definition
+  name: (word) @_fn_name) @function
+
+(command
+  name: (command_name
+    (word) @_cmd)
+  .
+  (word) @_import_module
+  (#eq? @_cmd "source")) @import
+
+(command
+  name: (command_name
+    (word) @_cmd)
+  .
+  (word) @_import_module
+  (#eq? @_cmd ".")) @import
+
+(program
+  (variable_assignment
+    name: (variable_name) @_var_name) @variable)
+
+(program
+  (declaration_command
+    (variable_assignment
+      name: (variable_name) @_var_name)) @variable)
+
+(command
+  name: (command_name (word) @_cmd)
+  argument: (concatenation (word) @_var_name)
+  (#eq? @_cmd "alias")
+  (#match? @_var_name "=")) @variable
diff --git a/packages/rbtr/src/rbtr/languages/bash.py b/packages/rbtr/src/rbtr/languages/bash/plugin.py
similarity index 79%
rename from packages/rbtr/src/rbtr/languages/bash.py
rename to packages/rbtr/src/rbtr/languages/bash/plugin.py
index 186318f0..562652a7 100644
--- a/packages/rbtr/src/rbtr/languages/bash.py
+++ b/packages/rbtr/src/rbtr/languages/bash/plugin.py
@@ -20,6 +20,7 @@ class system, or module structure.
 
 from typing import TYPE_CHECKING
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl, resolve_name
 
 if TYPE_CHECKING:
@@ -33,39 +34,7 @@ def _strip_alias_eq(capture_name: str, node: Node, captures: dict[str, list[Node
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """\
-(function_definition
-  name: (word) @_fn_name) @function
-
-(command
-  name: (command_name
-    (word) @_cmd)
-  .
-  (word) @_import_module
-  (#eq? @_cmd "source")) @import
-
-(command
-  name: (command_name
-    (word) @_cmd)
-  .
-  (word) @_import_module
-  (#eq? @_cmd ".")) @import
-
-(program
-  (variable_assignment
-    name: (variable_name) @_var_name) @variable)
-
-(program
-  (declaration_command
-    (variable_assignment
-      name: (variable_name) @_var_name)) @variable)
-
-(command
-  name: (command_name (word) @_cmd)
-  argument: (concatenation (word) @_var_name)
-  (#eq? @_cmd "alias")
-  (#match? @_var_name "=")) @variable
-"""
+_QUERY = load_query(__package__, "bash")
 
 # ── Plugin ───────────────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/c/__init__.py b/packages/rbtr/src/rbtr/languages/c/__init__.py
new file mode 100644
index 00000000..e7a6a312
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/c/__init__.py
@@ -0,0 +1 @@
+"""C language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/c/c.scm b/packages/rbtr/src/rbtr/languages/c/c.scm
new file mode 100644
index 00000000..918c4adc
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/c/c.scm
@@ -0,0 +1,61 @@
+
+(function_definition
+  declarator: (function_declarator
+    declarator: (identifier) @_fn_name)) @function
+
+(preproc_include
+  path: (system_lib_string) @_import_module) @import
+
+(preproc_include
+  path: (string_literal) @_import_module) @import
+
+(struct_specifier
+  name: (type_identifier) @_cls_name
+  body: (field_declaration_list)) @class
+
+(union_specifier
+  name: (type_identifier) @_cls_name
+  body: (field_declaration_list)) @class
+
+(enum_specifier
+  name: (type_identifier) @_cls_name
+  body: (enumerator_list)) @class
+
+(enumerator
+  name: (identifier) @_var_name) @variable
+
+(type_definition
+  declarator: (type_identifier) @_cls_name) @class
+
+(type_definition
+  declarator: (function_declarator
+    declarator: (parenthesized_declarator
+      (pointer_declarator
+        declarator: (type_identifier) @_cls_name)))) @class
+
+(preproc_function_def
+  name: (identifier) @_fn_name) @function
+
+(preproc_def
+  name: (identifier) @_var_name) @variable
+
+(translation_unit
+  (declaration
+    declarator: (function_declarator
+      declarator: (identifier) @_fn_name)) @function)
+
+(translation_unit
+  (declaration
+    declarator: (init_declarator
+      declarator: (identifier) @_var_name)) @variable)
+
+(translation_unit
+  (declaration
+    declarator: (pointer_declarator
+      declarator: (identifier) @_var_name)) @variable)
+
+(translation_unit
+  (declaration
+    declarator: (init_declarator
+      declarator: (pointer_declarator
+        declarator: (identifier) @_var_name))) @variable)
diff --git a/packages/rbtr/src/rbtr/languages/c.py b/packages/rbtr/src/rbtr/languages/c/plugin.py
similarity index 56%
rename from packages/rbtr/src/rbtr/languages/c.py
rename to packages/rbtr/src/rbtr/languages/c/plugin.py
index 69d6c41f..37bbcb35 100644
--- a/packages/rbtr/src/rbtr/languages/c.py
+++ b/packages/rbtr/src/rbtr/languages/c/plugin.py
@@ -21,72 +21,12 @@
 
 from __future__ import annotations
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """
-(function_definition
-  declarator: (function_declarator
-    declarator: (identifier) @_fn_name)) @function
-
-(preproc_include
-  path: (system_lib_string) @_import_module) @import
-
-(preproc_include
-  path: (string_literal) @_import_module) @import
-
-(struct_specifier
-  name: (type_identifier) @_cls_name
-  body: (field_declaration_list)) @class
-
-(union_specifier
-  name: (type_identifier) @_cls_name
-  body: (field_declaration_list)) @class
-
-(enum_specifier
-  name: (type_identifier) @_cls_name
-  body: (enumerator_list)) @class
-
-(enumerator
-  name: (identifier) @_var_name) @variable
-
-(type_definition
-  declarator: (type_identifier) @_cls_name) @class
-
-(type_definition
-  declarator: (function_declarator
-    declarator: (parenthesized_declarator
-      (pointer_declarator
-        declarator: (type_identifier) @_cls_name)))) @class
-
-(preproc_function_def
-  name: (identifier) @_fn_name) @function
-
-(preproc_def
-  name: (identifier) @_var_name) @variable
-
-(translation_unit
-  (declaration
-    declarator: (function_declarator
-      declarator: (identifier) @_fn_name)) @function)
-
-(translation_unit
-  (declaration
-    declarator: (init_declarator
-      declarator: (identifier) @_var_name)) @variable)
-
-(translation_unit
-  (declaration
-    declarator: (pointer_declarator
-      declarator: (identifier) @_var_name)) @variable)
-
-(translation_unit
-  (declaration
-    declarator: (init_declarator
-      declarator: (pointer_declarator
-        declarator: (identifier) @_var_name))) @variable)
-"""
+_QUERY = load_query(__package__, "c")
 
 # ── Plugin ───────────────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/cpp/__init__.py b/packages/rbtr/src/rbtr/languages/cpp/__init__.py
new file mode 100644
index 00000000..609d7979
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/cpp/__init__.py
@@ -0,0 +1 @@
+"""C++ language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/cpp.py b/packages/rbtr/src/rbtr/languages/cpp/cpp.scm
similarity index 55%
rename from packages/rbtr/src/rbtr/languages/cpp.py
rename to packages/rbtr/src/rbtr/languages/cpp/cpp.scm
index 3598aab4..7a89a1ad 100644
--- a/packages/rbtr/src/rbtr/languages/cpp.py
+++ b/packages/rbtr/src/rbtr/languages/cpp/cpp.scm
@@ -1,31 +1,4 @@
-"""C++ language plugin.
 
-Provides symbol extraction (functions, prototypes, classes, structs,
-unions, enums, type aliases, namespaces, methods including operator
-overloads, namespace/global variables, and function/object-like
-macros) and include directive capture.  Namespaces are both a symbol
-(class) and a naming scope.
-
-Extracted chunks::
-
-    void greet() {}                 → function "greet", scope ""
-    class Shape {};                 → class "Shape", scope ""
-    struct Point { ... };           → class "Point", scope ""
-    class Foo {
-      void bar() {}                 → method "bar", scope "Foo"
-    };
-
-    #include <iostream>
-        → import, metadata {module: "iostream"}
-"""
-
-from __future__ import annotations
-
-from rbtr.languages.hookspec import LanguageRegistration, hookimpl
-
-# ── Query ────────────────────────────────────────────────────────────
-
-_QUERY = """
 (function_definition
   declarator: (function_declarator
     declarator: (identifier) @_fn_name)) @function
@@ -129,30 +102,3 @@ class Foo {
       declarator: (init_declarator
         declarator: (pointer_declarator
           declarator: (identifier) @_var_name))) @variable))
-"""
-
-# ── Plugin ───────────────────────────────────────────────────────────
-
-
-class CppPlugin:
-    """C++ language support — functions, classes, methods, includes."""
-
-    @hookimpl
-    def rbtr_register_languages(self) -> list[LanguageRegistration]:
-        return [
-            LanguageRegistration(
-                id="cpp",
-                extensions=frozenset({".cpp", ".cc", ".cxx", ".hpp", ".hxx"}),
-                grammar_module="tree_sitter_cpp",
-                query=_QUERY,
-                scope_types=frozenset(
-                    {"class_specifier", "struct_specifier", "namespace_definition"}
-                ),
-                class_scope_types=frozenset({"class_specifier", "struct_specifier"}),
-                # Same grammar as C — single `comment` node.
-                doc_comment_node_types=frozenset({"comment"}),
-                source_roots=("", "include", "src"),
-                test_prefix="test_",
-                language_plugin_version=5,
-            ),
-        ]
diff --git a/packages/rbtr/src/rbtr/languages/cpp/plugin.py b/packages/rbtr/src/rbtr/languages/cpp/plugin.py
new file mode 100644
index 00000000..0f98c914
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/cpp/plugin.py
@@ -0,0 +1,55 @@
+"""C++ language plugin.
+
+Provides symbol extraction (functions, prototypes, classes, structs,
+unions, enums, type aliases, namespaces, methods including operator
+overloads, namespace/global variables, and function/object-like
+macros) and include directive capture.  Namespaces are both a symbol
+(class) and a naming scope.
+
+Extracted chunks::
+
+    void greet() {}                 → function "greet", scope ""
+    class Shape {};                 → class "Shape", scope ""
+    struct Point { ... };           → class "Point", scope ""
+    class Foo {
+      void bar() {}                 → method "bar", scope "Foo"
+    };
+
+    #include <iostream>
+        → import, metadata {module: "iostream"}
+"""
+
+from __future__ import annotations
+
+from rbtr.languages._queries import load_query
+from rbtr.languages.hookspec import LanguageRegistration, hookimpl
+
+# ── Query ────────────────────────────────────────────────────────────
+
+_QUERY = load_query(__package__, "cpp")
+
+# ── Plugin ───────────────────────────────────────────────────────────
+
+
+class CppPlugin:
+    """C++ language support — functions, classes, methods, includes."""
+
+    @hookimpl
+    def rbtr_register_languages(self) -> list[LanguageRegistration]:
+        return [
+            LanguageRegistration(
+                id="cpp",
+                extensions=frozenset({".cpp", ".cc", ".cxx", ".hpp", ".hxx"}),
+                grammar_module="tree_sitter_cpp",
+                query=_QUERY,
+                scope_types=frozenset(
+                    {"class_specifier", "struct_specifier", "namespace_definition"}
+                ),
+                class_scope_types=frozenset({"class_specifier", "struct_specifier"}),
+                # Same grammar as C — single `comment` node.
+                doc_comment_node_types=frozenset({"comment"}),
+                source_roots=("", "include", "src"),
+                test_prefix="test_",
+                language_plugin_version=5,
+            ),
+        ]
diff --git a/packages/rbtr/src/rbtr/languages/css/__init__.py b/packages/rbtr/src/rbtr/languages/css/__init__.py
new file mode 100644
index 00000000..f1849f82
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/css/__init__.py
@@ -0,0 +1 @@
+"""CSS language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/css/css.scm b/packages/rbtr/src/rbtr/languages/css/css.scm
new file mode 100644
index 00000000..dc091e41
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/css/css.scm
@@ -0,0 +1,21 @@
+(rule_set
+  (selectors) @_section_name) @doc_section
+
+(media_statement) @doc_section
+
+(charset_statement) @doc_section
+
+(keyframes_statement
+  (keyframes_name) @_section_name) @doc_section
+
+(import_statement
+  (call_expression
+    (arguments
+      (string_value (string_content) @_import_module)))) @import
+
+(import_statement
+  (string_value (string_content) @_import_module)) @import
+
+(declaration
+  (property_name) @_var_name
+  (#match? @_var_name "^--")) @variable
diff --git a/packages/rbtr/src/rbtr/languages/css.py b/packages/rbtr/src/rbtr/languages/css/plugin.py
similarity index 81%
rename from packages/rbtr/src/rbtr/languages/css.py
rename to packages/rbtr/src/rbtr/languages/css/plugin.py
index 55663259..36d43129 100644
--- a/packages/rbtr/src/rbtr/languages/css.py
+++ b/packages/rbtr/src/rbtr/languages/css/plugin.py
@@ -18,34 +18,13 @@
 
 from typing import TYPE_CHECKING
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, enclosing_nodes_of_type, hookimpl
 
 if TYPE_CHECKING:
     from tree_sitter import Node
 
-_QUERY = """\
-(rule_set
-  (selectors) @_section_name) @doc_section
-
-(media_statement) @doc_section
-
-(charset_statement) @doc_section
-
-(keyframes_statement
-  (keyframes_name) @_section_name) @doc_section
-
-(import_statement
-  (call_expression
-    (arguments
-      (string_value (string_content) @_import_module)))) @import
-
-(import_statement
-  (string_value (string_content) @_import_module)) @import
-
-(declaration
-  (property_name) @_var_name
-  (#match? @_var_name "^--")) @variable
-"""
+_QUERY = load_query(__package__, "css")
 
 
 def css_nesting_scope(capture_name: str, node: Node, captures: dict[str, list[Node]]) -> list[str]:
diff --git a/packages/rbtr/src/rbtr/languages/go/__init__.py b/packages/rbtr/src/rbtr/languages/go/__init__.py
new file mode 100644
index 00000000..1c49c64b
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/go/__init__.py
@@ -0,0 +1 @@
+"""Go language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/go/go.scm b/packages/rbtr/src/rbtr/languages/go/go.scm
new file mode 100644
index 00000000..e14e6fa1
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/go/go.scm
@@ -0,0 +1,49 @@
+(function_declaration
+  name: (identifier) @_fn_name) @function
+
+(method_declaration
+  receiver: (parameter_list
+    (parameter_declaration
+      type: [
+        (type_identifier) @_scope
+        (pointer_type (type_identifier) @_scope)
+      ]))
+  name: (field_identifier) @_method_name) @method
+
+(type_declaration
+  (type_spec
+    name: (type_identifier) @_cls_name)) @class
+
+(type_spec
+  (interface_type
+    (method_elem
+      name: (field_identifier) @_method_name) @method))
+
+(type_declaration
+  (type_alias
+    name: (type_identifier) @_cls_name)) @class
+
+(import_declaration
+  (import_spec
+    path: (interpreted_string_literal) @_import_module) @import)
+
+(import_declaration
+  (import_spec_list
+    (import_spec
+      path: (interpreted_string_literal) @_import_module) @import))
+
+(source_file
+  (var_declaration
+    (var_spec
+      name: (identifier) @_var_name) @variable))
+
+(source_file
+  (const_declaration
+    (const_spec
+      name: (identifier) @_var_name) @variable))
+
+(source_file
+  (var_declaration
+    (var_spec_list
+      (var_spec
+        name: (identifier) @_var_name) @variable)))
diff --git a/packages/rbtr/src/rbtr/languages/go.py b/packages/rbtr/src/rbtr/languages/go/plugin.py
similarity index 64%
rename from packages/rbtr/src/rbtr/languages/go.py
rename to packages/rbtr/src/rbtr/languages/go/plugin.py
index b8388737..49301b93 100644
--- a/packages/rbtr/src/rbtr/languages/go.py
+++ b/packages/rbtr/src/rbtr/languages/go/plugin.py
@@ -18,61 +18,12 @@
 
 from __future__ import annotations
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """\
-(function_declaration
-  name: (identifier) @_fn_name) @function
-
-(method_declaration
-  receiver: (parameter_list
-    (parameter_declaration
-      type: [
-        (type_identifier) @_scope
-        (pointer_type (type_identifier) @_scope)
-      ]))
-  name: (field_identifier) @_method_name) @method
-
-(type_declaration
-  (type_spec
-    name: (type_identifier) @_cls_name)) @class
-
-(type_spec
-  (interface_type
-    (method_elem
-      name: (field_identifier) @_method_name) @method))
-
-(type_declaration
-  (type_alias
-    name: (type_identifier) @_cls_name)) @class
-
-(import_declaration
-  (import_spec
-    path: (interpreted_string_literal) @_import_module) @import)
-
-(import_declaration
-  (import_spec_list
-    (import_spec
-      path: (interpreted_string_literal) @_import_module) @import))
-
-(source_file
-  (var_declaration
-    (var_spec
-      name: (identifier) @_var_name) @variable))
-
-(source_file
-  (const_declaration
-    (const_spec
-      name: (identifier) @_var_name) @variable))
-
-(source_file
-  (var_declaration
-    (var_spec_list
-      (var_spec
-        name: (identifier) @_var_name) @variable)))
-"""
+_QUERY = load_query(__package__, "go")
 
 # ── Plugin ───────────────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/hcl/__init__.py b/packages/rbtr/src/rbtr/languages/hcl/__init__.py
new file mode 100644
index 00000000..763eee1f
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/hcl/__init__.py
@@ -0,0 +1 @@
+"""HCL language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/hcl/hcl.scm b/packages/rbtr/src/rbtr/languages/hcl/hcl.scm
new file mode 100644
index 00000000..ed31d0d4
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/hcl/hcl.scm
@@ -0,0 +1,3 @@
+(config_file
+  (body
+    (block) @doc_section))
diff --git a/packages/rbtr/src/rbtr/languages/hcl.py b/packages/rbtr/src/rbtr/languages/hcl/plugin.py
similarity index 95%
rename from packages/rbtr/src/rbtr/languages/hcl.py
rename to packages/rbtr/src/rbtr/languages/hcl/plugin.py
index c336142f..6f030621 100644
--- a/packages/rbtr/src/rbtr/languages/hcl.py
+++ b/packages/rbtr/src/rbtr/languages/hcl/plugin.py
@@ -14,6 +14,7 @@
 
 from typing import TYPE_CHECKING
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl, resolve_name
 
 if TYPE_CHECKING:
@@ -21,11 +22,7 @@
 
 # Top-level blocks only: a `block` whose body is the file's own body,
 # not one nested inside another block.
-_QUERY = """\
-(config_file
-  (body
-    (block) @doc_section))
-"""
+_QUERY = load_query(__package__, "hcl")
 
 
 def hcl_block_name(capture_name: str, node: Node, captures: dict[str, list[Node]]) -> str:
diff --git a/packages/rbtr/src/rbtr/languages/html/__init__.py b/packages/rbtr/src/rbtr/languages/html/__init__.py
new file mode 100644
index 00000000..76f07495
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/html/__init__.py
@@ -0,0 +1 @@
+"""HTML language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/html/html.scm b/packages/rbtr/src/rbtr/languages/html/html.scm
new file mode 100644
index 00000000..21b555eb
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/html/html.scm
@@ -0,0 +1,18 @@
+(element (start_tag (tag_name) @_tag)
+  (#any-of? @_tag "head" "body" "article" "aside" "nav" "section" "header" "main" "footer" "figure" "form" "dialog" "details" "table")) @doc_section
+
+(script_element
+  (start_tag
+    (attribute (attribute_name) @_a
+      (quoted_attribute_value (attribute_value) @_import_module))
+    (#eq? @_a "src"))) @import
+
+(element
+  [(start_tag (tag_name) @_lt
+     (attribute (attribute_name) @_h
+       (quoted_attribute_value (attribute_value) @_import_module)))
+   (self_closing_tag (tag_name) @_lt
+     (attribute (attribute_name) @_h
+       (quoted_attribute_value (attribute_value) @_import_module)))]
+  (#eq? @_lt "link")
+  (#eq? @_h "href")) @import
diff --git a/packages/rbtr/src/rbtr/languages/html/injections.scm b/packages/rbtr/src/rbtr/languages/html/injections.scm
new file mode 100644
index 00000000..ee86b625
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/html/injections.scm
@@ -0,0 +1,8 @@
+; Inline <script>/<style> delegate to JavaScript/CSS. External
+; <script src>/<link href> have no raw_text, so they become imports instead.
+
+((script_element (raw_text) @injection.content)
+  (#set! injection.language "javascript"))
+
+((style_element (raw_text) @injection.content)
+  (#set! injection.language "css"))
diff --git a/packages/rbtr/src/rbtr/languages/html.py b/packages/rbtr/src/rbtr/languages/html/plugin.py
similarity index 81%
rename from packages/rbtr/src/rbtr/languages/html.py
rename to packages/rbtr/src/rbtr/languages/html/plugin.py
index 3ccdf192..305b8c7f 100644
--- a/packages/rbtr/src/rbtr/languages/html.py
+++ b/packages/rbtr/src/rbtr/languages/html/plugin.py
@@ -22,6 +22,7 @@ class and its methods). A file with none of these is left to the engine's
 from typing import TYPE_CHECKING
 
 from rbtr.index.models import ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     build_import_from_captures,
@@ -35,40 +36,12 @@ class and its methods). A file with none of these is left to the engine's
 # Elements that hold meaning of their own: the document containers, HTML5
 # sectioning content and landmarks, and self-contained units. Named by their
 # `id` when present, else by tag.
-_SEMANTIC_TAGS = (
-    '"head" "body" "article" "aside" "nav" "section" "header" "main" "footer" '
-    '"figure" "form" "dialog" "details" "table"'
-)
 
-_QUERY = f"""\
-(element (start_tag (tag_name) @_tag)
-  (#any-of? @_tag {_SEMANTIC_TAGS})) @doc_section
-
-(script_element
-  (start_tag
-    (attribute (attribute_name) @_a
-      (quoted_attribute_value (attribute_value) @_import_module))
-    (#eq? @_a "src"))) @import
-
-(element
-  [(start_tag (tag_name) @_lt
-     (attribute (attribute_name) @_h
-       (quoted_attribute_value (attribute_value) @_import_module)))
-   (self_closing_tag (tag_name) @_lt
-     (attribute (attribute_name) @_h
-       (quoted_attribute_value (attribute_value) @_import_module)))]
-  (#eq? @_lt "link")
-  (#eq? @_h "href")) @import
-"""
+_QUERY = load_query(__package__, "html")
 
 # Inline <script>/<style> delegate to JavaScript/CSS. External <script src>/
 # <link href> have no raw_text, so they are skipped here and become imports.
-_INJECTIONS = """\
-((script_element (raw_text) @injection.content)
- (#set! injection.language "javascript"))
-((style_element (raw_text) @injection.content)
- (#set! injection.language "css"))
-"""
+_INJECTIONS = load_query(__package__, "injections")
 
 
 def _get_attr(start_tag: Node, attr_name: str) -> str | None:
diff --git a/packages/rbtr/src/rbtr/languages/java/__init__.py b/packages/rbtr/src/rbtr/languages/java/__init__.py
new file mode 100644
index 00000000..4b1930a6
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/java/__init__.py
@@ -0,0 +1 @@
+"""Java language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/java/java.scm b/packages/rbtr/src/rbtr/languages/java/java.scm
new file mode 100644
index 00000000..7694537f
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/java/java.scm
@@ -0,0 +1,42 @@
+(method_declaration
+  name: (identifier) @_method_name) @method
+
+(constructor_declaration
+  name: (identifier) @_method_name) @method
+
+(field_declaration
+  declarator: (variable_declarator
+    name: (identifier) @_var_name)) @variable
+
+(class_declaration
+  name: (identifier) @_cls_name) @class
+
+(interface_declaration
+  name: (identifier) @_cls_name) @class
+
+(enum_declaration
+  name: (identifier) @_cls_name) @class
+
+(enum_declaration
+  body: (enum_body
+    (enum_constant
+      name: (identifier) @_var_name) @variable))
+
+(record_declaration
+  name: (identifier) @_cls_name) @class
+
+(record_declaration
+  parameters: (formal_parameters
+    (formal_parameter
+      name: (identifier) @_var_name) @variable))
+
+(annotation_type_declaration
+  name: (identifier) @_cls_name) @class
+
+(annotation_type_declaration
+  body: (annotation_type_body
+    (annotation_type_element_declaration
+      name: (identifier) @_method_name) @method))
+
+(import_declaration
+  (scoped_identifier) @_import_module) @import
diff --git a/packages/rbtr/src/rbtr/languages/java.py b/packages/rbtr/src/rbtr/languages/java/plugin.py
similarity index 70%
rename from packages/rbtr/src/rbtr/languages/java.py
rename to packages/rbtr/src/rbtr/languages/java/plugin.py
index b531b37f..9679ad09 100644
--- a/packages/rbtr/src/rbtr/languages/java.py
+++ b/packages/rbtr/src/rbtr/languages/java/plugin.py
@@ -17,54 +17,12 @@ class Service {
 
 from __future__ import annotations
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, ModuleStyle, hookimpl
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """\
-(method_declaration
-  name: (identifier) @_method_name) @method
-
-(constructor_declaration
-  name: (identifier) @_method_name) @method
-
-(field_declaration
-  declarator: (variable_declarator
-    name: (identifier) @_var_name)) @variable
-
-(class_declaration
-  name: (identifier) @_cls_name) @class
-
-(interface_declaration
-  name: (identifier) @_cls_name) @class
-
-(enum_declaration
-  name: (identifier) @_cls_name) @class
-
-(enum_declaration
-  body: (enum_body
-    (enum_constant
-      name: (identifier) @_var_name) @variable))
-
-(record_declaration
-  name: (identifier) @_cls_name) @class
-
-(record_declaration
-  parameters: (formal_parameters
-    (formal_parameter
-      name: (identifier) @_var_name) @variable))
-
-(annotation_type_declaration
-  name: (identifier) @_cls_name) @class
-
-(annotation_type_declaration
-  body: (annotation_type_body
-    (annotation_type_element_declaration
-      name: (identifier) @_method_name) @method))
-
-(import_declaration
-  (scoped_identifier) @_import_module) @import
-"""
+_QUERY = load_query(__package__, "java")
 
 # ── Plugin ───────────────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/javascript/__init__.py b/packages/rbtr/src/rbtr/languages/javascript/__init__.py
new file mode 100644
index 00000000..074ab7f8
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/javascript/__init__.py
@@ -0,0 +1 @@
+"""JavaScript and TypeScript language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/javascript/javascript.scm b/packages/rbtr/src/rbtr/languages/javascript/javascript.scm
new file mode 100644
index 00000000..39979b4e
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/javascript/javascript.scm
@@ -0,0 +1,4 @@
+; JS uses `identifier` for class names (TS uses `type_identifier`).
+(class_declaration
+  name: (identifier) @_cls_name) @class
+
diff --git a/packages/rbtr/src/rbtr/languages/javascript.py b/packages/rbtr/src/rbtr/languages/javascript/plugin.py
similarity index 67%
rename from packages/rbtr/src/rbtr/languages/javascript.py
rename to packages/rbtr/src/rbtr/languages/javascript/plugin.py
index 6fcdef9d..f8749ffb 100644
--- a/packages/rbtr/src/rbtr/languages/javascript.py
+++ b/packages/rbtr/src/rbtr/languages/javascript/plugin.py
@@ -27,6 +27,7 @@ class Service {}                → class "Service", scope ""
 from typing import TYPE_CHECKING
 
 from rbtr.index.models import ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     build_import_from_captures,
@@ -37,138 +38,10 @@ class Service {}                → class "Service", scope ""
 if TYPE_CHECKING:
     from tree_sitter import Node
 
-# ── Queries ──────────────────────────────────────────────────────────
+_SHARED_QUERIES = load_query(__package__, "shared") + load_query(__package__, "variables")
+_JS_QUERY = load_query(__package__, "javascript") + _SHARED_QUERIES
+_TS_QUERY = load_query(__package__, "typescript") + _SHARED_QUERIES
 
-# Shared patterns — identical across JS and TS grammars.
-# `method_definition` covers class and object-literal members, generators,
-# and get/set accessors; inside a class it promotes to a method scoped to
-# the class, elsewhere it is a scope-less method.
-_SHARED = """\
-(function_declaration
-  name: (identifier) @_fn_name) @function
-
-(generator_function_declaration
-  name: (identifier) @_fn_name) @function
-
-(import_statement
-  source: (string (string_fragment) @_import_module)) @import
-
-(lexical_declaration
-  (variable_declarator
-    name: (identifier) @_fn_name
-    value: (arrow_function))) @function
-
-(method_definition
-  name: (property_identifier) @_method_name) @method
-"""
-
-# Module-level const/let bindings with a non-function value become
-# variables.  The value allowlist excludes arrow/function expressions,
-# which `_SHARED` already captures as functions.
-_VAR_VALUES = """\
-[(number) (string) (template_string) (true) (false) (null)
- (object) (array) (identifier) (member_expression)
- (call_expression) (new_expression) (binary_expression) (unary_expression)]"""
-
-# Flat destructuring targets (object/array patterns).  The binding names
-# differ by shape: object shorthand, renamed `value:`, defaulted `left:`,
-# and rest elements.  Nested patterns are not captured (no query-only
-# recursion).  No value allowlist needed — a destructuring target is never a
-# function.
-_DESTRUCTURE_NAMES = """\
-name: [
-  (object_pattern [
-    (shorthand_property_identifier_pattern) @_var_name
-    (pair_pattern value: (identifier) @_var_name)
-    (object_assignment_pattern left: (shorthand_property_identifier_pattern) @_var_name)
-    (rest_pattern (identifier) @_var_name)
-  ])
-  (array_pattern [
-    (identifier) @_var_name
-    (rest_pattern (identifier) @_var_name)
-  ])
-]"""
-
-_VARIABLES = f"""
-(program
-  (lexical_declaration
-    (variable_declarator
-      name: (identifier) @_var_name
-      value: {_VAR_VALUES}) @variable))
-
-(program
-  (export_statement
-    declaration: (lexical_declaration
-      (variable_declarator
-        name: (identifier) @_var_name
-        value: {_VAR_VALUES}) @variable)))
-
-(program
-  (lexical_declaration
-    (variable_declarator
-      {_DESTRUCTURE_NAMES}) @variable))
-
-(program
-  (export_statement
-    declaration: (lexical_declaration
-      (variable_declarator
-        {_DESTRUCTURE_NAMES}) @variable)))
-"""
-
-# JS uses `identifier` for class names, TS uses `type_identifier`.
-_JS_QUERY = (
-    """\
-(class_declaration
-  name: (identifier) @_cls_name) @class
-
-"""
-    + _SHARED
-    + _VARIABLES
-)
-
-# TypeScript adds type-level declarations (interface, enum, type alias,
-# abstract class) as classes, and class/interface members as methods.
-# `method_definition` covers regular methods, constructors, and get/set
-# accessors; `method_signature` covers interface methods;
-# `abstract_method_signature` covers abstract declarations.
-_TS_ONLY = """\
-(class_declaration
-  name: (type_identifier) @_cls_name) @class
-
-(abstract_class_declaration
-  name: (type_identifier) @_cls_name) @class
-
-(interface_declaration
-  name: (type_identifier) @_cls_name) @class
-
-(enum_declaration
-  name: (identifier) @_cls_name) @class
-
-(enum_body
-  (property_identifier) @_var_name @variable)
-
-(enum_body
-  (enum_assignment
-    name: (property_identifier) @_var_name) @variable)
-
-(type_alias_declaration
-  name: (type_identifier) @_cls_name) @class
-
-(internal_module
-  name: (identifier) @_cls_name) @class
-
-(module
-  name: (identifier) @_cls_name) @class
-
-(method_signature
-  name: (property_identifier) @_method_name) @method
-
-(abstract_method_signature
-  name: (property_identifier) @_method_name) @method
-
-"""
-
-_TS_QUERY = _TS_ONLY + _SHARED + _VARIABLES
 
 # ── Import extractor (shared by JS and TS) ───────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/javascript/shared.scm b/packages/rbtr/src/rbtr/languages/javascript/shared.scm
new file mode 100644
index 00000000..2df2c738
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/javascript/shared.scm
@@ -0,0 +1,20 @@
+; Shared patterns — identical across the JS and TS grammars.
+; method_definition covers class and object-literal members, generators,
+; and get/set accessors; inside a class it promotes to a method scoped to
+; the class, elsewhere it is a scope-less method.
+(function_declaration
+  name: (identifier) @_fn_name) @function
+
+(generator_function_declaration
+  name: (identifier) @_fn_name) @function
+
+(import_statement
+  source: (string (string_fragment) @_import_module)) @import
+
+(lexical_declaration
+  (variable_declarator
+    name: (identifier) @_fn_name
+    value: (arrow_function))) @function
+
+(method_definition
+  name: (property_identifier) @_method_name) @method
diff --git a/packages/rbtr/src/rbtr/languages/javascript/typescript.scm b/packages/rbtr/src/rbtr/languages/javascript/typescript.scm
new file mode 100644
index 00000000..4f635205
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/javascript/typescript.scm
@@ -0,0 +1,36 @@
+; TypeScript adds type-level declarations (interface, enum, type alias,
+; abstract class) as classes, and class/interface members as methods.
+(class_declaration
+  name: (type_identifier) @_cls_name) @class
+
+(abstract_class_declaration
+  name: (type_identifier) @_cls_name) @class
+
+(interface_declaration
+  name: (type_identifier) @_cls_name) @class
+
+(enum_declaration
+  name: (identifier) @_cls_name) @class
+
+(enum_body
+  (property_identifier) @_var_name @variable)
+
+(enum_body
+  (enum_assignment
+    name: (property_identifier) @_var_name) @variable)
+
+(type_alias_declaration
+  name: (type_identifier) @_cls_name) @class
+
+(internal_module
+  name: (identifier) @_cls_name) @class
+
+(module
+  name: (identifier) @_cls_name) @class
+
+(method_signature
+  name: (property_identifier) @_method_name) @method
+
+(abstract_method_signature
+  name: (property_identifier) @_method_name) @method
+
diff --git a/packages/rbtr/src/rbtr/languages/javascript/variables.scm b/packages/rbtr/src/rbtr/languages/javascript/variables.scm
new file mode 100644
index 00000000..70c41f2b
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/javascript/variables.scm
@@ -0,0 +1,54 @@
+; Module-level const/let bindings with a non-function value become
+; variables. The value allowlist excludes arrow/function expressions,
+; which shared.scm already captures as functions. Flat destructuring
+; targets are captured; nested patterns are not (no query-only recursion).
+
+(program
+  (lexical_declaration
+    (variable_declarator
+      name: (identifier) @_var_name
+      value: [(number) (string) (template_string) (true) (false) (null)
+ (object) (array) (identifier) (member_expression)
+ (call_expression) (new_expression) (binary_expression) (unary_expression)]) @variable))
+
+(program
+  (export_statement
+    declaration: (lexical_declaration
+      (variable_declarator
+        name: (identifier) @_var_name
+        value: [(number) (string) (template_string) (true) (false) (null)
+ (object) (array) (identifier) (member_expression)
+ (call_expression) (new_expression) (binary_expression) (unary_expression)]) @variable)))
+
+(program
+  (lexical_declaration
+    (variable_declarator
+      name: [
+  (object_pattern [
+    (shorthand_property_identifier_pattern) @_var_name
+    (pair_pattern value: (identifier) @_var_name)
+    (object_assignment_pattern left: (shorthand_property_identifier_pattern) @_var_name)
+    (rest_pattern (identifier) @_var_name)
+  ])
+  (array_pattern [
+    (identifier) @_var_name
+    (rest_pattern (identifier) @_var_name)
+  ])
+]) @variable))
+
+(program
+  (export_statement
+    declaration: (lexical_declaration
+      (variable_declarator
+        name: [
+  (object_pattern [
+    (shorthand_property_identifier_pattern) @_var_name
+    (pair_pattern value: (identifier) @_var_name)
+    (object_assignment_pattern left: (shorthand_property_identifier_pattern) @_var_name)
+    (rest_pattern (identifier) @_var_name)
+  ])
+  (array_pattern [
+    (identifier) @_var_name
+    (rest_pattern (identifier) @_var_name)
+  ])
+]) @variable)))
diff --git a/packages/rbtr/src/rbtr/languages/json/__init__.py b/packages/rbtr/src/rbtr/languages/json/__init__.py
new file mode 100644
index 00000000..9773f878
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/json/__init__.py
@@ -0,0 +1 @@
+"""JSON language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/json/json.scm b/packages/rbtr/src/rbtr/languages/json/json.scm
new file mode 100644
index 00000000..d562103f
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/json/json.scm
@@ -0,0 +1,2 @@
+(pair
+  key: (string (string_content) @_section_name)) @doc_section
diff --git a/packages/rbtr/src/rbtr/languages/json.py b/packages/rbtr/src/rbtr/languages/json/plugin.py
similarity index 91%
rename from packages/rbtr/src/rbtr/languages/json.py
rename to packages/rbtr/src/rbtr/languages/json/plugin.py
index 46ef508c..c84c35d6 100644
--- a/packages/rbtr/src/rbtr/languages/json.py
+++ b/packages/rbtr/src/rbtr/languages/json/plugin.py
@@ -15,12 +15,10 @@
 
 from __future__ import annotations
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
-_QUERY = """\
-(pair
-  key: (string (string_content) @_section_name)) @doc_section
-"""
+_QUERY = load_query(__package__, "json")
 
 
 class JsonPlugin:
diff --git a/packages/rbtr/src/rbtr/languages/less/__init__.py b/packages/rbtr/src/rbtr/languages/less/__init__.py
new file mode 100644
index 00000000..4af716fa
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/less/__init__.py
@@ -0,0 +1 @@
+"""Less language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/less/less.scm b/packages/rbtr/src/rbtr/languages/less/less.scm
new file mode 100644
index 00000000..3719c02a
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/less/less.scm
@@ -0,0 +1,20 @@
+
+(declaration
+  (property_name) @_var_name
+  (#match? @_var_name "^[@]")) @variable
+
+(mixin_definition
+  (class_name) @_fn_name) @function
+
+(rule_set
+  (selectors) @_section_name) @doc_section
+
+(media_statement) @doc_section
+
+(charset_statement) @doc_section
+
+(keyframes_statement
+  (keyframes_name) @_section_name) @doc_section
+
+(import_statement
+  (string_value) @_import_module) @import
diff --git a/packages/rbtr/src/rbtr/languages/less.py b/packages/rbtr/src/rbtr/languages/less/plugin.py
similarity index 76%
rename from packages/rbtr/src/rbtr/languages/less.py
rename to packages/rbtr/src/rbtr/languages/less/plugin.py
index 71e7ce50..2df2177a 100644
--- a/packages/rbtr/src/rbtr/languages/less.py
+++ b/packages/rbtr/src/rbtr/languages/less/plugin.py
@@ -19,34 +19,15 @@
 
 from __future__ import annotations
 
-from rbtr.languages.css import css_nesting_scope
+from rbtr.languages._queries import load_query
+from rbtr.languages.css.plugin import css_nesting_scope
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     build_quoted_import,
     hookimpl,
 )
 
-_QUERY = r"""
-(declaration
-  (property_name) @_var_name
-  (#match? @_var_name "^[@]")) @variable
-
-(mixin_definition
-  (class_name) @_fn_name) @function
-
-(rule_set
-  (selectors) @_section_name) @doc_section
-
-(media_statement) @doc_section
-
-(charset_statement) @doc_section
-
-(keyframes_statement
-  (keyframes_name) @_section_name) @doc_section
-
-(import_statement
-  (string_value) @_import_module) @import
-"""
+_QUERY = load_query(__package__, "less")
 
 
 class LessPlugin:
diff --git a/packages/rbtr/src/rbtr/languages/markdown/__init__.py b/packages/rbtr/src/rbtr/languages/markdown/__init__.py
new file mode 100644
index 00000000..f83aa183
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/markdown/__init__.py
@@ -0,0 +1 @@
+"""Markdown language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/markdown/injections.scm b/packages/rbtr/src/rbtr/languages/markdown/injections.scm
new file mode 100644
index 00000000..bcd3442a
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/markdown/injections.scm
@@ -0,0 +1,4 @@
+; Fenced code blocks: the info string names the embedded language.
+(fenced_code_block
+  (info_string (language) @injection.language)
+  (code_fence_content) @injection.content)
diff --git a/packages/rbtr/src/rbtr/languages/markdown/links.scm b/packages/rbtr/src/rbtr/languages/markdown/links.scm
new file mode 100644
index 00000000..71e148d6
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/markdown/links.scm
@@ -0,0 +1 @@
+(inline_link (link_destination) @dest)
\ No newline at end of file
diff --git a/packages/rbtr/src/rbtr/languages/markdown.py b/packages/rbtr/src/rbtr/languages/markdown/plugin.py
similarity index 97%
rename from packages/rbtr/src/rbtr/languages/markdown.py
rename to packages/rbtr/src/rbtr/languages/markdown/plugin.py
index 8ca9b16f..e781d59d 100644
--- a/packages/rbtr/src/rbtr/languages/markdown.py
+++ b/packages/rbtr/src/rbtr/languages/markdown/plugin.py
@@ -28,6 +28,7 @@
 from rbtr.index.chunks import chunk_plaintext
 from rbtr.index.identity import make_chunk_id
 from rbtr.index.models import Chunk, ChunkKind, ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 if TYPE_CHECKING:
@@ -37,20 +38,12 @@
 _EXTERNAL_SCHEMES = ("http://", "https://", "mailto:", "ftp://")
 
 # Block-level query: captures headed sections.
-_SECTION_QUERY = """\
-(section
-  (atx_heading
-    (inline) @_section_name)) @doc_section
-"""
+_SECTION_QUERY = load_query(__package__, "sections")
 
 # Injection query: a fenced code block delegates its content to the language
 # named in the fence's info string (```python, ```sh). The info-string name
 # is captured dynamically and resolved to a language id by the runner.
-_INJECTIONS = """\
-(fenced_code_block
-  (info_string (language) @injection.language)
-  (code_fence_content) @injection.content)
-"""
+_INJECTIONS = load_query(__package__, "injections")
 
 
 # ── Chunking ─────────────────────────────────────────────────────────
@@ -201,7 +194,7 @@ def chunk_markdown(
 
 # ── Link extraction ──────────────────────────────────────────────────
 
-_LINK_QUERY = "(inline_link (link_destination) @dest)"
+_LINK_QUERY = load_query(__package__, "links")
 
 
 def _extract_links(
diff --git a/packages/rbtr/src/rbtr/languages/markdown/sections.scm b/packages/rbtr/src/rbtr/languages/markdown/sections.scm
new file mode 100644
index 00000000..5205f367
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/markdown/sections.scm
@@ -0,0 +1,3 @@
+(section
+  (atx_heading
+    (inline) @_section_name)) @doc_section
diff --git a/packages/rbtr/src/rbtr/languages/python/__init__.py b/packages/rbtr/src/rbtr/languages/python/__init__.py
new file mode 100644
index 00000000..9df618eb
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/python/__init__.py
@@ -0,0 +1 @@
+"""Python language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/python.py b/packages/rbtr/src/rbtr/languages/python/plugin.py
similarity index 77%
rename from packages/rbtr/src/rbtr/languages/python.py
rename to packages/rbtr/src/rbtr/languages/python/plugin.py
index 84438fcc..6519478e 100644
--- a/packages/rbtr/src/rbtr/languages/python.py
+++ b/packages/rbtr/src/rbtr/languages/python/plugin.py
@@ -25,6 +25,7 @@ def load(self):     → method "load", scope "Config"
 from typing import TYPE_CHECKING
 
 from rbtr.index.models import ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     ModuleStyle,
@@ -41,60 +42,7 @@ def load(self):     → method "load", scope "Config"
 # docstring for doc-range detection (used by `extract_doc_spans`
 # and the eval query sampler).  It is optional in the match
 # (`?`), so functions/classes without a docstring still match.
-_QUERY = """\
-(function_definition
-  name: (identifier) @_fn_name
-  body: (block
-    . (expression_statement (string) @_docstring)?)) @function
-
-(class_definition
-  name: (identifier) @_cls_name
-  body: (block
-    . (expression_statement (string) @_docstring)?)) @class
-
-(type_alias_statement
-  . (type (identifier) @_cls_name)) @class
-
-(module
-  (expression_statement
-    (assignment
-      left: (identifier) @_var_name) @variable))
-
-(module
-  (expression_statement
-    (assignment
-      left: (pattern_list (identifier) @_var_name)) @variable))
-
-(module
-  (expression_statement
-    (assignment
-      left: (tuple_pattern (identifier) @_var_name)) @variable))
-
-(module
-  (expression_statement
-    (assignment
-      left: (list_pattern (identifier) @_var_name)) @variable))
-
-(module
-  (expression_statement
-    (assignment
-      left: (pattern_list (list_splat_pattern (identifier) @_var_name))) @variable))
-
-(import_statement
-  name: (dotted_name) @_import_module) @import
-
-(import_from_statement
-  module_name: (dotted_name) @_import_module) @import
-
-(import_from_statement
-  module_name: (relative_import
-    (import_prefix) @_import_dots
-    (dotted_name) @_import_module)) @import
-
-(import_from_statement
-  module_name: (relative_import
-    (import_prefix) @_import_dots .)) @import
-"""
+_QUERY = load_query(__package__, "python")
 
 # ── Import extractor ─────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/python/python.scm b/packages/rbtr/src/rbtr/languages/python/python.scm
new file mode 100644
index 00000000..cb08622d
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/python/python.scm
@@ -0,0 +1,52 @@
+(function_definition
+  name: (identifier) @_fn_name
+  body: (block
+    . (expression_statement (string) @_docstring)?)) @function
+
+(class_definition
+  name: (identifier) @_cls_name
+  body: (block
+    . (expression_statement (string) @_docstring)?)) @class
+
+(type_alias_statement
+  . (type (identifier) @_cls_name)) @class
+
+(module
+  (expression_statement
+    (assignment
+      left: (identifier) @_var_name) @variable))
+
+(module
+  (expression_statement
+    (assignment
+      left: (pattern_list (identifier) @_var_name)) @variable))
+
+(module
+  (expression_statement
+    (assignment
+      left: (tuple_pattern (identifier) @_var_name)) @variable))
+
+(module
+  (expression_statement
+    (assignment
+      left: (list_pattern (identifier) @_var_name)) @variable))
+
+(module
+  (expression_statement
+    (assignment
+      left: (pattern_list (list_splat_pattern (identifier) @_var_name))) @variable))
+
+(import_statement
+  name: (dotted_name) @_import_module) @import
+
+(import_from_statement
+  module_name: (dotted_name) @_import_module) @import
+
+(import_from_statement
+  module_name: (relative_import
+    (import_prefix) @_import_dots
+    (dotted_name) @_import_module)) @import
+
+(import_from_statement
+  module_name: (relative_import
+    (import_prefix) @_import_dots .)) @import
diff --git a/packages/rbtr/src/rbtr/languages/rst/__init__.py b/packages/rbtr/src/rbtr/languages/rst/__init__.py
new file mode 100644
index 00000000..e3c6ed93
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/rst/__init__.py
@@ -0,0 +1 @@
+"""reStructuredText language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/rst.py b/packages/rbtr/src/rbtr/languages/rst/plugin.py
similarity index 98%
rename from packages/rbtr/src/rbtr/languages/rst.py
rename to packages/rbtr/src/rbtr/languages/rst/plugin.py
index 47d64640..9d65038f 100644
--- a/packages/rbtr/src/rbtr/languages/rst.py
+++ b/packages/rbtr/src/rbtr/languages/rst/plugin.py
@@ -25,6 +25,7 @@
 
 from rbtr.index.identity import make_chunk_id
 from rbtr.index.models import Chunk, ChunkKind, ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 if TYPE_CHECKING:
@@ -199,13 +200,7 @@ def chunk_rst(
 
 # ── Reference extraction ─────────────────────────────────────────────
 
-_REF_QUERY = """\
-(interpreted_text (role) @role) @ref
-
-(directive (type) @dir_type (body (content) @content)) @directive
-
-(reference) @hyperlink
-"""
+_REF_QUERY = load_query(__package__, "references")
 
 
 def _strip_rst_target(role: str, raw: str) -> str:
diff --git a/packages/rbtr/src/rbtr/languages/rst/references.scm b/packages/rbtr/src/rbtr/languages/rst/references.scm
new file mode 100644
index 00000000..8c415350
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/rst/references.scm
@@ -0,0 +1,5 @@
+(interpreted_text (role) @role) @ref
+
+(directive (type) @dir_type (body (content) @content)) @directive
+
+(reference) @hyperlink
diff --git a/packages/rbtr/src/rbtr/languages/ruby/__init__.py b/packages/rbtr/src/rbtr/languages/ruby/__init__.py
new file mode 100644
index 00000000..811af374
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/ruby/__init__.py
@@ -0,0 +1 @@
+"""Ruby language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/ruby.py b/packages/rbtr/src/rbtr/languages/ruby/plugin.py
similarity index 74%
rename from packages/rbtr/src/rbtr/languages/ruby.py
rename to packages/rbtr/src/rbtr/languages/ruby/plugin.py
index 66911be7..0260e4bd 100644
--- a/packages/rbtr/src/rbtr/languages/ruby.py
+++ b/packages/rbtr/src/rbtr/languages/ruby/plugin.py
@@ -27,6 +27,7 @@ def bar ... end               → method "bar", scope "Foo"
 from typing import TYPE_CHECKING
 
 from rbtr.index.models import ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     build_import_from_captures,
@@ -39,55 +40,7 @@ def bar ... end               → method "bar", scope "Foo"
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """
-(method
-  name: (identifier) @_fn_name) @function
-
-(singleton_method
-  name: (identifier) @_fn_name) @function
-
-(class
-  name: (constant) @_cls_name) @class
-
-(module
-  name: (constant) @_cls_name) @class
-
-(call
-  method: (identifier) @_call_name
-  arguments: (argument_list
-    (string) @_import_module)
-  (#eq? @_call_name "require"))  @import
-
-(call
-  method: (identifier) @_call_name
-  arguments: (argument_list
-    (string) @_import_module)
-  (#eq? @_call_name "require_relative"))  @import
-
-(assignment
-  left: (constant) @_var_name) @variable
-
-(assignment
-  left: (left_assignment_list (constant) @_var_name)) @variable
-
-(assignment
-  left: (left_assignment_list (rest_assignment (constant) @_var_name))) @variable
-
-(call
-  method: (identifier) @_call_name
-  arguments: (argument_list . (string (string_content) @_cls_name))
-  (#any-of? @_call_name "describe" "context" "feature" "shared_examples" "shared_context")) @class
-
-(call
-  method: (identifier) @_call_name
-  arguments: (argument_list . (constant) @_cls_name)
-  (#any-of? @_call_name "describe" "context" "feature")) @class
-
-(call
-  method: (identifier) @_call_name
-  arguments: (argument_list . (string (string_content) @_fn_name))
-  (#any-of? @_call_name "it" "specify" "example" "scenario")) @function
-"""
+_QUERY = load_query(__package__, "ruby")
 
 # ── Import extractor ─────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/ruby/ruby.scm b/packages/rbtr/src/rbtr/languages/ruby/ruby.scm
new file mode 100644
index 00000000..51a61b6e
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/ruby/ruby.scm
@@ -0,0 +1,48 @@
+
+(method
+  name: (identifier) @_fn_name) @function
+
+(singleton_method
+  name: (identifier) @_fn_name) @function
+
+(class
+  name: (constant) @_cls_name) @class
+
+(module
+  name: (constant) @_cls_name) @class
+
+(call
+  method: (identifier) @_call_name
+  arguments: (argument_list
+    (string) @_import_module)
+  (#eq? @_call_name "require"))  @import
+
+(call
+  method: (identifier) @_call_name
+  arguments: (argument_list
+    (string) @_import_module)
+  (#eq? @_call_name "require_relative"))  @import
+
+(assignment
+  left: (constant) @_var_name) @variable
+
+(assignment
+  left: (left_assignment_list (constant) @_var_name)) @variable
+
+(assignment
+  left: (left_assignment_list (rest_assignment (constant) @_var_name))) @variable
+
+(call
+  method: (identifier) @_call_name
+  arguments: (argument_list . (string (string_content) @_cls_name))
+  (#any-of? @_call_name "describe" "context" "feature" "shared_examples" "shared_context")) @class
+
+(call
+  method: (identifier) @_call_name
+  arguments: (argument_list . (constant) @_cls_name)
+  (#any-of? @_call_name "describe" "context" "feature")) @class
+
+(call
+  method: (identifier) @_call_name
+  arguments: (argument_list . (string (string_content) @_fn_name))
+  (#any-of? @_call_name "it" "specify" "example" "scenario")) @function
diff --git a/packages/rbtr/src/rbtr/languages/rust/__init__.py b/packages/rbtr/src/rbtr/languages/rust/__init__.py
new file mode 100644
index 00000000..3ff48cdf
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/rust/__init__.py
@@ -0,0 +1 @@
+"""Rust language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/rust.py b/packages/rbtr/src/rbtr/languages/rust/plugin.py
similarity index 86%
rename from packages/rbtr/src/rbtr/languages/rust.py
rename to packages/rbtr/src/rbtr/languages/rust/plugin.py
index d6263f6c..37a7df2d 100644
--- a/packages/rbtr/src/rbtr/languages/rust.py
+++ b/packages/rbtr/src/rbtr/languages/rust/plugin.py
@@ -27,6 +27,7 @@
 from typing import TYPE_CHECKING
 
 from rbtr.index.models import ImportMeta
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, collect_scoped_path, hookimpl
 
 if TYPE_CHECKING:
@@ -34,52 +35,7 @@
 
 # ── Query ────────────────────────────────────────────────────────────
 
-_QUERY = """\
-(function_item
-  name: (identifier) @_fn_name) @function
-
-(function_signature_item
-  name: (identifier) @_fn_name) @function
-
-(struct_item
-  name: (type_identifier) @_cls_name) @class
-
-(enum_item
-  name: (type_identifier) @_cls_name) @class
-
-(enum_item
-  body: (enum_variant_list
-    (enum_variant
-      name: (identifier) @_var_name) @variable))
-
-(union_item
-  name: (type_identifier) @_cls_name) @class
-
-(type_item
-  name: (type_identifier) @_cls_name) @class
-
-(trait_item
-  name: (type_identifier) @_cls_name) @class
-
-(mod_item
-  name: (identifier) @_cls_name) @class
-
-(macro_definition
-  name: (identifier) @_fn_name) @function
-
-(impl_item
-  type: (type_identifier) @_cls_name) @class
-
-(use_declaration) @import
-
-(source_file
-  (const_item
-    name: (identifier) @_var_name) @variable)
-
-(source_file
-  (static_item
-    name: (identifier) @_var_name) @variable)
-"""
+_QUERY = load_query(__package__, "rust")
 
 # ── Import extractor ─────────────────────────────────────────────────
 
diff --git a/packages/rbtr/src/rbtr/languages/rust/rust.scm b/packages/rbtr/src/rbtr/languages/rust/rust.scm
new file mode 100644
index 00000000..af4e8009
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/rust/rust.scm
@@ -0,0 +1,44 @@
+(function_item
+  name: (identifier) @_fn_name) @function
+
+(function_signature_item
+  name: (identifier) @_fn_name) @function
+
+(struct_item
+  name: (type_identifier) @_cls_name) @class
+
+(enum_item
+  name: (type_identifier) @_cls_name) @class
+
+(enum_item
+  body: (enum_variant_list
+    (enum_variant
+      name: (identifier) @_var_name) @variable))
+
+(union_item
+  name: (type_identifier) @_cls_name) @class
+
+(type_item
+  name: (type_identifier) @_cls_name) @class
+
+(trait_item
+  name: (type_identifier) @_cls_name) @class
+
+(mod_item
+  name: (identifier) @_cls_name) @class
+
+(macro_definition
+  name: (identifier) @_fn_name) @function
+
+(impl_item
+  type: (type_identifier) @_cls_name) @class
+
+(use_declaration) @import
+
+(source_file
+  (const_item
+    name: (identifier) @_var_name) @variable)
+
+(source_file
+  (static_item
+    name: (identifier) @_var_name) @variable)
diff --git a/packages/rbtr/src/rbtr/languages/scss/__init__.py b/packages/rbtr/src/rbtr/languages/scss/__init__.py
new file mode 100644
index 00000000..8262afc2
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/scss/__init__.py
@@ -0,0 +1 @@
+"""SCSS language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/scss.py b/packages/rbtr/src/rbtr/languages/scss/plugin.py
similarity index 71%
rename from packages/rbtr/src/rbtr/languages/scss.py
rename to packages/rbtr/src/rbtr/languages/scss/plugin.py
index b5be4dee..9550cad4 100644
--- a/packages/rbtr/src/rbtr/languages/scss.py
+++ b/packages/rbtr/src/rbtr/languages/scss/plugin.py
@@ -20,43 +20,15 @@
 
 from __future__ import annotations
 
-from rbtr.languages.css import css_nesting_scope
+from rbtr.languages._queries import load_query
+from rbtr.languages.css.plugin import css_nesting_scope
 from rbtr.languages.hookspec import (
     LanguageRegistration,
     build_quoted_import,
     hookimpl,
 )
 
-_QUERY = r"""
-(declaration
-  (property_name) @_var_name
-  (#match? @_var_name "^[$]")) @variable
-
-(mixin_statement
-  (identifier) @_fn_name) @function
-
-(function_statement
-  (identifier) @_fn_name) @function
-
-(rule_set
-  (selectors) @_section_name) @doc_section
-
-(media_statement) @doc_section
-
-(charset_statement) @doc_section
-
-(keyframes_statement
-  (keyframes_name) @_section_name) @doc_section
-
-(use_statement
-  (string_value) @_import_module) @import
-
-(forward_statement
-  (string_value) @_import_module) @import
-
-(import_statement
-  (string_value) @_import_module) @import
-"""
+_QUERY = load_query(__package__, "scss")
 
 
 class ScssPlugin:
diff --git a/packages/rbtr/src/rbtr/languages/scss/scss.scm b/packages/rbtr/src/rbtr/languages/scss/scss.scm
new file mode 100644
index 00000000..65bdaebd
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/scss/scss.scm
@@ -0,0 +1,29 @@
+
+(declaration
+  (property_name) @_var_name
+  (#match? @_var_name "^[$]")) @variable
+
+(mixin_statement
+  (identifier) @_fn_name) @function
+
+(function_statement
+  (identifier) @_fn_name) @function
+
+(rule_set
+  (selectors) @_section_name) @doc_section
+
+(media_statement) @doc_section
+
+(charset_statement) @doc_section
+
+(keyframes_statement
+  (keyframes_name) @_section_name) @doc_section
+
+(use_statement
+  (string_value) @_import_module) @import
+
+(forward_statement
+  (string_value) @_import_module) @import
+
+(import_statement
+  (string_value) @_import_module) @import
diff --git a/packages/rbtr/src/rbtr/languages/sfc/__init__.py b/packages/rbtr/src/rbtr/languages/sfc/__init__.py
new file mode 100644
index 00000000..b7af5e41
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/sfc/__init__.py
@@ -0,0 +1 @@
+"""Single-file component (Svelte, Vue) language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/sfc/injections.scm b/packages/rbtr/src/rbtr/languages/sfc/injections.scm
new file mode 100644
index 00000000..d6bb561c
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/sfc/injections.scm
@@ -0,0 +1,41 @@
+; <script>/<style> blocks delegate to JS/TS/CSS/SCSS/Less. A `lang="…"`
+; attribute selects the dialect (priority 1); the bare block is the
+; fallback (priority 0).
+
+((script_element
+   (start_tag
+     (attribute (attribute_name) @_attr
+       (quoted_attribute_value (attribute_value) @_lang)))
+   (raw_text) @injection.content)
+ (#eq? @_attr "lang")
+ (#any-of? @_lang "ts" "typescript")
+ (#set! injection.language "typescript")
+ (#set! injection.priority "1"))
+
+((script_element (raw_text) @injection.content)
+ (#set! injection.language "javascript")
+ (#set! injection.priority "0"))
+
+((style_element
+   (start_tag
+     (attribute (attribute_name) @_attr
+       (quoted_attribute_value (attribute_value) @_lang)))
+   (raw_text) @injection.content)
+ (#eq? @_attr "lang")
+ (#any-of? @_lang "scss" "sass")
+ (#set! injection.language "scss")
+ (#set! injection.priority "1"))
+
+((style_element
+   (start_tag
+     (attribute (attribute_name) @_attr
+       (quoted_attribute_value (attribute_value) @_lang)))
+   (raw_text) @injection.content)
+ (#eq? @_attr "lang")
+ (#any-of? @_lang "less")
+ (#set! injection.language "less")
+ (#set! injection.priority "1"))
+
+((style_element (raw_text) @injection.content)
+ (#set! injection.language "css")
+ (#set! injection.priority "0"))
diff --git a/packages/rbtr/src/rbtr/languages/sfc.py b/packages/rbtr/src/rbtr/languages/sfc/plugin.py
similarity index 82%
rename from packages/rbtr/src/rbtr/languages/sfc.py
rename to packages/rbtr/src/rbtr/languages/sfc/plugin.py
index e28267fc..f521ab38 100644
--- a/packages/rbtr/src/rbtr/languages/sfc.py
+++ b/packages/rbtr/src/rbtr/languages/sfc/plugin.py
@@ -22,6 +22,7 @@
 
 from rbtr.index.identity import make_chunk_id
 from rbtr.index.models import Chunk, ChunkKind
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 if TYPE_CHECKING:
@@ -33,27 +34,7 @@
 # same `script_element`/`style_element` → `raw_text` shape. Each block's
 # `lang` attribute picks the embedded language; a `lang`-tagged rule outranks
 # the bare fallback by priority, and the hint→id mapping is spelled out below.
-_SFC_INJECTIONS = """\
-((script_element
-  (start_tag (attribute (attribute_name) @_attr (quoted_attribute_value (attribute_value) @_lang)))
-  (raw_text) @injection.content)
- (#eq? @_attr "lang") (#any-of? @_lang "ts" "typescript")
- (#set! injection.language "typescript") (#set! injection.priority "1"))
-((script_element (raw_text) @injection.content)
- (#set! injection.language "javascript") (#set! injection.priority "0"))
-((style_element
-  (start_tag (attribute (attribute_name) @_attr (quoted_attribute_value (attribute_value) @_lang)))
-  (raw_text) @injection.content)
- (#eq? @_attr "lang") (#any-of? @_lang "scss" "sass")
- (#set! injection.language "scss") (#set! injection.priority "1"))
-((style_element
-  (start_tag (attribute (attribute_name) @_attr (quoted_attribute_value (attribute_value) @_lang)))
-  (raw_text) @injection.content)
- (#eq? @_attr "lang") (#any-of? @_lang "less")
- (#set! injection.language "less") (#set! injection.priority "1"))
-((style_element (raw_text) @injection.content)
- (#set! injection.language "css") (#set! injection.priority "0"))
-"""
+_SFC_INJECTIONS = load_query(__package__, "injections")
 
 
 def _template_chunk(
diff --git a/packages/rbtr/src/rbtr/languages/sql.py b/packages/rbtr/src/rbtr/languages/sql.py
deleted file mode 100644
index c56af17e..00000000
--- a/packages/rbtr/src/rbtr/languages/sql.py
+++ /dev/null
@@ -1,141 +0,0 @@
-"""SQL language plugin.
-
-SQL has no functions/classes in the OO sense and no native import
-mechanism, so constructs map onto rbtr's capture conventions by shape:
-structural definitions are classes, routines and executable statements
-are functions, and standalone named objects are variables.  One chunk is
-produced per top-level statement, plus one per CTE.
-
-The tree-sitter query is *generated* from `_DDL_VERBS` (one pattern per
-DDL/ALTER/DROP verb) and combined with hand-written patterns for the DML
-statements whose structure the table can't express.  The verb set and
-each verb's name location are verified against `tree-sitter-sql` 0.3.11.
-
-Extracted chunks::
-
-    CREATE TABLE users (...)            → class "users"
-    CREATE VIEW / MATERIALIZED VIEW     → class
-    CREATE TYPE mood AS ENUM (...)      → class "mood"
-
-    CREATE FUNCTION add(...) ...        → function "add"
-    SELECT ... FROM users               → function "users"
-    INSERT INTO logs ...                → function "logs"
-    UPDATE / DELETE ... t               → function "t"
-    WITH ranked AS (...)                → function "ranked"  (one per CTE)
-    ... UNION ...                       → function "<anonymous>"
-
-    CREATE INDEX idx ON users(...)      → variable "idx"
-    CREATE SEQUENCE / SCHEMA / ROLE …   → variable
-    CREATE TRIGGER trg ...              → variable "trg"
-    ALTER / DROP <object>               → function "<object>"
-
-A statement with no nameable target (`SELECT 1`, a sub-query `FROM`, a
-`UNION`) is named `<anonymous>`.  `CREATE PROCEDURE` and `PRAGMA` are not
-extracted — the grammar has no node for them (they parse to `ERROR`).
-"""
-
-from __future__ import annotations
-
-from rbtr.languages.hookspec import LanguageRegistration, hookimpl
-
-# ── Query generation ─────────────────────────────────────────────────
-
-# Capture name carrying the symbol name, per chunk kind.
-_CAPTURE = {"class": "_cls_name", "function": "_fn_name", "variable": "_var_name"}
-
-# DDL/ALTER/DROP verbs: (node_type, chunk_kind, name_node).
-#   name_node "object_reference" — the verb's single target object_reference
-#     (table/view/type/sequence/function).  Unanchored: each of these verbs
-#     has exactly one direct object_reference, and leaving it unanchored
-#     keeps `IF NOT EXISTS` / `OR REPLACE` / `TEMP` working (an anchor to
-#     the type keyword breaks when those keywords intervene).
-#   name_node "identifier" — a bare identifier child (index/schema/role/…);
-#     for these the object_reference, if any, is a *secondary* reference
-#     (e.g. the `ON` table of an index) so the bare identifier is the name.
-# Verified against tree-sitter-sql 0.3.11.  `create_trigger` is handled
-# separately (three object_references — the name must be anchored).
-_DDL_VERBS: list[tuple[str, str, str]] = [
-    ("create_table", "class", "object_reference"),
-    ("create_view", "class", "object_reference"),
-    ("create_materialized_view", "class", "object_reference"),
-    ("create_type", "class", "object_reference"),
-    ("create_function", "function", "object_reference"),
-    ("create_sequence", "variable", "object_reference"),
-    ("create_index", "variable", "identifier"),
-    ("create_schema", "variable", "identifier"),
-    ("create_database", "variable", "identifier"),
-    ("create_extension", "variable", "identifier"),
-    ("create_role", "variable", "identifier"),
-    ("alter_table", "function", "object_reference"),
-    ("alter_view", "function", "object_reference"),
-    ("alter_sequence", "function", "object_reference"),
-    ("alter_index", "function", "identifier"),
-    ("alter_schema", "function", "identifier"),
-    ("alter_database", "function", "identifier"),
-    ("alter_role", "function", "identifier"),
-    ("alter_type", "function", "identifier"),
-    ("drop_table", "function", "object_reference"),
-    ("drop_view", "function", "object_reference"),
-    ("drop_sequence", "function", "object_reference"),
-    ("drop_function", "function", "object_reference"),
-    ("drop_type", "function", "object_reference"),
-    ("drop_index", "function", "identifier"),
-    ("drop_schema", "function", "identifier"),
-    ("drop_database", "function", "identifier"),
-    ("drop_role", "function", "identifier"),
-    ("drop_extension", "function", "identifier"),
-]
-
-
-def _ddl_pattern(node_type: str, kind: str, name_node: str) -> str:
-    """Build a query pattern for a DDL/ALTER/DROP verb node."""
-    cap = _CAPTURE[kind]
-    if name_node == "object_reference":
-        inner = f"(object_reference name: (identifier) @{cap})"
-    else:
-        inner = f"(identifier) @{cap}"
-    return f"({node_type} {inner}) @{kind}"
-
-
-# DML statements, CTEs, triggers, and set operations — structures the DDL
-# table can't express.  DML patterns are anchored at `(program (statement
-# …))` so each top-level statement yields exactly one chunk: `select` and
-# `delete` keep their target in a sibling `from`, so the whole `statement`
-# is captured.  A `set_operation` (UNION/INTERSECT/EXCEPT) has no single
-# table and is named `<anonymous>`.
-_OTHER_PATTERNS = """\
-(create_trigger (keyword_trigger) . (object_reference name: (identifier) @_var_name)) @variable
-
-(cte (identifier) @_fn_name) @function
-
-(program (statement (select)
-  (from (relation (object_reference name: (identifier) @_fn_name)))?) @function)
-(program (statement (set_operation) @function))
-(program (statement (insert (object_reference name: (identifier) @_fn_name))) @function)
-(program (statement (update (relation (object_reference name: (identifier) @_fn_name)))) @function)
-(program (statement (delete) (from (object_reference name: (identifier) @_fn_name))) @function)
-"""
-
-_QUERY = "\n".join(_ddl_pattern(*verb) for verb in _DDL_VERBS) + "\n\n" + _OTHER_PATTERNS
-
-# ── Plugin ───────────────────────────────────────────────────────────
-
-
-class SqlPlugin:
-    """SQL language support — DDL definitions, DML statements, and CTEs."""
-
-    @hookimpl
-    def rbtr_register_languages(self) -> list[LanguageRegistration]:
-        return [
-            LanguageRegistration(
-                id="sql",
-                extensions=frozenset({".sql"}),
-                grammar_module="tree_sitter_sql",
-                query=_QUERY,
-                # SQL `--` line comments and `/* */` blocks both parse to
-                # `comment`; attach a leading run to its statement, as the
-                # Go/Ruby plugins do.
-                doc_comment_node_types=frozenset({"comment"}),
-                language_plugin_version=2,
-            ),
-        ]
diff --git a/packages/rbtr/src/rbtr/languages/sql/__init__.py b/packages/rbtr/src/rbtr/languages/sql/__init__.py
new file mode 100644
index 00000000..8969b114
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/sql/__init__.py
@@ -0,0 +1 @@
+"""SQL language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/sql/plugin.py b/packages/rbtr/src/rbtr/languages/sql/plugin.py
new file mode 100644
index 00000000..6d4dda6f
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/sql/plugin.py
@@ -0,0 +1,65 @@
+"""SQL language plugin.
+
+SQL has no functions/classes in the OO sense and no native import
+mechanism, so constructs map onto rbtr's capture conventions by shape:
+structural definitions are classes, routines and executable statements
+are functions, and standalone named objects are variables.  One chunk is
+produced per top-level statement, plus one per CTE.
+
+The tree-sitter query lives in `sql.scm`: DDL/ALTER/DROP verbs grouped
+into `[...]` alternations by chunk kind and name location, plus hand-
+written patterns for the DML statements those groups can't express.
+Verified against `tree-sitter-sql` 0.3.11.
+
+Extracted chunks::
+
+    CREATE TABLE users (...)            → class "users"
+    CREATE VIEW / MATERIALIZED VIEW     → class
+    CREATE TYPE mood AS ENUM (...)      → class "mood"
+
+    CREATE FUNCTION add(...) ...        → function "add"
+    SELECT ... FROM users               → function "users"
+    INSERT INTO logs ...                → function "logs"
+    UPDATE / DELETE ... t               → function "t"
+    WITH ranked AS (...)                → function "ranked"  (one per CTE)
+    ... UNION ...                       → function "<anonymous>"
+
+    CREATE INDEX idx ON users(...)      → variable "idx"
+    CREATE SEQUENCE / SCHEMA / ROLE …   → variable
+    CREATE TRIGGER trg ...              → variable "trg"
+    ALTER / DROP <object>               → function "<object>"
+
+A statement with no nameable target (`SELECT 1`, a sub-query `FROM`, a
+`UNION`) is named `<anonymous>`.  `CREATE PROCEDURE` and `PRAGMA` are not
+extracted — the grammar has no node for them (they parse to `ERROR`).
+"""
+
+from __future__ import annotations
+
+from rbtr.languages._queries import load_query
+from rbtr.languages.hookspec import LanguageRegistration, hookimpl
+
+_QUERY = load_query(__package__, "sql")
+
+
+# ── Plugin ───────────────────────────────────────────────────────────
+
+
+class SqlPlugin:
+    """SQL language support — DDL definitions, DML statements, and CTEs."""
+
+    @hookimpl
+    def rbtr_register_languages(self) -> list[LanguageRegistration]:
+        return [
+            LanguageRegistration(
+                id="sql",
+                extensions=frozenset({".sql"}),
+                grammar_module="tree_sitter_sql",
+                query=_QUERY,
+                # SQL `--` line comments and `/* */` blocks both parse to
+                # `comment`; attach a leading run to its statement, as the
+                # Go/Ruby plugins do.
+                doc_comment_node_types=frozenset({"comment"}),
+                language_plugin_version=2,
+            ),
+        ]
diff --git a/packages/rbtr/src/rbtr/languages/sql/sql.scm b/packages/rbtr/src/rbtr/languages/sql/sql.scm
new file mode 100644
index 00000000..3eda0ab3
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/sql/sql.scm
@@ -0,0 +1,67 @@
+; DDL/ALTER/DROP verbs, grouped by chunk kind and name location.
+;
+; object_reference names are left unanchored: each verb has exactly one
+; direct object_reference, and leaving it unanchored keeps IF NOT EXISTS /
+; OR REPLACE / TEMP working (anchoring to a keyword breaks when those
+; intervene). A bare (identifier) name (index/schema/role/…) is used when
+; the object_reference, if any, is a secondary reference (e.g. an index's
+; ON table). Verified against tree-sitter-sql 0.3.11.
+
+[
+  (create_table (object_reference name: (identifier) @_cls_name))
+  (create_view (object_reference name: (identifier) @_cls_name))
+  (create_materialized_view (object_reference name: (identifier) @_cls_name))
+  (create_type (object_reference name: (identifier) @_cls_name))
+] @class
+
+(create_sequence (object_reference name: (identifier) @_var_name)) @variable
+
+[
+  (create_function (object_reference name: (identifier) @_fn_name))
+  (alter_table (object_reference name: (identifier) @_fn_name))
+  (alter_view (object_reference name: (identifier) @_fn_name))
+  (alter_sequence (object_reference name: (identifier) @_fn_name))
+  (drop_table (object_reference name: (identifier) @_fn_name))
+  (drop_view (object_reference name: (identifier) @_fn_name))
+  (drop_sequence (object_reference name: (identifier) @_fn_name))
+  (drop_function (object_reference name: (identifier) @_fn_name))
+  (drop_type (object_reference name: (identifier) @_fn_name))
+] @function
+
+[
+  (create_index (identifier) @_var_name)
+  (create_schema (identifier) @_var_name)
+  (create_database (identifier) @_var_name)
+  (create_extension (identifier) @_var_name)
+  (create_role (identifier) @_var_name)
+] @variable
+
+[
+  (alter_index (identifier) @_fn_name)
+  (alter_schema (identifier) @_fn_name)
+  (alter_database (identifier) @_fn_name)
+  (alter_role (identifier) @_fn_name)
+  (alter_type (identifier) @_fn_name)
+  (drop_index (identifier) @_fn_name)
+  (drop_schema (identifier) @_fn_name)
+  (drop_database (identifier) @_fn_name)
+  (drop_role (identifier) @_fn_name)
+  (drop_extension (identifier) @_fn_name)
+] @function
+
+; DML statements, CTEs, triggers, and set operations — structures the DDL
+; groups can't express. DML patterns are anchored at (program (statement …))
+; so each top-level statement yields exactly one chunk: select and delete
+; keep their target in a sibling from, so the whole statement is captured.
+; A set_operation (UNION/INTERSECT/EXCEPT) has no single table → <anonymous>.
+
+(create_trigger (keyword_trigger) . (object_reference name: (identifier) @_var_name)) @variable
+
+(cte (identifier) @_fn_name) @function
+
+(program (statement (select)
+  (from (relation (object_reference name: (identifier) @_fn_name)))?) @function)
+(program (statement (set_operation) @function))
+(program (statement (insert (object_reference name: (identifier) @_fn_name))) @function)
+(program (statement (update (relation (object_reference name: (identifier) @_fn_name)))) @function)
+(program (statement (delete) (from (object_reference name: (identifier) @_fn_name))) @function)
diff --git a/packages/rbtr/src/rbtr/languages/toml/__init__.py b/packages/rbtr/src/rbtr/languages/toml/__init__.py
new file mode 100644
index 00000000..d4718936
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/toml/__init__.py
@@ -0,0 +1 @@
+"""TOML language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/toml.py b/packages/rbtr/src/rbtr/languages/toml/plugin.py
similarity index 89%
rename from packages/rbtr/src/rbtr/languages/toml.py
rename to packages/rbtr/src/rbtr/languages/toml/plugin.py
index 01991ed2..1f5c4982 100644
--- a/packages/rbtr/src/rbtr/languages/toml.py
+++ b/packages/rbtr/src/rbtr/languages/toml/plugin.py
@@ -21,30 +21,13 @@
 
 from typing import TYPE_CHECKING
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl, resolve_name
 
 if TYPE_CHECKING:
     from tree_sitter import Node
 
-_QUERY = """\
-(table
-  (bare_key) @_section_name) @doc_section
-
-(table
-  (dotted_key) @_section_name) @doc_section
-
-(table
-  (quoted_key) @_section_name) @doc_section
-
-(table_array_element
-  (bare_key) @_section_name) @doc_section
-
-(table_array_element
-  (dotted_key) @_section_name) @doc_section
-
-(table_array_element
-  (quoted_key) @_section_name) @doc_section
-"""
+_QUERY = load_query(__package__, "toml")
 
 
 def _key_text(node: Node) -> str:
diff --git a/packages/rbtr/src/rbtr/languages/toml/toml.scm b/packages/rbtr/src/rbtr/languages/toml/toml.scm
new file mode 100644
index 00000000..c16bfb63
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/toml/toml.scm
@@ -0,0 +1,17 @@
+(table
+  (bare_key) @_section_name) @doc_section
+
+(table
+  (dotted_key) @_section_name) @doc_section
+
+(table
+  (quoted_key) @_section_name) @doc_section
+
+(table_array_element
+  (bare_key) @_section_name) @doc_section
+
+(table_array_element
+  (dotted_key) @_section_name) @doc_section
+
+(table_array_element
+  (quoted_key) @_section_name) @doc_section
diff --git a/packages/rbtr/src/rbtr/languages/yaml/__init__.py b/packages/rbtr/src/rbtr/languages/yaml/__init__.py
new file mode 100644
index 00000000..e805d504
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/yaml/__init__.py
@@ -0,0 +1 @@
+"""YAML language plugin package."""
diff --git a/packages/rbtr/src/rbtr/languages/yaml.py b/packages/rbtr/src/rbtr/languages/yaml/plugin.py
similarity index 89%
rename from packages/rbtr/src/rbtr/languages/yaml.py
rename to packages/rbtr/src/rbtr/languages/yaml/plugin.py
index 5062cd8c..2bd5cc10 100644
--- a/packages/rbtr/src/rbtr/languages/yaml.py
+++ b/packages/rbtr/src/rbtr/languages/yaml/plugin.py
@@ -15,17 +15,12 @@
 
 from __future__ import annotations
 
+from rbtr.languages._queries import load_query
 from rbtr.languages.hookspec import LanguageRegistration, hookimpl
 
 # Top-level keys only: pairs of the document's own block mapping.
 # Nested pairs sit in a value's block mapping and do not match.
-_QUERY = """\
-(document
-  (block_node
-    (block_mapping
-      (block_mapping_pair
-        key: (_) @_section_name) @doc_section)))
-"""
+_QUERY = load_query(__package__, "yaml")
 
 
 class YamlPlugin:
diff --git a/packages/rbtr/src/rbtr/languages/yaml/yaml.scm b/packages/rbtr/src/rbtr/languages/yaml/yaml.scm
new file mode 100644
index 00000000..8587c383
--- /dev/null
+++ b/packages/rbtr/src/rbtr/languages/yaml/yaml.scm
@@ -0,0 +1,5 @@
+(document
+  (block_node
+    (block_mapping
+      (block_mapping_pair
+        key: (_) @_section_name) @doc_section)))