Commit fec71c5ab4fd860331fb15ce37c15edf6db1c236 | the-knife

author	Michel Liao <107891771+Michel-Liao@users.noreply.github.com> 2026-10-06 00:08:28-04:00
committer	GitHub <noreply@github.com> 2026-10-05 21:08:28-07:00
log	fec71c5ab4fd860331fb15ce37c15edf6db1c236
tree	b2f8bbbfd9e85174ee330fd639eb823778e27620
parent	ff2fda7d6d59a05b9077b8fc48a5e0b67054b8d5
signature	Signed by PGP key B5690EEEBB952194

fix(server): return partial workspace index on timeout (#11500)

2 files changed, 89 insertions(+), 4 deletions(-)

apps
- server
  - src
    workspace
    WorkspaceSearchIndex.test.ts
    WorkspaceSearchIndex.ts

apps/server/src/workspace/WorkspaceSearchIndex.test.ts+68

...	@@ -140,6 +140,74 @@ it.effect("preserves a full-index warmup timeout as a structured error", () =>	...	@@ -140,6 +140,74 @@ it.effect("preserves a full-index warmup timeout as a structured error", () =>
140	}),	140	}),
141	);	141	);
142		142
		143	it.effect("returns partial path results when the initial scan times out", () =>
		144	Effect.scoped(
		145	Effect.gen(function* () {
		146	const mixedSearch = vi.fn(() => ({
		147	ok: true as const,
		148	value: {
		149	items: [
		150	{
		151	type: "directory" as const,
		152	item: { relativePath: "src", fileName: "src", fileCount: 1 },
		153	},
		154	{ type: "file" as const, item: fileItem("src/index.ts") },
		155	],
		156	scores: [],
		157	totalMatched: 2,
		158	totalFiles: 1,
		159	},
		160	}));
		161	let scanning = true;
		162	const finder = {
		163	destroy: vi.fn(),
		164	isScanning: vi.fn(() => scanning),
		165	waitForIndexReady: vi.fn(async () => ({ ok: true as const, value: false })),
		166	mixedSearch,
		167	} as unknown as FileFinder;
		168	vi.spyOn(FileFinder, "create").mockReturnValueOnce({ ok: true, value: finder });
		169
		170	const searchIndex = yield* WorkspaceSearchIndex.make("/workspace/project", "paths");
		171	const list = yield* searchIndex.list();
		172	const search = yield* searchIndex.search("src", 10);
		173	scanning = true;
		174	mixedSearch.mockImplementationOnce(() => {
		175	scanning = false;
		176	return {
		177	ok: true as const,
		178	value: {
		179	items: [
		180	{
		181	type: "directory" as const,
		182	item: { relativePath: "src", fileName: "src", fileCount: 1 },
		183	},
		184	{ type: "file" as const, item: fileItem("src/index.ts") },
		185	],
		186	scores: [],
		187	totalMatched: 2,
		188	totalFiles: 1,
		189	},
		190	};
		191	});
		192	const searchCompletingDuringQuery = yield* searchIndex.search("src", 10);
		193	scanning = false;
		194	const completedSearch = yield* searchIndex.search("src", 10);
		195
		196	expect(list).toEqual({
		197	entries: [
		198	{ kind: "directory", path: "src" },
		199	{ kind: "file", path: "src/index.ts" },
		200	],
		201	truncated: true,
		202	});
		203	expect(search.truncated).toBe(true);
		204	expect(searchCompletingDuringQuery.truncated).toBe(true);
		205	expect(completedSearch.truncated).toBe(false);
		206	expect(mixedSearch).toHaveBeenCalledTimes(4);
		207	}),
		208	),
		209	);
		210
143	it.effect("preserves FileFinder destroy failures as structured defects", () =>	211	it.effect("preserves FileFinder destroy failures as structured defects", () =>
144	Effect.gen(function* () {	212	Effect.gen(function* () {
145	const cause = new Error("native destroy failed");	213	const cause = new Error("native destroy failed");

apps/server/src/workspace/WorkspaceSearchIndex.ts+21-4

 @@ -365,6 +365,7 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
       catch: (cause) => new WorkspaceSearchIndexDestroyFailed({ cwd, cause }),
     }).pipe(Effect.orDie),
   );
+  let initialScanTimedOut = false;
   yield* waitForIndexReady(
     cwd,
     finder,
 @@ -374,8 +375,18 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
         reason,
         cause,
       }),
+  ).pipe(
+    Effect.catchTag("WorkspaceSearchIndexScanTimedOut", (error) =>
+      variant === "paths"
+        ? Effect.sync(() => {
+            initialScanTimedOut = true;
+          })
+        : Effect.fail(error),
+    ),
   );
+  const hasIncompleteInitialScan = () => initialScanTimedOut && finder.isScanning();
   const runSearch = Effect.fn("WorkspaceSearchIndex.runSearch")(function* <A>(
     query: string,
     pageSize: number,
 @@ -436,6 +447,7 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
   const list: WorkspaceSearchIndex["Service"]["list"] = Effect.fn("WorkspaceSearchIndex.list")(
     function* () {
+      const incompleteBeforeQuery = hasIncompleteInitialScan();
       const result = yield* runSearch("", WORKSPACE_INDEX_PAGE_SIZE, "mixedSearch", () =>
         finder.mixedSearch("", { pageSize: WORKSPACE_INDEX_PAGE_SIZE }),
       );
 @@ -446,7 +458,8 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
       const entries = sortedEntries.slice(0, WORKSPACE_INDEX_MAX_ENTRIES);
       return {
         entries,
-        truncated: mapped.truncated || entries.length < sortedEntries.length,
+        truncated:
+          incompleteBeforeQuery || mapped.truncated || entries.length < sortedEntries.length,
       };
     },
   );
 @@ -455,22 +468,26 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
     "WorkspaceSearchIndex.search",
   )(function* (query, limit, kind, imageOnly) {
     const pageSize = imageOnly ? WORKSPACE_INDEX_PAGE_SIZE : Math.max(1, limit + 1);
+    const incompleteBeforeQuery = hasIncompleteInitialScan();
     if (kind === "file" || imageOnly) {
       const result = yield* runSearch(query, pageSize, "fileSearch", () =>
         finder.fileSearch(query, { pageSize }),
       );
-      return mapFileSearchResult(result, limit, imageOnly);
+      const mapped = mapFileSearchResult(result, limit, imageOnly);
+      return { ...mapped, truncated: incompleteBeforeQuery || mapped.truncated };
     }
     if (kind === "directory") {
       const result = yield* runSearch(query, pageSize, "directorySearch", () =>
         finder.directorySearch(query, { pageSize }),
       );
-      return mapDirectorySearchResult(result, limit);
+      const mapped = mapDirectorySearchResult(result, limit);
+      return { ...mapped, truncated: incompleteBeforeQuery || mapped.truncated };
     }
     const result = yield* runSearch(query, pageSize, "mixedSearch", () =>
       finder.mixedSearch(query, { pageSize }),
     );
-    return mapMixedSearchResult(result, limit);
+    const mapped = mapMixedSearchResult(result, limit);
+    return { ...mapped, truncated: incompleteBeforeQuery || mapped.truncated };
   });
   const searchContents: WorkspaceSearchIndex["Service"]["searchContents"] = Effect.fn(