perf(files): resolve a file chip's candidates by reference alone

A reference lookup matches an exact id before a path or name, so the separate id lookup per candidate found nothing the reference did not. Each candidate is now one reference lookup, plus the name search that keeps a shared name ambiguous; the de-duplicator is the shared one.
waleedlatif1 · Oct 29, 2026 · Oct 29, 2026 · Oct 29, 2026 · Oct 29, 2026 · Oct 29, 2026
commit dde3796db59ae726427d00eacc41ada856bb06e1
diff --git a/apps/sim/app/workspace/[workspaceId]/home/resolve-resource-ref.test.ts b/apps/sim/app/workspace/[workspaceId]/home/resolve-resource-ref.test.ts
@@ -124,4 +124,20 @@ describe('fetchWorkspaceResourceRef', () => {
       )
     ).toHaveLength(1)
   })
+
+  it('asks for each candidate once, as a reference, which already answers an exact id', async () => {
+    serveWorkspace([file({ id: 'wf_a', name: 'notes.md' })])
+    const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+
+    await expect(
+      fetchWorkspaceResourceRef(client, 'ws-1', ref({ id: 'wf_a' }))
+    ).resolves.toMatchObject({ id: 'wf_a' })
+    const lookups = apiClientRequestMockFns.mockRequestJson.mock.calls.filter(
+      ([contract]) => contract === lookupWorkspaceFilesContract
+    )
+    expect(lookups).toHaveLength(1)
+    const body = (lookups[0][1] as { body: Record<string, unknown> }).body
+    expect(body.ids ?? []).toEqual([])
+    expect(body.references).toEqual(expect.arrayContaining(['wf_a']))
+  })
 })
diff --git a/apps/sim/app/workspace/[workspaceId]/home/resolve-resource-ref.ts b/apps/sim/app/workspace/[workspaceId]/home/resolve-resource-ref.ts
@@ -5,6 +5,7 @@ import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { findWorkspaceFileByPath } from '@/hooks/queries/utils/find-workspace-file-by-src'
 import {
+  distinctFiles,
   getWorkspaceFileLookupQueryOptions,
   getWorkspaceFileSearchQueryOptions,
 } from '@/hooks/queries/workspace-files'
@@ -96,13 +97,12 @@ function fileRefCandidates(ref: WorkspaceResourceRef): string[] {
 
 /**
  * The reads that together hold every file a chip's candidates can match under
- * {@link resolveWorkspaceResourceRef}'s rules: each candidate as an exact id, as a reference (an
- * exact VFS path resolves first), and — for a candidate that could be a bare name — every file
- * whose name contains it, so a name shared by two files is still seen as ambiguous.
+ * {@link resolveWorkspaceResourceRef}'s rules: each candidate as a reference (an exact id
+ * resolves first, then an exact VFS path), and — for a candidate that could be a bare name —
+ * every file whose name contains it, so a name shared by two files is still seen as ambiguous.
  */
 function fileRefReads(queryClient: QueryClient, workspaceId: string, ref: WorkspaceResourceRef) {
   return fileRefCandidates(ref).flatMap((candidate) => [
-    getWorkspaceFileLookupQueryOptions(queryClient, workspaceId, 'id', candidate),
     getWorkspaceFileLookupQueryOptions(queryClient, workspaceId, 'reference', candidate),
     ...(candidate.includes('/') || candidate.length > V2_SEARCH_MAX_LENGTH
       ? []
@@ -115,17 +115,6 @@ function fileRefReads(queryClient: QueryClient, workspaceId: string, ref: Worksp
   ])
 }
 
-/** The distinct files several reads returned: one file found by two reads is still one file. */
-function distinctFiles(
-  reads: readonly (WorkspaceFileRecord | WorkspaceFileRecord[] | null)[]
-): WorkspaceFileRecord[] {
-  const files = new Map<string, WorkspaceFileRecord>()
-  for (const data of reads) {
-    for (const file of Array.isArray(data) ? data : data ? [data] : []) files.set(file.id, file)
-  }
-  return [...files.values()]
-}
-
 /**
  * Resolves a chip against the workspace's live files, fetching only the handful of files its
  * candidates can name rather than the workspace's list. `fresh` re-reads them all: a chip may