Merge remote-tracking branch 'origin/staging' into refactor/chip-modal-migration

# Conflicts:
#	apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

Author: emir-karabeg

apps/sim/app/api/admin/mothership/route.ts

@@ -3,7 +3,7 @@ import { settings, user } from '@sim/db/schema'
 import { getErrorMessage } from '@sim/utils/errors'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { adminMothershipQuerySchema } from '@/lib/api/contracts/mothership-tasks'
+import { adminMothershipQuerySchema } from '@/lib/api/contracts/mothership-chats'
 import { mothershipEnvironmentSchema } from '@/lib/api/contracts/user'
 import { searchParamsToObject, validationErrorResponse } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'

apps/sim/app/api/copilot/chat/delete/route.test.ts

@@ -19,8 +19,8 @@ vi.mock('@/lib/copilot/chat/lifecycle', () => ({
   getAccessibleCopilotChatAuth: mockGetAccessibleCopilotChatAuth,
 }))
 
-vi.mock('@/lib/copilot/tasks', () => ({
-  taskPubSub: { publishStatusChanged: vi.fn() },
+vi.mock('@/lib/copilot/chat-status', () => ({
+  chatPubSub: { publishStatusChanged: vi.fn() },
 }))
 
 import { DELETE } from './route'

apps/sim/app/api/copilot/chat/delete/route.ts

@@ -7,7 +7,7 @@ import { deleteCopilotChatContract } from '@/lib/api/contracts/copilot'
 import { parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { getAccessibleCopilotChatAuth } from '@/lib/copilot/chat/lifecycle'
-import { taskPubSub } from '@/lib/copilot/tasks'
+import { chatPubSub } from '@/lib/copilot/chat-status'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 
 const logger = createLogger('DeleteChatAPI')
@@ -47,7 +47,7 @@ export const DELETE = withRouteHandler(async (request: NextRequest) => {
     logger.info('Chat deleted', { chatId: parsed.chatId })
 
     if (deleted.workspaceId) {
-      taskPubSub?.publishStatusChanged({
+      chatPubSub?.publishStatusChanged({
         workspaceId: deleted.workspaceId,
         chatId: parsed.chatId,
         type: 'deleted',

apps/sim/app/api/copilot/chat/rename/route.ts

@@ -7,7 +7,7 @@ import { renameCopilotChatContract } from '@/lib/api/contracts/copilot'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { getAccessibleCopilotChatAuth } from '@/lib/copilot/chat/lifecycle'
-import { taskPubSub } from '@/lib/copilot/tasks'
+import { chatPubSub } from '@/lib/copilot/chat-status'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 
 const logger = createLogger('RenameChatAPI')
@@ -49,7 +49,7 @@ export const PATCH = withRouteHandler(async (request: NextRequest) => {
     logger.info('Chat renamed', { chatId, title })
 
     if (updated.workspaceId) {
-      taskPubSub?.publishStatusChanged({
+      chatPubSub?.publishStatusChanged({
         workspaceId: updated.workspaceId,
         chatId,
         type: 'renamed',

apps/sim/app/api/copilot/chat/stop/route.test.ts

@@ -16,8 +16,8 @@ vi.mock('@/lib/copilot/chat/messages-store', () => ({
   appendCopilotChatMessages: mockAppendCopilotChatMessages,
 }))
 
-vi.mock('@/lib/copilot/tasks', () => ({
-  taskPubSub: {
+vi.mock('@/lib/copilot/chat-status', () => ({
+  chatPubSub: {
     publishStatusChanged: mockPublishStatusChanged,
   },
 }))

apps/sim/app/api/copilot/chat/stop/route.ts

@@ -10,14 +10,14 @@ import {
   withStoppedContentBlock,
 } from '@/lib/copilot/chat/persisted-message'
 import { finalizeAssistantTurn } from '@/lib/copilot/chat/terminal-state'
+import { chatPubSub } from '@/lib/copilot/chat-status'
 import {
   CopilotChatFinalizeOutcome,
   CopilotStopOutcome,
 } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { withIncomingGoSpan } from '@/lib/copilot/request/otel'
-import { taskPubSub } from '@/lib/copilot/tasks'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 
 const logger = createLogger('CopilotChatStopAPI')
@@ -83,7 +83,7 @@ export const POST = withRouteHandler((req: NextRequest) =>
         result.updated || result.outcome === CopilotChatFinalizeOutcome.AssistantAlreadyPersisted
 
       if (shouldPublishCompleted && result.workspaceId) {
-        taskPubSub?.publishStatusChanged({
+        chatPubSub?.publishStatusChanged({
           workspaceId: result.workspaceId,
           chatId,
           type: 'completed',

apps/sim/app/api/copilot/chats/route.ts

@@ -7,14 +7,14 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { createWorkflowCopilotChatContract } from '@/lib/api/contracts/copilot'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { resolveOrCreateChat } from '@/lib/copilot/chat/lifecycle'
+import { chatPubSub } from '@/lib/copilot/chat-status'
 import {
   authenticateCopilotRequestSessionOnly,
   createBadRequestResponse,
   createForbiddenResponse,
   createInternalServerErrorResponse,
   createUnauthorizedResponse,
 } from '@/lib/copilot/request/http'
-import { taskPubSub } from '@/lib/copilot/tasks'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import {
   assertActiveWorkspaceAccess,
@@ -138,7 +138,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       return createInternalServerErrorResponse('Failed to create chat')
     }
 
-    taskPubSub?.publishStatusChanged({ workspaceId, chatId: result.chatId, type: 'created' })
+    chatPubSub?.publishStatusChanged({ workspaceId, chatId: result.chatId, type: 'created' })
 
     return NextResponse.json({ success: true, id: result.chatId })
   } catch (error) {

apps/sim/app/api/mothership/chat/abort/route.ts

@@ -1,5 +1,5 @@
 import type { NextRequest } from 'next/server'
-import { mothershipChatAbortEnvelopeSchema } from '@/lib/api/contracts/mothership-tasks'
+import { mothershipChatAbortEnvelopeSchema } from '@/lib/api/contracts/mothership-chats'
 import { validationErrorResponse } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { POST as copilotAbortPost } from '@/app/api/copilot/chat/abort/route'

apps/sim/app/api/mothership/chat/resources/route.ts

@@ -1,5 +1,5 @@
 import type { NextRequest, NextResponse } from 'next/server'
-import { mothershipChatResourceEnvelopeSchema } from '@/lib/api/contracts/mothership-tasks'
+import { mothershipChatResourceEnvelopeSchema } from '@/lib/api/contracts/mothership-chats'
 import { validationErrorResponse } from '@/lib/api/server'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import {

apps/sim/app/api/mothership/chat/route.ts

@@ -2,7 +2,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import {
   mothershipChatGetQuerySchema,
   mothershipChatPostEnvelopeSchema,
-} from '@/lib/api/contracts/mothership-tasks'
+} from '@/lib/api/contracts/mothership-chats'
 import { validationErrorResponse } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { handleUnifiedChatPost, maxDuration } from '@/lib/copilot/chat/post'