fix(files): align search with rendered cache identities

Author: mzxchandra

apps/sim/lib/projects/files/__integration__/content-rendered.integration.ts

@@ -855,7 +855,8 @@ afterAll(async () => {
   }
   await rm(localStorageRoot, { recursive: true, force: true })
   const report =
-    process.env.PROJECT_FILE_CONTENT_REPORT_PATH ?? 'test-results/project-file-content.json'
+    process.env.PROJECT_FILE_RENDERED_CONTENT_REPORT_PATH ??
+    'test-results/project-file-rendered-content.json'
   await mkdir(dirname(report), { recursive: true })
   await writeFile(report, JSON.stringify({ checks }, null, 2))
   await db.$client.end()

apps/sim/lib/uploads/documents/compile.ts

@@ -620,6 +620,21 @@ async function renderPreparedDocument(source: string, fmt: E2BDocFormat, inputs:
     : compileDocViaE2BPython(source, fmt, inputs)
 }
 
+/** Shared identity for owner-bound rendering and readers of its compiled artifacts. */
+export function fileDocumentCacheIdentity(
+  source: string,
+  format: E2BDocFormat,
+  sourceMime: string,
+  inputIdentity?: string
+): string {
+  return JSON.stringify({
+    sourceLanguage: getDocumentSourceLanguage(source, format, sourceMime),
+    renderer:
+      isDocSandboxEnabled && sourceMime !== 'text/x-pdflibjs' ? 'document-sandbox' : 'native',
+    inputs: inputIdentity ?? null,
+  })
+}
+
 /** Compiles a document against a fixed, authorized input manifest and canonical owner cache. */
 export async function compileFileDocument(args: {
   owner: EditableFileOwner
@@ -641,11 +656,12 @@ export async function compileFileDocument(args: {
     throw new DocCompileUserError('Document inputs exceed the rendering limit')
   }
   const useDocumentSandbox = isDocSandboxEnabled && args.sourceMime !== 'text/x-pdflibjs'
-  const cacheIdentity = JSON.stringify({
-    sourceLanguage: getDocumentSourceLanguage(args.source, fmt, args.sourceMime),
-    renderer: useDocumentSandbox ? 'document-sandbox' : 'native',
-    inputs: args.inputIdentity ?? null,
-  })
+  const cacheIdentity = fileDocumentCacheIdentity(
+    args.source,
+    fmt,
+    args.sourceMime,
+    args.inputIdentity
+  )
   const cached = await loadCompiledDoc(args.owner, args.source, fmt.ext, cacheIdentity, {
     maxBytes: args.maxBytes,
     signal: args.signal,

apps/sim/lib/workspace-files/search/owners.integration.ts

@@ -53,6 +53,7 @@ import {
   createOwnedWorkspaceFile,
   uploadWorkspaceFile,
 } from '@/lib/uploads/contexts/workspace/file-manager'
+import { fileDocumentCacheIdentity, getE2BDocFormat } from '@/lib/uploads/documents/compile'
 import { compiledArtifactKey, storeCompiledDoc } from '@/lib/uploads/documents/compiled-store'
 import { fileDocumentInputIdentity } from '@/lib/uploads/documents/input-identity'
 import { deleteUserAccount } from '@/lib/users/account-deletion'
@@ -773,7 +774,12 @@ describe('owner-scoped indexed file search on PostgreSQL and stored bytes', () =
         'docx',
         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
         artifact,
-        fileDocumentInputIdentity(f.owner, [dependencyRow])
+        fileDocumentCacheIdentity(
+          source,
+          (await getE2BDocFormat('report.docx'))!,
+          'text/plain',
+          fileDocumentInputIdentity(f.owner, [dependencyRow])
+        )
       )
       const { loadFileSearchSource } = await import('@/lib/workspace-files/search/source')
       const revision = {
@@ -866,7 +872,8 @@ describe('owner-scoped indexed file search on PostgreSQL and stored bytes', () =
         source,
         'docx',
         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        artifact
+        artifact,
+        fileDocumentCacheIdentity(source, (await getE2BDocFormat('transition.docx'))!, 'text/plain')
       )
       const input = { projectId: f.projectId, fileId: generated.file.id, maxBytes: 1_000_000 }
       const rendered = await readProjectFileArtifact.execute({ principal: f.reader, input })
@@ -987,13 +994,23 @@ describe('owner-scoped indexed file search on PostgreSQL and stored bytes', () =
         await Packer.toBuffer(
           new Document({ sections: [{ children: [new Paragraph('oldrender')] }] })
         ),
-        fileDocumentInputIdentity(f.owner, [dependencyRow])
+        fileDocumentCacheIdentity(
+          source,
+          (await getE2BDocFormat('report.docx'))!,
+          'text/plain',
+          fileDocumentInputIdentity(f.owner, [dependencyRow])
+        )
       )
       const artifactKey = compiledArtifactKey(
         f.owner,
         source,
         'docx',
-        fileDocumentInputIdentity(f.owner, [dependencyRow])
+        fileDocumentCacheIdentity(
+          source,
+          (await getE2BDocFormat('report.docx'))!,
+          'text/plain',
+          fileDocumentInputIdentity(f.owner, [dependencyRow])
+        )
       )
       const completion = {
         owner: f.owner,
@@ -1070,13 +1087,23 @@ describe('owner-scoped indexed file search on PostgreSQL and stored bytes', () =
         await Packer.toBuffer(
           new Document({ sections: [{ children: [new Paragraph('old-contributor')] }] })
         ),
-        fileDocumentInputIdentity(f.owner, [dependencyRow])
+        fileDocumentCacheIdentity(
+          source,
+          (await getE2BDocFormat('report.docx'))!,
+          'text/plain',
+          fileDocumentInputIdentity(f.owner, [dependencyRow])
+        )
       )
       const artifactKey = compiledArtifactKey(
         f.owner,
         source,
         'docx',
-        fileDocumentInputIdentity(f.owner, [dependencyRow])
+        fileDocumentCacheIdentity(
+          source,
+          (await getE2BDocFormat('report.docx'))!,
+          'text/plain',
+          fileDocumentInputIdentity(f.owner, [dependencyRow])
+        )
       )
       const { markFileSearchArtifactReadyInTx } = await import(
         '@/lib/workspace-files/search/artifact-ready'

apps/sim/lib/workspace-files/search/source.ts

@@ -10,6 +10,7 @@ import {
   getE2BDocFormat,
   isCompiledDocumentBuffer,
 } from '@/lib/uploads/documents'
+import { fileDocumentCacheIdentity } from '@/lib/uploads/documents/compile'
 import { DocCompileUserError } from '@/lib/uploads/documents/compile-error'
 import { compiledArtifactKey, loadCompiledDoc } from '@/lib/uploads/documents/compiled-store'
 import { fileDocumentInputIdentity } from '@/lib/uploads/documents/input-identity'
@@ -102,7 +103,11 @@ export async function loadFileSearchSource(
   if (inputs.length !== ids.length) throw new FileSearchExclusionError('incomplete_extraction')
   signal.throwIfAborted()
   const inputIdentity = fileDocumentInputIdentity(owner, inputs)
-  const artifact = await loadCompiledDoc(owner, source, format.ext, inputIdentity, {
+  const cacheIdentity =
+    owner.entityType === 'project'
+      ? fileDocumentCacheIdentity(source, format, file.contentType, inputIdentity)
+      : inputIdentity
+  const artifact = await loadCompiledDoc(owner, source, format.ext, cacheIdentity, {
     maxBytes: FILE_SEARCH_MAX_SOURCE_BYTES,
     signal,
   })
@@ -111,7 +116,7 @@ export async function loadFileSearchSource(
     bytes: artifact ? { buffer: artifact, kind: 'artifact' } : { buffer: raw, kind: 'source' },
     ...(artifact
       ? {
-          artifactKey: compiledArtifactKey(owner, source, format.ext, inputIdentity),
+          artifactKey: compiledArtifactKey(owner, source, format.ext, cacheIdentity),
         }
       : {}),
     dependencies: inputs.map((input) => ({