Fix persistence

Author: Sg312

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

@@ -0,0 +1,130 @@
+import { type NextRequest, NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import { env } from '@/lib/core/config/env'
+
+const ENV_URLS: Record<string, string | undefined> = {
+  dev: env.MOTHERSHIP_DEV_URL,
+  staging: env.MOTHERSHIP_STAGING_URL,
+  prod: env.MOTHERSHIP_PROD_URL,
+}
+
+function getMothershipUrl(environment: string): string | null {
+  return ENV_URLS[environment] ?? null
+}
+
+/**
+ * Proxy to the mothership admin API.
+ *
+ * Query params:
+ *   env       - "dev" | "staging" | "prod"
+ *   endpoint  - the admin endpoint path, e.g. "requests", "licenses", "traces"
+ *
+ * The request body (for POST) is forwarded as-is. Additional query params
+ * (e.g. requestId for GET /traces) are forwarded.
+ */
+export async function POST(req: NextRequest) {
+  const session = await getSession()
+  if (!session?.user || session.user.role !== 'admin') {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const adminKey = env.MOTHERSHIP_API_ADMIN_KEY
+  if (!adminKey) {
+    return NextResponse.json({ error: 'MOTHERSHIP_API_ADMIN_KEY not configured' }, { status: 500 })
+  }
+
+  const { searchParams } = new URL(req.url)
+  const environment = searchParams.get('env') || 'dev'
+  const endpoint = searchParams.get('endpoint')
+
+  if (!endpoint) {
+    return NextResponse.json({ error: 'endpoint query param required' }, { status: 400 })
+  }
+
+  const baseUrl = getMothershipUrl(environment)
+  if (!baseUrl) {
+    return NextResponse.json(
+      { error: `No URL configured for environment: ${environment}` },
+      { status: 400 }
+    )
+  }
+
+  const targetUrl = `${baseUrl}/api/admin/${endpoint}`
+
+  try {
+    const body = await req.text()
+    const upstream = await fetch(targetUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-api-key': adminKey,
+      },
+      ...(body ? { body } : {}),
+    })
+
+    const data = await upstream.json()
+    return NextResponse.json(data, { status: upstream.status })
+  } catch (error) {
+    return NextResponse.json(
+      {
+        error: `Failed to reach mothership (${environment}): ${error instanceof Error ? error.message : 'Unknown error'}`,
+      },
+      { status: 502 }
+    )
+  }
+}
+
+export async function GET(req: NextRequest) {
+  const session = await getSession()
+  if (!session?.user || session.user.role !== 'admin') {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const adminKey = env.MOTHERSHIP_API_ADMIN_KEY
+  if (!adminKey) {
+    return NextResponse.json({ error: 'MOTHERSHIP_API_ADMIN_KEY not configured' }, { status: 500 })
+  }
+
+  const { searchParams } = new URL(req.url)
+  const environment = searchParams.get('env') || 'dev'
+  const endpoint = searchParams.get('endpoint')
+
+  if (!endpoint) {
+    return NextResponse.json({ error: 'endpoint query param required' }, { status: 400 })
+  }
+
+  const baseUrl = getMothershipUrl(environment)
+  if (!baseUrl) {
+    return NextResponse.json(
+      { error: `No URL configured for environment: ${environment}` },
+      { status: 400 }
+    )
+  }
+
+  const forwardParams = new URLSearchParams()
+  searchParams.forEach((value, key) => {
+    if (key !== 'env' && key !== 'endpoint') {
+      forwardParams.set(key, value)
+    }
+  })
+
+  const qs = forwardParams.toString()
+  const targetUrl = `${baseUrl}/api/admin/${endpoint}${qs ? `?${qs}` : ''}`
+
+  try {
+    const upstream = await fetch(targetUrl, {
+      method: 'GET',
+      headers: { 'x-api-key': adminKey },
+    })
+
+    const data = await upstream.json()
+    return NextResponse.json(data, { status: upstream.status })
+  } catch (error) {
+    return NextResponse.json(
+      {
+        error: `Failed to reach mothership (${environment}): ${error instanceof Error ? error.message : 'Unknown error'}`,
+      },
+      { status: 502 }
+    )
+  }
+}

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

@@ -13,6 +13,7 @@ import {
   readEvents,
   SSE_RESPONSE_HEADERS,
 } from '@/lib/copilot/request/session'
+import { toStreamBatchEvent } from '@/lib/copilot/request/session/types'
 
 export const maxDuration = 3600
 
@@ -113,11 +114,7 @@ export async function GET(request: NextRequest) {
   if (batchMode) {
     const afterSeq = afterCursor || '0'
     const events = await readEvents(streamId, afterSeq)
-    const batchEvents = events.map((envelope) => ({
-      eventId: envelope.seq,
-      streamId: envelope.stream.streamId,
-      event: envelope,
-    }))
+    const batchEvents = events.map(toStreamBatchEvent)
     logger.info('[Resume] Batch response', {
       streamId,
       afterCursor: afterSeq,

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

@@ -12,6 +12,7 @@ import {
   createUnauthorizedResponse,
 } from '@/lib/copilot/request/http'
 import { readEvents } from '@/lib/copilot/request/session/buffer'
+import { type StreamBatchEvent, toStreamBatchEvent } from '@/lib/copilot/request/session/types'
 import { taskPubSub } from '@/lib/copilot/tasks'
 import { captureServerEvent } from '@/lib/posthog/server'
 
@@ -47,7 +48,7 @@ export async function GET(
     }
 
     let streamSnapshot: {
-      events: unknown[]
+      events: StreamBatchEvent[]
       status: string
     } | null = null
 
@@ -56,7 +57,7 @@ export async function GET(
         const events = await readEvents(chat.conversationId, '0')
 
         streamSnapshot = {
-          events: events || [],
+          events: events.map(toStreamBatchEvent),
           status: events.length > 0 ? 'active' : 'unknown',
         }
       } catch (error) {

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -35,6 +35,7 @@ import {
   ToolSearchToolRegex,
   WorkspaceFile,
 } from '@/lib/copilot/generated/tool-catalog-v1'
+import type { StreamBatchEvent } from '@/lib/copilot/request/session/types'
 import {
   extractResourcesFromToolResult,
   isResourceToolName,
@@ -148,12 +149,6 @@ type StreamingFilePreview = {
   content: string
 }
 
-type StreamBatchEvent = {
-  eventId: number
-  streamId: string
-  event: Record<string, unknown>
-}
-
 type StreamBatchResponse = {
   success: boolean
   events: StreamBatchEvent[]

apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx

@@ -142,6 +142,13 @@ const Admin = dynamic(
     import('@/app/workspace/[workspaceId]/settings/components/admin/admin').then((m) => m.Admin),
   { loading: () => <AdminSkeleton /> }
 )
+const Mothership = dynamic(
+  () =>
+    import('@/app/workspace/[workspaceId]/settings/components/mothership/mothership').then(
+      (m) => m.Mothership
+    ),
+  { loading: () => <SettingsSectionSkeleton /> }
+)
 const RecentlyDeleted = dynamic(
   () =>
     import(
@@ -175,7 +182,9 @@ export function SettingsPage({ section }: SettingsPageProps) {
         ? 'general'
         : section === 'admin' && !sessionLoading && !isAdminRole
           ? 'general'
-          : section
+          : section === 'mothership' && !sessionLoading && !isAdminRole
+            ? 'general'
+            : section
 
   const label =
     allNavigationItems.find((item) => item.id === effectiveSection)?.label ?? effectiveSection
@@ -207,6 +216,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
       {effectiveSection === 'inbox' && <Inbox />}
       {effectiveSection === 'recently-deleted' && <RecentlyDeleted />}
       {effectiveSection === 'admin' && <Admin />}
+      {effectiveSection === 'mothership' && <Mothership />}
     </div>
   )
 }