Fix vfs dynamic context encoding

Author: Sg312

apps/sim/lib/copilot/chat/workspace-context.test.ts

@@ -0,0 +1,76 @@
+/**
+ * @vitest-environment node
+ */
+
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@sim/db', () => ({ db: {} }))
+vi.mock('@sim/db/schema', () => ({
+  knowledgeBase: {},
+  knowledgeConnector: {},
+  mcpServers: {},
+  userTableDefinitions: {},
+  userTableRows: {},
+  workflow: {},
+  workflowFolder: {},
+  workflowSchedule: {},
+}))
+
+import { canonicalWorkflowVfsDir } from '@/lib/copilot/vfs/path-utils'
+import { buildWorkspaceMd, type WorkspaceMdData } from './workspace-context'
+
+function baseData(overrides: Partial<WorkspaceMdData> = {}): WorkspaceMdData {
+  return {
+    workspace: { id: 'ws-1', name: 'WS', ownerId: 'u-1' },
+    members: [],
+    workflows: [],
+    knowledgeBases: [],
+    tables: [],
+    files: [],
+    oauthIntegrations: [],
+    envVariables: [],
+    ...overrides,
+  }
+}
+
+describe('buildWorkspaceMd - workflow VFS state paths', () => {
+  // `workflows[].folderPath` arrives ALREADY per-segment percent-encoded (it is
+  // the value from buildVfsFolderPathMap / resolveFolderPath that also builds the
+  // stored VFS keys). The advertised path must not re-encode it.
+  it('emits a single-encoded state path for a folder name with a space', () => {
+    const md = buildWorkspaceMd(
+      baseData({
+        workflows: [
+          { id: 'wf-1', name: 'The Elder', isDeployed: false, folderPath: 'The%20Elder' },
+        ],
+      })
+    )
+
+    expect(md).toContain('workflows/The%20Elder/The%20Elder/state.json')
+    // The exact double-encoding regression: `%20` -> `%2520`.
+    expect(md).not.toContain('The%2520Elder')
+  })
+
+  it('matches the canonical VFS dir helper the materializer/pointers use', () => {
+    const folderPath = 'My%20Folder/Sub%20Folder'
+    const md = buildWorkspaceMd(
+      baseData({
+        workflows: [{ id: 'wf-1', name: 'My Flow', isDeployed: false, folderPath }],
+      })
+    )
+
+    const expected = `${canonicalWorkflowVfsDir({ name: 'My Flow', folderPath })}/state.json`
+    expect(expected).toBe('workflows/My%20Folder/Sub%20Folder/My%20Flow/state.json')
+    expect(md).toContain(expected)
+  })
+
+  it('does not advertise a VFS state path for root-level workflows', () => {
+    const md = buildWorkspaceMd(
+      baseData({
+        workflows: [{ id: 'wf-1', name: 'Root Flow', isDeployed: false, folderPath: null }],
+      })
+    )
+
+    expect(md).not.toContain('VFS state path')
+  })
+})

apps/sim/lib/copilot/chat/workspace-context.ts

@@ -13,7 +13,7 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { and, count, eq, inArray, isNull } from 'drizzle-orm'
 import { normalizeVfsSegment } from '@/lib/copilot/vfs/normalize-segment'
-import { canonicalWorkspaceFilePath } from '@/lib/copilot/vfs/path-utils'
+import { canonicalWorkflowVfsDir, canonicalWorkspaceFilePath } from '@/lib/copilot/vfs/path-utils'
 import { getAccessibleOAuthCredentials } from '@/lib/credentials/environment'
 import { listWorkspaceFiles } from '@/lib/uploads/contexts/workspace'
 import { listCustomTools } from '@/lib/workflows/custom-tools/operations'
@@ -76,21 +76,16 @@ export interface WorkspaceMdData {
   }>
 }
 
-function normalizeFolderPathForVfs(folderPath?: string | null): string | null {
-  if (!folderPath) return null
-  const segments = folderPath
-    .split('/')
-    .map((segment) => normalizeVfsSegment(segment))
-    .filter(Boolean)
-  return segments.length > 0 ? segments.join('/') : null
-}
-
+// `folderPath` is already per-segment percent-encoded: it comes from
+// buildVfsFolderPathMap / resolveFolderPath, the same maps that build the keys
+// the VFS materializer stores. Build the advertised path with
+// canonicalWorkflowVfsDir — the exact helper the materializer and @-mention
+// pointers use — so the WORKSPACE.md state path can never drift from the stored
+// VFS key. The workflow NAME is the raw display string, so the helper encodes it
+// once. Re-encoding the folder segment here is what produced double-encoded
+// paths like `The%2520Elder` for a folder named `The Elder`.
 function buildWorkflowStatePath(workflowName: string, folderPath?: string | null): string {
-  const normalizedFolderPath = normalizeFolderPathForVfs(folderPath)
-  const normalizedWorkflowName = normalizeVfsSegment(workflowName)
-  return normalizedFolderPath
-    ? `workflows/${normalizedFolderPath}/${normalizedWorkflowName}/state.json`
-    : `workflows/${normalizedWorkflowName}/state.json`
+  return `${canonicalWorkflowVfsDir({ name: workflowName, folderPath })}/state.json`
 }
 
 /**