Merge PR #9: add HCL/Terraform language support

CSCSoftware · CSCSoftware · commit 7f177eea9bc8 · 2026-04-25T16:54:25.000+02:00
diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
@@ -2,7 +2,7 @@
 
 MCP Server für persistentes Code-Indexing. Ermöglicht Claude Code schnelle, präzise Suchen statt Grep/Glob.
 
-**Version:** 1.17.0 | **Sprachen:** 11 | **Repo:** https://github.com/CSCSoftware/AiDex
+**Version:** 1.17.0 | **Sprachen:** 12 | **Repo:** https://github.com/CSCSoftware/AiDex
 
 ## Build & Run
 
@@ -106,7 +106,7 @@ Actions: `init` (Server starten) → `query` (Logs abfragen) → `free` (Server
 
 ## Sprachen
 
-C# · TypeScript · JavaScript · Rust · Python · C · C++ · Java · Go · PHP · Ruby
+C# · TypeScript · JavaScript · Rust · Python · C · C++ · Java · Go · PHP · Ruby · HCL/Terraform
 
 ## Architektur
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to AiDex will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+- **HCL/Terraform support**: Indexes `.tf`, `.tfvars`, and `.hcl` files
+  - Blocks (`resource`, `module`, `variable`, `output`, `data`, `locals`, `provider`, ...) → types with dotted names (e.g. `resource.aws_instance.web`)
+  - Function calls → methods
+  - Attributes → properties
+  - Uses `@tree-sitter-grammars/tree-sitter-hcl` grammar
+
 ### Changed
 - **tree-sitter upgrade**: Bumped `tree-sitter` from 0.21 to 0.25 and all grammar packages to latest — enables support for newer grammar packages requiring tree-sitter ^0.25.0
 
diff --git a/MCP-API-REFERENCE.md b/MCP-API-REFERENCE.md
@@ -1167,6 +1167,7 @@ Used by `aidex_query` parameters `modified_since` and `modified_before`:
 | Go | `.go` | tree-sitter-go |
 | PHP | `.php` | tree-sitter-php |
 | Ruby | `.rb`, `.rake` | tree-sitter-ruby |
+| HCL/Terraform | `.tf`, `.tfvars`, `.hcl` | @tree-sitter-grammars/tree-sitter-hcl |
 
 ---
 
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ AiDex is an MCP server that gives AI coding assistants instant access to your en
 | **Screenshots** | `screenshot`, `windows` | Cross-platform screen capture with LLM optimization — scale + color reduction saves up to 95% tokens |
 | **Viewer** | `viewer` | Interactive browser UI with file tree, signatures, tasks, logs, and live reload |
 
-**11 languages** — C#, TypeScript, JavaScript, Rust, Python, C, C++, Java, Go, PHP, Ruby
+**12 languages** — C#, TypeScript, JavaScript, Rust, Python, C, C++, Java, Go, PHP, Ruby, HCL/Terraform
 
 <details>
 <summary><strong>Quick Examples</strong> — see it in action</summary>
@@ -181,6 +181,7 @@ The index lives in `.aidex/index.db` (SQLite) - fast, portable, no external depe
 | Go | `.go` |
 | PHP | `.php` |
 | Ruby | `.rb`, `.rake` |
+| HCL/Terraform | `.tf`, `.tfvars`, `.hcl` |
 
 ## Quick Start
 
@@ -327,7 +328,7 @@ Do I want to search code?
 | Screenshots | `aidex_screenshot`, `aidex_windows` | Screen capture with LLM optimization (scale + color reduction, no index needed) |
 | Viewer | `aidex_viewer` | Interactive browser UI with file tree, signatures, tasks, and live logs |
 
-**11 languages:** C#, TypeScript, JavaScript, Rust, Python, C, C++, Java, Go, PHP, Ruby
+**12 languages:** C#, TypeScript, JavaScript, Rust, Python, C, C++, Java, Go, PHP, Ruby, HCL/Terraform
 
 ### Session Notes
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
   "license": "MIT",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
+    "@tree-sitter-grammars/tree-sitter-hcl": "^1.2.0",
     "better-sqlite3": "^11.0.0",
     "chokidar": "^5.0.0",
     "express": "^4.22.1",
diff --git a/src/commands/global/global-init.ts b/src/commands/global/global-init.ts
@@ -90,6 +90,8 @@ const PROJECT_MARKERS = [
     'composer.json',
     // C/C++
     'CMakeLists.txt', 'Makefile', 'meson.build',
+    // HCL/Terraform
+    '*.tf', '.terraform.lock.hcl',
 ];
 
 /** Glob-style markers that need directory listing (e.g., *.sln) */
@@ -416,6 +418,7 @@ const CODE_EXTS = new Set([
     '.cs', '.rs', '.py', '.pyw',
     '.c', '.h', '.cpp', '.cc', '.cxx', '.hpp', '.hxx',
     '.java', '.go', '.php', '.rb', '.rake',
+    '.tf', '.tfvars', '.hcl',
 ]);
 
 function estimateFileCount(dirPath: string): number {
diff --git a/src/commands/init.ts b/src/commands/init.ts
@@ -87,6 +87,7 @@ export const DEFAULT_EXCLUDE = [
     '**/.next/**',           // Next.js
     '**/coverage/**',        // Test coverage
     '**/tmp/**',             // Ruby, temp files
+    '**/.terraform/**',      // Terraform downloaded modules + state cache
     // Generated files
     '**/*.min.js',
     '**/*.generated.*',
@@ -127,7 +128,8 @@ const CODE_EXTENSIONS = new Set([
     '.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs',
     '.cs', '.rs', '.py', '.pyw',
     '.c', '.h', '.cpp', '.cc', '.cxx', '.hpp', '.hxx',
-    '.java', '.go', '.php', '.rb', '.rake'
+    '.java', '.go', '.php', '.rb', '.rake',
+    '.tf', '.tfvars', '.hcl',
 ]);
 
 const CONFIG_EXTENSIONS = new Set([
diff --git a/src/commands/summary.ts b/src/commands/summary.ts
@@ -234,6 +234,9 @@ function detectLanguages(queries: ReturnType<typeof createQueries>): string[] {
         '.go': 'Go',
         '.php': 'PHP',
         '.rb': 'Ruby',
+        '.tf': 'HCL/Terraform',
+        '.tfvars': 'HCL/Terraform',
+        '.hcl': 'HCL/Terraform',
     };
 
     const languages = new Set<string>();
diff --git a/src/db/global-database.ts b/src/db/global-database.ts
@@ -482,6 +482,7 @@ export function readProjectStats(projectPath: string): ProjectStats | null {
             '.rs': 'Rust', '.py': 'Python', '.pyw': 'Python',
             '.c': 'C', '.h': 'C', '.cpp': 'C++', '.cc': 'C++', '.cxx': 'C++', '.hpp': 'C++', '.hxx': 'C++',
             '.java': 'Java', '.go': 'Go', '.php': 'PHP', '.rb': 'Ruby', '.rake': 'Ruby',
+            '.tf': 'HCL/Terraform', '.tfvars': 'HCL/Terraform', '.hcl': 'HCL/Terraform',
         };
 
         const languages = [...new Set(
diff --git a/src/parser/extractor.ts b/src/parser/extractor.ts
@@ -106,6 +106,21 @@ export function extract(sourceCode: string, filePath: string): ExtractionResult
             if (typeInfo) {
                 types.push(typeInfo);
                 setLineType(lineNumber, 'struct');
+
+                // HCL: block labels are in a composed name (e.g. "resource.aws_instance.web").
+                // Index each label part as an item so `aidex_query` finds the declaration
+                // even when the label is only referenced here (e.g. a never-used module).
+                // Skip the first part (block type keyword like "resource"); index the rest
+                // unconditionally — labels like "default" or "root" are user-chosen names
+                // that happen to collide with HCL_KEYWORDS, but are meaningful here.
+                if (language === 'hcl' && node.type === 'block') {
+                    const parts = typeInfo.name.split('.');
+                    for (let i = 1; i < parts.length; i++) {
+                        if (parts[i].length >= 2) {
+                            items.push({ term: parts[i], lineNumber, lineType: 'struct' });
+                        }
+                    }
+                }
             }
         }
 
@@ -115,7 +130,11 @@ export function extract(sourceCode: string, filePath: string): ExtractionResult
             const methodInfo = extractMethodInfo(node, language, sourceLines);
             if (methodInfo) {
                 methods.push(methodInfo);
-                setLineType(lineNumber, 'method');
+                // HCL function_call is a usage (inside an attribute expression), not a definition.
+                // Don't overwrite the enclosing attribute's 'property' line type.
+                if (!(language === 'hcl' && node.type === 'function_call')) {
+                    setLineType(lineNumber, 'method');
+                }
             }
         }
 
@@ -244,6 +263,29 @@ function extractIdentifiersFromComment(
  * Extract type information from a type declaration node
  */
 function extractTypeInfo(node: Parser.SyntaxNode, language: SupportedLanguage): ExtractedType | null {
+    // HCL blocks: compose name from block type keyword + string labels
+    // e.g. `resource "aws_instance" "web"` → `resource.aws_instance.web`
+    if (language === 'hcl' && node.type === 'block') {
+        const parts: string[] = [];
+        for (const child of node.children) {
+            if (child.type === 'identifier') {
+                parts.push(child.text);
+            } else if (child.type === 'string_lit') {
+                // Grammar guarantees string_lit for block labels is wrapped in double quotes
+                parts.push(child.text.slice(1, -1));
+            } else if (child.type === 'block_start') {
+                break;
+            }
+        }
+        if (parts.length > 0) {
+            return {
+                name: parts.join('.'),
+                kind: 'type',
+                lineNumber: node.startPosition.row + 1,
+            };
+        }
+    }
+
     // Find the name child
     const nameNode = node.children.find(c =>
         c.type === 'identifier' || c.type === 'type_identifier' || c.type === 'name'
diff --git a/src/parser/languages/hcl.ts b/src/parser/languages/hcl.ts
@@ -0,0 +1,102 @@
+/**
+ * HCL (HashiCorp Configuration Language) / Terraform configuration for AiDex
+ */
+
+/**
+ * HCL keywords and common built-ins that should be filtered out during indexing
+ */
+export const HCL_KEYWORDS = new Set([
+    // Block types & reference prefixes (Terraform)
+    'resource', 'data', 'module', 'variable', 'output', 'locals',
+    'provider', 'terraform', 'backend', 'provisioner', 'connection',
+    'lifecycle', 'moved', 'import', 'check', 'removed',
+    'self', 'local', 'var', 'path', 'root',
+
+    // Meta-arguments
+    'count', 'for_each', 'depends_on', 'providers', 'source', 'version',
+
+    // Lifecycle arguments
+    'create_before_destroy', 'prevent_destroy', 'ignore_changes',
+    'replace_triggered_by', 'precondition', 'postcondition',
+
+    // Type constraints
+    'string', 'number', 'bool', 'list', 'map', 'set', 'object', 'tuple',
+    'any', 'optional', 'type',
+
+    // Literals & values
+    'true', 'false', 'null',
+
+    // Expression keywords
+    'for', 'in', 'if', 'else', 'each',
+
+    // Common attribute names (noise)
+    'default', 'description', 'sensitive', 'validation',
+    'nullable', 'value', 'condition', 'error_message',
+
+    // Common built-in functions (high frequency, low signal)
+    'abs', 'ceil', 'floor', 'log', 'max', 'min', 'parseint', 'pow', 'signum',
+    'chomp', 'format', 'formatlist', 'indent', 'join', 'lower', 'regex', 'regexall',
+    'replace', 'split', 'strrev', 'substr', 'title', 'trim', 'trimprefix',
+    'trimsuffix', 'trimspace', 'upper',
+    'chunklist', 'coalesce', 'coalescelist', 'compact', 'concat', 'contains',
+    'distinct', 'element', 'flatten', 'index', 'keys', 'length', 'lookup',
+    'matchkeys', 'merge', 'range', 'reverse', 'setintersection', 'setproduct',
+    'setsubtract', 'setunion', 'slice', 'sort', 'sum', 'toset', 'transpose', 'values',
+    'zipmap',
+    'base64decode', 'base64encode', 'base64gzip', 'csvdecode', 'jsondecode',
+    'jsonencode', 'textdecodebase64', 'textencodebase64', 'urlencode', 'yamldecode',
+    'yamlencode',
+    'abspath', 'dirname', 'pathexpand', 'basename', 'file', 'fileexists',
+    'fileset', 'filebase64', 'templatefile',
+    'formatdate', 'timeadd', 'timestamp',
+    'base64sha256', 'base64sha512', 'bcrypt', 'filebase64sha256', 'filebase64sha512',
+    'filemd5', 'filesha1', 'filesha256', 'filesha512', 'md5', 'rsadecrypt',
+    'sha1', 'sha256', 'sha512', 'uuid', 'uuidv5',
+    'cidrhost', 'cidrnetmask', 'cidrsubnet', 'cidrsubnets',
+    'can', 'nonsensitive', 'tobool', 'tolist', 'tomap', 'tonumber',
+    'tostring', 'try',
+]);
+
+/**
+ * Tree-sitter node types that represent identifiers in HCL
+ */
+export const HCL_IDENTIFIER_NODES = new Set([
+    'identifier',
+    'variable_expr',
+]);
+
+/**
+ * Tree-sitter node types for comments (# line, // line, and block comments)
+ */
+export const HCL_COMMENT_NODES = new Set([
+    'comment',
+]);
+
+/**
+ * Tree-sitter node types for function calls — treated as "methods" for indexing
+ */
+export const HCL_METHOD_NODES = new Set([
+    'function_call',
+]);
+
+/**
+ * Tree-sitter node types for block declarations — treated as "types" for indexing
+ * (resource, variable, output, module, data, locals, provider, terraform, etc.)
+ */
+export const HCL_TYPE_NODES = new Set([
+    'block',
+]);
+
+/**
+ * Tree-sitter node types for attribute declarations (key = value assignments)
+ */
+export const HCL_PROPERTY_NODES = new Set([
+    'attribute',
+]);
+
+/**
+ * Check if a term is an HCL keyword
+ */
+export function isKeyword(term: string): boolean {
+    return HCL_KEYWORDS.has(term);
+}
diff --git a/src/parser/languages/index.ts b/src/parser/languages/index.ts
@@ -13,6 +13,7 @@ import * as java from './java.js';
 import * as go from './go.js';
 import * as php from './php.js';
 import * as ruby from './ruby.js';
+import * as hcl from './hcl.js';
 
 export interface LanguageConfig {
     isKeyword: (term: string) => boolean;
@@ -103,6 +104,14 @@ const configs: Record<SupportedLanguage, LanguageConfig> = {
         methodNodes: ruby.RUBY_METHOD_NODES,
         typeNodes: ruby.RUBY_TYPE_NODES,
     },
+    hcl: {
+        isKeyword: hcl.isKeyword,
+        identifierNodes: hcl.HCL_IDENTIFIER_NODES,
+        commentNodes: hcl.HCL_COMMENT_NODES,
+        methodNodes: hcl.HCL_METHOD_NODES,
+        typeNodes: hcl.HCL_TYPE_NODES,
+        propertyNodes: hcl.HCL_PROPERTY_NODES,
+    },
 };
 
 /**
diff --git a/src/parser/tree-sitter.ts b/src/parser/tree-sitter.ts
@@ -15,10 +15,11 @@ import Java from 'tree-sitter-java';
 import Go from 'tree-sitter-go';
 import Php from 'tree-sitter-php';
 import Ruby from 'tree-sitter-ruby';
+import Hcl from '@tree-sitter-grammars/tree-sitter-hcl';
 
 export type SupportedLanguage =
     | 'csharp' | 'typescript' | 'javascript' | 'rust' | 'python'
-    | 'c' | 'cpp' | 'java' | 'go' | 'php' | 'ruby';
+    | 'c' | 'cpp' | 'java' | 'go' | 'php' | 'ruby' | 'hcl';
 
 // Grammar packages export types incompatible with tree-sitter 0.25's Parser.Language interface.
 // All grammars work at runtime via NAPI — this is a type declaration mismatch only.
@@ -37,6 +38,7 @@ const GRAMMAR_MAP: Record<string, Parser.Language> = {
     go: asLang(Go),
     php: asLang(Php.php),
     ruby: asLang(Ruby),
+    hcl: asLang(Hcl),
     tsx: asLang(TypeScript.tsx),
     jsx: asLang(TypeScript.tsx), // tsx grammar handles JSX too
 };
@@ -65,6 +67,9 @@ const EXTENSION_MAP: Record<string, SupportedLanguage> = {
     '.php': 'php',
     '.rb': 'ruby',
     '.rake': 'ruby',
+    '.tf': 'hcl',
+    '.tfvars': 'hcl',
+    '.hcl': 'hcl',
 };
 
 // Cached parsers per language (includes 'tsx' and 'jsx' as virtual keys)
diff --git a/src/viewer/server.ts b/src/viewer/server.ts
