fix(fork): call Go before Sim INSERT, update route baseline

Author: waleedlatif1

apps/sim/app/api/mothership/chats/[chatId]/fork/route.ts

@@ -82,37 +82,15 @@ export const POST = withRouteHandler(
       const title = `Fork | ${baseTitle}`
       const now = new Date()
 
-      const [newChat] = await db
-        .insert(copilotChats)
-        .values({
-          id: newId,
-          userId,
-          workspaceId: parent.workspaceId,
-          workflowId: parent.workflowId,
-          type: parent.type,
-          title,
-          model: parent.model,
-          messages: forkedMessages,
-          resources: parentResources,
-          previewYaml: parent.previewYaml,
-          planArtifact: parent.planArtifact,
-          config: parent.config,
-          conversationId: null,
-          updatedAt: now,
-          lastSeenAt: now,
-        })
-        .returning({ id: copilotChats.id, workspaceId: copilotChats.workspaceId })
-
-      if (!newChat) {
-        return createInternalServerErrorResponse('Failed to create forked chat')
-      }
-
-      // Clone copilot-service conversation state (messages, active_messages, memory files).
+      // Clone copilot-service conversation state first. If this fails we never
+      // insert the Sim row, so there is no orphaned UI entry to clean up.
+      // (The inverse order — Sim INSERT first — required a compensating delete
+      // and still left a brief window where the row was visible but Go state
+      // wasn't ready.)
       const copilotHeaders: Record<string, string> = { 'Content-Type': 'application/json' }
       if (env.COPILOT_API_KEY) {
         copilotHeaders['x-api-key'] = env.COPILOT_API_KEY
       }
-      let copilotFailed = false
       try {
         const copilotRes = await fetchGo(`${SIM_AGENT_API_URL}/api/chats/fork`, {
           method: 'POST',
@@ -129,24 +107,43 @@ export const POST = withRouteHandler(
         if (!copilotRes.ok) {
           const text = await copilotRes.text().catch(() => '')
           logger.error('Copilot fork returned non-OK', { status: copilotRes.status, body: text })
-          copilotFailed = true
+          return createInternalServerErrorResponse('Failed to fork chat')
         }
       } catch (err) {
         logger.error('Failed to call copilot fork endpoint', { err })
-        copilotFailed = true
+        return createInternalServerErrorResponse('Failed to fork chat')
       }
 
-      if (copilotFailed) {
-        // Compensating delete — remove the orphaned Sim row.
-        await db
-          .delete(copilotChats)
-          .where(eq(copilotChats.id, newId))
-          .catch((e: unknown) => {
-            logger.error('Failed to delete orphaned forked chat after copilot failure', {
-              error: e,
-            })
-          })
-        return createInternalServerErrorResponse('Failed to fork chat')
+      // Go state is ready — now persist the Sim metadata row. If this insert
+      // fails the Go conversation is orphaned but permanently inaccessible
+      // (no Sim row = no UI entry), which is harmless.
+      const [newChat] = await db
+        .insert(copilotChats)
+        .values({
+          id: newId,
+          userId,
+          workspaceId: parent.workspaceId,
+          workflowId: parent.workflowId,
+          type: parent.type,
+          title,
+          model: parent.model,
+          messages: forkedMessages,
+          resources: parentResources,
+          previewYaml: parent.previewYaml,
+          planArtifact: parent.planArtifact,
+          config: parent.config,
+          conversationId: null,
+          updatedAt: now,
+          lastSeenAt: now,
+        })
+        .returning({ id: copilotChats.id, workspaceId: copilotChats.workspaceId })
+
+      if (!newChat) {
+        logger.error('Failed to insert forked chat row after successful Go fork', {
+          newId,
+          chatId,
+        })
+        return createInternalServerErrorResponse('Failed to create forked chat')
       }
 
       if (newChat.workspaceId) {

scripts/check-api-validation-contracts.ts

@@ -9,8 +9,8 @@ const QUERY_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/queries')
 const SELECTOR_HOOKS_DIR = path.join(ROOT, 'apps/sim/hooks/selectors')
 
 const BASELINE = {
-  totalRoutes: 716,
-  zodRoutes: 716,
+  totalRoutes: 717,
+  zodRoutes: 717,
   nonZodRoutes: 0,
 } as const