Replace the hardcoded filetype and grammar maps with one Definition per linked grammar: grammar id, micro filetypes, ordered query files, and language constructor. Query layers concatenate in order, so TSX and C++ reuse their base language highlights without a query preprocessor. Remove the Go keyword refinement so capture mapping stays language-neutral, and add table-driven span tests plus incremental differential tests for Go and Python.