Skip to content

Find code by asking what it does. A CLI for coding agents that uses Jev to discover relevant files and source context.

fix: preserve discovery evidence on cancellation

David Zhangda5c05674c91
diff --git a/packages/core/src/retrieve.ts b/packages/core/src/retrieve.ts
index 510cc25..085ace2 100644
--- a/packages/core/src/retrieve.ts
+++ b/packages/core/src/retrieve.ts
@@ -108,6 +108,13 @@ export async function retrieve(input: SearchInput, evaluator: Evaluator): Promis
inspected.add(path);
return result.snapshot;
}
+ function isCancellation(error: unknown) {
+ return (
+ (error instanceof EvaluationFailure && error.kind === "cancelled") ||
+ (input.signal.aborted &&
+ (error === input.signal.reason || (error instanceof Error && error.name === "AbortError")))
+ );
+ }
async function score(
items: Iterable<NavigationItem> | AsyncIterable<NavigationItem>,
anchor: { path: string; classes: string[] } | undefined,
@@ -210,7 +217,8 @@ export async function retrieve(input: SearchInput, evaluator: Evaluator): Promis
let pending!: Promise<void>;
pending = scoreGroup(group)
.catch((error: unknown) => {
- failure ??= error;
+ if (isCancellation(error)) issue("cancelled");
+ else failure ??= error;
})
.finally(() => {
active.delete(pending);
@@ -297,7 +305,8 @@ export async function retrieve(input: SearchInput, evaluator: Evaluator): Promis
if (batch.length) await submit(batch);
await drain();
} catch (error) {
- failure ??= error;
+ if (isCancellation(error)) issue("cancelled");
+ else failure ??= error;
} finally {
await drain();
}
diff --git a/test/discovery.test.ts b/test/discovery.test.ts
index 8b3b7dd..edf21b1 100644
--- a/test/discovery.test.ts
+++ b/test/discovery.test.ts
@@ -1058,3 +1058,49 @@ testIfDocker("oversized preview chunks retain main's batch ordering", async () =
await rm(root, { recursive: true, force: true });
}
});
+
+testIfDocker(
+ "cancellation during a later preview preserves an already scored navigation group",
+ async () => {
+ const root = await mkdtemp(join(tmpdir(), "jg-discovery-preview-cancel-"));
+ const controller = new AbortController();
+ const source = await import("../packages/core/src/source");
+ const { spyOn } = await import("bun:test");
+ let firstGroupComplete!: () => void;
+ const completed = new Promise<void>((resolve) => {
+ firstGroupComplete = resolve;
+ });
+ let preview;
+ try {
+ for (let index = 0; index < 128; index++)
+ await writeFile(join(root, `a${String(index).padStart(3, "0")}.txt`), `entry ${index}\n`);
+ await writeFile(join(root, "z.py"), "def f():\n return 1\n".repeat(2000));
+ preview = spyOn(source, "pythonPreview").mockImplementation(async () => {
+ await Promise.race([completed, new Promise<void>((resolve) => setTimeout(resolve, 100))]);
+ const reason = new DOMException("cancelled by fixture", "AbortError");
+ controller.abort(reason);
+ throw reason;
+ });
+ const result = await retrieve(
+ { root, query: "find the implementation", signal: controller.signal },
+ {
+ requests: 0,
+ async evaluate(request) {
+ const state = request.state as { items?: Array<{ path: string }>; source?: string };
+ if (state.items)
+ return Object.fromEntries(Object.keys(request.questions).map((id) => [id, 0.9]));
+ firstGroupComplete();
+ return Object.fromEntries(Object.keys(request.questions).map((id) => [id, 0.9]));
+ },
+ },
+ );
+ expect(result.status).toBe("interrupted");
+ expect(result.files.map(({ path }) => path)).toContain("a000.txt");
+ } finally {
+ controller.abort();
+ firstGroupComplete();
+ preview?.mockRestore();
+ await rm(root, { recursive: true, force: true });
+ }
+ },
+);