diff --git a/src/extraction/grammars.ts b/src/extraction/grammars.ts
index c167d28b3..9e879c297 100644
--- a/src/extraction/grammars.ts
+++ b/src/extraction/grammars.ts
@@ -37,6 +37,7 @@ const WASM_GRAMMAR_FILES: Record<GrammarLanguage, string> = {
   scala: 'tree-sitter-scala.wasm',
   lua: 'tree-sitter-lua.wasm',
   luau: 'tree-sitter-luau.wasm',
+  hlsl: 'tree-sitter-hlsl.wasm',
 };
 
 /**
@@ -92,6 +93,11 @@ export const EXTENSION_MAP: Record<string, Language> = {
   '.sc': 'scala',
   '.lua': 'lua',
   '.luau': 'luau',
+  // Shader files (HLSL grammar with USF/USH/GLSL aliases)
+  '.hlsl': 'hlsl',
+  '.usf': 'hlsl',
+  '.ush': 'hlsl',
+  '.glsl': 'hlsl',
 };
 
 /**
@@ -169,7 +175,7 @@ export async function loadGrammarsForLanguages(languages: Language[]): Promise<v
       // ABI-13 build that corrupts the shared WASM heap under web-tree-sitter
       // 0.25 (drops nested calls/imports on every file after the first); we
       // vendor the upstream ABI-15 wasm instead.
-      const wasmPath = (lang === 'pascal' || lang === 'scala' || lang === 'lua' || lang === 'luau')
+      const wasmPath = (lang === 'pascal' || lang === 'scala' || lang === 'lua' || lang === 'luau' || lang === 'hlsl')
         ? path.join(__dirname, 'wasm', wasmFile)
         : require.resolve(`tree-sitter-wasms/out/${wasmFile}`);
       const language = await WasmLanguage.load(wasmPath);
@@ -342,6 +348,7 @@ export function getLanguageDisplayName(language: Language): string {
     scala: 'Scala',
     lua: 'Lua',
     luau: 'Luau',
+    hlsl: 'HLSL / Shader',
     yaml: 'YAML',
     twig: 'Twig',
     unknown: 'Unknown',
diff --git a/src/extraction/languages/hlsl.ts b/src/extraction/languages/hlsl.ts
new file mode 100644
index 000000000..d6c5d48fb
--- /dev/null
+++ b/src/extraction/languages/hlsl.ts
@@ -0,0 +1,71 @@
+import type { Node as SyntaxNode } from 'web-tree-sitter';
+import { getNodeText } from '../tree-sitter-helpers';
+import type { LanguageExtractor } from '../tree-sitter-types';
+
+/**
+ * HLSL / Shader language extractor.
+ *
+ * tree-sitter-hlsl extends tree-sitter-cpp, so the AST node types are a superset
+ * of C++.  HLSL-specific constructs (float4, cbuffer, semantics like
+ * : SV_Position, [numthreads] attributes) are parsed by the HLSL grammar.
+ *
+ * This extractor reuses the C++ node-type mappings and adds support for
+ * shader-specific constructs.
+ */
+export const hlslExtractor: LanguageExtractor = {
+  // Functions: shader entry points (VS, PS, CS) and helper functions
+  functionTypes: ['function_definition'],
+  // HLSL doesn't use classes (cbuffers are the struct-like containers)
+  classTypes: [],
+  // Methods inside structs/classes appear as function_definitions
+  methodTypes: ['function_definition'],
+  interfaceTypes: [],
+  // HLSL structs for input/output layouts
+  structTypes: ['struct_specifier'],
+  // Enums
+  enumTypes: ['enum_specifier'],
+  enumMemberTypes: ['enumerator'],
+  // No typedef in HLSL
+  typeAliasTypes: [],
+  // #include directives (UE-style shader includes)
+  importTypes: ['preproc_include'],
+  // Function calls (including HLSL intrinsics like mul(), tex2D(), Sample())
+  callTypes: ['call_expression'],
+  // Local and global variable declarations
+  variableTypes: ['declaration'],
+  // Fields inside structs and cbuffers
+  fieldTypes: ['field_declaration'],
+
+  nameField: 'declarator',
+  bodyField: 'body',
+  paramsField: 'parameters',
+
+  extractImport: (node, source) => {
+    const importText = source.substring(node.startIndex, node.endIndex).trim();
+    // HLSL includes: #include "Common.ush", #include "/Engine/Private/Common.ush"
+    const systemLib = node.namedChildren.find(
+      (c: SyntaxNode) => c.type === 'system_lib_string'
+    );
+    if (systemLib) {
+      return {
+        moduleName: getNodeText(systemLib, source).replace(/^<|>$/g, ''),
+        signature: importText,
+      };
+    }
+    const stringLiteral = node.namedChildren.find(
+      (c: SyntaxNode) => c.type === 'string_literal'
+    );
+    if (stringLiteral) {
+      const stringContent = stringLiteral.namedChildren.find(
+        (c: SyntaxNode) => c.type === 'string_content'
+      );
+      if (stringContent) {
+        return {
+          moduleName: getNodeText(stringContent, source),
+          signature: importText,
+        };
+      }
+    }
+    return null;
+  },
+};
diff --git a/src/extraction/languages/index.ts b/src/extraction/languages/index.ts
index a289f0289..6d713bbc7 100644
--- a/src/extraction/languages/index.ts
+++ b/src/extraction/languages/index.ts
@@ -25,6 +25,7 @@ import { pascalExtractor } from './pascal';
 import { scalaExtractor } from './scala';
 import { luaExtractor } from './lua';
 import { luauExtractor } from './luau';
+import { hlslExtractor } from './hlsl';
 
 export const EXTRACTORS: Partial<Record<Language, LanguageExtractor>> = {
   typescript: typescriptExtractor,
@@ -47,4 +48,5 @@ export const EXTRACTORS: Partial<Record<Language, LanguageExtractor>> = {
   scala: scalaExtractor,
   lua: luaExtractor,
   luau: luauExtractor,
+  hlsl: hlslExtractor,
 };
diff --git a/src/extraction/wasm/tree-sitter-hlsl.wasm b/src/extraction/wasm/tree-sitter-hlsl.wasm
new file mode 100644
index 000000000..7dcda3b49
Binary files /dev/null and b/src/extraction/wasm/tree-sitter-hlsl.wasm differ
diff --git a/src/types.ts b/src/types.ts
index 0168665d2..c76b96079 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -87,6 +87,7 @@ export const LANGUAGES = [
   'scala',
   'lua',
   'luau',
+  'hlsl',
   'yaml',
   'twig',
   'unknown',