refactor(chat): simplify portable resource copying

Author: j15z

apps/sim/app/workspace/[workspaceId]/components/message-actions/message-actions.tsx

@@ -70,9 +70,9 @@ export const MessageActions = memo(function MessageActions({
   const copyToClipboard = () => {
     const contentToCopy = getCopyContent?.() ?? content
     if (!contentToCopy) return
-    const markdown = prepareContentForCopy?.(contentToCopy) ?? contentToCopy
-    if (typeof markdown === 'string' && !markdown) return
-    void copyMessage(markdown)
+    const copyContent = prepareContentForCopy?.(contentToCopy) ?? contentToCopy
+    if (typeof copyContent === 'string' && !copyContent) return
+    void copyMessage(copyContent)
   }
 
   const copyRequestId = async () => {

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/extensions.ts

@@ -11,12 +11,12 @@ import {
 } from '@tiptap/extension-table'
 import { Markdown } from '@tiptap/markdown'
 import StarterKit from '@tiptap/starter-kit'
-import { SIM_LINK_SCHEME } from '@/lib/copilot/sim-link'
 import { MarkdownCodeBlock } from './code-block-schema'
 import { Highlight } from './highlight'
 import { MarkdownImage } from './image-schema'
 import { MarkdownLinkInputRule } from './link-input-rule'
 import { MarkdownMention } from './mention/mention-node'
+import { SIM_LINK_SCHEME } from './mention/sim-link'
 import {
   FootnoteDef,
   FootnoteRef,

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/mention/index.ts

@@ -1,8 +1,7 @@
-export { SIM_LINK_SCHEME, toSimHref } from '@/lib/copilot/sim-link'
 export { MENTION_PLUGIN_KEY, Mention, type MentionStorage } from './mention'
 export { MentionChip } from './mention-chip'
 export { MarkdownMention } from './mention-node'
-export { simLinkPath } from './sim-link'
+export { SIM_LINK_SCHEME, simLinkPath, toSimHref } from './sim-link'
 export type { MentionItem, MentionKind } from './types'
 export { useEditorMentions } from './use-editor-mentions'
 export { useMarkdownMentions } from './use-markdown-mentions'

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/mention/mention-node.test.ts

@@ -44,14 +44,6 @@ describe('mention node round-trip', () => {
     expect(serializeMarkdownBody(input).trim()).toBe(input)
   })
 
-  it('round-trips a file reference containing whitespace and a closing parenthesis', () => {
-    const input = '[Q1 plan](sim:file/files/Q1%20plan%29.md)'
-    const doc = parseMarkdownToDoc(input)
-    const mention = findMention(doc)
-    expect(mention?.attrs).toEqual({ kind: 'file', id: 'files/Q1 plan).md', label: 'Q1 plan' })
-    expect(serializeMarkdownBody(input).trim()).toBe(input)
-  })
-
   it('leaves a normal http link as a link, not a mention', () => {
     const doc = parseMarkdownToDoc('[Sim](https://sim.ai)')
     expect(findMention(doc)).toBeNull()

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/mention/mention-node.ts

@@ -1,6 +1,6 @@
 import type { JSONContent, MarkdownToken } from '@tiptap/core'
 import { InputRule, Node } from '@tiptap/core'
-import { fromSimHrefId, fromSimMarkdownLabel, toSimMarkdownLink } from '@/lib/copilot/sim-link'
+import { toSimHref } from './sim-link'
 import type { MentionKind } from './types'
 
 export interface MentionAttrs {
@@ -16,6 +16,16 @@ export interface MentionAttrs {
  */
 const MENTION_MD_RE = /^\[((?:\\.|[^\]\\])+)\]\(sim:([a-z_]+)\/([^)\s]+)\)/
 
+/** Escape `\`, `[`, `]` in a mention label so brackets in entity names can't break the link syntax. */
+function escapeLabel(label: string): string {
+  return label.replace(/[\\[\]]/g, '\\$&')
+}
+
+/** Inverse of {@link escapeLabel}, applied when parsing a mention back from markdown. */
+function unescapeLabel(label: string): string {
+  return label.replace(/\\([\\[\]])/g, '$1')
+}
+
 /** Custom fields the mention tokenizer hangs on the marked token (all optional, like the image token). */
 interface MentionTokenFields {
   label?: string
@@ -81,21 +91,17 @@ export const MarkdownMention = Node.create({
     const { kind, id, label } = token as MentionTokenFields
     return {
       type: 'mention',
-      attrs: {
-        kind: kind ?? '',
-        id: fromSimHrefId(id ?? ''),
-        label: fromSimMarkdownLabel(label ?? ''),
-      },
+      attrs: { kind: kind ?? '', id: id ?? '', label: unescapeLabel(label ?? '') },
     }
   },
   renderMarkdown: (node: JSONContent): string => {
     const { kind, id, label } = (node.attrs ?? {}) as MentionAttrs
-    return toSimMarkdownLink(kind, id, label)
+    return `[${escapeLabel(label)}](${toSimHref(kind, id)})`
   },
 
   renderText: ({ node }) => {
     const { kind, id, label } = node.attrs as MentionAttrs
-    return toSimMarkdownLink(kind, id, label)
+    return `[${escapeLabel(label)}](${toSimHref(kind, id)})`
   },
 
   /**
@@ -117,11 +123,7 @@ export const MarkdownMention = Node.create({
           state.tr.replaceWith(
             range.from,
             range.to,
-            type.create({
-              kind,
-              id: fromSimHrefId(id),
-              label: fromSimMarkdownLabel(rawLabel ?? ''),
-            })
+            type.create({ kind, id, label: unescapeLabel(rawLabel ?? '') })
           )
         },
       }),

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/mention/sim-link.test.ts

@@ -1,21 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { fromSimHrefId, toSimHref } from '@/lib/copilot/sim-link'
 import { simLinkPath } from './sim-link'
 
-describe('sim link id codec', () => {
-  it('round-trips identifiers containing link delimiters', () => {
-    const id = 'files/Q1 plan).md'
-    const href = toSimHref('file', id)
-
-    expect(href).toBe('sim:file/files/Q1%20plan%29.md')
-    expect(fromSimHrefId(href.slice('sim:file/'.length))).toBe(id)
-  })
-
-  it('leaves malformed percent encoding intact', () => {
-    expect(fromSimHrefId('file%2')).toBe('file%2')
-  })
-})
-
 describe('simLinkPath', () => {
   const ws = 'ws1'
 

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/mention/sim-link.ts

@@ -1,3 +1,14 @@
+/**
+ * The link scheme for `@`-mention links — `[label](sim:<kind>/<id>)`. Matches the chat composer's
+ * portable chip format (`chip-clipboard-codec.ts`), so a mention authored here is parseable there.
+ */
+export const SIM_LINK_SCHEME = 'sim'
+
+/** Builds the link target for a mention of `kind`/`id`. */
+export function toSimHref(kind: string, id: string): string {
+  return `${SIM_LINK_SCHEME}:${kind}/${id}`
+}
+
 /**
  * Resolves the in-app route for a clicked `sim:` mention, or `null` when the kind has no navigable
  * destination. Each path matches the entity's real route: files open the file detail view,

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/chat-content.tsx

@@ -15,10 +15,6 @@ import { Checkbox, CopyCodeButton, cn, languages, highlight as prismHighlight }
 import { decodeVfsSegmentSafe } from '@/lib/copilot/vfs/path-utils'
 import { extractTextContent } from '@/lib/core/utils/react-node-text'
 import { ContextMentionIcon } from '@/app/workspace/[workspaceId]/home/components/context-mention-icon'
-import {
-  appendInlineReferenceMarkdown,
-  workspaceResourceReferenceMarkdown,
-} from '@/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/workspace-resource-markdown'
 import {
   type ContentSegment,
   type CredentialSubmissionPayload,
@@ -99,6 +95,47 @@ const ANIMATION_DRAIN_MS = 300
  */
 const FADE_MAX_REVEALED_CHARS = 6000
 
+function startsInlineWord(value: string): boolean {
+  return /^[A-Za-z0-9_(]/.test(value)
+}
+
+function endsInlineWord(value: string): boolean {
+  return /[A-Za-z0-9_)]$/.test(value)
+}
+
+function nextInlineSegmentLabel(segment?: ContentSegment): string {
+  if (!segment) return ''
+  // Thinking segments are never rendered, so they contribute no following text.
+  if (segment.type === 'text') return segment.content
+  if (segment.type === 'workspace_resource') return segment.data.title || segment.data.id || ''
+  return ''
+}
+
+function appendInlineReferenceMarkdown(
+  currentMarkdown: string,
+  referenceMarkdown: string,
+  nextSegment?: ContentSegment
+): string {
+  let nextMarkdown = currentMarkdown
+  if (currentMarkdown && endsInlineWord(currentMarkdown) && !/\s$/.test(currentMarkdown)) {
+    nextMarkdown += ' '
+  }
+
+  nextMarkdown += referenceMarkdown
+
+  const followingText = nextInlineSegmentLabel(nextSegment)
+  if (
+    followingText &&
+    startsInlineWord(followingText) &&
+    !/^\s/.test(followingText) &&
+    !/\s$/.test(nextMarkdown)
+  ) {
+    nextMarkdown += ' '
+  }
+
+  return nextMarkdown
+}
+
 type TdProps = ComponentPropsWithoutRef<'td'>
 type ThProps = ComponentPropsWithoutRef<'th'>
 
@@ -549,9 +586,14 @@ function ChatContentInner({
     const s = parsed.segments[i]
     const nextSegment = parsed.segments[i + 1]
     if (s.type === 'workspace_resource') {
+      // Files are addressed by their encoded VFS path (copied verbatim from the tag);
+      // workflows/tables/KBs by id. The angle-bracket link destination keeps the path
+      // intact through markdown parsing (tolerates parens) without re-encoding it.
+      const ref = s.data.type === 'file' ? (s.data.path ?? s.data.id ?? '') : (s.data.id ?? '')
+      const label = s.data.title || ref
       pendingMarkdown = appendInlineReferenceMarkdown(
         pendingMarkdown,
-        workspaceResourceReferenceMarkdown(s.data),
+        `[${label}](<#wsres-${s.data.type}-${ref}>)`,
         nextSegment
       )
     } else if (s.type === 'thinking') {

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/chat-content/workspace-resource-markdown.ts

@@ -1,18 +1,10 @@
 import { describe, expect, it, vi } from 'vitest'
-
-vi.mock('@/lib/auth/auth-client', () => ({
-  useSession: vi.fn(() => ({ data: null, isPending: false })),
-}))
-
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
-import { getOrchestratorMessageText } from '@/app/workspace/[workspaceId]/home/components/message-content'
 import {
   prepareCopyableMarkdown,
-  serializeCopyableMarkdown,
   toCopyableMarkdown,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown'
 import { parseChipLinks } from '@/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec'
-import type { ContentBlock } from '@/app/workspace/[workspaceId]/home/types'
 
 const WORKSPACE_FILES: WorkspaceFileRecord[] = [
   {
@@ -83,7 +75,7 @@ describe('toCopyableMarkdown', () => {
         id: 'tbl_f26af6dae98d4222b014b250494d00fb',
         title: 'Checked_[rare]\\portal',
       })}</workspace_resource>.`,
-    ].join(' ')
+    ].join('')
 
     const markdown = toCopyableMarkdown(message, WORKSPACE_FILES)
 
@@ -117,32 +109,6 @@ describe('toCopyableMarkdown', () => {
     )
   })
 
-  it('uses cached names for workflow and table labels shown in the chat', () => {
-    const message = [
-      '<workspace_resource>{"type":"workflow","id":"workflow-1","title":"Old workflow name"}</workspace_resource>',
-      '<workspace_resource>{"type":"table","id":"table-1"}</workspace_resource>',
-    ].join(' and ')
-
-    expect(
-      toCopyableMarkdown(message, [], {
-        workflow: new Map([['workflow-1', 'Current workflow name']]),
-        table: new Map([['table-1', 'Current table name']]),
-      })
-    ).toBe(
-      '[Current workflow name](sim:workflow/workflow-1) and [Current table name](sim:table/table-1)'
-    )
-  })
-
-  it('reports file resources that need refreshed metadata before copying', () => {
-    const message =
-      'Read <workspace_resource>{"type":"file","path":"files/notes.md","title":"notes.md"}</workspace_resource>.'
-
-    expect(serializeCopyableMarkdown(message)).toEqual({
-      markdown: 'Read notes.md.',
-      hasUnresolvedFile: true,
-    })
-  })
-
   it('refreshes missing file metadata before producing copyable Markdown', async () => {
     const message =
       'Read <workspace_resource>{"type":"file","path":"files/The%20Bell%20at%20Low%20Tide.md","title":"The Bell at Low Tide.md"}</workspace_resource>.'
@@ -163,7 +129,7 @@ describe('toCopyableMarkdown', () => {
     const message =
       'Read <workspace_resource>{"type":"file","path":"files/Q1 plan).md","title":"Q1 plan).md"}</workspace_resource>.'
 
-    const { markdown } = serializeCopyableMarkdown(message)
+    const markdown = toCopyableMarkdown(message)
 
     expect(markdown).toBe('Read Q1 plan).md.')
     expect(parseChipLinks(markdown)).toEqual([])
@@ -193,20 +159,4 @@ describe('toCopyableMarkdown', () => {
     )
     expect(refreshWorkspaceFiles).not.toHaveBeenCalled()
   })
-
-  it('copies workspace resources from orchestrator content blocks', () => {
-    const contentBlocks: ContentBlock[] = [
-      { type: 'text', content: 'Read ' },
-      { type: 'thinking', content: 'Do not copy this.' },
-      {
-        type: 'text',
-        content:
-          '<workspace_resource>{"type":"file","path":"files/notes.md","title":"notes.md"}</workspace_resource> for details.',
-      },
-    ]
-
-    const content = getOrchestratorMessageText(contentBlocks, 'Fallback without the resource.')
-
-    expect(toCopyableMarkdown(content, WORKSPACE_FILES)).toBe('Read notes.md for details.')
-  })
 })