@stack-spot/ai-chat-widget 1.18.0 → 1.20.0

package/src/views/Agents/AgentsTab.tsx

@@ -2,21 +2,32 @@ import { Button, IconBox, Text } from '@citric/core'
 import { Agent, Search } from '@citric/icons'
 import { Placeholder } from '@stack-spot/portal-components/Placeholder'
 import { MiniLogo } from '@stack-spot/portal-components/svg'
-import { agentClient } from '@stack-spot/portal-network'
+import { agentClient, workspaceAiClient } from '@stack-spot/portal-network'
 import { AgentResponse, VisibilityLevel } from '@stack-spot/portal-network/api/agent'
-import { useMemo, useState } from 'react'
+import { WorkspaceResponse } from '@stack-spot/portal-network/api/workspace-ai'
+import { useCallback, useMemo, useState } from 'react'
 import { ButtonFavorite } from '../../components/ButtonFavorite'
+import { NavigationComponent } from '../../components/ComponentNavigator'
 import { DescribedRadioGroup } from '../../components/form/DescribedRadioGroup'
 import { IconInput } from '../../components/IconInput'
+import { WorkspaceTabNavigator } from '../../components/WorkspaceTabNavigator'
 import { useCurrentChat } from '../../context/hooks'
 import { useRightPanel } from '../../right-panel/hooks'
+import { ChatProperties } from '../../state/ChatState'
 import { isAgentDefault } from '../../utils/agent'
 import { AgentDescription } from './AgentDescription'
 import { useAgentsDictionary } from './dictionary'
 import { AgentLabel } from './styled'
 import { useAgentFavorites } from './useAgentFavorites'
 
-export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT-IN' }) => {
+export interface AgentTabProps {
+  visibility: VisibilityLevel | 'BUILT-IN',
+  workspaceId?: string,
+  agent: React.MutableRefObject<ChatProperties['agent']>,
+  showSubmitButton?: boolean,
+}
+
+export const AgentsTab = ({ visibility, workspaceId, agent, showSubmitButton = true }: AgentTabProps) => {
   const t = useAgentsDictionary()
   const { close } = useRightPanel()
   const chat = useCurrentChat()
@@ -26,10 +37,14 @@ export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT
 
   const agentsBuiltIn = agentClient.publicAgents.useQuery({})
   const agentDefault = agentsBuiltIn.find((agent) => isAgentDefault(agent.slug))
-  const agents = visibility === 'BUILT-IN' ? agentsBuiltIn : agentClient.agents.useQuery({ visibility })
-  
+  const agents = workspaceId
+    ? workspaceAiClient.getAgentFromWorkspaceAi.useQuery({ workspaceId })
+    : visibility === 'BUILT-IN' ? agentsBuiltIn : agentClient.agents.useQuery({ visibility })
+
   const [value, setValue] = useState<AgentResponse | undefined>(
-    chat.get('agent') ? agents.find(a => a.id === chat.get('agent')?.id) : agentDefault,
+    agent.current
+      ? agents.find(a => a.id === agent.current?.id)
+      : chat.get('agent') ? agents.find(a => a.id === chat.get('agent')?.id) : agentDefault,
   )
 
   const filtered = useMemo(
@@ -53,6 +68,13 @@ export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT
     close()
   }
 
+  const onChange = useCallback((newValue: AgentResponse) => {
+    const isBuiltIn = visibility === 'BUILT-IN' || agentsBuiltIn.some((agent) => agent.id === newValue.id)
+
+    setValue(newValue)
+    agent.current = { ...newValue, builtIn: isBuiltIn, label: newValue.name }
+  }, [])
+
   return (
     <>
       <div className="content">
@@ -65,7 +87,7 @@ export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT
           )}
           keygen={a => a.id}
           value={value}
-          onChange={setValue}
+          onChange={onChange}
           renderLabel={({ name, avatar, id }) => (
             <AgentLabel>
               {id ? (avatar ? <img src={avatar} /> : <IconBox size="xs"><Agent /></IconBox>) : <MiniLogo />}
@@ -74,7 +96,7 @@ export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT
           )}
           renderDescription={a => <AgentDescription
             agentId={a.id}
-            visibility={visibility}            
+            visibility={visibility}
             description={a.description}
             llm={a.llm_config?.model_slug}
             numberOfKnowledgeSources={a.knowledge_sources_config?.knowledge_sources?.length ?? 0}
@@ -89,7 +111,18 @@ export const AgentsTab = ({ visibility }: { visibility: VisibilityLevel | 'BUILT
           <Placeholder title={t.noSearchResults} description={t.noSearchResultsDescription} className="no-data-placeholder" />}
         {!agents.length && <Placeholder title={t.noData} description={t.noDataDescription} />}
       </div>
-      {!!filtered.length && <Button onClick={submit} disabled={!value}>{t.apply}</Button>}
+      {!!filtered.length && showSubmitButton && <Button onClick={submit} disabled={!value}>{t.apply}</Button>}
     </>
   )
 }
+
+export function AgentsTabWorkspace({ agent, visibility, showSubmitButton }: AgentTabProps) {
+  const workspaceTabComponents = useMemo(() => ({ agent: AgentsTab }), [agent])
+
+  const buildNavigateParams = (workspace: WorkspaceResponse): NavigationComponent<typeof workspaceTabComponents> => ({
+    component: 'agent',
+    props: { visibility, workspaceId: workspace.id, agent, showSubmitButton },
+  })
+
+  return <WorkspaceTabNavigator components={workspaceTabComponents} getNavigateParam={buildNavigateParams} />
+}

package/src/views/Agents/dictionary.ts

@@ -17,6 +17,7 @@ const dictionary = {
     description: 'Description',
     favorites: 'Favorites',
     tools: 'Tools',
+    spots: 'Spots',
   },
   pt: {
     title: 'Agentes',
@@ -34,6 +35,8 @@ const dictionary = {
     description: 'Descrição',
     favorites: 'Favoritos',
     tools: 'Ferramentas',
+    spots: 'Spots',
+
   },
 } satisfies Dictionary
 

package/src/views/Chat/ChatMessage.tsx

@@ -1,12 +1,10 @@
-/* eslint-disable semi */
 import { Box, Button, Checkbox, Flex, IconBox, Input, Label, Radio, Text } from '@citric/core'
 import { Cog, Copy, Dislike, DislikeFill, Like, LikeFill, TimesCircle } from '@citric/icons'
 import { Avatar, Badge, IconButton } from '@citric/ui'
 import { agentClient } from '@stack-spot/portal-network'
 import { listToClass } from '@stack-spot/portal-theme'
 import { Dictionary, useTranslate } from '@stack-spot/portal-translate'
-import { debounce } from 'lodash'
-import { Dispatch, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { createElement, Dispatch, useCallback, useMemo, useRef, useState } from 'react'
 import { PhoneInput } from 'react-international-phone'
 import 'react-international-phone/style.css'
 import { Markdown } from '../../components/Markdown'
@@ -20,7 +18,18 @@ import { useChatScrollToBottomEffect } from './chat-scroll'
 import { onCopyAll, onCopyCode, onLikeOrDislike } from './events'
 import { StepsList } from './StepsList'
 
-interface Props {
+export interface CustomMessage {
+  /**
+   * React component to render before each message in the chat. It receives the message as a prop.
+   */
+  beforeMessage?: React.FC<{ message: ChatEntry }>,
+  /**
+   * React component to render after each message in the chat. It receives the message as a prop.
+   */
+  afterMessage?: React.FC<{ message: ChatEntry }>,
+}
+
+interface Props extends CustomMessage {
   /**
    * The ChatEntry to render.
    */
@@ -47,17 +56,6 @@ interface RenderInputsEntryProps {
 
 const RenderInputsEntry = ({ isLast, entry, value, setValue, labels, setLabels }: RenderInputsEntryProps) => {
   const chat = useCurrentChat()
-  
-  const handleChange = useCallback(
-    debounce((data) => {
-      setValue((prevValue) => [...prevValue, data.target.value]);
-    }, 500),
-    [],
-  )
-  
-  useEffect(() => () => {
-    handleChange.cancel();
-  }, [handleChange])
 
   const renderInputs = () => {
     if (entry.type === 'input-text') {
@@ -127,8 +125,22 @@ const RenderInputsEntry = ({ isLast, entry, value, setValue, labels, setLabels }
           <Text ml={3}>{option.label}</Text>
           {option.hasInput && option.value && labels.findIndex((label) => label === option.value)!== -1 &&
             <Box w={4} ml={2}>
-              <Input name={entry.name} {...entry.validations} onChange={(data) => handleChange(data)} 
-                required={true} sx={{ height: '30px' }} />
+              <Input
+                name={entry.name}
+                {...entry.validations}
+                onChange={(data) => {
+                  const customIndex = value.findIndex(v => !entry.options?.map(o => o.label).includes(v))
+                  if (customIndex === -1) {
+                    setValue([...value, data.target.value])
+                  } else {
+                    const newValue = [...value]
+                    newValue[customIndex] = data.target.value
+                    setValue(newValue)
+                  } 
+                }}
+                required={true}
+                sx={{ height: '30px' }}
+              />
             </Box>
           }
         </Flex>
@@ -157,7 +169,7 @@ const RenderInputsEntry = ({ isLast, entry, value, setValue, labels, setLabels }
 /**
  * Renders a message (ChatEntry) in the chat.
  */
-export const ChatMessage = ({ message, username, isLast }: Props) => {
+export const ChatMessage = ({ message, username, isLast, beforeMessage, afterMessage }: Props) => {
   const t = useTranslate(dictionary)
   const [liked, setLiked] = useState<boolean | undefined>()
   const [value, setValue] = useState<string[]>(message.getValue()?.initialValue ?? [])
@@ -271,6 +283,7 @@ export const ChatMessage = ({ message, username, isLast }: Props) => {
     <li key={entry.messageId} className={entry.agentType} ref={ref}>
       <div className="chat-message" ref={chatRef} onKeyDown={handleKeyDown} tabIndex={0}>
         <div className={`user-info ${entry.agentType}`}>{userInfo}</div>
+        {beforeMessage && createElement(beforeMessage, { message })}
         {(entry.content || entry.steps) && <div className={listToClass(['message-content', entry.card && 'card', entry.type])}>
           {!!entry.badges?.length && <div className="badges">
             {entry.badges.map((b, index) => <Badge key={index} palette={b.color ?? 'cyan'} appearance="square">{b.label}</Badge>)}
@@ -286,6 +299,7 @@ export const ChatMessage = ({ message, username, isLast }: Props) => {
           <Text appearance="microtext1">{entry.error}</Text>
         </div>
       )}
+      {afterMessage && createElement(afterMessage, { message })}
       {!!entry.tools?.length && <StackedBadge
         aria-label={t.openToolsPanel}
         title={t.openToolsPanel}

package/src/views/Chat/ChatMessages.tsx

@@ -1,9 +1,9 @@
 import { useMemo, useRef } from 'react'
 import { useChatMessages } from '../../context/hooks'
-import { ChatMessage } from './ChatMessage'
+import { ChatMessage, CustomMessage } from './ChatMessage'
 import { ChatList } from './styled'
 
-interface Props {
+interface Props extends CustomMessage {
   username: string,
   chatId: string,
 }
@@ -11,10 +11,17 @@ interface Props {
 /**
  * Renders all messages of a chat.
  */
-export const ChatMessages = ({ chatId, username }: Props) => {
+export const ChatMessages = ({ chatId, username, beforeMessage, afterMessage }: Props) => {
   const messages = useChatMessages(chatId)
   const items = useMemo(
-    () => messages.map((m, index) => <ChatMessage key={m.id} message={m} username={username} isLast={index === messages.length - 1} />),
+    () => messages.map((m, index) => <ChatMessage
+      key={m.id}
+      message={m}
+      username={username}
+      isLast={index === messages.length - 1}
+      beforeMessage={beforeMessage}
+      afterMessage={afterMessage}
+    />),
     [messages],
   )
   const ref = useRef<HTMLUListElement>(null)

package/src/views/Chat/StepsList.tsx

@@ -1,5 +1,5 @@
 import { Button, IconBox, Text } from '@citric/core'
-import { CheckCircleFill, Circle, PlayFill, TimesCircleFill } from '@citric/icons'
+import { CheckCircleFill, PlayFill, Spaces, TimesCircleFill } from '@citric/icons'
 import { LoadingCircular } from '@citric/ui'
 import { AnimatedHeight } from '@stack-spot/portal-components/AnimatedHeight'
 import { ChatStep, StepChatStep } from '@stack-spot/portal-network'
@@ -27,7 +27,7 @@ function getStatusIcon(status: ChatStep['status']) {
   switch (status) {
     case 'error': return <IconBox {...iconBoxProps}><TimesCircleFill /></IconBox>
     case 'success': return <IconBox {...iconBoxProps}><CheckCircleFill /></IconBox>
-    case 'pending': return <IconBox {...iconBoxProps}><Circle /></IconBox>
+    case 'pending': return <IconBox {...iconBoxProps}><Spaces /></IconBox>
     case 'running': return <LoadingCircular className="loading" colorScheme="inverse" size="xs" />
   }
 }

package/src/views/Chat/index.tsx

@@ -1,7 +1,8 @@
 import { useChatTabs } from '../../context/hooks'
+import { CustomMessage } from './ChatMessage'
 import { ChatMessages } from './ChatMessages'
 
-interface Props {
+interface Props extends CustomMessage {
   /**
    * The name of the user currently logged in.
    */
@@ -11,7 +12,7 @@ interface Props {
 /**
  * Renders the chat panel, with all of its messages.
  */
-export const Chat = ({ username }: Props) => {
+export const Chat = ({ username, beforeMessage, afterMessage }: Props) => {
   const { active } = useChatTabs()
-  return <ChatMessages key={active.id} chatId={active.id} username={username} />
+  return <ChatMessages key={active.id} chatId={active.id} username={username} beforeMessage={beforeMessage} afterMessage={afterMessage} />
 }

package/src/views/ChatHistory/utils.ts

@@ -1,4 +1,4 @@
-import { agentClient, aiClient, workspaceClient } from '@stack-spot/portal-network'
+import { agentClient, aiClient, workspaceAiClient, workspaceClient } from '@stack-spot/portal-network'
 import { ChatProperties } from '../../state/ChatState'
 import { LabeledWithImage } from '../../state/types'
 
@@ -44,9 +44,20 @@ export async function findWorkspace(id: string | null): Promise<ChatProperties['
  */
 export async function getAllAgents(): Promise<LabeledWithImage[]> {
   try {
-    const [agents, publicAgents] = await Promise.all([agentClient.agents.query({}), agentClient.publicAgents.query({})])
+    const [agentsAccount, agentsPersonal, agentsShared, publicAgents, workspaceAgents] = await Promise.all([
+      agentClient.agents.query({ visibility: 'ACCOUNT' }),
+      agentClient.agents.query({ visibility: 'PERSONAL' }),
+      agentClient.agents.query({ visibility: 'SHARED' }),
+      agentClient.publicAgents.query({}),
+
+      workspaceAiClient.workspacesContentsByType.query({ contentType: 'agent' }),
+    ])
+
+    const workspaceAgentsAsArray = workspaceAgents.flatMap(({ agents }) => agents)
     const builtInAgents = publicAgents.map((a) => ({ id: a.id, label: a.name, image: a.avatar, slug: a.slug, builtIn: true }))
-    return agents.map(a => ({ id: a.id, label: a.name, image: a.avatar, slug: a.slug, builtIn: false })).concat(builtInAgents)
+    return [...agentsAccount, ...agentsPersonal, ...agentsShared, ...workspaceAgentsAsArray]
+      .map(a => ({ id: a?.id, label: a?.name, image: a?.avatar, slug: a?.slug, builtIn: false }))
+      .concat(builtInAgents)
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error(error)

package/src/views/KnowledgeSources.tsx

@@ -1,24 +1,29 @@
 import { Button } from '@citric/core'
 import { Search } from '@citric/icons'
 import { Placeholder } from '@stack-spot/portal-components/Placeholder'
-import { aiClient, dataIntegrationClient } from '@stack-spot/portal-network'
+import { aiClient, dataIntegrationClient, workspaceAiClient } from '@stack-spot/portal-network'
 import { KnowledgeSourceItemResponse, VisibilityLevelEnum } from '@stack-spot/portal-network/api/ai'
+import { WorkspaceResponse } from '@stack-spot/portal-network/api/workspace-ai'
 import { Dictionary, useTranslate } from '@stack-spot/portal-translate'
 import { difference, uniqBy } from 'lodash'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { ButtonFavorite } from '../components/ButtonFavorite'
+import { NavigationComponent } from '../components/ComponentNavigator'
 import { DescribedCheckboxGroup } from '../components/form/DescribedCheckboxGroup'
 import { IconInput } from '../components/IconInput'
 import { RightPanelTabs } from '../components/RightPanelTabs'
+import { WorkspaceTabNavigator } from '../components/WorkspaceTabNavigator'
 import { useCurrentChat, useWidget, useWidgetState } from '../context/hooks'
 import { useRightPanel } from '../right-panel/hooks'
 import { ChatProperties } from '../state/ChatState'
 import { checkIsTrial } from '../utils/check-is-trial'
 
-interface TabProps {
+export interface TabProps {
   visibility: VisibilityLevelEnum,
-  onSubmit: () => void,
   allKS: React.MutableRefObject<ChatProperties['knowledgeSources']>,
+  workspaceId?: string,
+  showSubmitButton?: boolean,
+  onSubmit?: () => void,
 }
 
 export const KnowledgeSources = () => {
@@ -55,7 +60,7 @@ const KnowledgeSourcesPanel = () => {
   useEffect(() => {
     allKS.current = chat.get('knowledgeSources') ?? []
   }, [chat])
-  
+
   const tabs = isTrial ? [
     { title: t.favorites, content: <KnowledgeSourcesTab key="favorite" visibility="favorite" allKS={allKS} onSubmit={onSubmit} /> },
     { title: t.personal, content: <KnowledgeSourcesTab key="personal" visibility="personal" allKS={allKS} onSubmit={onSubmit} /> },
@@ -63,19 +68,23 @@ const KnowledgeSourcesPanel = () => {
     { title: t.favorites, content: <KnowledgeSourcesTab key="favorite" visibility="favorite" allKS={allKS} onSubmit={onSubmit} /> },
     { title: t.personal, content: <KnowledgeSourcesTab key="personal" visibility="personal" allKS={allKS} onSubmit={onSubmit} /> },
     { title: t.shared, content: <KnowledgeSourcesTab key="shared" visibility="shared" allKS={allKS} onSubmit={onSubmit} /> },
-    { title: t.account, content: <KnowledgeSourcesTab key="account" visibility="account" allKS={allKS} onSubmit={onSubmit} /> },
+    { title: t.spots, content: <KnowledgeSourcesTabWorkspace key="workspace" visibility="workspace" allKS={allKS} onSubmit={onSubmit} /> },
+    { title: t.account, content: <KnowledgeSourcesTab key="account" visibility="account" allKS={allKS} onSubmit={onSubmit} /> },    
   ]
-  
+
   return <RightPanelTabs key={chat.id} tabs={tabs} />
 }
 
-const KnowledgeSourcesTab = ({ visibility, allKS, onSubmit }: TabProps) => {
+export const KnowledgeSourcesTab = ({ visibility, allKS, onSubmit, workspaceId, showSubmitButton = true }: TabProps) => {
   const t = useTranslate(dictionary)
   const [filter, setFilter] = useState('')
-  
-  const knowledgeSources = aiClient.knowledgeSources.useQuery({ 
-    visibility, order: 'a-to-z', types: ['snippet', 'api', 'event', 'custom'], 
-  })
+
+  const knowledgeSources = workspaceId
+    ? workspaceAiClient.getKSFromWorkspaceAi.useQuery({ workspaceId })
+    : aiClient.knowledgeSources.useQuery({
+      visibility, order: 'a-to-z', types: ['snippet', 'api', 'event', 'custom'],
+    })
+
   const listFavorites = dataIntegrationClient.knowledgeSources.useQuery({ visibility: 'favorite' })
   const [addFavorite, pendingAddFav] = dataIntegrationClient.addFavoriteKnowledgeSource.useMutation()
   const [removeFavorite, pendingRemoveFav] = dataIntegrationClient.removeFavoriteKnowledgeSource.useMutation()
@@ -131,7 +140,7 @@ const KnowledgeSourcesTab = ({ visibility, allKS, onSubmit }: TabProps) => {
       reject(error)
     } 
   })
-  
+
   const [value, setValue] = useState<KnowledgeSourceItemResponse[]>((() => {
     const currentlySelected = allKS.current?.map(ks => ks.id)
     return knowledgeSources.filter(ks => currentlySelected?.includes(ks.slug))
@@ -139,7 +148,7 @@ const KnowledgeSourcesTab = ({ visibility, allKS, onSubmit }: TabProps) => {
   const filtered = useMemo(
     () => filter 
       // Recreate the list so that the favorites list is taken into account
-      ? knowledgeSources.filter(ks => value.includes(ks) || ks.name.toLocaleLowerCase().includes(filter.toLocaleLowerCase())) 
+      ? knowledgeSources.filter(ks => value.includes(ks) || ks.name.toLocaleLowerCase().includes(filter.toLocaleLowerCase()))
       : [...knowledgeSources]
     , [knowledgeSources, filter, value, listFavorites],
   )
@@ -181,11 +190,23 @@ const KnowledgeSourcesTab = ({ visibility, allKS, onSubmit }: TabProps) => {
         )}
         {!filtered.length && <Placeholder title={t.noData} description={t.noDataDescription} className="no-data-placeholder" />}
       </div>
-      {!!filtered.length && <Button onClick={onSubmit}>{t.apply}</Button>}
+      {!!filtered.length && showSubmitButton && <Button onClick={onSubmit}>{t.apply}</Button>}
     </>
   )
 }
 
+export function KnowledgeSourcesTabWorkspace({ allKS, onSubmit }: TabProps) {
+  const workspaceTabComponents = useMemo(() => ({ ks: KnowledgeSourcesTab }), [allKS, onSubmit])
+
+  const buildNavigateParams = (workspace: WorkspaceResponse): NavigationComponent<typeof workspaceTabComponents> => ({
+    component: 'ks',
+    props: { visibility: 'workspace', workspaceId: workspace.id, allKS, onSubmit },
+  })
+  
+  return <WorkspaceTabNavigator components={workspaceTabComponents} getNavigateParam={buildNavigateParams} />
+}
+
+
 const dictionary = {
   en: {
     title: 'Knowledge Sources',
@@ -199,6 +220,7 @@ const dictionary = {
     noSearchResultsDescription: 'Please, try another search term.',
     noData: 'There are no knowledge sources in this category yet.',
     noDataDescription: 'Use the tabs above to try other categories or use the AI portal to create new knowledge sources.',
+    spots: 'Spots',
   },
   pt: {
     title: 'Knowledge Sources',
@@ -212,5 +234,6 @@ const dictionary = {
     noSearchResultsDescription: 'Por favor, tente outra busca.',
     noData: 'Ainda não há knowledge sources nesta categoria.',
     noDataDescription: 'Use as abas acima para tentar outras categorias ou use o Portal AI para criar novos knowledge sources.',
+    spots: 'Spots',
   },
 } satisfies Dictionary

package/src/views/MessageInput/AgentSelector.tsx

@@ -1,6 +1,6 @@
 import { Flex, IconBox, Image } from '@citric/core'
 import { Agent } from '@citric/icons'
-import { agentClient } from '@stack-spot/portal-network'
+import { agentClient, workspaceAiClient } from '@stack-spot/portal-network'
 import { AgentResponse } from '@stack-spot/portal-network/api/agent'
 import { uniqBy } from 'lodash'
 import { useCallback } from 'react'
@@ -9,17 +9,23 @@ import { useCurrentChat, useCurrentChatState } from '../../context/hooks'
 import { agentRegex } from '../../regex'
 import { useAgentFavorites } from '../Agents/useAgentFavorites'
 
-const AgentItem = ({ avatar, name }: AgentResponse) => {
+type AgentWithSpaceName = AgentResponse & { spaceName?: string }
+
+const AgentItem = ({ avatar, name, spaceName }: AgentWithSpaceName) => {
   const avatarComponent = avatar ? <Image width="32" height="32" radius="full" src={avatar} /> : <IconBox size="md"><Agent /></IconBox>
 
   return <Flex flexWrap="nowrap" alignItems="center" sx={{ gap: '8px' }}>
     {avatarComponent}
-    <p className="selector-title">{name}</p>
+    <div>
+      <p className="selector-description">{spaceName}</p>
+      <p className="selector-title">{name}</p>
+    </div>
   </Flex>
 }
 
 export const AgentSelector = ({ inputRef, isTrial }: { isTrial: boolean,
-  inputRef: React.RefObject<HTMLTextAreaElement | HTMLInputElement>, }) => {
+  inputRef: React.RefObject<HTMLTextAreaElement | HTMLInputElement>,
+}) => {
   const chat = useCurrentChat()
   const isAgentEnabled = useCurrentChatState('features').agent
   
@@ -33,8 +39,10 @@ export const AgentSelector = ({ inputRef, isTrial }: { isTrial: boolean,
     const isBuiltIn = agent.visibility_level === 'builtIn' || builtInsAgents.some((builtInAgent) => builtInAgent.id === agent.id)
     chat.set(
       'agent',
-      { id: agent.id, label: agent.name, image: agent.avatar, slug: agent.slug, 
-        builtIn: isBuiltIn, visibility_level: agent.visibility_level },
+      {
+        id: agent.id, label: agent.name, image: agent.avatar, slug: agent.slug,
+        builtIn: isBuiltIn, visibility_level: agent.visibility_level,
+      },
     )
 
     if (!inputRef.current) return
@@ -46,6 +54,10 @@ export const AgentSelector = ({ inputRef, isTrial }: { isTrial: boolean,
     const personalAgents = agentClient.agents.useQuery({ visibility: 'PERSONAL' })
     const publicAgents = agentClient.publicAgents.useQuery({})
     const builtInsAgents = [...publicAgents.map((agent) => ({ ...agent, visibility_level: 'builtIn' }))]
+    const workspaceAgents = workspaceAiClient.workspacesContentsByType.useQuery({ contentType: 'agent' })
+
+    const workspaceAgentsWithWorkspaceName = workspaceAgents.flatMap(({ agents, space_name }) =>
+      agents?.map((agent) => ({ ...agent, spaceName: space_name }))) as AgentWithSpaceName[]
     let accountAgents: AgentResponse[] = []
     let sharedAgents: AgentResponse[] = []
     if (!isTrial) {
@@ -53,7 +65,7 @@ export const AgentSelector = ({ inputRef, isTrial }: { isTrial: boolean,
       sharedAgents = agentClient.agents.useQuery({ visibility: 'SHARED' }) || []
     }
 
-    return uniqBy([...personalAgents, ...accountAgents, ...sharedAgents, ...builtInsAgents], 'id')
+    return uniqBy([...personalAgents, ...workspaceAgentsWithWorkspaceName, ...accountAgents, ...sharedAgents, ...builtInsAgents], 'id')
   }
 
   return <Selector
@@ -66,7 +78,7 @@ export const AgentSelector = ({ inputRef, isTrial }: { isTrial: boolean,
       regex: agentRegex,
       urlBuilder: (agent) => `/agents/${agent?.id}`,
       searchProp: 'name',
-      sections:  isTrial ? ['favorite', 'personal', 'builtIn'] : ['favorite', 'personal', 'account', 'shared', 'builtIn'],
+      sections:  isTrial ? ['favorite', 'personal', 'builtIn'] : ['favorite', 'personal', 'workspace', 'account', 'shared', 'builtIn'],
       renderComponentItem: AgentItem,
       isEnabled: isAgentEnabled,
       onSelect: onSelectItem,

package/src/views/MessageInput/ButtonGroup.tsx

@@ -1,4 +1,4 @@
-import { ChevronRight, Code, KnowledgeSource, Send, Stack, Times, Workspace } from '@citric/icons'
+import { ChevronRight, Code, KnowledgeSource, Send, Spaces, Stack, Times } from '@citric/icons'
 import { IconButton } from '@citric/ui'
 import { listToClass } from '@stack-spot/portal-theme'
 import { useEffect, useRef } from 'react'
@@ -62,8 +62,8 @@ export const ButtonGroup = ({ onSend, onCancel, expanded, setExpanded, isLoading
           style={{ width: expanded ? featureButtonsWidth.current : 0 }}
         >
           {features.workspace && (
-            <IconButton aria-label={t.workspace} title={t.workspace} onClick={() => widget.set('panel', 'workspace')}>
-              <Workspace />
+            <IconButton aria-label={t.spot} title={t.spot} onClick={() => widget.set('panel', 'workspace')}>
+              <Spaces />
             </IconButton>
           )}
           {features.knowledgeSource && (

package/src/views/MessageInput/QuickCommandSelector.tsx

@@ -1,11 +1,13 @@
 import { QuickCommand } from '@citric/icons'
-import { aiClient } from '@stack-spot/portal-network'
-import { QuickCommandListResponse } from '@stack-spot/portal-network/api/ai'
+import { aiClient, workspaceAiClient } from '@stack-spot/portal-network'
+import { QuickCommandResponse } from '@stack-spot/portal-network/api/ai'
 import { useCallback } from 'react'
 import { Selector } from '../../components/Selector'
 import { useCurrentChat, useCurrentChatState } from '../../context/hooks'
 import { quickCommandRegex } from '../../regex'
 
+type QuickCommandResponseWithSpaceName = QuickCommandResponse & { spaceName?: string }
+
 export const QuickCommandSelector = ({ inputRef, isTrial }: 
   { isTrial: boolean, inputRef: React.RefObject<HTMLTextAreaElement | HTMLInputElement> }) => {
   const chat = useCurrentChat()
@@ -65,7 +67,7 @@ export const QuickCommandSelector = ({ inputRef, isTrial }:
     } 
   })
   
-  const onSelectItem = useCallback((qc: QuickCommandListResponse) => {
+  const onSelectItem = useCallback((qc: QuickCommandResponseWithSpaceName) => {
     const newValue = `/${qc.slug}`
     chat.set('nextMessage', newValue)
 
@@ -74,8 +76,19 @@ export const QuickCommandSelector = ({ inputRef, isTrial }:
     inputRef.current.focus()
   }, [chat, inputRef])
 
-  const QuickCommandItem = ({ slug, description }: QuickCommandListResponse) => <>
-    <p className="selector-title">/{slug.toUpperCase()}</p>
+  const getQuickCommands = () => {
+    const quickCommands = aiClient.quickCommands.useQuery({ order: 'a-to-z' })
+    const quickCommandsFiltered = quickCommands.filter((qc) => qc.visibility_level.toLowerCase() !== 'workspace')
+    const workspaceQuickCommands = workspaceAiClient.workspacesContentsByType.useQuery({ contentType: 'quick_command' })
+    const workspaceQuickCommandsWithWorkspaceName: QuickCommandResponseWithSpaceName[] = workspaceQuickCommands
+      .flatMap(({ qcs, space_name }) => qcs?.map((qc) => ({ ...qc, spaceName: space_name }))) as QuickCommandResponseWithSpaceName[]
+
+    return [...quickCommandsFiltered, ...workspaceQuickCommandsWithWorkspaceName]
+  }
+
+  const QuickCommandItem = ({ slug, description, spaceName }: QuickCommandResponseWithSpaceName) => <>
+    <p className="selector-description">{spaceName}</p>
+    <p className="selector-title">/{slug?.toUpperCase()}</p>
     <p className="selector-description">{description}</p>
   </>
 
@@ -95,7 +108,7 @@ export const QuickCommandSelector = ({ inputRef, isTrial }:
       isEnabled: isQuickCommandEnabled,
       onSelect: onSelectItem,
       renderComponentItem: QuickCommandItem,
-      useData: () => aiClient.quickCommands.useQuery({ order: 'a-to-z' }),
+      useData: getQuickCommands,
     }}
   />
 }

package/src/views/MessageInput/dictionary.ts

@@ -4,7 +4,7 @@ const dictionary = {
   en: {
     stack: 'Select stack',
     code: 'Open code editor',
-    workspace: 'Select workspace',
+    spot: 'Select spot',
     knowledgeSource: 'Select knowledge sources',
     agent: 'Select agent',
     collapse: 'Hide buttons',
@@ -14,7 +14,7 @@ const dictionary = {
     cancel: 'Cancel',
     removeConfig: 'Remove all the configuration',
     removeStack: 'Stop using the current stack',
-    removeWorkspace: 'Stop using the current workspace',
+    removeWorkspace: 'Stop using the current spot',
     removeKS: 'Stop using this knowledge source',
     selected: 'Selected',
     removeSelection: 'Remove current code selection',
@@ -23,7 +23,7 @@ const dictionary = {
   pt: {
     stack: 'Selecionar stack',
     code: 'Abrir editor de código',
-    workspace: 'Selecionar workspace',
+    spot: 'Selecionar spot',
     knowledgeSource: 'Selecionar knowledge sources',
     agent: 'Selecionar agente',
     collapse: 'Esconder botões',
@@ -33,7 +33,7 @@ const dictionary = {
     cancel: 'Cancelar',
     removeConfig: 'Remover todas as configurações',
     removeStack: 'Parar de usar a stack atual',
-    removeWorkspace: 'Parar de usar o workspace atual',
+    removeWorkspace: 'Parar de usar o spot atual',
     removeKS: 'Parar de usar este knowledge source',
     selected: 'Selecionado',
     removeSelection: 'Desfazer seleção de código',