diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
index d20098720e7..137e41de6d6 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
@@ -8,6 +8,7 @@ import {
   Task,
   TerminalWindow,
   Workflow,
+  Workspaces,
 } from '@sim/emcn/icons'
 import { AgentSkillsIcon, McpIcon } from '@/components/icons'
 import { getDocumentIcon } from '@/components/icons/document-icons'
@@ -54,6 +55,10 @@ function renderIntegrationTile({ context, className }: RenderIconArgs): ReactNod
  * without an icon.
  */
 export const CHAT_CONTEXT_KIND_REGISTRY: Record<ChatContextKind, ChatContextKindConfig> = {
+  workspace: {
+    label: 'Workspace',
+    renderIcon: ({ className }) => <Workspaces className={className} />,
+  },
   browser_tab: {
     label: 'Browser tab',
     renderIcon: ({ className }) => <Globe className={className} />,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
index ec9af2c3669..231a56a85a0 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
@@ -204,6 +204,9 @@ export function useResourceTreeSections({
 }
 
 interface ResourceMenuSectionsProps {
+  flat?: boolean
+  /** Organization chat combines two selectable resource kinds under Files. */
+  combineFileFolders?: boolean
   /** Foldered families, from {@link useResourceTreeSections}. */
   sections: ResourceTreeSection[]
   /** Every available family. Foldered ones are taken from `sections` instead. */
@@ -225,16 +228,21 @@ interface ResourceMenuSectionsProps {
  * canonical order.
  */
 export function ResourceMenuSections({
+  flat = false,
+  combineFileFolders = false,
   sections,
   groups,
   onSelect,
   subContentClassName,
 }: ResourceMenuSectionsProps) {
   const sectionByType = new Map(sections.map((section) => [section.type, section]))
+  const fileFolderItems = groups.find((group) => group.type === 'filefolder')?.items ?? []
   const entries = groups
-    .filter(({ type, items }) =>
-      FOLDERED_RESOURCE_TYPES.has(type) ? sectionByType.has(type) : items.length > 0
-    )
+    .filter(({ type, items }) => {
+      if (combineFileFolders && type === 'filefolder') return false
+      if (combineFileFolders && type === 'file') return items.length + fileFolderItems.length > 0
+      return !flat && FOLDERED_RESOURCE_TYPES.has(type) ? sectionByType.has(type) : items.length > 0
+    })
     .sort(byResourceMenuOrder)
 
   return (
@@ -243,6 +251,13 @@ export function ResourceMenuSections({
         const config = getResourceConfig(type)
         const Icon = config.icon
         const section = sectionByType.get(type)
+        const rows =
+          combineFileFolders && type === 'file'
+            ? [
+                ...fileFolderItems.map((item) => ({ type: 'filefolder' as const, item })),
+                ...items.map((item) => ({ type: 'file' as const, item })),
+              ]
+            : items.map((item) => ({ type, item }))
 
         // The Browser and Terminal launchers are flat rows that open a new page
         // or shell. Live pages and shells offered as context are an ordinary
@@ -275,12 +290,12 @@ export function ResourceMenuSections({
                   onSelect={onSelect}
                 />
               ) : (
-                items.map((item) => (
+                rows.map(({ type: itemType, item }) => (
                   <DropdownMenuItem
-                    key={`${item.workspaceId ?? ''}:${item.id}`}
-                    onClick={() => onSelect(resourceFromItem(type, item))}
+                    key={`${itemType}:${item.workspaceId ?? ''}:${item.id}`}
+                    onClick={() => onSelect(resourceFromItem(itemType, item))}
                   >
-                    {config.renderDropdownItem({ item })}
+                    {getResourceConfig(itemType).renderDropdownItem({ item })}
                     {typeof item.workspaceName === 'string' && (
                       <span className='ml-auto text-[var(--text-muted)] text-xs'>
                         {item.workspaceName}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
index 2cc097a1be2..c4e922a817c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
@@ -23,6 +23,7 @@ const CHIP_LINK_SCHEME = 'sim'
  * no single portable id (an array / two ids / none) and degrade to plain text.
  */
 const PORTABLE_KIND_TO_ID_FIELD = {
+  workspace: 'workspaceId',
   table: 'tableId',
   file: 'fileId',
   folder: 'folderId',
@@ -235,6 +236,8 @@ export function parseChipLinks(text: string): ParsedChipLink[] {
  */
 export function chipLinkToContext(link: ParsedChipLink): ChatContext {
   switch (link.kind) {
+    case 'workspace':
+      return { kind: 'workspace', workspaceId: link.id, label: link.label }
     case 'table':
       return { kind: 'table', tableId: link.id, label: link.label }
     case 'file':
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
index 0d59291a4c7..057d6caed5f 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
@@ -5,17 +5,22 @@ import {
   cn,
   DropdownMenu,
   DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuItemLabel,
   DropdownMenuLabel,
   DropdownMenuSearchInput,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
   DropdownMenuTrigger,
   dropdownMenuRowClass,
 } from '@sim/emcn'
+import { Workspaces } from '@sim/emcn/icons'
 import {
   ResourceMenuSections,
   resourceFromItem,
   useAvailableResources,
   useResourceTreeSections,
-  WorkspaceResourceSubmenu,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown'
 import type { AvailableResources } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources'
 import {
@@ -30,6 +35,7 @@ import {
 import type { PlusMenuHandle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/constants'
 import {
   buildMentionPreview,
+  type ResourceMentionCandidate,
   resourceMentionMatches,
   withBrowserTabMentions,
   withFolderMentions,
@@ -64,17 +70,6 @@ const MENTION_MAX_HEIGHT_CLASS = 'max-h-[min(280px,var(--radix-popper-available-
  */
 const MENTION_ONLY_RESOURCE_TYPES = new Set<MothershipResourceType>(['integration'])
 
-/**
- * Families an organization chat's workspace submenus leave out: the mention-only
- * ones, plus Browser and Terminal, which belong to this desktop rather than to a
- * workspace and so sit once after the workspaces.
- */
-const WORKSPACE_SUBMENU_EXCLUDED_TYPES: readonly MothershipResourceType[] = [
-  ...MENTION_ONLY_RESOURCE_TYPES,
-  'browser',
-  'terminal',
-]
-
 function isNativeResourceGroup({ type }: { type: MothershipResourceType }): boolean {
   return type === 'browser' || type === 'terminal'
 }
@@ -82,6 +77,10 @@ function isNativeResourceGroup({ type }: { type: MothershipResourceType }): bool
 const EMPTY_BROWSER_TABS = [] as const
 const EMPTY_TERMINAL_TABS = [] as const
 
+type PickerCandidate =
+  | ResourceMentionCandidate
+  | { type: 'workspace'; item: { id: string; name: string } }
+
 interface PlusMenuDropdownProps {
   workspaceId: string
   organizationId?: string
@@ -94,6 +93,7 @@ interface PlusMenuDropdownProps {
    */
   warm?: boolean
   onResourceSelect: (resource: MothershipResource) => void
+  onWorkspaceSelect: (workspace: { id: string; name: string }) => void
   onClose: () => void
   textareaRef: React.RefObject<HTMLTextAreaElement | null>
   pendingCursorRef: React.MutableRefObject<number | null>
@@ -108,6 +108,7 @@ export const PlusMenuDropdown = React.memo(
       organizationId,
       warm,
       onResourceSelect,
+      onWorkspaceSelect,
       onClose,
       textareaRef,
       pendingCursorRef,
@@ -197,31 +198,44 @@ export const PlusMenuDropdown = React.memo(
       terminalTabs,
     ])
 
-    /**
-     * Built from this workspace's own inventory, which has no foldered families in an
-     * organization chat: there each workspace submenu builds its own sections, because
-     * ids are only unique within a workspace.
-     */
+    /** Organization chat uses flat cross-workspace rows; workspace chat keeps its tree. */
     const treeSections = useResourceTreeSections({
       groups: workspaceInventory.groups,
       structureFolders: workspaceInventory.structureFolders,
       selectFolders: true,
     })
 
-    const filteredItems = useMemo(() => {
+    const filteredItems = useMemo<PickerCandidate[] | null>(() => {
       const rawQuery = isMention ? (mentionQuery ?? '') : search
       const q = rawQuery.toLowerCase().trim()
       if (!isMention && !q) return null
+      const workspaceMatches = organizationId
+        ? workspaces
+            .filter(
+              (workspace) =>
+                !q || workspace.name.toLowerCase().includes(q) || 'workspaces'.includes(q)
+            )
+            .map((workspace) => ({
+              type: 'workspace' as const,
+              item: { id: workspace.id, name: workspace.name },
+            }))
+        : []
       if (isMention && !q) {
-        return buildMentionPreview(
-          visibleResources,
-          (type) => getResourceConfig(type).mentionPreviewLimit ?? MENTION_PREVIEW_DEFAULT_LIMIT
-        )
+        return [
+          ...workspaceMatches.slice(0, MENTION_PREVIEW_DEFAULT_LIMIT),
+          ...buildMentionPreview(
+            visibleResources,
+            (type) => getResourceConfig(type).mentionPreviewLimit ?? MENTION_PREVIEW_DEFAULT_LIMIT
+          ),
+        ]
       }
-      return visibleResources.flatMap(({ type, items }) =>
-        items.filter((item) => resourceMentionMatches(item, q)).map((item) => ({ type, item }))
-      )
-    }, [isMention, mentionQuery, search, visibleResources])
+      return [
+        ...workspaceMatches,
+        ...visibleResources.flatMap(({ type, items }) =>
+          items.filter((item) => resourceMentionMatches(item, q)).map((item) => ({ type, item }))
+        ),
+      ]
+    }, [isMention, mentionQuery, search, visibleResources, organizationId, workspaces])
 
     const filteredItemsRef = useRef(filteredItems)
     filteredItemsRef.current = filteredItems
@@ -238,15 +252,29 @@ export const PlusMenuDropdown = React.memo(
       if (isMention) setActiveIndex(0)
     }, [isMention, mentionQuery])
 
-    const handleSelect = (resource: MothershipResource) => {
-      onResourceSelect(resource)
+    const closeAfterSelect = () => {
       setOpen(false)
       setSearch('')
       setActiveIndex(0)
     }
 
-    const handleSelectRef = useRef(handleSelect)
-    handleSelectRef.current = handleSelect
+    const handleSelect = (resource: MothershipResource) => {
+      onResourceSelect(resource)
+      closeAfterSelect()
+    }
+
+    const handleWorkspaceSelect = (workspace: { id: string; name: string }) => {
+      onWorkspaceSelect(workspace)
+      closeAfterSelect()
+    }
+
+    const handleCandidateSelect = (candidate: PickerCandidate) => {
+      if (candidate.type === 'workspace') handleWorkspaceSelect(candidate.item)
+      else handleSelect(resourceFromItem(candidate.type, candidate.item))
+    }
+
+    const handleSelectRef = useRef(handleCandidateSelect)
+    handleSelectRef.current = handleCandidateSelect
 
     React.useImperativeHandle(
       ref,
@@ -267,7 +295,7 @@ export const PlusMenuDropdown = React.memo(
           const items = filteredItemsRef.current
           const target = items?.length ? (items[activeIndexRef.current] ?? items[0]) : undefined
           if (!target) return isHydratingRef.current ? 'hydrating' : 'empty'
-          handleSelectRef.current(resourceFromItem(target.type, target.item))
+          handleSelectRef.current(target)
           return 'selected'
         },
       }),
@@ -306,7 +334,7 @@ export const PlusMenuDropdown = React.memo(
       } else if (e.key === 'Enter' || (e.key === 'Tab' && !e.shiftKey)) {
         e.preventDefault()
         const target = filteredItems[activeIndex] ?? filteredItems[0]
-        if (target) handleSelect(resourceFromItem(target.type, target.item))
+        if (target) handleCandidateSelect(target)
       }
     }
 
@@ -405,21 +433,36 @@ export const PlusMenuDropdown = React.memo(
             {/* Always-mounted; swapping this subtree with filtered results makes Radix's
                   menu FocusScope steal focus from the search input back to the content root. */}
             <div hidden={filteredItems !== null}>
-              {organizationId &&
-                workspaces.map((workspace) => (
-                  <WorkspaceResourceSubmenu
-                    key={workspace.id}
-                    workspace={workspace}
-                    excludeTypes={WORKSPACE_SUBMENU_EXCLUDED_TYPES}
-                    selectFolders
-                    onSelect={handleSelect}
-                  />
-                ))}
+              {organizationId && (
+                <DropdownMenuSub>
+                  <DropdownMenuSubTrigger>
+                    <Workspaces className='size-[14px]' />
+                    <DropdownMenuItemLabel label='Workspaces' />
+                  </DropdownMenuSubTrigger>
+                  <DropdownMenuSubContent className='max-w-[min(300px,calc(100vw-32px))]'>
+                    {workspaces.length ? (
+                      workspaces.map((workspace) => (
+                        <DropdownMenuItem
+                          key={workspace.id}
+                          onClick={() => handleWorkspaceSelect(workspace)}
+                        >
+                          <Workspaces className='size-[14px]' />
+                          <DropdownMenuItemLabel label={workspace.name} />
+                        </DropdownMenuItem>
+                      ))
+                    ) : (
+                      <DropdownMenuItem disabled>
+                        {workspacesPending ? 'Loading workspaces…' : 'No accessible workspaces'}
+                      </DropdownMenuItem>
+                    )}
+                  </DropdownMenuSubContent>
+                </DropdownMenuSub>
+              )}
               <ResourceMenuSections
-                sections={treeSections}
-                groups={
-                  organizationId ? visibleResources.filter(isNativeResourceGroup) : visibleResources
-                }
+                flat={Boolean(organizationId)}
+                combineFileFolders={Boolean(organizationId)}
+                sections={organizationId ? [] : treeSections}
+                groups={visibleResources}
                 onSelect={handleSelect}
                 subContentClassName='max-w-[min(300px,calc(100vw-32px))]'
               />
@@ -428,24 +471,37 @@ export const PlusMenuDropdown = React.memo(
                   menu Collection, or FocusScope restores focus to the content root. */}
             {filteredItems !== null &&
               (filteredItems.length > 0 ? (
-                filteredItems.map(({ type, item }, index) => {
-                  const config = getResourceConfig(type)
+                filteredItems.map((candidate, index) => {
+                  const { type, item } = candidate
+                  const config = type === 'workspace' ? null : getResourceConfig(type)
                   const isActive = index === activeIndex
-                  /* Items arrive grouped by family (one group per type, ordered by
-                     RESOURCE_MENU_ORDER), so a type change marks a section boundary.
-                     Deriving the heading from the flat list keeps `activeIndex` — and
-                     therefore every keyboard path — indexing exactly what it did. */
-                  const startsSection = index === 0 || filteredItems[index - 1]?.type !== type
+                  const sectionLabel =
+                    type === 'workspace'
+                      ? 'Workspaces'
+                      : organizationId && type === 'filefolder'
+                        ? 'Files'
+                        : (config?.label ?? 'Workspaces')
+                  const previous = filteredItems[index - 1]
+                  const previousSection = previous
+                    ? previous.type === 'workspace'
+                      ? 'Workspaces'
+                      : organizationId && previous.type === 'filefolder'
+                        ? 'Files'
+                        : getResourceConfig(previous.type).label
+                    : null
+                  const startsSection = sectionLabel !== previousSection
                   return (
-                    <React.Fragment key={`${type}:${item.workspaceId ?? ''}:${item.id}`}>
-                      {startsSection && <DropdownMenuLabel>{config.label}</DropdownMenuLabel>}
+                    <React.Fragment
+                      key={`${type}:${'workspaceId' in item ? item.workspaceId : ''}:${item.id}`}
+                    >
+                      {startsSection && <DropdownMenuLabel>{sectionLabel}</DropdownMenuLabel>}
                       <button
                         type='button'
                         role='menuitem'
                         data-filtered-idx={index}
                         onMouseEnter={() => setActiveIndex(index)}
                         onClick={() => {
-                          handleSelect(resourceFromItem(type, item))
+                          handleCandidateSelect(candidate)
                         }}
                         className={cn(
                           dropdownMenuRowClass,
@@ -454,8 +510,15 @@ export const PlusMenuDropdown = React.memo(
                           isActive && 'bg-[var(--surface-hover)]'
                         )}
                       >
-                        {config.renderDropdownItem({ item })}
-                        {typeof item.workspaceName === 'string' && (
+                        {config ? (
+                          config.renderDropdownItem({ item })
+                        ) : (
+                          <>
+                            <Workspaces className='size-[14px] shrink-0 text-[var(--text-icon)]' />
+                            <span className='truncate'>{item.name}</span>
+                          </>
+                        )}
+                        {'workspaceName' in item && typeof item.workspaceName === 'string' && (
                           <span className='ml-auto text-[var(--text-muted)] text-xs'>
                             {item.workspaceName}
                           </span>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
index 9c44f63fe36..63ab704b60f 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
@@ -226,6 +226,7 @@ export function PromptEditor({
             organizationId={editor.organizationId}
             warm={hasFocused}
             onResourceSelect={editor.insertResource}
+            onWorkspaceSelect={editor.insertWorkspace}
             onClose={editor.handlePlusMenuClose}
             textareaRef={editor.textareaRef}
             pendingCursorRef={editor.pendingCursorRef}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
index b668558afb2..8ec727c341f 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
@@ -448,15 +448,13 @@ export function usePromptEditor({
     }
   }, [textareaRef])
 
-  const insertResource = useCallback(
-    (resource: MothershipResource, selected = contextManagementRef.current.selectedContexts) => {
-      const mapped = mapResourceToContext(resource)
-      if (!mapped) return
-      const ownerWorkspaceId = resource.workspaceId ?? workspaceIdRef.current
-      const candidate =
-        organizationId && ownerWorkspaceId ? { ...mapped, workspaceId: ownerWorkspaceId } : mapped
+  const insertMentionContext = useCallback(
+    (candidate: ChatContext, selected = contextManagementRef.current.selectedContexts) => {
       const context =
-        organizationId || candidate.kind === 'folder' || candidate.kind === 'filefolder'
+        organizationId ||
+        candidate.kind === 'workspace' ||
+        candidate.kind === 'folder' ||
+        candidate.kind === 'filefolder'
           ? (selected.find(
               (current) => current.kind === candidate.kind && areContextsEqual(current, candidate)
             ) ?? { ...candidate, label: uniqueContextLabel(candidate.label, selected) })
@@ -502,6 +500,24 @@ export function usePromptEditor({
     [textareaRef, addContextNotified, organizationId]
   )
 
+  const insertResource = useCallback(
+    (resource: MothershipResource, selected = contextManagementRef.current.selectedContexts) => {
+      const mapped = mapResourceToContext(resource)
+      if (!mapped) return
+      const ownerWorkspaceId = resource.workspaceId ?? workspaceIdRef.current
+      const candidate =
+        organizationId && ownerWorkspaceId ? { ...mapped, workspaceId: ownerWorkspaceId } : mapped
+      return insertMentionContext(candidate, selected)
+    },
+    [insertMentionContext, organizationId]
+  )
+
+  const insertWorkspace = useCallback(
+    (workspace: { id: string; name: string }) =>
+      insertMentionContext({ kind: 'workspace', workspaceId: workspace.id, label: workspace.name }),
+    [insertMentionContext]
+  )
+
   /**
    * Inserts a batch of resources as `@title` chips (drag-drop path), then
    * resets the insert anchor so the next non-drop insert uses the cursor.
@@ -1320,6 +1336,8 @@ export function usePromptEditor({
     /** @internal */
     insertResource,
     /** @internal */
+    insertWorkspace,
+    /** @internal */
     handleSkillSelect,
     /** @internal */
     handleMcpSelect,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
index 0b99341558f..e1669a4ca10 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
@@ -252,6 +252,8 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
     const curr = editor.contexts
     const contextId = (ctx: ChatContext): string => {
       switch (ctx.kind) {
+        case 'workspace':
+          return `workspace:${ctx.workspaceId}`
         case 'workflow':
         case 'current_workflow':
           return `${ctx.kind}:${ctx.workflowId}`
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
index fec8dd4e78a..85945554d8d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
@@ -66,6 +66,8 @@ function isChatContext(value: unknown): value is ChatContext {
   }
 
   switch (value.kind) {
+    case 'workspace':
+      return typeof value.workspaceId === 'string'
     case 'past_chat':
       return typeof value.chatId === 'string'
     case 'workflow':
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
index 15de9ecf2f0..9a761617dc3 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -3386,6 +3386,7 @@ export function useChat(
       const messageContexts: ChatMessageContext[] | undefined = contexts?.map((c) => ({
         kind: c.kind,
         label: c.label,
+        ...(c.kind === 'workspace' ? { workspaceId: c.workspaceId } : {}),
         ...('workflowId' in c && c.workflowId ? { workflowId: c.workflowId } : {}),
         ...('knowledgeId' in c && c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
         ...('tableId' in c && c.tableId ? { tableId: c.tableId } : {}),
diff --git a/apps/sim/app/workspace/[workspaceId]/home/types.ts b/apps/sim/app/workspace/[workspaceId]/home/types.ts
index 71f7845fac9..df627bf7cee 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/types.ts
@@ -161,6 +161,7 @@ export interface ChatMessageAttachment {
 export interface ChatMessageContext {
   kind: ChatContextKind
   label: string
+  workspaceId?: string
   workflowId?: string
   knowledgeId?: string
   tableId?: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
index ba7adf37342..9d223901481 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
@@ -183,6 +183,8 @@ export function areContextsEqual(c: ChatContext, context: ChatContext): boolean
   const otherOwner = 'workspaceId' in context ? context.workspaceId : undefined
   if (owner !== otherOwner) return false
   switch (c.kind) {
+    case 'workspace':
+      return context.kind === 'workspace' && c.workspaceId === context.workspaceId
     case 'past_chat': {
       const ctx = context as PastChatContext
       return c.chatId === ctx.chatId
diff --git a/apps/sim/lib/mothership/chat/display-message.ts b/apps/sim/lib/mothership/chat/display-message.ts
index fbe3d568e3c..f9119fc3394 100644
--- a/apps/sim/lib/mothership/chat/display-message.ts
+++ b/apps/sim/lib/mothership/chat/display-message.ts
@@ -135,6 +135,7 @@ function toDisplayContexts(
   return contexts.map((c) => ({
     kind: c.kind as ChatContextKind,
     label: c.label,
+    ...(c.workspaceId ? { workspaceId: c.workspaceId } : {}),
     ...(c.workflowId ? { workflowId: c.workflowId } : {}),
     ...(c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
     ...(c.tableId ? { tableId: c.tableId } : {}),
diff --git a/apps/sim/lib/mothership/chat/persisted-message.test.ts b/apps/sim/lib/mothership/chat/persisted-message.test.ts
index 78861c7169c..c3cd5f9eac4 100644
--- a/apps/sim/lib/mothership/chat/persisted-message.test.ts
+++ b/apps/sim/lib/mothership/chat/persisted-message.test.ts
@@ -459,6 +459,20 @@ describe('persisted-message', () => {
     expect(msg.contexts).toBeUndefined()
   })
 
+  it('keeps the stable workspace address through storage and display', () => {
+    const persisted = buildPersistedUserMessage({
+      id: 'user-workspace',
+      content: '@Planning Review the plan',
+      contexts: [{ kind: 'workspace', label: 'Planning', workspaceId: 'ws-planning' }],
+    })
+    const normalized = normalizeMessage(persisted as unknown as Record<string, unknown>)
+
+    expect(normalized.contexts).toEqual([
+      { kind: 'workspace', label: 'Planning', workspaceId: 'ws-planning' },
+    ])
+    expect(toDisplayMessage(normalized).contexts).toEqual(normalized.contexts)
+  })
+
   it('persists the source names a selection chip renders from, but not its payload', () => {
     const contexts = [
       {
diff --git a/apps/sim/lib/mothership/chat/persisted-message.ts b/apps/sim/lib/mothership/chat/persisted-message.ts
index 2e15cabb9da..77abc89604e 100644
--- a/apps/sim/lib/mothership/chat/persisted-message.ts
+++ b/apps/sim/lib/mothership/chat/persisted-message.ts
@@ -37,6 +37,7 @@ export interface PersistedFileAttachment {
 interface PersistedMessageContext {
   kind: string
   label: string
+  workspaceId?: string
   workflowId?: string
   knowledgeId?: string
   tableId?: string
@@ -438,6 +439,7 @@ export function buildPersistedUserMessage(params: UserMessageParams): PersistedM
     message.contexts = params.contexts.map((c) => ({
       kind: c.kind,
       label: c.label,
+      ...(c.workspaceId ? { workspaceId: c.workspaceId } : {}),
       ...(c.workflowId ? { workflowId: c.workflowId } : {}),
       ...(c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
       ...(c.tableId ? { tableId: c.tableId } : {}),
@@ -789,6 +791,7 @@ export function normalizeMessage(raw: Record<string, unknown>): PersistedMessage
     msg.contexts = rawContexts.map((c) => ({
       kind: c.kind,
       label: c.label,
+      ...(c.workspaceId ? { workspaceId: c.workspaceId } : {}),
       ...(c.workflowId ? { workflowId: c.workflowId } : {}),
       ...(c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
       ...(c.tableId ? { tableId: c.tableId } : {}),
diff --git a/apps/sim/lib/mothership/chat/post.test.ts b/apps/sim/lib/mothership/chat/post.test.ts
index 6e94a8a6b7c..9fd4b1ad1ce 100644
--- a/apps/sim/lib/mothership/chat/post.test.ts
+++ b/apps/sim/lib/mothership/chat/post.test.ts
@@ -651,6 +651,67 @@ describe('handleUnifiedChatPost', () => {
     }
   )
 
+  it('validates workspace tags and forwards multiple IDs in an organization send', async () => {
+    const contexts = [
+      { kind: 'workspace', workspaceId: 'ws-a', label: 'Planning' },
+      { kind: 'workspace', workspaceId: 'ws-b', label: 'Operations' },
+    ]
+    const response = await handleUnifiedChatPost(
+      new NextRequest('http://localhost/api/mothership/chat', {
+        method: 'POST',
+        body: JSON.stringify({
+          message: 'Review both workspaces',
+          organizationId: 'org-1',
+          mode: 'agent',
+          contexts,
+        }),
+      })
+    )
+
+    expect(response.status).toBe(200)
+    expect(processContextsServer).toHaveBeenCalledWith(
+      contexts,
+      'user-1',
+      'Review both workspaces',
+      undefined,
+      'chat-1',
+      expect.any(ResolvedSecretTraceRegistry),
+      'org-1'
+    )
+
+    const invalid = await handleUnifiedChatPost(
+      new NextRequest('http://localhost/api/mothership/chat', {
+        method: 'POST',
+        body: JSON.stringify({
+          message: 'Review this workspace',
+          organizationId: 'org-1',
+          mode: 'agent',
+          contexts: [{ kind: 'workspace', label: 'Missing ID' }],
+        }),
+      })
+    )
+    expect(invalid.status).toBe(400)
+  })
+
+  it('refuses an unauthorized workspace tag before starting the agent', async () => {
+    processContextsServer.mockRejectedValueOnce(new OrchestrationError('not_found', 'Workspace'))
+    const response = await handleUnifiedChatPost(
+      new NextRequest('http://localhost/api/mothership/chat', {
+        method: 'POST',
+        body: JSON.stringify({
+          message: 'Review this workspace',
+          organizationId: 'org-1',
+          mode: 'agent',
+          contexts: [{ kind: 'workspace', workspaceId: 'foreign', label: 'Foreign' }],
+        }),
+      })
+    )
+
+    expect(response.status).toBe(403)
+    expect(buildCopilotRequestPayload).not.toHaveBeenCalled()
+    expect(createSSEStream).not.toHaveBeenCalled()
+  })
+
   it('builds Assistant from only personal accounts and the selected Search scope', async () => {
     dbChainMockFns.returning.mockResolvedValueOnce([{ model: null }])
     getSession.mockResolvedValue({ user: { id: 'user-1' }, session: { id: 'session-1' } })
diff --git a/apps/sim/lib/mothership/chat/post.ts b/apps/sim/lib/mothership/chat/post.ts
index 7216025e601..decb3e768cb 100644
--- a/apps/sim/lib/mothership/chat/post.ts
+++ b/apps/sim/lib/mothership/chat/post.ts
@@ -193,6 +193,7 @@ const TerminalTextSelectionSchema = z
 const ChatContextSchema = z
   .object({
     kind: z.enum([
+      'workspace',
       'past_chat',
       'workflow',
       'current_workflow',
@@ -242,7 +243,14 @@ const ChatContextSchema = z
     columnIds: z.array(z.string()).max(MAX_TABLE_SELECTION_COLUMNS).optional(),
     selection: z.union([BrowserTextSelectionSchema, TerminalTextSelectionSchema]).optional(),
   })
-  .superRefine(({ kind, selection }, refinementContext) => {
+  .superRefine(({ kind, selection, workspaceId }, refinementContext) => {
+    if (kind === 'workspace' && !workspaceId) {
+      refinementContext.addIssue({
+        code: 'custom',
+        message: 'workspace context requires a workspace ID',
+        path: ['workspaceId'],
+      })
+    }
     if (!selection) return
     const isTerminalSelection = 'startLine' in selection
     const selectionMatchesKind =
@@ -547,6 +555,7 @@ async function resolveAgentContexts(params: {
       )
     } catch (error) {
       logger.error(`[${requestId}] Failed to process contexts`, error)
+      if (contexts.some((context) => context.kind === 'workspace')) throw error
     }
   }
 
diff --git a/apps/sim/lib/mothership/chat/process-contents.test.ts b/apps/sim/lib/mothership/chat/process-contents.test.ts
index 50625f8e44b..1156a722759 100644
--- a/apps/sim/lib/mothership/chat/process-contents.test.ts
+++ b/apps/sim/lib/mothership/chat/process-contents.test.ts
@@ -1847,6 +1847,70 @@ describe('table view context', () => {
   })
 })
 
+describe('organization workspace tags', () => {
+  it('uses authorized IDs and current names for multiple focus cues', async () => {
+    resolveInvocationWorkspace.mockImplementation(async (_owner, workspaceId) => ({ workspaceId }))
+    dbChainMockFns.limit.mockResolvedValueOnce([{ name: 'Current name' }])
+    dbChainMockFns.limit.mockResolvedValueOnce([{ name: 'Current name' }])
+
+    const result = await processContextsServer(
+      [
+        { kind: 'workspace', workspaceId: 'workspace-a', label: 'Old name' },
+        { kind: 'workspace', workspaceId: 'workspace-b', label: 'Second' },
+      ],
+      'user',
+      'Review both',
+      undefined,
+      'chat',
+      undefined,
+      'org'
+    )
+
+    expect(result).toHaveLength(2)
+    expect(result.map(({ type }) => type)).toEqual(['workspace', 'workspace'])
+    expect(result[0]?.content).toContain('"id":"workspace-a","name":"Current name"')
+    expect(result[1]?.content).toContain('"id":"workspace-b","name":"Current name"')
+    expect(result[0]?.content).not.toContain('Old name')
+    expect(resolveInvocationWorkspace).toHaveBeenCalledWith(
+      { userId: 'user', organizationId: 'org', chatId: 'chat' },
+      'workspace-a'
+    )
+    expect(resolveInvocationWorkspace).toHaveBeenCalledWith(
+      { userId: 'user', organizationId: 'org', chatId: 'chat' },
+      'workspace-b'
+    )
+  })
+
+  it('rejects an inaccessible or stale workspace instead of dropping its tag', async () => {
+    resolveInvocationWorkspace.mockRejectedValueOnce(new Error('Workspace not found'))
+    await expect(
+      processContextsServer(
+        [{ kind: 'workspace', workspaceId: 'foreign', label: 'Foreign' }],
+        'user',
+        'Review this',
+        undefined,
+        'chat',
+        undefined,
+        'org'
+      )
+    ).rejects.toThrow('Workspace not found')
+
+    resolveInvocationWorkspace.mockResolvedValueOnce({ workspaceId: 'removed' })
+    dbChainMockFns.limit.mockResolvedValueOnce([])
+    await expect(
+      processContextsServer(
+        [{ kind: 'workspace', workspaceId: 'removed', label: 'Removed' }],
+        'user',
+        'Review this',
+        undefined,
+        'chat',
+        undefined,
+        'org'
+      )
+    ).rejects.toThrow('Tagged workspace is unavailable')
+  })
+})
+
 describe('organization skill mention targets', () => {
   beforeEach(() => {
     resolveInvocationWorkspace.mockImplementation(async (_owner, workspaceId) => {
diff --git a/apps/sim/lib/mothership/chat/process-contents.ts b/apps/sim/lib/mothership/chat/process-contents.ts
index 2c63211401e..4f4107c492e 100644
--- a/apps/sim/lib/mothership/chat/process-contents.ts
+++ b/apps/sim/lib/mothership/chat/process-contents.ts
@@ -1,4 +1,5 @@
 import { db } from '@sim/db'
+import { workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import {
   authorizeWorkflowByWorkspacePermission,
@@ -9,6 +10,7 @@ import { eq } from 'drizzle-orm'
 import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership-resources'
 import { EnvCapabilityConfigurationError } from '@/lib/core/config/env-capabilities'
 import { getAllowedIntegrationsFromEnv } from '@/lib/core/config/env-flags'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { mapWithConcurrency } from '@/lib/core/utils/concurrency'
 import { isIntegrationDeploymentAvailableForVisibility } from '@/lib/integrations/availability.server'
 import { readKnowledgeBase } from '@/lib/knowledge/application/knowledge-bases'
@@ -57,6 +59,7 @@ import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secr
 import type { BrowserTextSelection, ChatContext, TerminalTextSelection } from '@/stores/panel'
 
 type AgentContextType =
+  | 'workspace'
   | 'past_chat'
   | 'workflow'
   | 'current_workflow'
@@ -134,6 +137,25 @@ export async function processContextsServer(
     : undefined
   const resolveContext = async (ctx: ChatContext) => {
     try {
+      if (ctx.kind === 'workspace') {
+        if (!organizationId || !chatId)
+          throw new OrchestrationError('validation', 'Workspace tags require an organization chat')
+        const target = await resolveInvocationWorkspace(
+          { userId, organizationId, chatId },
+          ctx.workspaceId
+        )
+        const [row] = await db
+          .select({ name: workspace.name })
+          .from(workspace)
+          .where(eq(workspace.id, target.workspaceId))
+          .limit(1)
+        if (!row) throw new OrchestrationError('not_found', 'Tagged workspace is unavailable')
+        return {
+          type: 'workspace' as const,
+          tag: ctx.label ? `@${ctx.label}` : '@',
+          content: `The user tagged workspace ${JSON.stringify({ id: target.workspaceId, name: row.name })}. Focus this request on that workspace. Use its ID for workspace-specific operations.`,
+        }
+      }
       if (ctx.kind === 'skill' && ctx.skillId) {
         // Global code-owned templates do not require an arbitrary workspace.
         const builtin = organizationId ? getBuiltinSkillById(ctx.skillId) : undefined
@@ -348,6 +370,7 @@ export async function processContextsServer(
       return null
     } catch (error) {
       logger.error('Failed processing context (server)', { ctx, error })
+      if (ctx.kind === 'workspace') throw error
       return null
     }
   }
diff --git a/apps/sim/stores/panel/types.ts b/apps/sim/stores/panel/types.ts
index a851d651f23..d894e9251db 100644
--- a/apps/sim/stores/panel/types.ts
+++ b/apps/sim/stores/panel/types.ts
@@ -32,6 +32,7 @@ export interface TerminalTextSelection {
 }
 
 export type ChatContext =
+  | { kind: 'workspace'; workspaceId: string; label: string }
   | { kind: 'past_chat'; chatId: string; label: string }
   | { kind: 'workflow'; workflowId: string; label: string }
   | { kind: 'current_workflow'; workflowId: string; label: string }