fix(files): preserve slashes in folder paths (#6589)

* fix(files): preserve slashes in folder paths

* fix(files): resolve escaped folder lookups

Author: TheodoreSpeaks

apps/sim/app/api/v2/files/folders/route.test.ts

@@ -156,6 +156,37 @@ describe('/api/v2/files/folders', () => {
     })
   })
 
+  it('preserves an escaped slash within a folder name', async () => {
+    mocks.listFolders.mockResolvedValueOnce({
+      folders: [{ ...folder, name: 'Finance/Legal', path: 'Finance\\/Legal' }],
+    })
+
+    const response = await GET(
+      request('GET', `/api/v2/files/folders?workspaceId=${WORKSPACE_ID}`),
+      context
+    )
+
+    expect(response.status).toBe(200)
+    expect((await response.json()).data[0]).toMatchObject({
+      name: 'Finance/Legal',
+      path: '/Finance%2FLegal',
+      parentPath: '/',
+    })
+  })
+
+  it('fails when a canonical path does not match the returned folder name', async () => {
+    mocks.listFolders.mockResolvedValueOnce({
+      folders: [{ ...folder, name: 'Finance/Legal', path: '/Finance/Legal' }],
+    })
+
+    const response = await GET(
+      request('GET', `/api/v2/files/folders?workspaceId=${WORKSPACE_ID}`),
+      context
+    )
+
+    expect(response.status).toBe(500)
+  })
+
   it('creates a folder from its canonical path', async () => {
     const response = await POST(
       request('POST', '/api/v2/files/folders', { workspaceId: WORKSPACE_ID, path: '/Reports' }),

apps/sim/app/api/v2/files/folders/route.ts

@@ -5,7 +5,7 @@ import {
   v2RelocateFileFolderContract,
 } from '@/lib/api/contracts/v2/files'
 import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes'
-import { buildFolderPath, parentFolderPath } from '@/lib/folders/paths'
+import { buildFolderPath, parentFolderPath, parseFolderPath } from '@/lib/folders/paths'
 import { v2FileErrorPolicies } from '@/lib/workspace-files/api'
 import { fileOperations } from '@/lib/workspace-files/application/operations'
 import {
@@ -14,12 +14,19 @@ import {
   listWorkspaceFileFoldersOperation,
   updateWorkspaceFileFolderOperation,
 } from '@/lib/workspace-files/application/workspace-file-folders'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
 
 export const dynamic = 'force-dynamic'
 export const revalidate = 0
 
 function toV2Folder(folder: { name: string; path: string; createdAt: Date; updatedAt: Date }) {
-  const path = folder.path.startsWith('/') ? folder.path : buildFolderPath(folder.path.split('/'))
+  const segments = folder.path.startsWith('/')
+    ? parseFolderPath(folder.path)
+    : parseWorkspaceFileFolderDisplayPath(folder.path)
+  if (segments.at(-1) !== folder.name) {
+    throw new Error('Workspace file folder path does not match its folder name')
+  }
+  const path = buildFolderPath(segments)
   return {
     name: folder.name,
     path,

apps/sim/app/api/v2/files/route.test.ts

@@ -154,6 +154,20 @@ describe('/api/v2/files', () => {
     })
   })
 
+  it('preserves escaped slashes in the containing folder path', async () => {
+    mocks.queryFiles.mockResolvedValueOnce({
+      files: [{ ...FILE, folderId: 'folder-1', folderPath: 'Finance\\/Legal' }],
+      nextKeys: undefined,
+      cursorSort: 'name:asc',
+    })
+    const response = await GET(
+      new NextRequest(`http://localhost:3000/api/v2/files?workspaceId=${WORKSPACE_ID}`)
+    )
+
+    expect(response.status).toBe(200)
+    expect((await response.json()).data[0].folderPath).toBe('/Finance%2FLegal')
+  })
+
   it('rejects malformed cursors before the application service', async () => {
     const response = await GET(
       new NextRequest(

apps/sim/app/api/v2/files/utils.ts

@@ -2,6 +2,7 @@ import type { V2File } from '@/lib/api/contracts/v2/files'
 import { buildFolderPath } from '@/lib/folders/paths'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { getUserEmailsByIds, requireResolvedUserEmail } from '@/lib/users/queries'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
 
 /** Shared serialization for the v2 files surface. */
 
@@ -14,7 +15,7 @@ function serializeV2File(record: WorkspaceFileRecord, uploadedByEmail: string):
     ? buildFolderPath(
         (() => {
           if (!record.folderPath) throw new Error('File references an unresolved folder')
-          return record.folderPath.split('/')
+          return parseWorkspaceFileFolderDisplayPath(record.folderPath)
         })()
       )
     : '/'

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -43,6 +43,7 @@ import { isChatEnabled } from '@/lib/core/config/env-flags'
 import { isMacPlatform } from '@/lib/core/utils/platform'
 import { buildFolderTree, getFolderPathNames } from '@/lib/folders/tree'
 import { captureEvent } from '@/lib/posthog/client'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
 import { CONNECT_MODE } from '@/app/workspace/[workspaceId]/integrations/connect-route'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
 import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
@@ -927,7 +928,9 @@ export const Sidebar = memo(function Sidebar({
             id: f.id,
             name: f.name,
             href: `/workspace/${workspaceId}/files/${f.id}`,
-            folderPath: f.folderPath ? f.folderPath.split('/').filter(Boolean) : undefined,
+            folderPath: f.folderPath
+              ? parseWorkspaceFileFolderDisplayPath(f.folderPath)
+              : undefined,
           })),
     [fetchedFiles, workspaceId, permissionConfig.hideFilesTab]
   )

apps/sim/hooks/queries/workspace-file-folders.ts

@@ -11,6 +11,10 @@ import {
   updateWorkspaceFileFolderContract,
   type WorkspaceFileFolderApi,
 } from '@/lib/api/contracts/workspace-file-folders'
+import {
+  buildWorkspaceFileFolderDisplayPath,
+  parseWorkspaceFileFolderDisplayPath,
+} from '@/lib/workspace-files/folder-display-path'
 import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
 
 type WorkspaceFileFolderScope = 'active' | 'archived' | 'all'
@@ -109,7 +113,10 @@ export function useUpdateWorkspaceFileFolder() {
         const oldPath = target?.path
         const newPath =
           updates.name !== undefined && oldPath !== undefined
-            ? [...oldPath.split('/').slice(0, -1), updates.name].filter(Boolean).join('/')
+            ? buildWorkspaceFileFolderDisplayPath([
+                ...parseWorkspaceFileFolderDisplayPath(oldPath).slice(0, -1),
+                updates.name,
+              ])
             : oldPath
 
         queryClient.setQueryData<WorkspaceFileFolderApi[]>(

apps/sim/lib/copilot/chat/process-contents.ts

@@ -46,6 +46,7 @@ import { getWorkspaceFileFolderPath } from '@/lib/uploads/contexts/workspace/wor
 import { getSkillById } from '@/lib/workflows/skills/operations'
 import { listFolders } from '@/lib/workflows/utils'
 import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
 import { getUserPermissionConfig } from '@/ee/access-control/utils/permission-check'
 import { escapeRegExp } from '@/executor/constants'
 import type { BrowserTextSelection, ChatContext, TerminalTextSelection } from '@/stores/panel'
@@ -1071,7 +1072,7 @@ async function resolveFileFolderResource(
   try {
     const rawPath = await getWorkspaceFileFolderPath(workspaceId, folderId)
     if (!rawPath) return null
-    const encoded = encodeVfsPathSegments(rawPath.split('/').filter(Boolean))
+    const encoded = encodeVfsPathSegments(parseWorkspaceFileFolderDisplayPath(rawPath))
     return {
       type: 'active_resource',
       tag: '@active_resource',

apps/sim/lib/copilot/tools/handlers/function-execute.ts

@@ -46,6 +46,10 @@ import { listAllWorkspaceFiles } from '@/lib/workspace-files/application/list-wo
 import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content'
 import { downloadWorkspaceFileRecord } from '@/lib/workspace-files/application/read-workspace-file-record'
 import { listWorkspaceFileFoldersOperation } from '@/lib/workspace-files/application/workspace-file-folders'
+import {
+  buildWorkspaceFileFolderDisplayPath,
+  parseWorkspaceFileFolderDisplayPath,
+} from '@/lib/workspace-files/folder-display-path'
 import { extractCodeSecretNames } from '@/executor/utils/code-secret-references'
 import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 import { executeTool as executeAppTool } from '@/tools'
@@ -388,7 +392,7 @@ export async function resolveInputFiles(
             : undefined
       if (!dirPath) continue
       const folderSegments = decodeVfsPathSegments(dirPath.replace(/^\/?files\/?/, ''))
-      const folderDisplayPath = folderSegments.join('/')
+      const folderDisplayPath = buildWorkspaceFileFolderDisplayPath(folderSegments)
       const folder = folders.find((candidate) => candidate.path === folderDisplayPath)
       if (!folder) {
         const unmountable = unmountableNamespaceReason(dirPath)
@@ -403,7 +407,7 @@ export async function resolveInputFiles(
         dirRef !== null &&
         (dirRef as CanonicalDirectoryInput).sandboxPath
           ? (dirRef as CanonicalDirectoryInput).sandboxPath!
-          : `/home/user/files/${encodeVfsPathSegments(folder.path.split('/'))}`
+          : `/home/user/files/${encodeVfsPathSegments(parseWorkspaceFileFolderDisplayPath(folder.path))}`
       const descendants = allFiles.filter((file) => {
         if (!file.folderPath) return false
         return file.folderPath === folder.path || file.folderPath.startsWith(`${folder.path}/`)

apps/sim/lib/copilot/vfs/path-utils.test.ts

@@ -31,6 +31,15 @@ describe('VFS path utilities', () => {
       })
     ).toBe('files/Reports/Q4%20Report%20(Final)/sales%2Feast.csv')
   })
+
+  it('keeps an escaped slash inside one workspace folder segment', () => {
+    expect(
+      canonicalWorkspaceFilePath({
+        folderPath: 'Finance\\/Legal/Quarterly',
+        name: 'report.pdf',
+      })
+    ).toBe('files/Finance%2FLegal/Quarterly/report.pdf')
+  })
 })
 
 describe('canonical resource VFS paths', () => {

apps/sim/lib/copilot/vfs/path-utils.ts

@@ -6,6 +6,7 @@ import {
   encodeVfsPathSegments as encodeNeutralVfsPathSegments,
   encodeVfsSegment as encodeNeutralVfsSegment,
 } from '@/lib/vfs/path'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
 
 export function encodeVfsSegment(segment: string): string {
   return encodeNeutralVfsSegment(segment)
@@ -41,7 +42,9 @@ export function canonicalWorkspaceFilePath(parts: {
   prefix?: 'files' | 'recently-deleted/files'
 }): string {
   const prefix = parts.prefix ?? 'files'
-  const folderSegments = parts.folderPath ? parts.folderPath.split('/').filter(Boolean) : []
+  const folderSegments = parts.folderPath
+    ? parseWorkspaceFileFolderDisplayPath(parts.folderPath)
+    : []
   const encoded = encodeVfsPathSegments([...folderSegments, parts.name])
   return `${prefix}/${encoded}`
 }