gitnexus 1.6.6-rc.54 → 1.6.6-rc.55

package/dist/core/ingestion/languages/php/namespace-siblings.js

@@ -293,6 +293,9 @@ export function populatePhpNamespaceSiblings(parsedFiles, indexes, inputs) {
     //
     // Additionally, mirror from files that are imported via `use` (different
     // namespace) so return types from dependencies are chain-followable too.
+    const parsedByPath = new Map();
+    for (const p of parsedFiles)
+        parsedByPath.set(p.filePath, p);
     for (const parsed of parsedFiles) {
         const moduleScope = parsed.scopes.find((s) => s.kind === 'Module');
         if (moduleScope === undefined)
@@ -328,7 +331,7 @@ export function populatePhpNamespaceSiblings(parsedFiles, indexes, inputs) {
         }
         // Mirror return-type bindings from accessible files.
         for (const srcFilePath of accessibleFiles) {
-            const srcParsed = parsedFiles.find((p) => p.filePath === srcFilePath);
+            const srcParsed = parsedByPath.get(srcFilePath);
             if (srcParsed === undefined)
                 continue;
             const srcModuleScope = srcParsed.scopes.find((s) => s.kind === 'Module');

package/dist/core/ingestion/scope-extractor.d.ts

@@ -78,9 +78,11 @@ export type ScopeExtractorHooks = Pick<LanguageProvider, 'resolveScopeKind' | 'b
  * Drive the five extraction passes and return a `ParsedFile`.
  *
  * Throws `ScopeTreeInvariantError` (from #912) when the provider emits
- * captures that violate structural scope invariants. The error surfaces
- * upward rather than being silently corrected — a malformed capture set
- * is a bug in the provider's `emitScopeCaptures`, not a data condition
- * to tolerate.
+ * captures that violate structural scope invariants (e.g., overlapping
+ * sibling scopes). When no `@scope.module` capture is present, a
+ * synthetic Module scope is created spanning all captures, and orphan
+ * non-Module scopes are re-parented under it. This enables indexing of
+ * files where tree-sitter produces an ERROR root (e.g., complex .phtml
+ * templates with mixed PHP/HTML/JS).
  */
 export declare function extract(matches: readonly CaptureMatch[], filePath: string, provider: ScopeExtractorHooks): ParsedFile;

package/dist/core/ingestion/scope-extractor.js

@@ -65,17 +65,28 @@ import { extractTemplateArguments } from './utils/template-arguments.js';
  * Drive the five extraction passes and return a `ParsedFile`.
  *
  * Throws `ScopeTreeInvariantError` (from #912) when the provider emits
- * captures that violate structural scope invariants. The error surfaces
- * upward rather than being silently corrected — a malformed capture set
- * is a bug in the provider's `emitScopeCaptures`, not a data condition
- * to tolerate.
+ * captures that violate structural scope invariants (e.g., overlapping
+ * sibling scopes). When no `@scope.module` capture is present, a
+ * synthetic Module scope is created spanning all captures, and orphan
+ * non-Module scopes are re-parented under it. This enables indexing of
+ * files where tree-sitter produces an ERROR root (e.g., complex .phtml
+ * templates with mixed PHP/HTML/JS).
  */
 export function extract(matches, filePath, provider) {
     // Partition matches by topic up front — one linear pass over the input.
     const partitioned = partitionByTopic(matches);
     // ── Pass 1: build the scope tree ─────────────────────────────────────
     const scopeDrafts = pass1BuildScopes(partitioned.scope, filePath, provider);
-    const moduleScope = ensureModuleScope(scopeDrafts, matches.length, filePath);
+    const moduleScope = ensureModuleScope(scopeDrafts, filePath, matches);
+    // Re-parent orphan drafts (parent === null, non-Module) under the
+    // Module scope. Replaces drafts with new ones carrying the correct
+    // parent — runs before content passes so bindings/ownedDefs are empty.
+    for (let i = 0; i < scopeDrafts.length; i++) {
+        const d = scopeDrafts[i];
+        if (d.parent === null && d.kind !== 'Module') {
+            scopeDrafts[i] = makeDraft(d.id, moduleScope.id, d.kind, d.range, d.filePath);
+        }
+    }
     const scopes = scopeDrafts.map(draftToScope);
     // buildScopeTree validates invariants (throws on violation) and exposes
     // the lookup contract consumed by Passes 2-5.
@@ -171,18 +182,29 @@ function topicOf(match) {
     }
     return 'unknown';
 }
-function ensureModuleScope(scopeDrafts, matchCount, filePath) {
+function ensureModuleScope(scopeDrafts, filePath, allMatches) {
     const moduleScope = scopeDrafts.find((s) => s.kind === 'Module');
     if (moduleScope !== undefined)
         return moduleScope;
-    if (scopeDrafts.length === 0 && matchCount === 0) {
-        const range = { startLine: 0, startCol: 0, endLine: 0, endCol: 0 };
-        const synthetic = makeDraft(makeScopeId({ filePath, range, kind: 'Module' }), null, 'Module', range, filePath);
-        scopeDrafts.push(synthetic);
-        return synthetic;
+    // Synthesize a Module scope spanning all captures in the file.
+    // Computed from ALL captures (scope, declaration, reference, etc.)
+    // so the range covers top-level references that appear after the
+    // last inner scope — not just inner Function/Class scopes.
+    let endLine = 0;
+    let endCol = 0;
+    for (const match of allMatches) {
+        for (const capture of Object.values(match)) {
+            if (capture.range.endLine > endLine ||
+                (capture.range.endLine === endLine && capture.range.endCol > endCol)) {
+                endLine = capture.range.endLine;
+                endCol = capture.range.endCol;
+            }
+        }
     }
-    throw new Error(`ScopeExtractor: no Module scope found for '${filePath}'. ` +
-        `Provider must emit at least one @scope.module capture per file.`);
+    const range = { startLine: 0, startCol: 0, endLine, endCol };
+    const synthetic = makeDraft(makeScopeId({ filePath, range, kind: 'Module' }), null, 'Module', range, filePath);
+    scopeDrafts.push(synthetic);
+    return synthetic;
 }
 function draftToScope(draft) {
     const frozenBindings = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.6-rc.54",
+  "version": "1.6.6-rc.55",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",