fix(chat): disambiguate folder mentions

Author: Bill Leoutsakos

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx

@@ -16,6 +16,7 @@ import {
 import { getResourceConfig } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
 import type { PlusMenuHandle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/constants'
 import {
+  buildFolderMentionLocationMap,
   resourceMentionMatches,
   withDesktopTabMentions,
 } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items'
@@ -41,6 +42,35 @@ const NON_ATTACHABLE_RESOURCE_TYPES = new Set<MothershipResourceType>(['browser'
 const EMPTY_BROWSER_TABS = [] as const
 const EMPTY_TERMINAL_TABS = [] as const
 
+interface FolderMentionPathProps {
+  segments: readonly string[]
+}
+
+/** Right-aligned folder location whose middle ancestors yield space first. */
+function FolderMentionPath({ segments }: FolderMentionPathProps) {
+  const family = segments[0]
+  const parentNames = segments.slice(1)
+  const nearestParent = parentNames.at(-1)
+  const middleParents = parentNames.slice(0, -1)
+
+  return (
+    <span className='ml-auto flex min-w-0 pl-2 text-[var(--text-subtle)] text-small'>
+      <span className='flex-shrink-0'>{family}</span>
+      {middleParents.length > 0 && (
+        <span className='min-w-0 truncate whitespace-pre [flex-shrink:9999]'>
+          {` / ${middleParents.join(' / ')}`}
+        </span>
+      )}
+      {nearestParent && (
+        <>
+          <span className='flex-shrink-0 whitespace-pre'> / </span>
+          <span className='min-w-0 truncate'>{nearestParent}</span>
+        </>
+      )}
+    </span>
+  )
+}
+
 interface PlusMenuDropdownProps {
   workspaceId: string
   /**
@@ -119,6 +149,11 @@ export const PlusMenuDropdown = React.memo(
       return attachable.filter(({ type }) => !MENTION_ONLY_RESOURCE_TYPES.has(type))
     }, [availableResources, browserTabs, isMention, terminalTabs])
 
+    const folderMentionLocations = useMemo(
+      () => buildFolderMentionLocationMap(visibleResources),
+      [visibleResources]
+    )
+
     const treeSections = useResourceTreeSections({
       groups: visibleResources,
       structureFolders,
@@ -334,6 +369,10 @@ export const PlusMenuDropdown = React.memo(
                 filteredItems.map(({ type, item }, index) => {
                   const config = getResourceConfig(type)
                   const isActive = index === activeIndex
+                  const location = folderMentionLocations.get(`${type}:${item.id}`)
+                  const locationPath = location
+                    ? [getResourceConfig(location.familyType).label, ...location.parentNames]
+                    : null
                   return (
                     <button
                       key={`${type}:${item.id}`}
@@ -351,6 +390,7 @@ export const PlusMenuDropdown = React.memo(
                       )}
                     >
                       {config.renderDropdownItem({ item })}
+                      {locationPath && <FolderMentionPath segments={locationPath} />}
                     </button>
                   )
                 })

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.test.ts

@@ -4,6 +4,7 @@ import {
   TERMINAL_SESSION_RESOURCE_ID,
 } from '@/lib/copilot/resources/types'
 import {
+  buildFolderMentionLocationMap,
   resourceMentionMatches,
   withDesktopTabMentions,
 } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items'
@@ -20,6 +21,88 @@ const groups = [
   },
 ]
 
+describe('buildFolderMentionLocationMap', () => {
+  it('distinguishes same-named top-level workflow and file folders by family', () => {
+    const locations = buildFolderMentionLocationMap([
+      {
+        type: 'folder',
+        items: [{ id: 'enterprise', name: 'Enterprise', parentId: null }],
+      },
+      {
+        type: 'filefolder',
+        items: [{ id: 'enterprise', name: 'Enterprise', parentId: null }],
+      },
+    ])
+
+    expect(locations.get('folder:enterprise')).toEqual({
+      familyType: 'workflow',
+      parentNames: [],
+    })
+    expect(locations.get('filefolder:enterprise')).toEqual({
+      familyType: 'file',
+      parentNames: [],
+    })
+  })
+
+  it('returns root-first parents without repeating the current folder name', () => {
+    const locations = buildFolderMentionLocationMap([
+      {
+        type: 'folder',
+        items: [
+          { id: 'engineering', name: 'Engineering', parentId: null },
+          { id: 'accounts', name: 'Accounts', parentId: 'engineering' },
+          { id: 'enterprise', name: 'Enterprise', parentId: 'accounts' },
+        ],
+      },
+    ])
+
+    expect(locations.get('folder:enterprise')).toEqual({
+      familyType: 'workflow',
+      parentNames: ['Engineering', 'Accounts'],
+    })
+  })
+
+  it('falls back to the family when a parent is missing', () => {
+    const locations = buildFolderMentionLocationMap([
+      {
+        type: 'filefolder',
+        items: [{ id: 'enterprise', name: 'Enterprise', parentId: 'missing' }],
+      },
+    ])
+
+    expect(locations.get('filefolder:enterprise')).toEqual({
+      familyType: 'file',
+      parentNames: [],
+    })
+  })
+
+  it('terminates cyclic ancestry without repeating the current folder', () => {
+    const locations = buildFolderMentionLocationMap([
+      {
+        type: 'folder',
+        items: [
+          { id: 'enterprise', name: 'Enterprise', parentId: 'accounts' },
+          { id: 'accounts', name: 'Accounts', parentId: 'enterprise' },
+        ],
+      },
+    ])
+
+    expect(locations.get('folder:enterprise')).toEqual({
+      familyType: 'workflow',
+      parentNames: ['Accounts'],
+    })
+  })
+
+  it('does not add locations for non-folder resources', () => {
+    const locations = buildFolderMentionLocationMap([
+      { type: 'workflow', items: [{ id: 'workflow-1', name: 'Enterprise' }] },
+      { type: 'file', items: [{ id: 'file-1', name: 'Enterprise' }] },
+    ])
+
+    expect(locations.size).toBe(0)
+  })
+})
+
 describe('withDesktopTabMentions', () => {
   it('keeps Browser and Terminal as flat resource mentions with no live tabs', () => {
     const result = withDesktopTabMentions(groups, [], [])

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts

@@ -4,6 +4,7 @@ import {
   BROWSER_SESSION_RESOURCE_ID,
   TERMINAL_SESSION_RESOURCE_ID,
 } from '@/lib/copilot/resources/types'
+import { folderAncestorChain } from '@/lib/folders/tree'
 import type { AvailableItem } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree'
 import { browserTabTitle } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-tab-label'
 import type { MothershipResourceType } from '@/app/workspace/[workspaceId]/home/types'
@@ -15,6 +16,57 @@ export interface ResourceMentionGroup {
 
 export type ResourceMentionLevel = 'resource' | 'tab'
 
+export interface FolderMentionLocation {
+  familyType: 'workflow' | 'file'
+  parentNames: string[]
+}
+
+interface FolderMentionNode {
+  id: string
+  name: string
+  parentId: string | null
+}
+
+function folderFamilyType(
+  type: MothershipResourceType
+): FolderMentionLocation['familyType'] | null {
+  if (type === 'folder') return 'workflow'
+  if (type === 'filefolder') return 'file'
+  return null
+}
+
+/** Builds display-only locations for the folder rows in the flat resource picker. */
+export function buildFolderMentionLocationMap(
+  groups: readonly ResourceMentionGroup[]
+): Map<string, FolderMentionLocation> {
+  const locations = new Map<string, FolderMentionLocation>()
+
+  for (const group of groups) {
+    const familyType = folderFamilyType(group.type)
+    if (!familyType) continue
+
+    const nodes = new Map<string, FolderMentionNode>(
+      group.items.map((item) => [
+        item.id,
+        {
+          id: item.id,
+          name: item.name,
+          parentId: typeof item.parentId === 'string' ? item.parentId : null,
+        },
+      ])
+    )
+
+    for (const node of nodes.values()) {
+      const parentNames = folderAncestorChain(node.parentId, (id) => nodes.get(id))
+        .filter((parent) => parent.id !== node.id)
+        .map((parent) => parent.name)
+      locations.set(`${group.type}:${node.id}`, { familyType, parentNames })
+    }
+  }
+
+  return locations
+}
+
 /** A family query such as "browser" keeps that resource's live tabs visible. */
 export function resourceMentionMatches(item: AvailableItem, query: string): boolean {
   const normalized = query.toLowerCase().trim()