Remove redundant fileExists check from absolute path suggestions

Author: charlesvien

apps/code/src/main/services/fs/schemas.ts

@@ -29,7 +29,6 @@ const fileEntry = z.object({
 
 export const listRepoFilesOutput = z.array(fileEntry);
 export const readRepoFileOutput = z.string().nullable();
-export const fileExistsOutput = z.boolean();
 
 export type ListRepoFilesInput = z.infer<typeof listRepoFilesInput>;
 export type ReadRepoFileInput = z.infer<typeof readRepoFileInput>;

apps/code/src/main/services/fs/service.ts

@@ -97,15 +97,6 @@ export class FsService {
     }
   }
 
-  async fileExists(filePath: string): Promise<boolean> {
-    try {
-      const stat = await fs.promises.stat(path.resolve(filePath));
-      return stat.isFile();
-    } catch {
-      return false;
-    }
-  }
-
   async readAbsoluteFile(filePath: string): Promise<string | null> {
     try {
       return await fs.promises.readFile(path.resolve(filePath), "utf-8");

apps/code/src/main/trpc/routers/fs.ts

@@ -1,7 +1,6 @@
 import { container } from "../../di/container";
 import { MAIN_TOKENS } from "../../di/tokens";
 import {
-  fileExistsOutput,
   listRepoFilesInput,
   listRepoFilesOutput,
   readAbsoluteFileInput,
@@ -34,11 +33,6 @@ export const fsRouter = router({
     .output(readRepoFileOutput)
     .query(({ input }) => getService().readAbsoluteFile(input.filePath)),
 
-  fileExists: publicProcedure
-    .input(readAbsoluteFileInput)
-    .output(fileExistsOutput)
-    .query(({ input }) => getService().fileExists(input.filePath)),
-
   readFileAsBase64: publicProcedure
     .input(readAbsoluteFileInput)
     .output(readRepoFileOutput)

apps/code/src/renderer/features/message-editor/suggestions/getSuggestions.ts

@@ -6,7 +6,6 @@ import {
   pathToFileItem,
   searchFiles,
 } from "@hooks/useRepoFiles";
-import { trpcClient } from "@renderer/trpc/client";
 import { isAbsolutePath } from "@utils/path";
 import Fuse, { type IFuseOptions } from "fuse.js";
 import { useDraftStore } from "../stores/draftStore";
@@ -50,19 +49,10 @@ function parentDirLabel(dir: string, name: string): string {
   return parent ? `${parent}/${name}` : name;
 }
 
-async function getAbsolutePathSuggestion(
-  query: string,
-): Promise<FileSuggestionItem | null> {
+function getAbsolutePathSuggestion(query: string): FileSuggestionItem | null {
   if (!isAbsolutePath(query)) return null;
   if (!/\.\w+$/.test(query)) return null;
 
-  try {
-    const exists = await trpcClient.fs.fileExists.query({ filePath: query });
-    if (!exists) return null;
-  } catch {
-    return null;
-  }
-
   const fileItem = pathToFileItem(query);
   return {
     id: query,
@@ -78,11 +68,10 @@ export async function getFileSuggestions(
   query: string,
 ): Promise<FileSuggestionItem[]> {
   const repoPath = useDraftStore.getState().contexts[sessionId]?.repoPath;
-  const absolutePathSuggestion = getAbsolutePathSuggestion(query);
+  const absoluteMatch = getAbsolutePathSuggestion(query);
 
   if (!repoPath) {
-    const resolved = await absolutePathSuggestion;
-    return resolved ? [resolved] : [];
+    return absoluteMatch ? [absoluteMatch] : [];
   }
 
   const { files, fzf } = await fetchRepoFiles(repoPath);
@@ -96,9 +85,11 @@ export async function getFileSuggestions(
     path: file.path,
   }));
 
-  const resolved = await absolutePathSuggestion;
-  if (resolved && !results.some((r) => `${repoPath}/${r.id}` === resolved.id)) {
-    results.unshift(resolved);
+  if (
+    absoluteMatch &&
+    !results.some((r) => `${repoPath}/${r.id}` === absoluteMatch.id)
+  ) {
+    results.unshift(absoluteMatch);
   }
 
   return results;