fix(sync): preserve cross-file caller edges across callee re-index (#899) (#927)

`storeExtractionResult` deletes a re-indexed file's nodes via `deleteFile`,
which cascades through `edges.FK ... ON DELETE CASCADE` to delete every edge
whose source OR target is one of those nodes. Edges whose source is in the
re-indexed file are re-emitted by the extractor, but edges whose source is in
a *different* (unchanged) file are not — they are silently dropped. This is
issue #899: re-indexing a callee file severs `calls`/`references` edges from
callers that import it via module-attribute access (`pkg.mod.fn(...)`), so
`codegraph callers fn` reports 0 callers for functions that have real call
sites. A docstring-only edit on the callee is sufficient to trigger it.

The bug affects every incremental path that routes through `sync()` /
`indexFile()`: `codegraph sync`, the file-watcher auto-sync (which calls
`sync()`), and the git sync hooks. `codegraph index` was already fixed by
#894 (it now clears-then-rebuilds, so it's a full re-extraction, not
incremental). `sync` remains the fast incremental path and still has the bug.

Fix: before the delete, snapshot incoming cross-file edges paired with the
target node's (name, kind). After re-inserting the file's nodes + same-file
edges, re-insert the snapshot — re-resolving each edge's target to the
re-indexed node's NEW id by (filePath, kind, name). Node ids are
`sha256(filePath:kind:name:line)`, so any line shift in the callee file (e.g.
a docstring-only edit above the symbol) changes every target id and a naive
re-insert by old id would drop them all. Matching by (kind, name) is stable
across line shifts; if the symbol was renamed/removed, no match is found and
the edge stays dropped (correct). `insertEdges` still filters to endpoints
that exist, so edges whose caller (source) was deleted are also dropped.

Regression tests in `__tests__/sync.test.ts` model the RAGFlow production
case: a `pkg/mod.py` with two callees, both called from `test/test_callers.py`
via `mod.<fn>(...)`. The first test confirms a docstring-only edit that shifts
the second callee's line preserves both incoming edges. The second test
confirms renaming a callee correctly drops its old incoming edge (no phantom
preservation against a non-existent symbol).
This commit is contained in:
Josh
2026-06-21 11:47:01 -05:00
committed by GitHub
parent 4aa2752ef1
commit 6110df8b76
3 changed files with 207 additions and 0 deletions
+134
View File
@@ -303,4 +303,138 @@ describe('Sync Module', () => {
expect(result.changedFilePaths).toBeUndefined();
});
});
describe('Cross-file module-attribute caller edges survive callee re-index (#899)', () => {
let testDir: string;
let cg: CodeGraph;
beforeEach(async () => {
testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codegraph-899-'));
// pkg/mod.py — a module with two functions, both called from a separate
// test file via `mod.<fn>(...)` (module-attribute access). This is the
// exact shape from the RAGFlow production case in issue #899.
fs.mkdirSync(path.join(testDir, 'pkg'), { recursive: true });
fs.mkdirSync(path.join(testDir, 'test'), { recursive: true });
fs.writeFileSync(
path.join(testDir, 'pkg', '__init__.py'),
``
);
fs.writeFileSync(
path.join(testDir, 'pkg', 'mod.py'),
[
`def callee_one(value):`,
` """First callee — docstring above the second callee so edits here shift its line."""`,
` return value + 1`,
``,
``,
`def callee_two(value):`,
` """Second callee, called from the test file via mod.callee_two(...)."""`,
` return value + 2`,
``,
].join('\n')
);
fs.writeFileSync(
path.join(testDir, 'test', 'test_callers.py'),
[
`from pkg import mod`,
``,
``,
`def test_calls_callee_one():`,
` assert mod.callee_one(1) == 2`,
``,
``,
`def test_calls_callee_two():`,
` assert mod.callee_two(1) == 3`,
``,
].join('\n')
);
cg = CodeGraph.initSync(testDir, {
config: { include: ['**/*.py'], exclude: [] },
});
await cg.indexAll();
});
afterEach(() => {
if (cg) cg.destroy();
if (fs.existsSync(testDir)) fs.rmSync(testDir, { recursive: true, force: true });
});
function callerCount(fnName: string): number {
const results = cg.searchNodes(fnName);
const def = results.map(r => r.node).find(n => n.kind === 'function' && n.name === fnName);
if (!def) return -1;
return cg.getCallers(def.id).length;
}
it('preserves incoming cross-file calls edges when the callee file is re-indexed', async () => {
// Baseline: both callees have one cross-file caller each.
expect(callerCount('callee_one')).toBe(1);
expect(callerCount('callee_two')).toBe(1);
// Docstring-only edit to callee_one — adds 1 line, shifting callee_two's
// line number. A naive ID-based edge restore would drop callee_two's
// incoming edge (its node id changed); the (kind, name) re-resolve
// preserves it. A docstring-only edit also confirms zero-AST-change
// re-indexes don't sever edges.
fs.writeFileSync(
path.join(testDir, 'pkg', 'mod.py'),
[
`def callee_one(value):`,
` """First callee — docstring above the second callee so edits here shift its line."""`,
` """Probe: extra docstring line to shift callee_two's start line by 1."""`,
` return value + 1`,
``,
``,
`def callee_two(value):`,
` """Second callee, called from the test file via mod.callee_two(...)."""`,
` return value + 2`,
``,
].join('\n')
);
const result = await cg.sync();
expect(result.filesModified).toBe(1);
// Both incoming cross-file calls edges must survive the callee re-index.
expect(callerCount('callee_one')).toBe(1);
expect(callerCount('callee_two')).toBe(1);
});
it('drops incoming edges for a callee that was renamed during re-index', async () => {
// Baseline.
expect(callerCount('callee_one')).toBe(1);
// Rename callee_one -> callee_one_renamed. The old edge's target
// (kind=function, name=callee_one) no longer matches any re-indexed
// node, so the edge is correctly dropped (not preserved against a
// non-existent symbol).
fs.writeFileSync(
path.join(testDir, 'pkg', 'mod.py'),
[
`def callee_one_renamed(value):`,
` """Renamed callee — the old edge targeting callee_one must not be restored."""`,
` return value + 1`,
``,
``,
`def callee_two(value):`,
` """Second callee, called from the test file via mod.callee_two(...)."""`,
` return value + 2`,
``,
].join('\n')
);
await cg.sync();
// The renamed callee has no callers (the test still calls mod.callee_one,
// which no longer exists). The old callee_one node is gone, so its
// callerCount is -1 (definition not found); callee_one_renamed exists
// but has no incoming edges (the test calls the old name).
expect(callerCount('callee_one')).toBe(-1);
expect(callerCount('callee_one_renamed')).toBe(0);
// callee_two is untouched by the rename and its edge survives.
expect(callerCount('callee_two')).toBe(1);
});
});
});