Understand any codebase instantly. System intelligence for codebases, built for humans and AI.
TypeScript aiai-memoryclaude-codeclicode-analysiscode-mappingcode-memorycodebase-understandingcodexdeveloper-toolsllmopenclawpersistent-memoryprogram-analysissoftware-architecturesystem-intelligencesystem-mapping
fix(ingest): make --lang actually filter the files ingested
KageBinaryb3d7f9eb62be
diff --git a/ix-cli/src/cli/__tests__/ingest-files.test.ts b/ix-cli/src/cli/__tests__/ingest-files.test.tsindex 8dca029e..2704e7f3 100644--- a/ix-cli/src/cli/__tests__/ingest-files.test.ts+++ b/ix-cli/src/cli/__tests__/ingest-files.test.ts@@ -963,6 +963,24 @@ describe("ingestFiles against a fake backend", () => {expect(baselineFiles()).toEqual(expect.arrayContaining([join(repo, "src", "m000.ts"), join(repo, "src", "m002.ts")]));});+ it("ingests only the languages --lang names, and keeps the rest of the baseline", async () => {+ fixture(3);+ writeFileSync(join(repo, "src", "tool.py"), "def tool():\n return 1\n", "utf8");+ execFileSync("git", ["add", "-A"], { cwd: repo, stdio: "ignore" });+ const baselineFiles = () =>+ Object.keys((JSON.parse(readFileSync(ingestMtimeCachePath(repo), "utf8")) as { files: Record<string, number> }).files);++ await ingestFiles(repo, { format: "text", suppressOutput: true, printSummary: false });+ const everything = baselineFiles();+ expect(everything).toHaveLength(4);++ backend.resetRequests();+ const summary = await ingestFiles(repo, { format: "text", force: true, lang: "py", suppressOutput: true, printSummary: false });+ expect(summary.filesDiscovered, "only the Python file is in scope").toBe(1);+ expect(backend.acceptedPatches()).toBe(1);+ expect(baselineFiles().sort(), "the TypeScript files keep their entries").toEqual([...everything].sort());+ });+it("re-sends commits that lost the base-rev race to another writer", async () => {// Two `ix map` runs against one backend: each commit that lands moves the// rev under the other's in-flight commit, which is answered 200diff --git a/ix-cli/src/cli/commands/ingest.ts b/ix-cli/src/cli/commands/ingest.tsindex 73a78eba..f1af2ea3 100644--- a/ix-cli/src/cli/commands/ingest.ts+++ b/ix-cli/src/cli/commands/ingest.ts@@ -913,18 +913,19 @@ const REBUILD_PROGRESS_SAVE_MS = 2_000;// ---------------------------------------------------------------------------/**- * The mtimes to record, plus the deleted files whose cleanup this run had to- * skip, at their previous mtimes. Keeping them in the baseline is what makes- * the next run find them deleted and retry.+ * The mtimes to record, plus `carried` -- files this run did not process -- at+ * their previous mtimes: deleted files whose cleanup had to be skipped (kept so+ * the next run finds them deleted and retries) and files a `--lang` run left+ * out (kept so it does not reset their state).*/-export function withDeferredDeletions(+export function carryForwardMtimes(currentMtimes: Map<string, number>,previousMtimes: Map<string, number>,- deferred: readonly string[],+ carried: readonly string[],): Map<string, number> {- if (deferred.length === 0) return currentMtimes;+ if (carried.length === 0) return currentMtimes;const out = new Map(currentMtimes);- for (const filePath of deferred) {+ for (const filePath of carried) {const mtime = previousMtimes.get(filePath);if (mtime !== undefined && !out.has(filePath)) out.set(filePath, mtime);}@@ -1496,7 +1497,7 @@ export async function ingestFiles(const trueStart = performance.now();const [- { parseFile, resolveEdges, isGrammarSupported },+ { parseFile, resolveEdges },{buildPatchWithResolution,buildDeletionPatch,@@ -1968,12 +1969,6 @@ export async function ingestFiles(try {// Phase: discover filesconst langFilter = opts.lang ? parseLangs(opts.lang) : null;- const supportsFile = (fileName: string): boolean => {- if (!isGrammarSupported(fileName)) return false;- if (!langFilter) return true;- const lang = languageFromPath(fileName);- return lang !== null && langFilter.has(lang);- };if (!fs.existsSync(resolvedPath)) {throw new Error(`Path not found: ${resolvedPath}`);@@ -1991,7 +1986,15 @@ export async function ingestFiles(?? Array.from(walkFiles(resolvedPath, opts.recursive ?? true, exclude))),stat.isFile() ? undefined : resolvedPath,);- const filePaths: string[] = discovery.files;+ // `--lang` narrows discovery to the named languages. The files it leaves+ // out keep their baseline entries (`langExcluded`, below): this run says+ // nothing about them, so it must neither drop nor refresh them.+ const inLangFilter = (fp: string): boolean => {+ const lang = languageFromPath(fp);+ return lang !== null && langFilter!.has(lang);+ };+ const filePaths: string[] = langFilter ? discovery.files.filter(inLangFilter) : discovery.files;+ const langExcluded: string[] = langFilter ? discovery.files.filter(fp => !inLangFilter(fp)) : [];outsideRoot = discovery.outsideRoot;const resolveOpts = {...crossRepoResolveOpts,@@ -3460,7 +3463,7 @@ export async function ingestFiles(// missing from the graph until a --force.const baselinePersisted = persistIngestBaselineIfClean(projectRoot,- withDeferredDeletions(currentMtimes, previousMtimes, deferredDeletions),+ carryForwardMtimes(currentMtimes, previousMtimes, [...deferredDeletions, ...langExcluded]),latestRev,// Lost parses count as parse errors HERE, whatever they are called// elsewhere. A run whose worker pool died resolves every later file as