gitnexus 1.6.6-rc.53 → 1.6.6-rc.55

package/dist/core/group/sync.js

@@ -64,22 +64,22 @@ export async function syncGroup(config, opts) {
     let manifestCrossLinks = [];
     let dbExecutors;
     let registryEntries;
-    const eo = opts?.extractorOverride;
-    if (eo && eo.length === 0) {
-        autoContracts = await eo();
-    }
-    else {
-        registryEntries = await readRegistry();
-        const entries = registryEntries;
-        const resolve = opts?.resolveRepoHandle ?? defaultResolveHandle(entries);
-        const httpEx = new HttpRouteExtractor();
-        const grpcEx = new GrpcExtractor();
-        const thriftEx = new ThriftExtractor();
-        const topicEx = new TopicExtractor();
-        const includeEx = new IncludeExtractor();
-        dbExecutors = new Map();
-        const openPoolIds = [];
-        try {
+    const openPoolIds = [];
+    try {
+        const eo = opts?.extractorOverride;
+        if (eo && eo.length === 0) {
+            autoContracts = await eo();
+        }
+        else {
+            registryEntries = await readRegistry();
+            const entries = registryEntries;
+            const resolve = opts?.resolveRepoHandle ?? defaultResolveHandle(entries);
+            const httpEx = new HttpRouteExtractor();
+            const grpcEx = new GrpcExtractor();
+            const thriftEx = new ThriftExtractor();
+            const topicEx = new TopicExtractor();
+            const includeEx = new IncludeExtractor();
+            dbExecutors = new Map();
             for (const [groupPath, regName] of Object.entries(config.repos)) {
                 const handle = await resolve(regName, groupPath);
                 if (!handle) {
@@ -166,55 +166,49 @@ export async function syncGroup(config, opts) {
                 }
             }
         }
-        finally {
-            for (const id of [...new Set(openPoolIds)]) {
-                await closeLbug(id).catch(() => { });
+        // Workspace discovery and manifest extraction run inside this outer try
+        // block so dbExecutors closures resolve against live pools (issue #1802).
+        // The finally below closes pools after this completes (or throws).
+        let allLinks = [...config.links];
+        if (config.detect.workspace_deps) {
+            const repoPaths = new Map();
+            if (!registryEntries)
+                registryEntries = await readRegistry();
+            for (const [groupPath, regName] of Object.entries(config.repos)) {
+                const e = registryEntries.find((en) => en.name === regName);
+                if (e)
+                    repoPaths.set(groupPath, e.path);
             }
-        }
-    }
-    // Auto-discover workspace dependency contracts (Rust Cargo workspaces, etc.)
-    // and merge them with explicit manifest links. Discovered links use the same
-    // ManifestExtractor pipeline as hand-written links in group.yaml.
-    let allLinks = [...config.links];
-    if (config.detect.workspace_deps) {
-        const repoPaths = new Map();
-        if (!registryEntries)
-            registryEntries = await readRegistry();
-        for (const [groupPath, regName] of Object.entries(config.repos)) {
-            const e = registryEntries.find((en) => en.name === regName);
-            if (e)
-                repoPaths.set(groupPath, e.path);
-        }
-        const wsResult = await discoverWorkspaceLinks(config.repos, repoPaths, dbExecutors);
-        if (wsResult.links.length > 0) {
-            allLinks = [...allLinks, ...wsResult.links];
-            if (opts?.verbose) {
-                for (const s of wsResult.stats) {
-                    logger.info(`  workspace-deps: discovered ${s.linkCount} cross-${s.ecosystem.toLowerCase()} links from ${s.projectCount} ${s.ecosystem} projects`);
+            const wsResult = await discoverWorkspaceLinks(config.repos, repoPaths, dbExecutors);
+            if (wsResult.links.length > 0) {
+                allLinks = [...allLinks, ...wsResult.links];
+                if (opts?.verbose) {
+                    for (const s of wsResult.stats) {
+                        logger.info(`  workspace-deps: discovered ${s.linkCount} cross-${s.ecosystem.toLowerCase()} links from ${s.projectCount} ${s.ecosystem} projects`);
+                    }
                 }
             }
         }
-    }
-    // Process manifest links declared in group.yaml (plus any auto-discovered).
-    // ManifestExtractor is fully implemented but was never wired into this
-    // pipeline — config.links were parsed and validated but silently dropped.
-    // Placed after the DB try/finally: resolveSymbol falls back to synthetic
-    // UIDs when dbExecutors is undefined or a pool is closed, so cross-links
-    // are always generated regardless of whether real DB executors are available.
-    if (allLinks.length > 0) {
-        const knownRepos = new Set(Object.keys(config.repos));
-        for (const link of allLinks) {
-            const dangling = [link.from, link.to].filter((r) => !knownRepos.has(r));
-            if (dangling.length > 0) {
-                logger.warn(`[group/sync] manifest link ${link.type}:${link.contract} references repos not in config.repos: ${dangling.join(', ')} — cross-links will use synthetic UIDs`);
+        if (allLinks.length > 0) {
+            const knownRepos = new Set(Object.keys(config.repos));
+            for (const link of allLinks) {
+                const dangling = [link.from, link.to].filter((r) => !knownRepos.has(r));
+                if (dangling.length > 0) {
+                    logger.warn(`[group/sync] manifest link ${link.type}:${link.contract} references repos not in config.repos: ${dangling.join(', ')} — cross-links will use synthetic UIDs`);
+                }
+            }
+            const manifestEx = new ManifestExtractor();
+            const manifestResult = await manifestEx.extractFromManifest(allLinks, dbExecutors);
+            autoContracts.push(...manifestResult.contracts);
+            manifestCrossLinks = manifestResult.crossLinks;
+            if (opts?.verbose) {
+                logger.info(`  manifest: ${manifestCrossLinks.length} cross-links from ${allLinks.length} links (${config.links.length} declared + ${allLinks.length - config.links.length} discovered)`);
             }
         }
-        const manifestEx = new ManifestExtractor();
-        const manifestResult = await manifestEx.extractFromManifest(allLinks, dbExecutors);
-        autoContracts.push(...manifestResult.contracts);
-        manifestCrossLinks = manifestResult.crossLinks;
-        if (opts?.verbose) {
-            logger.info(`  manifest: ${manifestCrossLinks.length} cross-links from ${allLinks.length} links (${config.links.length} declared + ${allLinks.length - config.links.length} discovered)`);
+    }
+    finally {
+        for (const id of [...new Set(openPoolIds)]) {
+            await closeLbug(id).catch(() => { });
         }
     }
     const providerIndex = buildProviderIndex(autoContracts, config.matching);

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.53",
+  "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",