fix open resource

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx

@@ -260,7 +260,7 @@ function EmbeddedFileActions({ workspaceId, fileId }: EmbeddedFileActionsProps)
   }, [file])
 
   const handleOpenInFiles = useCallback(() => {
-    router.push(`/workspace/${workspaceId}/files?fileId=${fileId}`)
+    router.push(`/workspace/${workspaceId}/files?fileId=${encodeURIComponent(fileId)}`)
   }, [router, workspaceId, fileId])
 
   return (

apps/sim/lib/copilot/orchestrator/tool-executor/index.ts

@@ -16,6 +16,7 @@ import { validateMcpDomain } from '@/lib/mcp/domain-check'
 import { mcpService } from '@/lib/mcp/service'
 import { generateMcpServerId } from '@/lib/mcp/utils'
 import { getAllOAuthServices } from '@/lib/oauth/utils'
+import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager'
 import {
   deleteCustomTool,
   getCustomToolById,
@@ -24,7 +25,7 @@ import {
 } from '@/lib/workflows/custom-tools/operations'
 import { deleteSkill, listSkills, upsertSkills } from '@/lib/workflows/skills/operations'
 import { getWorkflowById } from '@/lib/workflows/utils'
-import { isMcpTool } from '@/executor/constants'
+import { isMcpTool, isUuid } from '@/executor/constants'
 import { executeTool } from '@/tools'
 import { getTool, resolveToolId } from '@/tools/utils'
 import {
@@ -1029,15 +1030,42 @@ const SIM_WORKFLOW_TOOL_HANDLERS: Record<
   list: (p, c) => executeVfsList(p, c),
 
   // Resource visibility
-  open_resource: async (p: OpenResourceParams) => {
+  open_resource: async (p: OpenResourceParams, c: ExecutionContext) => {
     const validated = validateOpenResourceParams(p)
     if (!validated.success) {
       return { success: false, error: validated.error }
     }
 
     const params = validated.params
     const resourceType = params.type
-    const resourceId = params.id
+    let resourceId = params.id
+    let title: string = resourceType
+
+    if (resourceType === 'file') {
+      if (!c.workspaceId) {
+        return {
+          success: false,
+          error:
+            'Opening a workspace file requires workspace context. Pass the file UUID from files/<name>/meta.json.',
+        }
+      }
+      if (!isUuid(params.id)) {
+        return {
+          success: false,
+          error:
+            'open_resource for files requires the canonical UUID from files/<name>/meta.json (the "id" field). Do not pass VFS paths, display names, or file_<name> strings.',
+        }
+      }
+      const record = await getWorkspaceFile(c.workspaceId, params.id)
+      if (!record) {
+        return {
+          success: false,
+          error: `No workspace file with id "${params.id}". Confirm the UUID from meta.json.`,
+        }
+      }
+      resourceId = record.id
+      title = record.name
+    }
 
     return {
       success: true,
@@ -1046,7 +1074,7 @@ const SIM_WORKFLOW_TOOL_HANDLERS: Record<
         {
           type: resourceType as 'workflow' | 'table' | 'knowledgebase' | 'file',
           id: resourceId,
-          title: resourceType,
+          title,
         },
       ],
     }

apps/sim/lib/copilot/vfs/operations.test.ts

@@ -81,6 +81,16 @@ describe('grep', () => {
     expect(lineOnly).toHaveLength(0)
   })
 
+  it('treats trailing slash on directory scope like grep (files/ matches files/foo)', () => {
+    const files = vfsFromEntries([
+      ['files/TEST BOY.md/meta.json', '"name": "TEST BOY.md"'],
+      ['workflows/x', 'TEST BOY'],
+    ])
+    const hits = grep(files, 'TEST BOY', 'files/', { outputMode: 'files_with_matches' })
+    expect(hits).toContain('files/TEST BOY.md/meta.json')
+    expect(hits).not.toContain('workflows/x')
+  })
+
   it('scopes to directory prefix without matching unrelated prefixes', () => {
     const files = vfsFromEntries([
       ['workflows/a/x', 'needle'],

apps/sim/lib/copilot/vfs/operations.ts

@@ -57,14 +57,19 @@ function splitLinesForGrep(content: string): string[] {
  * Returns true when `filePath` is `scope` or a descendant path (`scope/...`). If `scope` contains
  * `*` or `?`, filters with micromatch `isMatch` and {@link VFS_GLOB_OPTIONS}. Other characters
  * (including `[`, `{`, spaces) use directory-prefix logic so literal VFS path segments are not
- * parsed as glob syntax.
+ * parsed as glob syntax. Trailing slashes are stripped so `files/` and `files` both scope under
+ * `files/...`.
  */
 function pathWithinGrepScope(filePath: string, scope: string): boolean {
   const scopeUsesStarOrQuestionGlob = /[*?]/.test(scope)
   if (scopeUsesStarOrQuestionGlob) {
     return micromatch.isMatch(filePath, scope, VFS_GLOB_OPTIONS)
   }
-  return filePath === scope || filePath.startsWith(scope + '/')
+  const base = scope.replace(/\/+$/, '')
+  if (base === '') {
+    return true
+  }
+  return filePath === base || filePath.startsWith(`${base}/`)
 }
 
 /**

apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts

@@ -13,6 +13,9 @@ import {
   incrementStorageUsage,
 } from '@/lib/billing/storage'
 import { normalizeVfsSegment } from '@/lib/copilot/vfs/normalize-segment'
+import { normalizeWorkspaceFileReference } from '@/lib/uploads/contexts/workspace/workspace-file-reference'
+
+export { normalizeWorkspaceFileReference }
 import {
   downloadFile,
   hasCloudStorage,
@@ -331,30 +334,9 @@ export async function listWorkspaceFiles(
   }
 }
 
-/**
- * Normalize a workspace file reference to its display name.
- * Supports raw names and VFS-style paths like `files/name`, `files/name/content`,
- * and `files/name/meta.json`.
- */
-export function normalizeWorkspaceFileReference(fileReference: string): string {
-  const trimmed = fileReference.trim().replace(/^\/+/, '')
-
-  if (trimmed.startsWith('files/')) {
-    const withoutPrefix = trimmed.slice('files/'.length)
-    if (withoutPrefix.endsWith('/meta.json')) {
-      return withoutPrefix.slice(0, -'/meta.json'.length)
-    }
-    if (withoutPrefix.endsWith('/content')) {
-      return withoutPrefix.slice(0, -'/content'.length)
-    }
-    return withoutPrefix
-  }
-
-  return trimmed
-}
-
 /**
  * Find a workspace file record in an existing list from either its id or a VFS/name reference.
+ * For copilot `open_resource` and the resource panel, use {@link getWorkspaceFile} with a UUID only.
  */
 export function findWorkspaceFileRecord(
   files: WorkspaceFileRecord[],

apps/sim/lib/uploads/contexts/workspace/workspace-file-reference.ts

@@ -0,0 +1,24 @@
+/**
+ * Normalize a workspace file reference to its display name.
+ * Supports raw names and VFS-style paths like `files/name`, `files/name/content`,
+ * and `files/name/meta.json`.
+ *
+ * Used by storage resolution (`findWorkspaceFileRecord`), not by `open_resource`, which
+ * requires the canonical database UUID only.
+ */
+export function normalizeWorkspaceFileReference(fileReference: string): string {
+  const trimmed = fileReference.trim().replace(/^\/+/, '')
+
+  if (trimmed.startsWith('files/')) {
+    const withoutPrefix = trimmed.slice('files/'.length)
+    if (withoutPrefix.endsWith('/meta.json')) {
+      return withoutPrefix.slice(0, -'/meta.json'.length)
+    }
+    if (withoutPrefix.endsWith('/content')) {
+      return withoutPrefix.slice(0, -'/content'.length)
+    }
+    return withoutPrefix
+  }
+
+  return trimmed
+}