fix(settings): confirm every discarded fork choice, keep settings UI out of the workspace chrome

- A fork sync direction switch drops every in-session choice, not just unsaved mapping edits. Expose hasSessionChoices (mapping edits, a copy selection that differs from the default, accepted dropped references, trigger URL choices) and confirm the switch whenever any is set.
- Move SettingsPendingSection into its own module so the provider in the workspace chrome no longer imports the settings header UI.

Author: waleedlatif1

apps/sim/app/o/[organizationId]/settings/layout.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import { SettingsPendingSection } from '@/components/settings/settings-navigation-provider'
+import { SettingsPendingSection } from '@/components/settings/settings-pending-section'
 import { useSettingsBeforeUnload } from '@/components/settings/use-settings-before-unload'
 import { resolveOrganizationSurfaceHeaderMeta } from '@/app/o/[organizationId]/settings/navigation'
 

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

@@ -2,10 +2,8 @@
 
 import { useCallback } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import {
-  SettingsPendingSection,
-  useSettingsIntentHandler,
-} from '@/components/settings/settings-navigation-provider'
+import { useSettingsIntentHandler } from '@/components/settings/settings-navigation-provider'
+import { SettingsPendingSection } from '@/components/settings/settings-pending-section'
 import { useSettingsBeforeUnload } from '@/components/settings/use-settings-before-unload'
 import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import {

apps/sim/components/settings/settings-navigation-provider.tsx

@@ -12,11 +12,6 @@ import {
   useTransition,
 } from 'react'
 import { useRouter } from 'next/navigation'
-import {
-  type SettingsHeaderMeta,
-  SettingsHeaderProvider,
-  SettingsHeaderShell,
-} from '@/components/settings/settings-header'
 
 interface SettingsNavigationState {
   /** The section a sidebar click is navigating to, until that navigation settles. */
@@ -97,39 +92,3 @@ export function useSettingsIntentHandler(handler: (section: string) => void): vo
   const { registerIntentHandler } = useSettingsNavigationState()
   useEffect(() => registerIntentHandler(handler), [registerIntentHandler, handler])
 }
-
-interface SettingsPendingSectionProps {
-  /** The header a pending section paints with, or null to keep showing the current section. */
-  resolveMeta: (section: string) => SettingsHeaderMeta | null
-  children: ReactNode
-}
-
-/**
- * Paints a clicked section's heading over an empty body while its route resolves — the same frame
- * the route commits with, minus the body — so the click lands immediately. The current section
- * stays mounted and laid out underneath, invisible and inert, so its scroll position and state are
- * intact if the navigation settles back on it. With nothing pending both wrappers are
- * `display: contents` and add no box of their own.
- */
-export function SettingsPendingSection({ resolveMeta, children }: SettingsPendingSectionProps) {
-  const { pendingSection } = useSettingsNavigationState()
-  const pendingMeta = pendingSection ? resolveMeta(pendingSection) : null
-
-  return (
-    <div className={pendingMeta ? 'relative flex h-full min-h-0 flex-col' : 'contents'}>
-      {pendingMeta && (
-        <div className='absolute inset-0 z-10 bg-[var(--bg)]'>
-          <SettingsHeaderProvider>
-            <SettingsHeaderShell meta={pendingMeta}>{null}</SettingsHeaderShell>
-          </SettingsHeaderProvider>
-        </div>
-      )}
-      <div
-        className={pendingMeta ? 'invisible flex h-full min-h-0 flex-col' : 'contents'}
-        inert={pendingMeta ? true : undefined}
-      >
-        {children}
-      </div>
-    </div>
-  )
-}

apps/sim/components/settings/settings-pending-section.tsx

@@ -0,0 +1,45 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import {
+  type SettingsHeaderMeta,
+  SettingsHeaderProvider,
+  SettingsHeaderShell,
+} from '@/components/settings/settings-header'
+import { useSettingsNavigationState } from '@/components/settings/settings-navigation-provider'
+
+interface SettingsPendingSectionProps {
+  /** The header a pending section paints with, or null to keep showing the current section. */
+  resolveMeta: (section: string) => SettingsHeaderMeta | null
+  children: ReactNode
+}
+
+/**
+ * Paints a clicked section's heading over an empty body while its route resolves — the same frame
+ * the route commits with, minus the body — so the click lands immediately. The current section
+ * stays mounted and laid out underneath, invisible and inert, so its scroll position and state are
+ * intact if the navigation settles back on it. With nothing pending both wrappers are
+ * `display: contents` and add no box of their own.
+ */
+export function SettingsPendingSection({ resolveMeta, children }: SettingsPendingSectionProps) {
+  const { pendingSection } = useSettingsNavigationState()
+  const pendingMeta = pendingSection ? resolveMeta(pendingSection) : null
+
+  return (
+    <div className={pendingMeta ? 'relative flex h-full min-h-0 flex-col' : 'contents'}>
+      {pendingMeta && (
+        <div className='absolute inset-0 z-10 bg-[var(--bg)]'>
+          <SettingsHeaderProvider>
+            <SettingsHeaderShell meta={pendingMeta}>{null}</SettingsHeaderShell>
+          </SettingsHeaderProvider>
+        </div>
+      )}
+      <div
+        className={pendingMeta ? 'invisible flex h-full min-h-0 flex-col' : 'contents'}
+        inert={pendingMeta ? true : undefined}
+      >
+        {children}
+      </div>
+    </div>
+  )
+}

apps/sim/components/settings/standalone-settings-shell.tsx

@@ -17,11 +17,9 @@ import {
   toSettingsHeaderMeta,
 } from '@/components/settings/navigation'
 import { SettingsHeaderProvider, SettingsHeaderShell } from '@/components/settings/settings-header'
-import {
-  SettingsNavigationProvider,
-  SettingsPendingSection,
-} from '@/components/settings/settings-navigation-provider'
+import { SettingsNavigationProvider } from '@/components/settings/settings-navigation-provider'
 import { SettingsSectionProvider } from '@/components/settings/settings-panel'
+import { SettingsPendingSection } from '@/components/settings/settings-pending-section'
 import { SettingsSidebar } from '@/components/settings/settings-sidebar'
 import { useSettingsBeforeUnload } from '@/components/settings/use-settings-before-unload'
 import type { DeploymentShape } from '@/lib/api/contracts/workspaces'

apps/sim/ee/workspace-forking/components/fork-sync-detail-view/fork-sync-detail-view.tsx

@@ -18,6 +18,7 @@ import {
   ARCHIVED_PREVIEW_LIMIT,
   useForkSync,
 } from '@/ee/workspace-forking/components/fork-sync/use-fork-sync'
+import type { ForkDirection } from '@/ee/workspace-forking/hooks/workspace-fork'
 import { buildWebhookTriggerUrl } from '@/triggers/webhook-url'
 
 interface ForkSyncDetailViewProps {
@@ -71,6 +72,12 @@ export function ForkSyncDetailView({
   const guard = useSettingsUnsavedGuard({ isDirty: controller.dirty })
 
   const [confirmSyncOpen, setConfirmSyncOpen] = useState(false)
+  // A direction switch drops every in-session choice (see `useForkSync`), so any confirms first.
+  const [pendingDirection, setPendingDirection] = useState<ForkDirection | null>(null)
+  const changeDirection = (next: ForkDirection) => {
+    if (controller.hasSessionChoices) setPendingDirection(next)
+    else void setDirection(next)
+  }
 
   // Sync is the edge's primary action, so it's the rightmost/black chip; the caller's
   // Open workspace chip sits left of it. Dirty mapping edits swap the whole cluster
@@ -112,11 +119,7 @@ export function ForkSyncDetailView({
         title={title}
         actions={panelActions}
       >
-        <ForkSyncView
-          controller={controller}
-          // A direction switch drops the in-session mapping choices, so unsaved edits confirm first.
-          onDirectionChange={(next) => guard.guardBack(() => void setDirection(next))}
-        />
+        <ForkSyncView controller={controller} onDirectionChange={changeDirection} />
       </SettingsPanel>
 
       <UnsavedChangesModal
@@ -125,6 +128,17 @@ export function ForkSyncDetailView({
         onDiscard={guard.confirmDiscard}
       />
 
+      <UnsavedChangesModal
+        open={pendingDirection !== null}
+        onOpenChange={(open) => {
+          if (!open) setPendingDirection(null)
+        }}
+        onDiscard={() => {
+          if (pendingDirection) void setDirection(pendingDirection)
+          setPendingDirection(null)
+        }}
+      />
+
       <ChipConfirmModal
         open={confirmSyncOpen}
         onOpenChange={setConfirmSyncOpen}

apps/sim/ee/workspace-forking/components/fork-sync/use-fork-sync.ts

@@ -220,6 +220,12 @@ export interface ForkSyncController {
   mcpReauthCount: number
   inlineSecretCount: number
   dirty: boolean
+  /**
+   * Whether a direction switch would discard anything chosen this session: unsaved mapping edits,
+   * a copy selection that differs from the default, accepted dropped references, or trigger URL
+   * choices. Broader than {@link dirty}, which only tracks what Save persists.
+   */
+  hasSessionChoices: boolean
   saving: boolean
   save: () => void
   discard: () => void
@@ -769,6 +775,20 @@ export function useForkSync(params: {
 
   const dirty = targetsDirty || reconfigDirty
 
+  const copySelectionChanged = useMemo(() => {
+    if (!copyDefaulted) return false
+    const defaults = forkDefaultCopySelection(copyableUnmapped)
+    if (defaults.size !== copySelected.size) return true
+    for (const key of copySelected) if (!defaults.has(key)) return true
+    return false
+  }, [copyDefaulted, copyableUnmapped, copySelected])
+
+  const hasSessionChoices =
+    dirty ||
+    copySelectionChanged ||
+    droppedRefs.size > 0 ||
+    Object.keys(triggerAdoptions).length > 0
+
   const save = () => {
     if (!otherWorkspaceId || !dirty || updateMapping.isPending) return
     const submittedTargets = targets
@@ -1059,6 +1079,7 @@ export function useForkSync(params: {
     mcpReauthCount: diff.data?.mcpReauthServerIds.length ?? 0,
     inlineSecretCount: diff.data?.inlineSecretSources.length ?? 0,
     dirty,
+    hasSessionChoices,
     saving: updateMapping.isPending,
     save,
     discard,