- {tasksLoading ? (
+ {chatsLoading ? (
) : (
<>
- {tasks.length === 0 ? (
+ {chats.length === 0 ? (
No chats yet
) : null}
- {/* `selectTaskOnly` populates `selectedTasks` on every click, so
+ {/* `selectChatOnly` populates `selectedChats` on every click, so
a single entry just means "last clicked" — already conveyed by
`isCurrentRoute`. Highlight from selection only for explicit
multi-selection (size > 1), otherwise it lingers after navigating
- away from a task. */}
- {tasks.slice(0, visibleTaskCount).map((task) => {
- const isCurrentRoute = pathname === task.href
- const isRenaming = taskFlyoutRename.editingId === task.id
+ away from a chat. */}
+ {chats.slice(0, visibleChatCount).map((chat) => {
+ const isCurrentRoute = pathname === chat.href
+ const isRenaming = chatFlyoutRename.editingId === chat.id
const isSelected =
- task.id !== 'new' &&
- hasTaskMultiSelection &&
- selectedTasks.has(task.id)
+ chat.id !== 'new' &&
+ hasChatMultiSelection &&
+ selectedChats.has(chat.id)
if (isRenaming) {
return (
taskFlyoutRename.setValue(e.target.value)}
- onKeyDown={taskFlyoutRename.handleKeyDown}
- onBlur={handleTaskRenameBlur}
+ ref={chatFlyoutRename.inputRef}
+ value={chatFlyoutRename.value}
+ onChange={(e) => chatFlyoutRename.setValue(e.target.value)}
+ onKeyDown={chatFlyoutRename.handleKeyDown}
+ onBlur={handleChatRenameBlur}
className='min-w-0 flex-1 border-none bg-transparent text-[14px] text-[var(--text-body)] outline-none'
/>
@@ -1442,37 +1442,37 @@ export const Sidebar = memo(function Sidebar() {
}
return (
-
)
})}
- {tasks.length > 5 && (
+ {chats.length > 5 && (
)}
@@ -1714,36 +1714,36 @@ export const Sidebar = memo(function Sidebar() {
/>
@@ -1772,7 +1772,7 @@ export const Sidebar = memo(function Sidebar() {
onOpenChange={setIsSearchModalOpen}
workflows={searchModalWorkflows}
workspaces={searchModalWorkspaces}
- tasks={tasks}
+ chats={chats}
tables={searchModalTables}
files={searchModalFiles}
knowledgeBases={searchModalKnowledgeBases}
diff --git a/apps/sim/hooks/queries/tasks.test.ts b/apps/sim/hooks/queries/mothership-chats.test.ts
similarity index 90%
rename from apps/sim/hooks/queries/tasks.test.ts
rename to apps/sim/hooks/queries/mothership-chats.test.ts
index 641ede02146..6555d30846d 100644
--- a/apps/sim/hooks/queries/tasks.test.ts
+++ b/apps/sim/hooks/queries/mothership-chats.test.ts
@@ -21,7 +21,11 @@ vi.mock('@tanstack/react-query', () => ({
useMutation: vi.fn((options) => options),
}))
-import { fetchChatHistory, fetchTasks, useAddChatResource } from '@/hooks/queries/tasks'
+import {
+ fetchMothershipChatHistory,
+ fetchMothershipChats,
+ useAddChatResource,
+} from '@/hooks/queries/mothership-chats'
function jsonResponse(body: unknown, init?: ResponseInit): Response {
return new Response(JSON.stringify(body), {
@@ -60,7 +64,7 @@ describe('tasks query boundary parsing', () => {
})
)
- const tasks = await fetchTasks('ws-1')
+ const tasks = await fetchMothershipChats('ws-1')
expect(tasks).toHaveLength(1)
expect(tasks[0]).toEqual(
@@ -92,7 +96,9 @@ describe('tasks query boundary parsing', () => {
})
)
- await expect(fetchTasks('ws-1')).rejects.toThrow('Response failed contract validation')
+ await expect(fetchMothershipChats('ws-1')).rejects.toThrow(
+ 'Response failed contract validation'
+ )
})
it('parses valid mothership chat history responses', async () => {
@@ -114,7 +120,7 @@ describe('tasks query boundary parsing', () => {
})
)
- const history = await fetchChatHistory('chat-1')
+ const history = await fetchMothershipChatHistory('chat-1')
expect(history).toEqual({
id: 'chat-1',
@@ -146,7 +152,7 @@ describe('tasks query boundary parsing', () => {
})
)
- await expect(fetchChatHistory('chat-1')).rejects.toThrow(
+ await expect(fetchMothershipChatHistory('chat-1')).rejects.toThrow(
'Invalid chat response: chat.resources[0].type is invalid'
)
})
diff --git a/apps/sim/hooks/queries/tasks.ts b/apps/sim/hooks/queries/mothership-chats.ts
similarity index 62%
rename from apps/sim/hooks/queries/tasks.ts
rename to apps/sim/hooks/queries/mothership-chats.ts
index 65a1d5c4bea..bc7743804d6 100644
--- a/apps/sim/hooks/queries/tasks.ts
+++ b/apps/sim/hooks/queries/mothership-chats.ts
@@ -14,11 +14,11 @@ import {
forkMothershipChatContract,
getMothershipChatContract,
listMothershipChatsContract,
- type MothershipTask,
+ type MothershipChat,
removeMothershipChatResourceContract,
reorderMothershipChatResourcesContract,
updateMothershipChatContract,
-} from '@/lib/api/contracts/mothership-tasks'
+} from '@/lib/api/contracts/mothership-chats'
import type { PersistedMessage } from '@/lib/copilot/chat/persisted-message'
import { normalizeMessage } from '@/lib/copilot/chat/persisted-message'
import {
@@ -29,7 +29,7 @@ import { isStreamBatchEvent, type StreamBatchEvent } from '@/lib/copilot/request
import { type MothershipResource, MothershipResourceType } from '@/lib/copilot/resources/types'
import { useMothershipQueueStore } from '@/stores/mothership-queue/store'
-export interface TaskMetadata {
+export interface MothershipChatMetadata {
id: string
name: string
updatedAt: Date
@@ -38,7 +38,7 @@ export interface TaskMetadata {
isPinned: boolean
}
-export interface TaskChatHistory {
+export interface MothershipChatHistory {
id: string
title: string | null
messages: PersistedMessage[]
@@ -51,12 +51,13 @@ export interface TaskChatHistory {
} | null
}
-export const taskKeys = {
- all: ['tasks'] as const,
- lists: () => [...taskKeys.all, 'list'] as const,
- list: (workspaceId: string | undefined) => [...taskKeys.lists(), workspaceId ?? ''] as const,
- details: () => [...taskKeys.all, 'detail'] as const,
- detail: (chatId: string | undefined) => [...taskKeys.details(), chatId ?? ''] as const,
+export const mothershipChatKeys = {
+ all: ['mothership-chats'] as const,
+ lists: () => [...mothershipChatKeys.all, 'list'] as const,
+ list: (workspaceId: string | undefined) =>
+ [...mothershipChatKeys.lists(), workspaceId ?? ''] as const,
+ details: () => [...mothershipChatKeys.all, 'detail'] as const,
+ detail: (chatId: string | undefined) => [...mothershipChatKeys.details(), chatId ?? ''] as const,
}
function isRecord(value: unknown): value is Record
{
@@ -80,7 +81,7 @@ function isResourceType(value: unknown): value is MothershipResource['type'] {
)
}
-function parseStreamSnapshot(value: unknown): TaskChatHistory['streamSnapshot'] {
+function parseStreamSnapshot(value: unknown): MothershipChatHistory['streamSnapshot'] {
if (!isRecord(value)) {
return null
}
@@ -140,7 +141,7 @@ function parseResources(value: unknown, context: string): MothershipResource[] {
function parseStrictStreamSnapshot(
value: unknown,
context: string
-): TaskChatHistory['streamSnapshot'] {
+): MothershipChatHistory['streamSnapshot'] {
if (value === undefined || value === null) {
return null
}
@@ -150,7 +151,7 @@ function parseStrictStreamSnapshot(
return snapshot
}
-function parseChatHistory(value: unknown): TaskChatHistory {
+function parseChatHistory(value: unknown): MothershipChatHistory {
const responseContext = 'Invalid chat response'
const chatContext = `${responseContext}: chat`
@@ -185,7 +186,7 @@ function parseChatResourcesResponse(value: unknown): { resources: MothershipReso
}
}
-function mapTask(chat: MothershipTask): TaskMetadata {
+function mapChat(chat: MothershipChat): MothershipChatMetadata {
const updatedAt = new Date(chat.updatedAt)
return {
id: chat.id,
@@ -199,34 +200,34 @@ function mapTask(chat: MothershipTask): TaskMetadata {
}
}
-export async function fetchTasks(
+export async function fetchMothershipChats(
workspaceId: string,
signal?: AbortSignal
-): Promise {
+): Promise {
const data = await requestJson(listMothershipChatsContract, {
query: { workspaceId },
signal,
})
- return data.data.map(mapTask)
+ return data.data.map(mapChat)
}
/**
- * Fetches mothership chat tasks for a workspace.
+ * Fetches mothership chat chats for a workspace.
* These are workspace-scoped conversations from the Home page.
*/
-export function useTasks(workspaceId?: string) {
+export function useMothershipChats(workspaceId?: string) {
return useQuery({
- queryKey: taskKeys.list(workspaceId),
- queryFn: workspaceId ? ({ signal }) => fetchTasks(workspaceId, signal) : skipToken,
+ queryKey: mothershipChatKeys.list(workspaceId),
+ queryFn: workspaceId ? ({ signal }) => fetchMothershipChats(workspaceId, signal) : skipToken,
placeholderData: keepPreviousData,
staleTime: 60 * 1000,
})
}
-export async function fetchChatHistory(
+export async function fetchMothershipChatHistory(
chatId: string,
signal?: AbortSignal
-): Promise {
+): Promise {
try {
const data = await requestJson(getMothershipChatContract, {
params: { chatId },
@@ -254,60 +255,59 @@ export async function fetchChatHistory(
}
/**
- * Fetches chat history for a single task (mothership chat).
- * Used by the task page to load an existing conversation.
+ * Fetches chat history for a single chat (mothership chat).
+ * Used by the chat page to load an existing conversation.
*/
-export function useChatHistory(chatId: string | undefined) {
+export function useMothershipChatHistory(chatId: string | undefined) {
return useQuery({
- queryKey: taskKeys.detail(chatId),
- queryFn: ({ signal }) => fetchChatHistory(chatId!, signal),
- enabled: Boolean(chatId),
+ queryKey: mothershipChatKeys.detail(chatId),
+ queryFn: chatId ? ({ signal }) => fetchMothershipChatHistory(chatId, signal) : skipToken,
staleTime: 30 * 1000,
})
}
-async function deleteTask(chatId: string): Promise {
+async function deleteChat(chatId: string): Promise {
await requestJson(deleteMothershipChatContract, {
params: { chatId },
})
}
/**
- * Deletes a mothership chat task and invalidates the task list.
+ * Deletes a mothership chat chat and invalidates the chat list.
*/
-export function useDeleteTask(workspaceId?: string) {
+export function useDeleteMothershipChat(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
- mutationFn: deleteTask,
+ mutationFn: deleteChat,
onSettled: (_data, _error, chatId) => {
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
- queryClient.removeQueries({ queryKey: taskKeys.detail(chatId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
+ queryClient.removeQueries({ queryKey: mothershipChatKeys.detail(chatId) })
useMothershipQueueStore.getState().clearChat(chatId)
},
})
}
/**
- * Deletes multiple mothership chat tasks and invalidates the task list.
+ * Deletes multiple mothership chat chats and invalidates the chat list.
*/
-export function useDeleteTasks(workspaceId?: string) {
+export function useDeleteMothershipChats(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
mutationFn: async (chatIds: string[]) => {
- await Promise.all(chatIds.map(deleteTask))
+ await Promise.all(chatIds.map(deleteChat))
},
onSettled: (_data, _error, chatIds) => {
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
const queueStore = useMothershipQueueStore.getState()
for (const chatId of chatIds) {
- queryClient.removeQueries({ queryKey: taskKeys.detail(chatId) })
+ queryClient.removeQueries({ queryKey: mothershipChatKeys.detail(chatId) })
queueStore.clearChat(chatId)
}
},
})
}
-async function renameTask({ chatId, title }: { chatId: string; title: string }): Promise {
+async function renameChat({ chatId, title }: { chatId: string; title: string }): Promise {
await requestJson(updateMothershipChatContract, {
params: { chatId },
body: { title },
@@ -315,31 +315,34 @@ async function renameTask({ chatId, title }: { chatId: string; title: string }):
}
/**
- * Renames a mothership chat task with optimistic update.
+ * Renames a mothership chat chat with optimistic update.
*/
-export function useRenameTask(workspaceId?: string) {
+export function useRenameMothershipChat(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
- mutationFn: renameTask,
+ mutationFn: renameChat,
onMutate: async ({ chatId, title }) => {
- await queryClient.cancelQueries({ queryKey: taskKeys.list(workspaceId) })
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
- const previousTasks = queryClient.getQueryData(taskKeys.list(workspaceId))
+ const previousChats = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
- queryClient.setQueryData(taskKeys.list(workspaceId), (old) =>
- old?.map((task) => (task.id === chatId ? { ...task, name: title } : task))
+ queryClient.setQueryData(
+ mothershipChatKeys.list(workspaceId),
+ (old) => old?.map((chat) => (chat.id === chatId ? { ...chat, name: title } : chat))
)
- return { previousTasks }
+ return { previousChats }
},
onError: (_err, _variables, context) => {
- if (context?.previousTasks) {
- queryClient.setQueryData(taskKeys.list(workspaceId), context.previousTasks)
+ if (context?.previousChats) {
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), context.previousChats)
}
},
onSettled: (_data, _error, variables) => {
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
- queryClient.invalidateQueries({ queryKey: taskKeys.detail(variables.chatId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(variables.chatId) })
},
})
}
@@ -360,14 +363,16 @@ export function useAddChatResource(chatId?: string) {
mutationFn: addChatResource,
onMutate: async ({ resource }) => {
if (!chatId) return
- await queryClient.cancelQueries({ queryKey: taskKeys.detail(chatId) })
- const previous = queryClient.getQueryData(taskKeys.detail(chatId))
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.detail(chatId) })
+ const previous = queryClient.getQueryData(
+ mothershipChatKeys.detail(chatId)
+ )
if (previous) {
const exists = previous.resources.some(
(r) => r.type === resource.type && r.id === resource.id
)
if (!exists) {
- queryClient.setQueryData(taskKeys.detail(chatId), {
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), {
...previous,
resources: [...previous.resources, resource],
})
@@ -377,12 +382,12 @@ export function useAddChatResource(chatId?: string) {
},
onError: (_err, _variables, context) => {
if (context?.previous && chatId) {
- queryClient.setQueryData(taskKeys.detail(chatId), context.previous)
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), context.previous)
}
},
onSettled: () => {
if (chatId) {
- queryClient.invalidateQueries({ queryKey: taskKeys.detail(chatId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(chatId) })
}
},
})
@@ -404,10 +409,12 @@ export function useReorderChatResources(chatId?: string) {
mutationFn: reorderChatResources,
onMutate: async ({ resources }) => {
if (!chatId) return
- await queryClient.cancelQueries({ queryKey: taskKeys.detail(chatId) })
- const previous = queryClient.getQueryData(taskKeys.detail(chatId))
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.detail(chatId) })
+ const previous = queryClient.getQueryData(
+ mothershipChatKeys.detail(chatId)
+ )
if (previous) {
- queryClient.setQueryData(taskKeys.detail(chatId), {
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), {
...previous,
resources,
})
@@ -416,12 +423,12 @@ export function useReorderChatResources(chatId?: string) {
},
onError: (_err, _variables, context) => {
if (context?.previous && chatId) {
- queryClient.setQueryData(taskKeys.detail(chatId), context.previous)
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), context.previous)
}
},
onSettled: () => {
if (chatId) {
- queryClient.invalidateQueries({ queryKey: taskKeys.detail(chatId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(chatId) })
}
},
})
@@ -444,11 +451,11 @@ export function useRemoveChatResource(chatId?: string) {
mutationFn: removeChatResource,
onMutate: async ({ resourceType, resourceId }) => {
if (!chatId) return
- await queryClient.cancelQueries({ queryKey: taskKeys.detail(chatId) })
- const removed: TaskChatHistory['resources'] = []
- queryClient.setQueryData(taskKeys.detail(chatId), (prev) => {
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.detail(chatId) })
+ const removed: MothershipChatHistory['resources'] = []
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), (prev) => {
if (!prev) return prev
- const next: TaskChatHistory['resources'] = []
+ const next: MothershipChatHistory['resources'] = []
for (const r of prev.resources) {
if (r.type === resourceType && r.id === resourceId) removed.push(r)
else next.push(r)
@@ -459,26 +466,26 @@ export function useRemoveChatResource(chatId?: string) {
},
onError: (_err, _variables, context) => {
if (!chatId || !context?.removed.length) return
- queryClient.setQueryData(taskKeys.detail(chatId), (prev) =>
+ queryClient.setQueryData(mothershipChatKeys.detail(chatId), (prev) =>
prev ? { ...prev, resources: [...prev.resources, ...context.removed] } : prev
)
},
onSettled: () => {
if (chatId) {
- queryClient.invalidateQueries({ queryKey: taskKeys.detail(chatId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(chatId) })
}
},
})
}
-async function markTaskRead(chatId: string): Promise {
+async function markChatRead(chatId: string): Promise {
await requestJson(updateMothershipChatContract, {
params: { chatId },
body: { isUnread: false },
})
}
-async function markTaskUnread(chatId: string): Promise {
+async function markChatUnread(chatId: string): Promise {
await requestJson(updateMothershipChatContract, {
params: { chatId },
body: { isUnread: true },
@@ -491,81 +498,87 @@ function applyUnreadFlag(
chatId: string,
isUnread: boolean
): void {
- const current = queryClient.getQueryData(taskKeys.list(workspaceId))
+ const current = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
if (!current) return
- queryClient.setQueryData(
- taskKeys.list(workspaceId),
- current.map((task) => (task.id === chatId ? { ...task, isUnread } : task))
+ queryClient.setQueryData(
+ mothershipChatKeys.list(workspaceId),
+ current.map((chat) => (chat.id === chatId ? { ...chat, isUnread } : chat))
)
}
/**
- * Marks a task as read with optimistic update.
+ * Marks a chat as read with optimistic update.
*
* The server only updates `lastSeenAt`, never `updatedAt`, so we deliberately
* do not invalidate the list cache — that would trigger a refetch that can
* reorder the sidebar if any unrelated server-side update landed in between.
*
* If there is no cached list yet (initial fetch still in flight, e.g. on
- * task-page refresh), we skip cancellation entirely so the in-flight fetch
+ * chat-page refresh), we skip cancellation entirely so the in-flight fetch
* can resolve normally — otherwise it would be orphaned and never refetched.
* `onSuccess` then reconciles whichever state the fetch produced.
*/
-export function useMarkTaskRead(workspaceId?: string) {
+export function useMarkMothershipChatRead(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
- mutationFn: markTaskRead,
+ mutationFn: markChatRead,
onMutate: async (chatId) => {
- const previousTasks = queryClient.getQueryData(taskKeys.list(workspaceId))
- if (!previousTasks) return { previousTasks }
+ const previousChats = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
+ if (!previousChats) return { previousChats }
- await queryClient.cancelQueries({ queryKey: taskKeys.list(workspaceId) })
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
applyUnreadFlag(queryClient, workspaceId, chatId, false)
- return { previousTasks }
+ return { previousChats }
},
onSuccess: (_data, chatId) => {
applyUnreadFlag(queryClient, workspaceId, chatId, false)
},
onError: (_err, _variables, context) => {
- if (context?.previousTasks) {
- queryClient.setQueryData(taskKeys.list(workspaceId), context.previousTasks)
+ if (context?.previousChats) {
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), context.previousChats)
}
},
})
}
/**
- * Marks a task as unread with optimistic update.
+ * Marks a chat as unread with optimistic update.
*
- * Same rationale as `useMarkTaskRead` — no list invalidation, since the server
+ * Same rationale as `useMarkMothershipChatRead` — no list invalidation, since the server
* only flips `lastSeenAt` and the optimistic update fully reflects the change.
*/
-export function useMarkTaskUnread(workspaceId?: string) {
+export function useMarkMothershipChatUnread(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
- mutationFn: markTaskUnread,
+ mutationFn: markChatUnread,
onMutate: async (chatId) => {
- const previousTasks = queryClient.getQueryData(taskKeys.list(workspaceId))
- if (!previousTasks) return { previousTasks }
+ const previousChats = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
+ if (!previousChats) return { previousChats }
- await queryClient.cancelQueries({ queryKey: taskKeys.list(workspaceId) })
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
applyUnreadFlag(queryClient, workspaceId, chatId, true)
- return { previousTasks }
+ return { previousChats }
},
onSuccess: (_data, chatId) => {
applyUnreadFlag(queryClient, workspaceId, chatId, true)
},
onError: (_err, _variables, context) => {
- if (context?.previousTasks) {
- queryClient.setQueryData(taskKeys.list(workspaceId), context.previousTasks)
+ if (context?.previousChats) {
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), context.previousChats)
}
},
})
}
-async function setTaskPinned({
+async function setChatPinned({
chatId,
pinned,
}: {
@@ -579,39 +592,41 @@ async function setTaskPinned({
}
/**
- * Pins or unpins a task with optimistic update. Pinned tasks are sorted to
+ * Pins or unpins a chat with optimistic update. Pinned chats are sorted to
* the top of the list by the server; the optimistic reducer preserves that
- * ordering by partitioning pinned and unpinned tasks while keeping each
+ * ordering by partitioning pinned and unpinned chats while keeping each
* partition in its existing order (server returns desc(updatedAt) within).
*/
-export function useSetTaskPinned(workspaceId?: string) {
+export function useSetMothershipChatPinned(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
- mutationFn: setTaskPinned,
+ mutationFn: setChatPinned,
onMutate: async ({ chatId, pinned }) => {
- await queryClient.cancelQueries({ queryKey: taskKeys.list(workspaceId) })
- const previousTasks = queryClient.getQueryData(taskKeys.list(workspaceId))
- if (!previousTasks) return { previousTasks: undefined }
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
+ const previousChats = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
+ if (!previousChats) return { previousChats: undefined }
- const updated = previousTasks.map((task) =>
- task.id === chatId ? { ...task, isPinned: pinned } : task
+ const updated = previousChats.map((chat) =>
+ chat.id === chatId ? { ...chat, isPinned: pinned } : chat
)
- const pinnedTasks = updated.filter((task) => task.isPinned)
- const unpinnedTasks = updated.filter((task) => !task.isPinned)
- queryClient.setQueryData(taskKeys.list(workspaceId), [
- ...pinnedTasks,
- ...unpinnedTasks,
+ const pinnedChats = updated.filter((chat) => chat.isPinned)
+ const unpinnedChats = updated.filter((chat) => !chat.isPinned)
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), [
+ ...pinnedChats,
+ ...unpinnedChats,
])
- return { previousTasks }
+ return { previousChats }
},
onError: (_err, _variables, context) => {
- if (context?.previousTasks) {
- queryClient.setQueryData(taskKeys.list(workspaceId), context.previousTasks)
+ if (context?.previousChats) {
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), context.previousChats)
}
},
onSettled: () => {
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
},
})
}
@@ -621,7 +636,7 @@ async function createChat(workspaceId: string): Promise<{ id: string }> {
return { id }
}
-export function useCreateTask(workspaceId?: string) {
+export function useCreateMothershipChat(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
mutationFn: () => {
@@ -630,8 +645,10 @@ export function useCreateTask(workspaceId?: string) {
},
onSuccess: (data) => {
if (!workspaceId) return
- const existing = queryClient.getQueryData(taskKeys.list(workspaceId)) ?? []
- const newTask: TaskMetadata = {
+ const existing =
+ queryClient.getQueryData(mothershipChatKeys.list(workspaceId)) ??
+ []
+ const newChat: MothershipChatMetadata = {
id: data.id,
name: 'New chat',
updatedAt: new Date(),
@@ -639,17 +656,17 @@ export function useCreateTask(workspaceId?: string) {
isUnread: false,
isPinned: false,
}
- const pinnedCount = existing.findIndex((task) => !task.isPinned)
+ const pinnedCount = existing.findIndex((chat) => !chat.isPinned)
const insertAt = pinnedCount === -1 ? existing.length : pinnedCount
- queryClient.setQueryData(taskKeys.list(workspaceId), [
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), [
...existing.slice(0, insertAt),
- newTask,
+ newChat,
...existing.slice(insertAt),
])
},
onSettled: () => {
if (!workspaceId) return
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
},
})
}
@@ -665,18 +682,20 @@ async function forkChat(params: {
return { id: data.id }
}
-export function useForkTask(workspaceId?: string) {
+export function useForkMothershipChat(workspaceId?: string) {
const queryClient = useQueryClient()
return useMutation({
mutationFn: forkChat,
onSuccess: async (data, variables) => {
if (!workspaceId) return
- await queryClient.cancelQueries({ queryKey: taskKeys.list(workspaceId) })
- const existing = queryClient.getQueryData(taskKeys.list(workspaceId))
+ await queryClient.cancelQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
+ const existing = queryClient.getQueryData(
+ mothershipChatKeys.list(workspaceId)
+ )
if (existing) {
- const sourceTask = existing.find((t) => t.id === variables.chatId)
- const baseName = (sourceTask?.name ?? 'New chat').replace(/^Fork \| /, '')
- const optimisticTask: TaskMetadata = {
+ const sourceChat = existing.find((t) => t.id === variables.chatId)
+ const baseName = (sourceChat?.name ?? 'New chat').replace(/^Fork \| /, '')
+ const optimisticChat: MothershipChatMetadata = {
id: data.id,
name: `Fork | ${baseName}`,
updatedAt: new Date(),
@@ -684,18 +703,18 @@ export function useForkTask(workspaceId?: string) {
isUnread: false,
isPinned: false,
}
- const pinnedCount = existing.findIndex((task) => !task.isPinned)
+ const pinnedCount = existing.findIndex((chat) => !chat.isPinned)
const insertAt = pinnedCount === -1 ? existing.length : pinnedCount
- queryClient.setQueryData(taskKeys.list(workspaceId), [
+ queryClient.setQueryData(mothershipChatKeys.list(workspaceId), [
...existing.slice(0, insertAt),
- optimisticTask,
+ optimisticChat,
...existing.slice(insertAt),
])
}
},
onSettled: () => {
if (!workspaceId) return
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
},
})
}
diff --git a/apps/sim/hooks/use-task-events.test.ts b/apps/sim/hooks/use-mothership-chat-events.test.ts
similarity index 83%
rename from apps/sim/hooks/use-task-events.test.ts
rename to apps/sim/hooks/use-mothership-chat-events.test.ts
index e81edbca6dd..de511c0bfa8 100644
--- a/apps/sim/hooks/use-task-events.test.ts
+++ b/apps/sim/hooks/use-mothership-chat-events.test.ts
@@ -4,10 +4,10 @@
import type { QueryClient } from '@tanstack/react-query'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { taskKeys } from '@/hooks/queries/tasks'
-import { handleTaskStatusEvent } from '@/hooks/use-task-events'
+import { mothershipChatKeys } from '@/hooks/queries/mothership-chats'
+import { handleMothershipChatStatusEvent } from '@/hooks/use-mothership-chat-events'
-describe('handleTaskStatusEvent', () => {
+describe('handleMothershipChatStatusEvent', () => {
const queryClient = {
getQueryData: vi.fn(),
invalidateQueries: vi.fn().mockResolvedValue(undefined),
@@ -20,7 +20,7 @@ describe('handleTaskStatusEvent', () => {
})
it('invalidates the task list and detail for completed task events', () => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -32,10 +32,10 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -49,7 +49,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -61,7 +61,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -75,7 +75,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -88,7 +88,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -102,7 +102,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -115,7 +115,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -129,7 +129,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -142,10 +142,10 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -159,7 +159,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -172,10 +172,10 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -189,7 +189,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -202,16 +202,16 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
it('invalidates the task list and detail for metadata-changing task events', () => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -223,16 +223,16 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
it('invalidates the task list and removes detail cache for deleted task events', () => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -244,16 +244,16 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).toHaveBeenCalledTimes(1)
expect(queryClient.removeQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
})
it('invalidates the task list and detail for started task events', () => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -265,10 +265,10 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -282,7 +282,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -294,7 +294,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -308,7 +308,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -321,7 +321,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -335,7 +335,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -348,7 +348,7 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
@@ -362,7 +362,7 @@ describe('handleTaskStatusEvent', () => {
resources: [],
})
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -375,16 +375,16 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(2)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.detail('chat-1'),
+ queryKey: mothershipChatKeys.detail('chat-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
it('keeps list invalidation only for unknown task event types', () => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
'ws-1',
JSON.stringify({
@@ -396,13 +396,13 @@ describe('handleTaskStatusEvent', () => {
expect(queryClient.invalidateQueries).toHaveBeenCalledTimes(1)
expect(queryClient.invalidateQueries).toHaveBeenCalledWith({
- queryKey: taskKeys.list('ws-1'),
+ queryKey: mothershipChatKeys.list('ws-1'),
})
expect(queryClient.removeQueries).not.toHaveBeenCalled()
})
it('does not invalidate when task event payload is invalid', () => {
- handleTaskStatusEvent(queryClient, 'ws-1', '{')
+ handleMothershipChatStatusEvent(queryClient, 'ws-1', '{')
expect(queryClient.invalidateQueries).not.toHaveBeenCalled()
expect(queryClient.removeQueries).not.toHaveBeenCalled()
diff --git a/apps/sim/hooks/use-task-events.ts b/apps/sim/hooks/use-mothership-chat-events.ts
similarity index 66%
rename from apps/sim/hooks/use-task-events.ts
rename to apps/sim/hooks/use-mothership-chat-events.ts
index b9a5216dad4..ad8f0d9d3fd 100644
--- a/apps/sim/hooks/use-task-events.ts
+++ b/apps/sim/hooks/use-mothership-chat-events.ts
@@ -3,31 +3,31 @@ import { createLogger } from '@sim/logger'
import type { QueryClient } from '@tanstack/react-query'
import { useQueryClient } from '@tanstack/react-query'
import { getLiveAssistantMessageId } from '@/lib/copilot/chat/effective-transcript'
-import { type TaskChatHistory, taskKeys } from '@/hooks/queries/tasks'
+import { type MothershipChatHistory, mothershipChatKeys } from '@/hooks/queries/mothership-chats'
-const logger = createLogger('TaskEvents')
+const logger = createLogger('MothershipChatEvents')
-const TASK_STATUS_TYPES = ['started', 'completed', 'created', 'deleted', 'renamed'] as const
-type TaskStatusEventType = (typeof TASK_STATUS_TYPES)[number]
-const TASK_STATUS_TYPE_SET = new Set(TASK_STATUS_TYPES)
+const CHAT_STATUS_TYPES = ['started', 'completed', 'created', 'deleted', 'renamed'] as const
+type ChatStatusEventType = (typeof CHAT_STATUS_TYPES)[number]
+const CHAT_STATUS_TYPE_SET = new Set(CHAT_STATUS_TYPES)
-interface TaskStatusEventPayload {
+interface ChatStatusEventPayload {
chatId?: string
- type?: TaskStatusEventType
+ type?: ChatStatusEventType
streamId?: string
}
-const DETAIL_INVALIDATING_TASK_STATUS_TYPES = new Set([
+const DETAIL_INVALIDATING_CHAT_STATUS_TYPES = new Set([
'started',
'completed',
'renamed',
])
-function isTaskStatusEventType(value: unknown): value is TaskStatusEventType {
- return typeof value === 'string' && TASK_STATUS_TYPE_SET.has(value)
+function isChatStatusEventType(value: unknown): value is ChatStatusEventType {
+ return typeof value === 'string' && CHAT_STATUS_TYPE_SET.has(value)
}
-function isLocalOptimisticActiveStream(current: TaskChatHistory | undefined) {
+function isLocalOptimisticActiveStream(current: MothershipChatHistory | undefined) {
if (!current?.activeStreamId) return false
const liveAssistantId = getLiveAssistantMessageId(current.activeStreamId)
return current.messages.some((message) => message.id === liveAssistantId)
@@ -39,7 +39,7 @@ function isLocalOptimisticActiveStream(current: TaskChatHistory | undefined) {
* If either stream is absent from the transcript, callers should refetch
* instead of inferring order from incomplete cache state.
*/
-function hasNewerKnownActiveStream(current: TaskChatHistory | undefined, streamId: string) {
+function hasNewerKnownActiveStream(current: MothershipChatHistory | undefined, streamId: string) {
if (!current?.activeStreamId || current.activeStreamId === streamId) return false
const activeIndex = current.messages.findIndex((message) => message.id === current.activeStreamId)
@@ -50,8 +50,8 @@ function hasNewerKnownActiveStream(current: TaskChatHistory | undefined, streamI
}
function shouldSkipDetailInvalidationForStreamEvent(
- current: TaskChatHistory | undefined,
- payload: TaskStatusEventPayload
+ current: MothershipChatHistory | undefined,
+ payload: ChatStatusEventPayload
) {
if (payload.type !== 'started' && payload.type !== 'completed') return false
if (!current?.activeStreamId) return false
@@ -66,7 +66,7 @@ function shouldSkipDetailInvalidationForStreamEvent(
)
}
-function parseTaskStatusEventPayload(data: unknown): TaskStatusEventPayload | null {
+function parseChatStatusEventPayload(data: unknown): ChatStatusEventPayload | null {
let parsed = data
if (typeof parsed === 'string') {
@@ -85,43 +85,46 @@ function parseTaskStatusEventPayload(data: unknown): TaskStatusEventPayload | nu
return {
...(typeof record.chatId === 'string' ? { chatId: record.chatId } : {}),
- ...(isTaskStatusEventType(record.type) ? { type: record.type } : {}),
+ ...(isChatStatusEventType(record.type) ? { type: record.type } : {}),
...(typeof record.streamId === 'string' ? { streamId: record.streamId } : {}),
}
}
-export function handleTaskStatusEvent(
+export function handleMothershipChatStatusEvent(
queryClient: Pick,
workspaceId: string,
data: unknown
): void {
- const payload = parseTaskStatusEventPayload(data)
+ const payload = parseChatStatusEventPayload(data)
if (!payload) {
logger.warn('Received invalid task_status payload')
return
}
- queryClient.invalidateQueries({ queryKey: taskKeys.list(workspaceId) })
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.list(workspaceId) })
if (!payload.chatId) return
if (payload.type === 'deleted') {
- queryClient.removeQueries({ queryKey: taskKeys.detail(payload.chatId) })
+ queryClient.removeQueries({ queryKey: mothershipChatKeys.detail(payload.chatId) })
return
}
if (payload.type === 'started' || payload.type === 'completed') {
- const current = queryClient.getQueryData(taskKeys.detail(payload.chatId))
+ const current = queryClient.getQueryData(
+ mothershipChatKeys.detail(payload.chatId)
+ )
if (shouldSkipDetailInvalidationForStreamEvent(current, payload)) {
return
}
}
- if (payload.type && DETAIL_INVALIDATING_TASK_STATUS_TYPES.has(payload.type)) {
- queryClient.invalidateQueries({ queryKey: taskKeys.detail(payload.chatId) })
+ if (payload.type && DETAIL_INVALIDATING_CHAT_STATUS_TYPES.has(payload.type)) {
+ queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(payload.chatId) })
}
}
/**
- * Subscribes to task status SSE events and invalidates task caches on changes.
+ * Subscribes to chat status SSE events and invalidates chat caches on changes.
+ * The SSE event name remains `task_status` for wire compatibility.
*/
-export function useTaskEvents(workspaceId: string | undefined) {
+export function useMothershipChatEvents(workspaceId: string | undefined) {
const queryClient = useQueryClient()
useEffect(() => {
@@ -132,7 +135,7 @@ export function useTaskEvents(workspaceId: string | undefined) {
)
eventSource.addEventListener('task_status', (event) => {
- handleTaskStatusEvent(
+ handleMothershipChatStatusEvent(
queryClient,
workspaceId,
event instanceof MessageEvent ? event.data : undefined
diff --git a/apps/sim/lib/api/contracts/mothership-tasks.ts b/apps/sim/lib/api/contracts/mothership-chats.ts
similarity index 98%
rename from apps/sim/lib/api/contracts/mothership-tasks.ts
rename to apps/sim/lib/api/contracts/mothership-chats.ts
index 6e29964cdbe..2c65c824c2c 100644
--- a/apps/sim/lib/api/contracts/mothership-tasks.ts
+++ b/apps/sim/lib/api/contracts/mothership-chats.ts
@@ -201,7 +201,7 @@ export const removeMothershipChatResourceContract = defineRouteContract({
},
})
-export const mothershipTaskSchema = z.object({
+export const mothershipChatSchema = z.object({
id: z.string(),
title: z.string().nullable(),
updatedAt: dateStringSchema,
@@ -218,7 +218,7 @@ export const listMothershipChatsContract = defineRouteContract({
mode: 'json',
schema: z.object({
success: z.literal(true),
- data: z.array(mothershipTaskSchema),
+ data: z.array(mothershipChatSchema),
}),
},
})
@@ -343,4 +343,4 @@ export const getMothershipChatContract = defineRouteContract({
},
})
-export type MothershipTask = z.infer
+export type MothershipChat = z.infer
diff --git a/apps/sim/lib/copilot/chat-status.ts b/apps/sim/lib/copilot/chat-status.ts
new file mode 100644
index 00000000000..221eb20ac9f
--- /dev/null
+++ b/apps/sim/lib/copilot/chat-status.ts
@@ -0,0 +1,42 @@
+/**
+ * Chat Status Pub/Sub Adapter
+ *
+ * Broadcasts chat status events across processes using Redis Pub/Sub.
+ * Gracefully falls back to process-local EventEmitter when Redis is unavailable.
+ *
+ * The Redis channel and SSE label retain the legacy `task:status_changed`
+ * identifier so live status updates keep flowing across pods during a rolling
+ * deploy (old and new pods must publish/subscribe on the same channel).
+ */
+
+import { createPubSubChannel, type PubSubChannel } from '@/lib/events/pubsub'
+
+interface ChatStatusEvent {
+ workspaceId: string
+ chatId: string
+ type: 'started' | 'completed' | 'created' | 'deleted' | 'renamed'
+ streamId?: string
+}
+
+type ChatPubSubGlobal = typeof globalThis & {
+ _chatStatusChannel?: PubSubChannel | null
+}
+
+const g = globalThis as ChatPubSubGlobal
+
+if (!('_chatStatusChannel' in g)) {
+ g._chatStatusChannel =
+ typeof window !== 'undefined'
+ ? null
+ : createPubSubChannel({ channel: 'task:status_changed', label: 'task' })
+}
+
+const channel = g._chatStatusChannel
+
+export const chatPubSub = channel
+ ? {
+ publishStatusChanged: (event: ChatStatusEvent) => channel.publish(event),
+ onStatusChanged: (handler: (event: ChatStatusEvent) => void) => channel.subscribe(handler),
+ dispose: () => channel.dispose(),
+ }
+ : null
diff --git a/apps/sim/lib/copilot/chat/post.test.ts b/apps/sim/lib/copilot/chat/post.test.ts
index c2271ece05b..e9f4ba41e30 100644
--- a/apps/sim/lib/copilot/chat/post.test.ts
+++ b/apps/sim/lib/copilot/chat/post.test.ts
@@ -92,8 +92,8 @@ vi.mock('@/lib/copilot/chat/messages-store', () => ({
appendCopilotChatMessages,
}))
-vi.mock('@/lib/copilot/tasks', () => ({
- taskPubSub: {
+vi.mock('@/lib/copilot/chat-status', () => ({
+ chatPubSub: {
publishStatusChanged: mockPublishStatusChanged,
},
}))
diff --git a/apps/sim/lib/copilot/chat/post.ts b/apps/sim/lib/copilot/chat/post.ts
index 9cf5e6b2d15..f3b8e4a9259 100644
--- a/apps/sim/lib/copilot/chat/post.ts
+++ b/apps/sim/lib/copilot/chat/post.ts
@@ -23,6 +23,7 @@ import {
} from '@/lib/copilot/chat/process-contents'
import { finalizeAssistantTurn } from '@/lib/copilot/chat/terminal-state'
import { generateWorkspaceContext } from '@/lib/copilot/chat/workspace-context'
+import { chatPubSub } from '@/lib/copilot/chat-status'
import { COPILOT_REQUEST_MODES } from '@/lib/copilot/constants'
import {
CopilotChatFinalizeOutcome,
@@ -41,7 +42,6 @@ import {
} from '@/lib/copilot/request/session'
import type { ExecutionContext, OrchestratorResult } from '@/lib/copilot/request/types'
import { persistChatResources } from '@/lib/copilot/resources/persistence'
-import { taskPubSub } from '@/lib/copilot/tasks'
import { prepareExecutionContext } from '@/lib/copilot/tools/handlers/context'
import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
import { getWorkflowById, resolveWorkflowIdForUser } from '@/lib/workflows/utils'
@@ -352,7 +352,7 @@ async function persistUserMessage(params: {
)
if (notifyWorkspaceStatus && updated && workspaceId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId,
chatId,
type: 'started',
@@ -451,7 +451,7 @@ function buildOnComplete(params: {
finalization.outcome === CopilotChatFinalizeOutcome.AssistantAlreadyPersisted
if (notifyWorkspaceStatus && workspaceId && shouldPublishCompletion) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId,
chatId,
type: 'completed',
@@ -470,7 +470,7 @@ function buildOnComplete(params: {
})
if (notifyWorkspaceStatus && workspaceId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId,
chatId,
type: 'completed',
@@ -502,7 +502,7 @@ function buildOnError(params: {
await finalizeAssistantTurn({ chatId, userMessageId })
if (notifyWorkspaceStatus && workspaceId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId,
chatId,
type: 'completed',
diff --git a/apps/sim/lib/copilot/request/lifecycle/start.test.ts b/apps/sim/lib/copilot/request/lifecycle/start.test.ts
index 917c56ba339..e5307fb703d 100644
--- a/apps/sim/lib/copilot/request/lifecycle/start.test.ts
+++ b/apps/sim/lib/copilot/request/lifecycle/start.test.ts
@@ -107,8 +107,8 @@ vi.mock('@sim/db', () => ({
},
}))
-vi.mock('@/lib/copilot/tasks', () => ({
- taskPubSub: null,
+vi.mock('@/lib/copilot/chat-status', () => ({
+ chatPubSub: null,
}))
import { createSSEStream } from './start'
diff --git a/apps/sim/lib/copilot/request/lifecycle/start.ts b/apps/sim/lib/copilot/request/lifecycle/start.ts
index 595efe15f33..69682f0019f 100644
--- a/apps/sim/lib/copilot/request/lifecycle/start.ts
+++ b/apps/sim/lib/copilot/request/lifecycle/start.ts
@@ -5,6 +5,7 @@ import { createLogger } from '@sim/logger'
import { getErrorMessage } from '@sim/utils/errors'
import { eq } from 'drizzle-orm'
import { createRunSegment } from '@/lib/copilot/async-runs/repository'
+import { chatPubSub } from '@/lib/copilot/chat-status'
import {
MothershipStreamV1EventType,
MothershipStreamV1SessionKind,
@@ -40,7 +41,6 @@ import {
import { SSE_RESPONSE_HEADERS } from '@/lib/copilot/request/session/sse'
import { reportTrace, TraceCollector } from '@/lib/copilot/request/trace'
import { getMothershipBaseURL, getMothershipSourceEnvHeaders } from '@/lib/copilot/server/agent-url'
-import { taskPubSub } from '@/lib/copilot/tasks'
import { env } from '@/lib/core/config/env'
export { SSE_RESPONSE_HEADERS }
@@ -476,7 +476,7 @@ function fireTitleGeneration(params: {
payload: { kind: MothershipStreamV1SessionKind.title, title },
})
if (workspaceId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId,
chatId,
type: 'renamed',
diff --git a/apps/sim/lib/copilot/tasks.ts b/apps/sim/lib/copilot/tasks.ts
deleted file mode 100644
index 252b82a61ae..00000000000
--- a/apps/sim/lib/copilot/tasks.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Task Status Pub/Sub Adapter
- *
- * Broadcasts task status events across processes using Redis Pub/Sub.
- * Gracefully falls back to process-local EventEmitter when Redis is unavailable.
- *
- * Channel: `task:status_changed`
- */
-
-import { createPubSubChannel, type PubSubChannel } from '@/lib/events/pubsub'
-
-interface TaskStatusEvent {
- workspaceId: string
- chatId: string
- type: 'started' | 'completed' | 'created' | 'deleted' | 'renamed'
- streamId?: string
-}
-
-type TaskPubSubGlobal = typeof globalThis & {
- _taskStatusChannel?: PubSubChannel | null
-}
-
-const g = globalThis as TaskPubSubGlobal
-
-if (!('_taskStatusChannel' in g)) {
- g._taskStatusChannel =
- typeof window !== 'undefined'
- ? null
- : createPubSubChannel({ channel: 'task:status_changed', label: 'task' })
-}
-
-const channel = g._taskStatusChannel
-
-export const taskPubSub = channel
- ? {
- publishStatusChanged: (event: TaskStatusEvent) => channel.publish(event),
- onStatusChanged: (handler: (event: TaskStatusEvent) => void) => channel.subscribe(handler),
- dispose: () => channel.dispose(),
- }
- : null
diff --git a/apps/sim/lib/copilot/tools/handlers/oauth.ts b/apps/sim/lib/copilot/tools/handlers/oauth.ts
index 15ae0d04554..3919b0ba557 100644
--- a/apps/sim/lib/copilot/tools/handlers/oauth.ts
+++ b/apps/sim/lib/copilot/tools/handlers/oauth.ts
@@ -109,7 +109,7 @@ async function generateOAuthLink(
workflowId && workspaceId
? `${baseUrl}/workspace/${workspaceId}/w/${workflowId}`
: chatId && workspaceId
- ? `${baseUrl}/workspace/${workspaceId}/task/${chatId}`
+ ? `${baseUrl}/workspace/${workspaceId}/chat/${chatId}`
: `${baseUrl}/workspace/${workspaceId}`
if (providerId === 'trello') {
diff --git a/apps/sim/lib/mothership/inbox/executor.ts b/apps/sim/lib/mothership/inbox/executor.ts
index 67ac5296632..871dfa033a7 100644
--- a/apps/sim/lib/mothership/inbox/executor.ts
+++ b/apps/sim/lib/mothership/inbox/executor.ts
@@ -11,10 +11,10 @@ import {
buildPersistedUserMessage,
} from '@/lib/copilot/chat/persisted-message'
import { generateWorkspaceContext } from '@/lib/copilot/chat/workspace-context'
+import { chatPubSub } from '@/lib/copilot/chat-status'
import { runHeadlessCopilotLifecycle } from '@/lib/copilot/request/lifecycle/headless'
import { requestChatTitle } from '@/lib/copilot/request/lifecycle/start'
import type { OrchestratorResult } from '@/lib/copilot/request/types'
-import { taskPubSub } from '@/lib/copilot/tasks'
import { isHosted } from '@/lib/core/config/feature-flags'
import * as agentmail from '@/lib/mothership/inbox/agentmail-client'
import { formatEmailAsMessage } from '@/lib/mothership/inbox/format'
@@ -117,7 +117,7 @@ export async function executeInboxTask(taskId: string): Promise {
.then(async (title) => {
if (title && chatId) {
await db.update(copilotChats).set({ title }).where(eq(copilotChats.id, chatId))
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId: ws.id,
chatId,
type: 'renamed',
@@ -128,7 +128,7 @@ export async function executeInboxTask(taskId: string): Promise {
logger.warn('Failed to generate chat title', { chatId, err })
})
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId: ws.id,
chatId,
type: 'created',
@@ -138,7 +138,7 @@ export async function executeInboxTask(taskId: string): Promise {
const userMessageId = generateId()
if (chatId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId: ws.id,
chatId,
type: 'started',
@@ -260,7 +260,7 @@ export async function executeInboxTask(taskId: string): Promise {
.where(eq(mothershipInboxTask.id, taskId))
if (chatId) {
- taskPubSub?.publishStatusChanged({
+ chatPubSub?.publishStatusChanged({
workspaceId: ws.id,
chatId,
type: 'completed',
diff --git a/apps/sim/lib/mothership/inbox/response.ts b/apps/sim/lib/mothership/inbox/response.ts
index f289ec705ce..1a32f5d6355 100644
--- a/apps/sim/lib/mothership/inbox/response.ts
+++ b/apps/sim/lib/mothership/inbox/response.ts
@@ -32,7 +32,7 @@ export async function sendInboxResponse(
}
const chatUrl = inboxTask.chatId
- ? `${getBaseUrl()}/workspace/${ctx.workspaceId}/task/${inboxTask.chatId}`
+ ? `${getBaseUrl()}/workspace/${ctx.workspaceId}/chat/${inboxTask.chatId}`
: `${getBaseUrl()}/workspace/${ctx.workspaceId}/home`
const text = result.success
diff --git a/apps/sim/next.config.ts b/apps/sim/next.config.ts
index d5b81c9da5c..7addcc8b697 100644
--- a/apps/sim/next.config.ts
+++ b/apps/sim/next.config.ts
@@ -315,6 +315,15 @@ const nextConfig: NextConfig = {
}
)
+ // Legacy chat URL support: the workspace chat route was renamed from
+ // `/workspace/:workspaceId/task/:chatId` to `/workspace/:workspaceId/chat/:chatId`.
+ // Preserve existing bookmarks and deeplinks.
+ redirects.push({
+ source: '/workspace/:workspaceId/task/:chatId',
+ destination: '/workspace/:workspaceId/chat/:chatId',
+ permanent: true,
+ })
+
return redirects
},
async rewrites() {
diff --git a/apps/sim/stores/folders/store.ts b/apps/sim/stores/folders/store.ts
index b3ac643cdee..5f4115418fb 100644
--- a/apps/sim/stores/folders/store.ts
+++ b/apps/sim/stores/folders/store.ts
@@ -9,8 +9,8 @@ interface FolderState {
selectedWorkflows: Set
selectedFolders: Set
lastSelectedFolderId: string | null
- selectedTasks: Set
- lastSelectedTaskId: string | null
+ selectedChats: Set
+ lastSelectedChatId: string | null
toggleExpanded: (folderId: string) => void
setExpanded: (folderId: string, expanded: boolean) => void
@@ -33,15 +33,15 @@ interface FolderState {
selectFolderRange: (folderIds: string[], fromId: string, toId: string) => void
isFolderSelected: (folderId: string) => boolean
- // Task selection actions
- selectTaskOnly: (taskId: string) => void
- toggleTaskSelection: (taskId: string) => void
- selectTaskRange: (taskIds: string[], fromId: string, toId: string) => void
- clearTaskSelection: () => void
- isTaskSelected: (taskId: string) => boolean
+ // Chat selection actions
+ selectChatOnly: (chatId: string) => void
+ toggleChatSelection: (chatId: string) => void
+ selectChatRange: (chatIds: string[], fromId: string, toId: string) => void
+ clearChatSelection: () => void
+ isChatSelected: (chatId: string) => boolean
// Unified selection helpers
- getFullSelection: () => { workflowIds: string[]; folderIds: string[]; taskIds: string[] }
+ getFullSelection: () => { workflowIds: string[]; folderIds: string[]; chatIds: string[] }
hasAnySelection: () => boolean
isMixedSelection: () => boolean
clearAllSelection: () => void
@@ -54,8 +54,8 @@ export const useFolderStore = create()(
selectedWorkflows: new Set(),
selectedFolders: new Set(),
lastSelectedFolderId: null,
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
toggleExpanded: (folderId) =>
set((state) => {
@@ -104,9 +104,9 @@ export const useFolderStore = create()(
}
return {
selectedWorkflows: newSelected,
- ...(state.selectedTasks.size > 0 && {
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ ...(state.selectedChats.size > 0 && {
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
}),
}
}),
@@ -118,8 +118,8 @@ export const useFolderStore = create()(
selectedWorkflows: new Set([workflowId]),
selectedFolders: new Set(),
lastSelectedFolderId: null,
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
}),
selectRange: (workflowIds, fromId, toId) => {
@@ -175,9 +175,9 @@ export const useFolderStore = create()(
return {
selectedFolders: newSelected,
lastSelectedFolderId: newLastSelected,
- ...(state.selectedTasks.size > 0 && {
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ ...(state.selectedChats.size > 0 && {
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
}),
}
}),
@@ -188,8 +188,8 @@ export const useFolderStore = create()(
set({
selectedFolders: new Set([folderId]),
lastSelectedFolderId: folderId,
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
}),
selectFolderRange: (folderIds, fromId, toId) => {
@@ -206,11 +206,11 @@ export const useFolderStore = create()(
isFolderSelected: (folderId) => get().selectedFolders.has(folderId),
- // Task selection actions
- selectTaskOnly: (taskId) =>
+ // Chat selection actions
+ selectChatOnly: (chatId) =>
set((state) => ({
- selectedTasks: new Set([taskId]),
- lastSelectedTaskId: taskId,
+ selectedChats: new Set([chatId]),
+ lastSelectedChatId: chatId,
...(state.selectedWorkflows.size > 0 && { selectedWorkflows: new Set() }),
...(state.selectedFolders.size > 0 && {
selectedFolders: new Set(),
@@ -218,23 +218,23 @@ export const useFolderStore = create()(
}),
})),
- toggleTaskSelection: (taskId) =>
+ toggleChatSelection: (chatId) =>
set((state) => {
- const newSelected = new Set(state.selectedTasks)
+ const newSelected = new Set(state.selectedChats)
let newLastSelected: string | null
- if (newSelected.has(taskId)) {
- newSelected.delete(taskId)
+ if (newSelected.has(chatId)) {
+ newSelected.delete(chatId)
newLastSelected =
- state.lastSelectedTaskId === taskId
+ state.lastSelectedChatId === chatId
? (Array.from(newSelected)[0] ?? null)
- : state.lastSelectedTaskId
+ : state.lastSelectedChatId
} else {
- newSelected.add(taskId)
- newLastSelected = taskId
+ newSelected.add(chatId)
+ newLastSelected = chatId
}
return {
- selectedTasks: newSelected,
- lastSelectedTaskId: newLastSelected,
+ selectedChats: newSelected,
+ lastSelectedChatId: newLastSelected,
...(state.selectedWorkflows.size > 0 && { selectedWorkflows: new Set() }),
...(state.selectedFolders.size > 0 && {
selectedFolders: new Set(),
@@ -243,19 +243,19 @@ export const useFolderStore = create()(
}
}),
- selectTaskRange: (taskIds, fromId, toId) => {
- const fromIndex = taskIds.indexOf(fromId)
- const toIndex = taskIds.indexOf(toId)
+ selectChatRange: (chatIds, fromId, toId) => {
+ const fromIndex = chatIds.indexOf(fromId)
+ const toIndex = chatIds.indexOf(toId)
if (fromIndex === -1 || toIndex === -1) return
const [start, end] = fromIndex < toIndex ? [fromIndex, toIndex] : [toIndex, fromIndex]
- const rangeIds = taskIds.slice(start, end + 1)
+ const rangeIds = chatIds.slice(start, end + 1)
const state = get()
set({
- selectedTasks: new Set(rangeIds),
- lastSelectedTaskId: fromId,
+ selectedChats: new Set(rangeIds),
+ lastSelectedChatId: fromId,
...(state.selectedWorkflows.size > 0 && { selectedWorkflows: new Set() }),
...(state.selectedFolders.size > 0 && {
selectedFolders: new Set(),
@@ -264,21 +264,21 @@ export const useFolderStore = create()(
})
},
- clearTaskSelection: () => set({ selectedTasks: new Set(), lastSelectedTaskId: null }),
+ clearChatSelection: () => set({ selectedChats: new Set(), lastSelectedChatId: null }),
- isTaskSelected: (taskId) => get().selectedTasks.has(taskId),
+ isChatSelected: (chatId) => get().selectedChats.has(chatId),
// Unified selection helpers
getFullSelection: () => ({
workflowIds: Array.from(get().selectedWorkflows),
folderIds: Array.from(get().selectedFolders),
- taskIds: Array.from(get().selectedTasks),
+ chatIds: Array.from(get().selectedChats),
}),
hasAnySelection: () =>
get().selectedWorkflows.size > 0 ||
get().selectedFolders.size > 0 ||
- get().selectedTasks.size > 0,
+ get().selectedChats.size > 0,
isMixedSelection: () => get().selectedWorkflows.size > 0 && get().selectedFolders.size > 0,
@@ -287,8 +287,8 @@ export const useFolderStore = create()(
selectedWorkflows: new Set(),
selectedFolders: new Set(),
lastSelectedFolderId: null,
- selectedTasks: new Set(),
- lastSelectedTaskId: null,
+ selectedChats: new Set(),
+ lastSelectedChatId: null,
}),
}),
{ name: 'folder-store' }