@lzehrung/codegraph 2.3.19 → 2.3.20

package/dist/indexer/build-index.js

@@ -309,7 +309,9 @@ function createIndexBuildRunState(projectRoot, opts, graphOptions = normalizeGra
         normalizedProjectRoot: normalizePath(path.resolve(projectRoot)),
         report,
         timings: report?.timings,
-        totalStart: performance.now(),
+        // Delegated rebuilds mint a fresh run state after the preamble; reuse the caller's
+        // origin so totalMs covers the whole wait, matching progress completion.
+        totalStart: opts?.progressStartedAt ?? performance.now(),
         cacheMode,
         cacheEnabled: cacheMode !== "off",
         graphOptions,
@@ -397,6 +399,16 @@ const TRANSIENT_BUILD_TIMING_STEP_NAMES = {
     "persist-cache": true,
     "workspace-manifests": true,
     "index-manifest": true,
+    "file-identity": true,
+    "clear-resolution-caches": true,
+    "load-manifest": true,
+    "diff-build-options": true,
+    "git-head": true,
+    "config-hash": true,
+    "manifest-transform": true,
+    "manifest-write": true,
+    "cache-prune": true,
+    "metadata-discovery": true,
     finalize: true,
     "snapshot-write": true,
 };
@@ -432,6 +444,12 @@ function recordBuildTimingStep(timings, step) {
     if (step.name === "filesystem-scan")
         timings.filesystemScanMs = step.ms;
 }
+async function recordTimedBuildStep(timings, name, fn) {
+    const startedAt = performance.now();
+    const result = await fn();
+    recordBuildTimingStep(timings, { name, ms: Math.round(performance.now() - startedAt) });
+    return result;
+}
 function buildConcurrency(opts) {
     return resolveWorkerThreadCount({ requested: Number(opts?.threads || 0), defaultCount: 8, max: 64 });
 }
@@ -891,6 +909,7 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
                     files: manifestEntries,
                     timings,
                     manifestReport: report?.manifest,
+                    ...(helperOpts?.configHash ? { configHash: helperOpts.configHash } : {}),
                     ...(helperOpts?.transientFiles !== undefined ? { transientFiles: helperOpts.transientFiles } : {}),
                     ...(helperOpts?.symlinkDirectories !== undefined
                         ? { symlinkDirectories: helperOpts.symlinkDirectories }
@@ -904,29 +923,31 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
                 return [file, { ...entry, ...(cacheSig ? { cacheSig } : {}) }];
             }))
             : manifestEntriesForIndex;
-        const index = await timeIndexBuildPhase({
+        const discoveredInsideFinalize = projectFiles === undefined;
+        const finalizeStartedAt = performance.now();
+        if (buildStartedAt !== undefined) {
+            emitIndexBuildActivity(opts, "Finalizing project graph", totalFiles, totalFiles);
+        }
+        const index = await finalizeProjectIndex({
+            projectRoot,
+            normalizedProjectRoot,
             opts,
             timings,
-            buildStartedAt,
-            stepName: "finalize",
-            activity: "Finalizing project graph",
-            current: totalFiles,
-            total: totalFiles,
-            fn: () => finalizeProjectIndex({
-                projectRoot,
-                normalizedProjectRoot,
-                opts,
-                timings,
-                totalStart,
-                graph,
-                modules,
-                parsedMap,
-                bloomFilterCache,
-                ...(projectFiles !== undefined ? { projectFiles } : {}),
-                buildReport: report,
-                manifestEntries: indexManifestEntries,
-            }),
+            totalStart,
+            graph,
+            modules,
+            parsedMap,
+            bloomFilterCache,
+            ...(projectFiles !== undefined ? { projectFiles } : {}),
+            buildReport: report,
+            manifestEntries: indexManifestEntries,
         });
+        if (timings) {
+            const elapsed = Math.round(performance.now() - finalizeStartedAt);
+            const discoveryMs = discoveredInsideFinalize ? (timings.metadataDiscoveryMs ?? 0) : 0;
+            const finalizeMs = discoveredInsideFinalize ? Math.max(0, elapsed - discoveryMs) : elapsed;
+            recordBuildTimingStep(timings, { name: "finalize", ms: finalizeMs });
+        }
         if (manifestEntries) {
             await timeIndexBuildPhase({
                 opts,
@@ -955,7 +976,6 @@ async function buildIndexFromFileListShared(projectRoot, rawFiles, opts, helperO
 }
 async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpts) {
     const timings = opts?.report ? (opts.report.timings ??= {}) : undefined;
-    resetTransientBuildTimings(timings);
     await initializeFileIdentityCaseSensitivity(projectRoot);
     try {
         const useDiskCache = (opts?.cache ?? "off") === "disk";
@@ -1032,6 +1052,7 @@ async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpt
             warnNoFilesMessage: `Warning: No files found in project root: ${projectRoot}. Check codegraph.config.json globs and CLI --include-glob/--ignore-glob filters. Diagnostic: codegraph doctor`,
             ...(helperOpts?.ignoreExistingManifest ? { ignoreExistingManifest: true } : {}),
             ...(helperOpts?.reportDiscoveryProgress ? { reportDiscoveryProgress: true } : {}),
+            ...(helperOpts?.configHash ? { configHash: helperOpts.configHash } : {}),
             projectFiles,
             transientFiles,
             ...(discoveredSymlinkDirectories !== undefined ? { symlinkDirectories: discoveredSymlinkDirectories } : {}),
@@ -1056,9 +1077,12 @@ async function buildProjectIndexWithManifestOptions(projectRoot, opts, helperOpt
  * discovery, so a caller rendering progress reports the wait the user observed.
  */
 export async function buildProjectIndex(projectRoot, opts) {
+    const progressStartedAt = opts?.progressStartedAt ?? performance.now();
+    const timings = opts?.report ? (opts.report.timings ??= {}) : undefined;
+    resetTransientBuildTimings(timings);
     return buildProjectIndexWithManifestOptions(projectRoot, {
         ...opts,
-        progressStartedAt: opts?.progressStartedAt ?? performance.now(),
+        progressStartedAt,
     });
 }
 /**
@@ -1072,6 +1096,10 @@ export async function buildProjectIndexFromFiles(projectRoot, inputFiles, rawOpt
     // Discovery, manifest loading, and cache checks all precede file processing, so stamp the
     // operation origin here and let the completion event report the caller's whole wait.
     const opts = { ...rawOpts, progressStartedAt: rawOpts?.progressStartedAt ?? performance.now() };
+    // A caller can reuse one BuildReport across repeated calls here, the same way an MCP
+    // session reuses `buildOptions.report`, so clear the prior call's transient steps.
+    const timings = opts.report ? (opts.report.timings ??= {}) : undefined;
+    resetTransientBuildTimings(timings);
     try {
         const useDiskCache = (opts?.cache ?? "off") === "disk";
         const normalizedInputFiles = await normalizeIndexedFileInputsWithinRoot(projectRoot, inputFiles, "Index file");
@@ -1122,15 +1150,17 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         ...rawOpts,
         progressStartedAt: rawOpts?.progressStartedAt ?? performance.now(),
     };
-    await initializeFileIdentityCaseSensitivity(projectRoot);
-    clearResolutionCaches();
+    const discoveryTimings = opts.report ? (opts.report.timings ??= {}) : undefined;
+    resetTransientBuildTimings(discoveryTimings);
+    await recordTimedBuildStep(discoveryTimings, "file-identity", () => initializeFileIdentityCaseSensitivity(projectRoot));
+    await recordTimedBuildStep(discoveryTimings, "clear-resolution-caches", () => {
+        clearResolutionCaches();
+    });
     const graphOptions = normalizeGraphOptions(opts?.graph);
     const strictIncremental = opts?.incrementalStrict ?? false;
     if (strictIncremental && graphOptions.fast)
         graphOptions.fast = false;
     const { normalizedProjectRoot, report, timings, totalStart, cacheMode, cacheEnabled, onFallbackImportExtraction } = createIndexBuildRunState(projectRoot, opts, graphOptions);
-    const discoveryTimings = opts?.report ? (opts.report.timings ??= {}) : undefined;
-    resetTransientBuildTimings(discoveryTimings);
     let checkProgressActive = false;
     const startCheckProgress = () => {
         if (checkProgressActive)
@@ -1176,14 +1206,14 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         }
         startCheckProgress();
         const manifestStart = performance.now();
-        const manifest = await loadManifest(projectRoot, opts, report);
+        const manifest = await recordTimedBuildStep(timings, "load-manifest", () => loadManifest(projectRoot, opts, report));
         if (timings)
             timings.manifestMs = Math.round(performance.now() - manifestStart);
         const manifestUsed = !!manifest;
         const manifestReport = initManifestReport(report, manifestUsed, false);
         if (manifestReport && !manifestUsed)
             manifestReport.reason = "missing";
-        const optionDiffs = diffBuildOptions(manifest?.buildOptions, opts);
+        const optionDiffs = await recordTimedBuildStep(timings, "diff-build-options", () => diffBuildOptions(manifest?.buildOptions, opts));
         const warningOptionDiffs = optionDiffs.filter((diff) => diff !== "cache");
         if (manifest && warningOptionDiffs.length) {
             logWithLevel(opts?.logLevel, "warn", `Warning: Manifest options differ from current build options: ${warningOptionDiffs.join(", ")}`);
@@ -1191,7 +1221,7 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         if (manifestReport && optionDiffs.length) {
             manifestReport.optionsMismatch = optionDiffs;
         }
-        const currentConfigHashResult = await computeConfigHash(projectRoot, opts?.logLevel);
+        const currentConfigHashResult = await recordTimedBuildStep(timings, "config-hash", () => computeConfigHash(projectRoot, opts?.logLevel));
         const currentConfigHash = recordConfigHashResult(manifestReport, currentConfigHashResult, opts?.logLevel);
         const configChanged = !!currentConfigHashResult.error || !manifest?.configHash || currentConfigHash !== manifest.configHash;
         let resolverEnvironmentFingerprint;
@@ -1229,6 +1259,7 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
             return await buildProjectIndexFromExport(projectRoot, opts, {
                 ignoreExistingManifest: true,
                 reportDiscoveryProgress: true,
+                configHash: currentConfigHashResult,
             });
         }
         const gitAvailable = await isGitRepo(projectRoot);
@@ -1282,6 +1313,7 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
                 const rebuiltIndex = await buildProjectIndexFromExport(projectRoot, opts, {
                     ignoreExistingManifest: true,
                     reportDiscoveryProgress: true,
+                    configHash: currentConfigHashResult,
                 });
                 if (manifestReport) {
                     manifestReport.reason = "staleGitCommit";
@@ -1303,6 +1335,7 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
                 return await buildProjectIndexFromExport(projectRoot, opts, {
                     ignoreExistingManifest: true,
                     reportDiscoveryProgress: true,
+                    configHash: currentConfigHashResult,
                 });
             }
         }
@@ -1356,6 +1389,7 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
                 return await buildProjectIndexFromExport(projectRoot, opts, {
                     ignoreExistingManifest: true,
                     reportDiscoveryProgress: true,
+                    configHash: currentConfigHashResult,
                 });
             }
         }
@@ -1417,17 +1451,27 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
         const dependentFilesOfDeletedTracked = collectDeletedTrackedFileDependents(trackedEntries, deletedTrackedFiles);
         if (allFiles.size === 0) {
             completeCheckProgress(0);
-            await writeIndexManifestSnapshot({
-                projectRoot,
+            await timeIndexBuildPhase({
                 opts,
-                graphOptions,
-                ...(resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {}),
-                files: {},
                 timings,
-                manifestReport,
-                allowEmpty: true,
-                transientFiles,
-                ...(manifest.symlinkDirectories !== undefined ? { symlinkDirectories: manifest.symlinkDirectories } : {}),
+                buildStartedAt: undefined,
+                stepName: "index-manifest",
+                activity: "Writing index manifest",
+                current: 0,
+                total: 0,
+                fn: () => writeIndexManifestSnapshot({
+                    projectRoot,
+                    opts,
+                    graphOptions,
+                    ...(resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {}),
+                    files: {},
+                    timings,
+                    manifestReport,
+                    allowEmpty: true,
+                    transientFiles,
+                    configHash: currentConfigHashResult,
+                    ...(manifest.symlinkDirectories !== undefined ? { symlinkDirectories: manifest.symlinkDirectories } : {}),
+                }),
             });
             return {
                 graph: { nodes: new Set(), edges: [] },
@@ -1837,16 +1881,27 @@ export async function buildProjectIndexIncremental(projectRoot, rawOpts) {
                     ...(signature.gitSig ? { gitSig: signature.gitSig } : {}),
                 });
             }
-            await writeIndexManifestSnapshot({
-                projectRoot,
+            await timeIndexBuildPhase({
                 opts,
-                graphOptions,
-                ...(resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {}),
-                files: manifestEntries,
                 timings,
-                manifestReport,
-                transientFiles,
-                ...(manifest.symlinkDirectories !== undefined ? { symlinkDirectories: manifest.symlinkDirectories } : {}),
+                buildStartedAt: updateStartedAt,
+                stepName: "index-manifest",
+                activity: "Writing index manifest",
+                current: allFiles.size,
+                total: allFiles.size,
+                mode: "update",
+                fn: () => writeIndexManifestSnapshot({
+                    projectRoot,
+                    opts,
+                    graphOptions,
+                    ...(resolverEnvironmentFingerprint ? { resolverEnvironmentFingerprint } : {}),
+                    files: manifestEntries,
+                    timings,
+                    manifestReport,
+                    transientFiles,
+                    configHash: currentConfigHashResult,
+                    ...(manifest.symlinkDirectories !== undefined ? { symlinkDirectories: manifest.symlinkDirectories } : {}),
+                }),
             });
             const index = await finalizeProjectIndex({
                 projectRoot,