Updates

Author: Sg312

apps/sim/app/api/users/me/settings/route.ts

@@ -20,7 +20,7 @@ const defaultSettings = {
   billingUsageNotificationsEnabled: true,
   showTrainingControls: false,
   superUserModeEnabled: false,
-  mothershipEnvironment: 'prod',
+  mothershipEnvironment: 'default',
   errorNotificationsEnabled: true,
   snapToGridSize: 0,
   showActionBar: true,
@@ -57,7 +57,7 @@ export const GET = withRouteHandler(async () => {
           billingUsageNotificationsEnabled: userSettings.billingUsageNotificationsEnabled ?? true,
           showTrainingControls: userSettings.showTrainingControls ?? false,
           superUserModeEnabled: userSettings.superUserModeEnabled ?? false,
-          mothershipEnvironment: userSettings.mothershipEnvironment ?? 'prod',
+          mothershipEnvironment: userSettings.mothershipEnvironment ?? 'default',
           errorNotificationsEnabled: userSettings.errorNotificationsEnabled ?? true,
           snapToGridSize: userSettings.snapToGridSize ?? 0,
           showActionBar: userSettings.showActionBar ?? true,

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

@@ -146,6 +146,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(
@@ -202,11 +209,9 @@ export function SettingsPage({ section }: SettingsPageProps) {
         ? 'general'
         : section === 'admin' && !sessionLoading && !isAdminRole
           ? 'general'
-          : section === 'mothership' && !sessionLoading && isAdminRole
-            ? 'admin'
-            : section === 'mothership' && !sessionLoading && !isAdminRole
-              ? 'general'
-              : section
+          : section === 'mothership' && !sessionLoading && !isAdminRole
+            ? 'general'
+            : section
 
   const label =
     allNavigationItems.find((item) => item.id === effectiveSection)?.label ?? effectiveSection
@@ -247,6 +252,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
       {effectiveSection === 'inbox' && <Inbox />}
       {effectiveSection === 'recently-deleted' && <RecentlyDeleted />}
       {effectiveSection === 'admin' && <Admin />}
+      {effectiveSection === 'mothership' && <Mothership />}
     </div>
   )
 }

apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx

@@ -2,7 +2,15 @@
 
 import { useCallback, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
-import { Badge, Button, Input as EmcnInput, Label, Skeleton, Switch } from '@/components/emcn'
+import {
+  Badge,
+  Button,
+  Combobox,
+  Input as EmcnInput,
+  Label,
+  Skeleton,
+  Switch,
+} from '@/components/emcn'
 import type { MothershipEnvironment } from '@/lib/api/contracts'
 import { useSession } from '@/lib/auth/auth-client'
 import { cn } from '@/lib/core/utils/cn'
@@ -18,10 +26,11 @@ import { useImportWorkflow } from '@/hooks/queries/workflows'
 
 const PAGE_SIZE = 20 as const
 
-const ENV_OPTIONS: { id: MothershipEnvironment; label: string }[] = [
-  { id: 'dev', label: 'Dev' },
-  { id: 'staging', label: 'Staging' },
-  { id: 'prod', label: 'Prod' },
+const MOTHERSHIP_ENV_OPTIONS: { value: MothershipEnvironment; label: string }[] = [
+  { value: 'default', label: 'Default' },
+  { value: 'dev', label: 'Dev' },
+  { value: 'staging', label: 'Staging' },
+  { value: 'prod', label: 'Prod' },
 ]
 
 export function Admin() {
@@ -154,26 +163,22 @@ export function Admin() {
             <div className='flex flex-col gap-1'>
               <Label className='text-[var(--text-primary)] text-sm'>Mothership Environment</Label>
               <p className='text-[var(--text-secondary)] text-xs'>
-                Controls which Copilot backend this admin session talks to.
+                Default uses the configured Sim agent URL.
               </p>
             </div>
-            <div className='flex gap-1'>
-              {ENV_OPTIONS.map((opt) => (
-                <button
-                  key={opt.id}
-                  type='button'
-                  onClick={() => handleMothershipEnvironmentChange(opt.id)}
-                  disabled={updateSetting.isPending}
-                  className={cn(
-                    'rounded-md px-3 py-1 font-medium text-sm transition-colors',
-                    (settings?.mothershipEnvironment ?? 'prod') === opt.id
-                      ? 'bg-[var(--surface-hover)] text-[var(--text-primary)]'
-                      : 'text-[var(--text-tertiary)] hover-hover:hover:text-[var(--text-secondary)]'
-                  )}
-                >
-                  {opt.label}
-                </button>
-              ))}
+            <div className='w-[160px]'>
+              <Combobox
+                size='sm'
+                align='end'
+                dropdownWidth={160}
+                value={settings?.mothershipEnvironment ?? 'default'}
+                onChange={(value) =>
+                  handleMothershipEnvironmentChange(value as MothershipEnvironment)
+                }
+                placeholder='Select environment'
+                disabled={updateSetting.isPending}
+                options={MOTHERSHIP_ENV_OPTIONS}
+              />
             </div>
           </div>
         )}

apps/sim/app/workspace/[workspaceId]/settings/components/mothership/mothership.tsx

@@ -3,7 +3,6 @@
 import { useCallback, useMemo, useState } from 'react'
 import { Badge, Button, Input as EmcnInput, Label, Skeleton } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
-import { useGeneralSettings, useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
 import {
   type MothershipEnv,
   useGenerateLicense,
@@ -63,58 +62,22 @@ function SectionLabel({ children }: { children: React.ReactNode }) {
 
 export function Mothership() {
   const [activeTab, setActiveTab] = useState<Tab>('overview')
-  const { data: settings, isLoading: settingsLoading } = useGeneralSettings()
-  const updateSetting = useUpdateGeneralSetting()
-  const environment = settings?.mothershipEnvironment ?? 'prod'
+  const [environment, setEnvironment] = useState<MothershipEnv>('dev')
   const defaults = useMemo(() => defaultTimeRange(), [])
   const [start, setStart] = useState(defaults.start)
   const [end, setEnd] = useState(defaults.end)
 
-  const handleEnvironmentChange = useCallback(
-    async (nextEnvironment: MothershipEnv) => {
-      if (nextEnvironment !== settings?.mothershipEnvironment && !updateSetting.isPending) {
-        await updateSetting.mutateAsync({
-          key: 'mothershipEnvironment',
-          value: nextEnvironment,
-        })
-      }
-    },
-    [settings?.mothershipEnvironment, updateSetting]
-  )
-
-  if (settingsLoading) {
-    return (
-      <div className='flex h-full flex-col gap-5'>
-        <Skeleton className='h-[32px] w-[320px] rounded-md' />
-        <Skeleton className='h-[40px] w-full rounded-md' />
-        <Skeleton className='h-[120px] w-full rounded-md' />
-      </div>
-    )
-  }
-
-  if (!settings?.superUserModeEnabled) {
-    return (
-      <div className='flex h-full flex-col gap-3'>
-        <p className='font-medium text-[var(--text-primary)] text-sm'>Super admin mode is off</p>
-        <p className='text-[var(--text-secondary)] text-sm'>
-          Enable Super admin mode in Admin settings to view Mothership controls and change the
-          Mothership environment.
-        </p>
-      </div>
-    )
-  }
-
   return (
     <div className='flex h-full flex-col gap-5'>
-      <div className='flex items-center gap-3'>
-        <Label className='text-[var(--text-secondary)] text-sm'>Mothership Environment</Label>
+      {/* Environment selector */}
+      <div className='flex items-center gap-2'>
+        <Label className='text-[var(--text-secondary)] text-sm'>Environment</Label>
         <div className='flex gap-1'>
           {ENV_OPTIONS.map((opt) => (
             <button
               key={opt.id}
               type='button'
-              onClick={() => handleEnvironmentChange(opt.id)}
-              disabled={updateSetting.isPending}
+              onClick={() => setEnvironment(opt.id)}
               className={cn(
                 'rounded-md px-3 py-1 font-medium text-sm transition-colors',
                 environment === opt.id

apps/sim/app/workspace/[workspaceId]/settings/navigation.ts

@@ -218,4 +218,11 @@ export const allNavigationItems: NavigationItem[] = [
     section: 'superuser',
     requiresAdminRole: true,
   },
+  {
+    id: 'mothership',
+    label: 'Mothership',
+    icon: Server,
+    section: 'superuser',
+    requiresAdminRole: true,
+  },
 ]

apps/sim/hooks/queries/mothership-admin.ts

@@ -1,6 +1,6 @@
 import { keepPreviousData, useMutation, useQuery } from '@tanstack/react-query'
 
-export type MothershipEnv = 'dev' | 'staging' | 'prod'
+export type MothershipEnv = 'default' | 'dev' | 'staging' | 'prod'
 
 const BASE = '/api/admin/mothership'
 

apps/sim/lib/api/contracts/user.ts

@@ -61,7 +61,7 @@ export const userSettingsEmailPreferencesSchema = z.object({
   unsubscribeNotifications: z.boolean().optional(),
 })
 
-export const mothershipEnvironmentSchema = z.enum(['dev', 'staging', 'prod'])
+export const mothershipEnvironmentSchema = z.enum(['default', 'dev', 'staging', 'prod'])
 export type MothershipEnvironment = z.infer<typeof mothershipEnvironmentSchema>
 
 export const userSettingsSchema = z.object({
@@ -72,7 +72,7 @@ export const userSettingsSchema = z.object({
   billingUsageNotificationsEnabled: z.boolean().default(true),
   showTrainingControls: z.boolean().default(false),
   superUserModeEnabled: z.boolean().default(false),
-  mothershipEnvironment: mothershipEnvironmentSchema.default('prod'),
+  mothershipEnvironment: mothershipEnvironmentSchema.default('default'),
   errorNotificationsEnabled: z.boolean().default(true),
   snapToGridSize: z.number().min(0).max(50).default(0),
   showActionBar: z.boolean().default(true),

apps/sim/lib/copilot/server/agent-url.ts

@@ -11,7 +11,9 @@ export interface GetMothershipBaseURLOptions {
   fallbackUrl?: string | null
 }
 
-const ENVIRONMENT_URLS: Record<MothershipEnvironment, string | undefined> = {
+type ConcreteMothershipEnvironment = Exclude<MothershipEnvironment, 'default'>
+
+const ENVIRONMENT_URLS: Record<ConcreteMothershipEnvironment, string | undefined> = {
   // env vars
   dev: env.COPILOT_DEV_URL,
   staging: env.COPILOT_STAGING_URL,
@@ -24,6 +26,7 @@ function normalizeUrl(url: string | undefined): string | null {
 }
 
 function getConfiguredEnvironmentUrl(environment: MothershipEnvironment): string | null {
+  if (environment === 'default') return null
   return normalizeUrl(ENVIRONMENT_URLS[environment])
 }
 
@@ -59,7 +62,7 @@ export async function getMothershipBaseURL(
   if (!effectiveSuperUser) return defaultUrl
 
   const parsedEnvironment = mothershipEnvironmentSchema.safeParse(row.mothershipEnvironment)
-  const environment = parsedEnvironment.success ? parsedEnvironment.data : 'prod'
+  const environment = parsedEnvironment.success ? parsedEnvironment.data : 'default'
 
   return getConfiguredEnvironmentUrl(environment) ?? defaultUrl
 }

packages/db/migrations/0206_amazing_maximus.sql

@@ -0,0 +1 @@
+ALTER TABLE "settings" ALTER COLUMN "mothership_environment" SET DEFAULT 'default';