@morscherlab/mint-sdk 1.2.0-beta.1 → 1.2.0-beta.11

package/src/composables/usePluginConfig.ts

@@ -0,0 +1,252 @@
+import { ref, computed, onMounted, type Ref, type ComputedRef } from 'vue'
+import { useApi } from './useApi'
+import { usePlatformContext } from './usePlatformContext'
+import { getInjectedPlatformContext } from './platformContextHelpers'
+import { useRequestSyncState } from './useRequestSyncState'
+
+const PLATFORM_OWNED_SETTINGS_KEY = 'allowed_experiment_types'
+
+function cloneConfig(config: Record<string, unknown>): Record<string, unknown> {
+  return JSON.parse(JSON.stringify(config)) as Record<string, unknown>
+}
+
+function hasOwnConfig(config: Record<string, unknown>, key: string): boolean {
+  return Object.prototype.hasOwnProperty.call(config, key)
+}
+
+function changedTopLevelKeys(
+  current: Record<string, unknown>,
+  saved: Record<string, unknown>,
+): Set<string> {
+  return new Set(
+    [...new Set([...Object.keys(current), ...Object.keys(saved)])].filter(
+      key => JSON.stringify(current[key]) !== JSON.stringify(saved[key]),
+    ),
+  )
+}
+
+function topLevelConfigPatch(
+  current: Record<string, unknown>,
+  keys: Iterable<string>,
+): Record<string, unknown> {
+  return Object.fromEntries(
+    [...keys].map(key => [
+      key,
+      hasOwnConfig(current, key) ? current[key] : null,
+    ]),
+  )
+}
+
+function platformOwnedConfigPatch(config: Record<string, unknown>): Record<string, unknown> {
+  return {
+    [PLATFORM_OWNED_SETTINGS_KEY]: hasOwnConfig(config, PLATFORM_OWNED_SETTINGS_KEY)
+      ? config[PLATFORM_OWNED_SETTINGS_KEY]
+      : null,
+  }
+}
+
+function responseConfigPayload(response: {
+  config?: Record<string, unknown>
+  settings?: Record<string, unknown>
+}): Record<string, unknown> {
+  return response.config ?? response.settings ?? {}
+}
+
+export interface UsePluginConfigReturn {
+  /** Editable plugin configuration values. */
+  config: Ref<Record<string, unknown>>
+  /** Whether the config is currently loading. */
+  isLoading: Ref<boolean>
+  /** Whether the config is currently saving. */
+  isSaving: Ref<boolean>
+  /** Error message from the last failed operation, or null. */
+  error: Ref<string | null>
+  /** Timestamp of the last successful load, or null. */
+  lastLoadedAt: Ref<Date | null>
+  /** Timestamp of the last successful save, or null. */
+  lastSavedAt: Ref<Date | null>
+  /** Whether local config differs from the last loaded or saved snapshot. */
+  isDirty: ComputedRef<boolean>
+  /** Load plugin configuration from the platform. */
+  load: () => Promise<void>
+  /** Save plugin configuration to the platform. */
+  save: () => Promise<boolean>
+  /** Restore the last loaded or saved configuration snapshot. */
+  reset: () => void
+}
+
+/**
+ * @deprecated Unused by the MINT platform and scheduled for removal in MINT 1.3; use `usePluginSettings()` for typed plugin settings.
+ */
+export function usePluginConfig(pluginName?: string): UsePluginConfigReturn {
+  const injectedContext = getInjectedPlatformContext()
+  const { plugin } = usePlatformContext()
+  const platformApi = useApi()
+  const pluginApi = useApi({
+    baseUrl: injectedContext?.plugin?.api_prefix ?? plugin.value?.api_prefix,
+  })
+
+  const resolvedName = computed(
+    () => pluginName ?? plugin.value?.name ?? injectedContext?.plugin?.name ?? '',
+  )
+  const usesPluginSettingsApi = computed(() => {
+    const currentPlugin = injectedContext?.plugin ?? plugin.value
+    return currentPlugin?.settings_api === 'plugin'
+      && resolvedName.value === currentPlugin.name
+  })
+
+  const config = ref<Record<string, unknown>>({})
+  const savedConfig = ref<Record<string, unknown>>({})
+  const revision = ref<string | null>(null)
+  const request = useRequestSyncState('Plugin config request failed.')
+  const isLoading = ref(false)
+  const isSaving = ref(false)
+  const error = request.error
+  const lastLoadedAt = request.lastLoadedAt
+  const lastSavedAt = request.lastSavedAt
+
+  const isDirty = computed(() => {
+    return JSON.stringify(config.value) !== JSON.stringify(savedConfig.value)
+  })
+
+  async function load(): Promise<void> {
+    const name = resolvedName.value
+    if (!name) return
+
+    isLoading.value = true
+    try {
+      const response = usesPluginSettingsApi.value
+        ? await request.run(
+          () => pluginApi.get<{
+            settings: Record<string, unknown>
+            mode?: string
+            revision?: string
+          }>('/settings'),
+          { success: 'load', errorMessage: 'Failed to load plugin config' },
+        )
+        : await request.run(
+          () => platformApi.get<{
+            plugin_name: string
+            config: Record<string, unknown>
+            revision?: string
+          }>(
+            `/plugins/${encodeURIComponent(name)}/config`,
+          ),
+          { success: 'load', errorMessage: 'Failed to load plugin config' },
+        )
+      const responseConfig = responseConfigPayload(response)
+      config.value = cloneConfig(responseConfig)
+      savedConfig.value = cloneConfig(responseConfig)
+      revision.value = response.revision ?? null
+    } catch {
+      // Error state is handled by request.run().
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function save(): Promise<boolean> {
+    const name = resolvedName.value
+    if (!name) return false
+
+    isSaving.value = true
+    try {
+      const payload = cloneConfig(config.value)
+      let response: {
+        plugin_name?: string
+        config?: Record<string, unknown>
+        settings?: Record<string, unknown>
+        mode?: string
+        revision?: string
+      } | undefined
+      let nextRevision = revision.value
+
+      if (usesPluginSettingsApi.value) {
+        response = await request.run(
+          () => pluginApi.put<{
+            settings: Record<string, unknown>
+            mode?: string
+            revision?: string
+          }>(
+            '/settings',
+            payload,
+            revision.value
+              ? { headers: { 'If-Match': `"${revision.value}"` } }
+              : undefined,
+          ),
+          { success: 'save', errorMessage: 'Failed to save plugin config' },
+        )
+        nextRevision = response.revision ?? nextRevision
+      } else {
+        const dirtyKeys = changedTopLevelKeys(payload, savedConfig.value)
+        const platformOwnedChanged = dirtyKeys.has(PLATFORM_OWNED_SETTINGS_KEY)
+        const typedKeys = [...dirtyKeys].filter(
+          key => key !== PLATFORM_OWNED_SETTINGS_KEY,
+        )
+
+        if (typedKeys.length) {
+          response = await request.run(
+            () => platformApi.patch<{
+              plugin_name: string
+              config: Record<string, unknown>
+              revision?: string
+            }>(
+              `/plugins/${encodeURIComponent(name)}/config`,
+              { config: topLevelConfigPatch(payload, typedKeys) },
+            ),
+            { success: 'save', errorMessage: 'Failed to save plugin config' },
+          )
+          nextRevision = response.revision ?? nextRevision
+        }
+
+        if (platformOwnedChanged) {
+          response = await request.run(
+            () => platformApi.patch<{
+              plugin_name: string
+              config: Record<string, unknown>
+              revision?: string
+            }>(
+              `/plugins/${encodeURIComponent(name)}/config`,
+              { config: platformOwnedConfigPatch(payload) },
+            ),
+            { success: 'save', errorMessage: 'Failed to save plugin config' },
+          )
+          nextRevision = response.revision ?? nextRevision
+        }
+      }
+
+      if (!response) return true
+      const responseConfig = responseConfigPayload(response)
+      config.value = cloneConfig(responseConfig)
+      savedConfig.value = cloneConfig(responseConfig)
+      revision.value = response.revision ?? nextRevision
+      return true
+    } catch {
+      return false
+    } finally {
+      isSaving.value = false
+    }
+  }
+
+  function reset(): void {
+    config.value = cloneConfig(savedConfig.value)
+    request.clearError()
+  }
+
+  onMounted(() => {
+    load()
+  })
+
+  return {
+    config,
+    isLoading,
+    isSaving,
+    error,
+    lastLoadedAt,
+    lastSavedAt,
+    isDirty,
+    load,
+    save,
+    reset,
+  }
+}

package/src/composables/usePluginWorkspace.ts

@@ -0,0 +1,208 @@
+import { computed } from 'vue'
+import type { ComputedRef } from 'vue'
+import type { PageSelectorItem, PillNavItem } from '../types'
+import type {
+  PluginWorkspaceViewEmit,
+  PluginWorkspaceViewProps,
+} from '../components/PluginWorkspaceView.props'
+import { usePluginWorkspaceControls } from '../components/PluginWorkspaceView.controls'
+import { usePluginWorkspaceNavigation } from '../components/PluginWorkspaceView.navigation'
+import {
+  getPluginWorkspaceSidebarSlotNames,
+  getPluginWorkspaceTopBarSlotNames,
+  hasPluginWorkspaceSidebarSurface,
+} from '../components/PluginWorkspaceView.shell'
+import type {
+  PluginWorkspaceControlsModel,
+  PluginWorkspaceShellModel,
+  PluginWorkspaceSidebarModel,
+} from './pluginWorkspaceModel'
+
+/**
+ * Loosely-typed view of a component's `useSlots()` result: only slot presence and names are
+ * read here, so this accepts any `defineSlots()` shape without fighting Vue's `Slot` render
+ * function type. Mirrors the `SlotKeyMap` helper type in PluginWorkspaceView.shell.ts.
+ */
+export type PluginWorkspaceSlotsLike = Readonly<Record<string, unknown>>
+
+export interface UsePluginWorkspaceOptions {
+  /** PluginWorkspaceView's own reactive props object (from `defineProps`). */
+  props: PluginWorkspaceViewProps
+  /** PluginWorkspaceView's own slots (from `useSlots()`), used to detect provided passthrough slots. */
+  slots: PluginWorkspaceSlotsLike
+  /** PluginWorkspaceView's own typed `emit` function (from `defineEmits<PluginWorkspaceViewEmits>()`). */
+  emit: PluginWorkspaceViewEmit
+}
+
+export interface UsePluginWorkspaceReturn {
+  /** Model consumed by WorkspaceShellInternal's `shell` prop. */
+  shell: ComputedRef<PluginWorkspaceShellModel>
+  /** Model consumed by WorkspaceSidebarInternal's `sidebar` prop. */
+  sidebar: ComputedRef<PluginWorkspaceSidebarModel>
+  /** Model consumed by WorkspaceControlsInternal's `controls` prop, and by the raw `default` slot. */
+  controls: ComputedRef<PluginWorkspaceControlsModel>
+  /** Whether AppLayout should render a sidebar surface at all. */
+  hasSidebarSurface: ComputedRef<boolean>
+  /** Applies an AppSidebar `update:model-value` payload to the shared control values and emits `update:modelValue`/`update:values`. */
+  handleControlValuesUpdate: (values: Record<string, unknown>) => void
+  /** Resolves an AppTopBar `page-selector-select` payload into the active view and emits `page-selector-select`. */
+  handlePageSelectorSelect: (page: PageSelectorItem) => void
+  /** Resolves an AppTopBar `pill-select` payload into the active view and emits `pill-select`. */
+  handlePillSelect: (item: PillNavItem) => void
+}
+
+/**
+ * Maps PluginWorkspaceView's flat 72-prop surface into the three typed model objects
+ * (`shell`, `sidebar`, `controls`) rendered by its internal pieces
+ * (WorkspaceShellInternal, WorkspaceSidebarInternal, WorkspaceControlsInternal). Reuses the
+ * existing `usePluginWorkspaceControls` / `usePluginWorkspaceNavigation` composables and the
+ * PluginWorkspaceView.shell slot-detection helpers, so it changes only how that state is
+ * assembled and exposed, not the underlying behavior.
+ *
+ * @example Recommended
+ * ```ts
+ * const props = withDefaults(defineProps<PluginWorkspaceViewProps>(), { ... })
+ * const emit = defineEmits<PluginWorkspaceViewEmits>()
+ * const slots = useSlots()
+ * const { shell, sidebar, controls } = usePluginWorkspace({ props, slots, emit })
+ * ```
+ */
+export function usePluginWorkspace(options: UsePluginWorkspaceOptions): UsePluginWorkspaceReturn {
+  const { props, slots, emit } = options
+
+  const controlsState = usePluginWorkspaceControls({
+    model: () => props.model,
+    controls: () => props.controls,
+    controlOptions: () => props.controlOptions ?? {},
+    modelValue: () => props.modelValue,
+    values: () => props.values,
+    componentBindings: () => props.componentBindings,
+    componentProps: () => props.componentProps,
+    componentPropsById: () => props.componentPropsById,
+    emitValues: (values) => {
+      emit('update:modelValue', values)
+      emit('update:values', values)
+    },
+  })
+
+  const navigationState = usePluginWorkspaceNavigation({
+    activeView: () => props.activeView,
+    defaultActiveView: () => props.defaultActiveView,
+    currentPillId: () => props.currentPillId,
+    currentPageSelectorId: () => props.currentPageSelectorId,
+    pillNav: () => props.pillNav,
+    pageSelector: () => props.pageSelector,
+    panelIds: () => Object.keys(props.panels ?? {}),
+    generatedPillNav: controlsState.generatedPillNav,
+    generatedDefaultView: controlsState.generatedDefaultView,
+    emitActiveView: viewId => emit('update:activeView', viewId),
+    emitPageSelectorSelect: page => emit('page-selector-select', page),
+    emitPillSelect: item => emit('pill-select', item),
+  })
+
+  const topBarSlotNames = computed<string[]>(() => getPluginWorkspaceTopBarSlotNames(slots))
+  const sidebarSlotNames = computed<string[]>(() => getPluginWorkspaceSidebarSlotNames(slots))
+
+  const hasSidebarSurface = computed(() => hasPluginWorkspaceSidebarSurface({
+    showSidebar: props.showSidebar ?? true,
+    panels: props.panels ?? {},
+    forms: props.forms ?? {},
+    model: props.model,
+    controls: props.controls,
+    showSidebarWhenEmpty: props.showSidebarWhenEmpty ?? false,
+    sidebarContentId: props.sidebarContentId,
+    sidebarTitle: props.sidebarTitle,
+    sidebarSubtitle: props.sidebarSubtitle,
+    sidebarBadge: props.sidebarBadge,
+    hasSidebarSlot: Boolean(slots.sidebar),
+    sidebarSlotCount: sidebarSlotNames.value.length,
+  }))
+
+  const controls = computed<PluginWorkspaceControlsModel>(() => ({
+    activeView: navigationState.resolvedActiveView.value,
+    setActiveView: navigationState.setActiveView,
+    values: controlsState.internalControlValues,
+    componentBindings: controlsState.resolvedComponentBindings.value,
+    componentBindingsById: controlsState.resolvedComponentBindingsById.value,
+    componentProps: controlsState.resolvedComponentProps.value,
+    componentPropsById: controlsState.resolvedComponentPropsById.value,
+  }))
+
+  const shell = computed<PluginWorkspaceShellModel>(() => ({
+    sidebarPosition: props.sidebarPosition ?? 'left',
+    sidebarWidth: props.sidebarWidth,
+    floating: props.floating ?? true,
+    responsiveSidebar: props.responsiveSidebar ?? true,
+    sidebarToggleLabel: props.sidebarToggleLabel ?? 'Open workspace sidebar',
+    sidebarCloseLabel: props.sidebarCloseLabel ?? 'Close workspace sidebar',
+    hasSidebarSurface: hasSidebarSurface.value,
+    title: props.title ?? 'Workspace',
+    subtitle: props.subtitle,
+    topBarVariant: props.topBarVariant ?? 'card',
+    homePath: props.homePath ?? '/',
+    showLogo: props.showLogo ?? true,
+    pageSelector: props.pageSelector,
+    currentPageSelectorId: navigationState.resolvedCurrentPageSelectorId.value,
+    pluginSwitcher: props.pluginSwitcher,
+    pillNav: navigationState.resolvedPillNav.value,
+    currentPillId: navigationState.resolvedCurrentPillId.value,
+    showThemeToggle: props.showThemeToggle ?? true,
+    showSettings: props.showSettings ?? true,
+    settingsConfig: props.settingsConfig,
+    showStandaloneLabel: props.showStandaloneLabel ?? false,
+    standaloneLabel: props.standaloneLabel ?? 'Standalone',
+    accountMenu: props.accountMenu,
+    showNotifications: props.showNotifications ?? false,
+    hasNotificationDot: props.hasNotificationDot ?? false,
+    showAdmin: props.showAdmin ?? false,
+    adminPath: props.adminPath ?? '/admin',
+    userName: props.userName,
+    userInitial: props.userInitial,
+    userEmail: props.userEmail,
+    topBarSlotNames: topBarSlotNames.value,
+    controls: controls.value,
+  }))
+
+  const sidebar = computed<PluginWorkspaceSidebarModel>(() => ({
+    title: props.sidebarTitle,
+    subtitle: props.sidebarSubtitle,
+    badge: props.sidebarBadge,
+    variant: props.sidebarVariant ?? 'analysis',
+    panels: props.panels ?? {},
+    activeView: navigationState.resolvedActiveView.value,
+    floating: false,
+    dense: props.dense ?? true,
+    width: props.sidebarWidth,
+    side: props.sidebarPosition ?? 'left',
+    forms: props.forms ?? {},
+    contentId: props.sidebarContentId,
+    showWhenEmpty: (props.showSidebarWhenEmpty ?? false) || props.sidebarContentId !== undefined,
+    model: props.model,
+    controlSchema: props.controls,
+    controlOptions: props.controlOptions ?? {},
+    values: controlsState.internalControlValues,
+    formEnhancements: props.formEnhancements,
+    showFormActions: props.showFormActions ?? false,
+    formLoading: props.formLoading ?? false,
+    formDisabled: props.formDisabled ?? false,
+    formReadonly: props.formReadonly ?? false,
+    formSize: props.formSize ?? 'sm',
+    collapsible: props.sidebarCollapsible,
+    collapsed: props.sidebarCollapsed,
+    defaultCollapsed: props.defaultSidebarCollapsed ?? false,
+    collapsedWidth: props.sidebarCollapsedWidth ?? '3rem',
+    collapseButtonLabel: props.sidebarCollapseButtonLabel ?? 'Collapse sidebar',
+    expandButtonLabel: props.sidebarExpandButtonLabel ?? 'Expand sidebar',
+    slotNames: sidebarSlotNames.value,
+  }))
+
+  return {
+    shell,
+    sidebar,
+    controls,
+    hasSidebarSurface,
+    handleControlValuesUpdate: controlsState.handleControlValuesUpdate,
+    handlePageSelectorSelect: navigationState.handlePageSelectorSelect,
+    handlePillSelect: navigationState.handlePillSelect,
+  }
+}

package/src/composables/useRackEditor.ts

@@ -1,5 +1,6 @@
 import { ref, computed, type Ref, type ComputedRef } from 'vue'
 import type { Rack, SlotPosition, WellPlateFormat, Well } from '../types'
+import { PLATE_CONFIGS, rowLabel as plateRowLabel } from '../components/WellPlate.geometry'
 
 export interface UseRackEditorOptions {
   defaultFormat?: WellPlateFormat
@@ -31,15 +32,6 @@ export interface UseRackEditorReturn {
 
 const SLOT_CYCLE: SlotPosition[] = ['R', 'G', 'B', 'Y']
 
-const PLATE_CONFIGS: Record<WellPlateFormat, { rows: number; cols: number }> = {
-  6: { rows: 2, cols: 3 },
-  12: { rows: 3, cols: 4 },
-  24: { rows: 4, cols: 6 },
-  48: { rows: 6, cols: 8 },
-  54: { rows: 6, cols: 9 },
-  96: { rows: 8, cols: 12 },
-  384: { rows: 16, cols: 24 },
-}
 
 let globalIdCounter = 0
 
@@ -156,8 +148,7 @@ export function useRackEditor(
     let counter = 1
     for (let row = 0; row < config.rows; row++) {
       for (let col = 0; col < config.cols; col++) {
-        const rowLabel = String.fromCharCode(65 + row)
-        const wellId = `${rowLabel}${col + 1}`
+        const wellId = `${plateRowLabel(row)}${col + 1}`
         // Only fill empty wells
         if (!rack.wells[wellId]?.sampleType) {
           const paddedNum = String(counter).padStart(3, '0')

package/src/composables/useRequestSyncState.ts

@@ -1,10 +1,28 @@
 import { ref, type Ref } from 'vue'
+import { readErrorMessage as readSharedErrorMessage } from '../utils/errors'
 
 export type RequestSyncSuccessKind = 'load' | 'save' | 'run'
 
+/**
+ * The unit of work `run()` drives.
+ *
+ * It receives an `AbortSignal` that fires when the run is superseded by a
+ * newer `run()` or by `cancel()`. Zero-argument operations stay valid and
+ * simply ignore it.
+ */
+export type RequestSyncOperation<T> = (signal: AbortSignal) => Promise<T>
+
 export interface RequestSyncRunOptions {
   success?: RequestSyncSuccessKind
   errorMessage?: string
+  /**
+   * Abort the previously started run when this one starts. Default `true`;
+   * pass `false` to let overlapping runs finish their own work (the stale
+   * guard on shared state still applies either way).
+   */
+  abortPrevious?: boolean
+  /** Caller-owned signal; aborting it aborts this run's signal too. */
+  signal?: AbortSignal
 }
 
 export interface UseRequestSyncStateReturn {
@@ -30,8 +48,32 @@ export interface UseRequestSyncStateReturn {
   markSaved: (date?: Date) => void
   /** Mark the operation as successfully run. */
   markRun: (date?: Date) => void
-  /** Run a request with shared loading/error handling and optional sync marking. */
-  run: <T>(operation: () => Promise<T>, options?: RequestSyncRunOptions) => Promise<T>
+  /**
+   * Run a request with shared loading/error handling and optional sync marking.
+   *
+   * ## Stale-response semantics
+   *
+   * Every call takes a monotonically increasing token. Starting a run
+   * supersedes any run started before it, and a superseded run writes **no**
+   * shared state when it finally settles: it does not clear `loading`, does not
+   * set `error`, and does not move `lastLoadedAt` / `lastSavedAt` / `lastRunAt`.
+   * Only the newest run owns those.
+   *
+   * The caller's own promise is untouched by the guard — a superseded run still
+   * resolves with its value or rejects with its own error, exactly as the
+   * operation did. The guard never invents a rejection, so a caller awaiting
+   * `run()` never sees a "superseded" error it did not cause.
+   *
+   * The operation additionally receives an `AbortSignal` that fires when its
+   * run is superseded or `cancel()` is called, so an operation that forwards
+   * the signal (`fetch(url, { signal })`) stops work instead of racing.
+   */
+  run: <T>(operation: RequestSyncOperation<T>, options?: RequestSyncRunOptions) => Promise<T>
+  /**
+   * Abort the in-flight run and drop `loading`. The aborted run's completion
+   * is treated as stale and writes no state.
+   */
+  cancel: () => void
 }
 
 /** Shared loading/error/timestamp state for generated plugin request helpers. */
@@ -49,22 +91,7 @@ export function useRequestSyncState(
   }
 
   function readErrorMessage(value: unknown, fallback = defaultErrorMessage): string {
-    if (value instanceof Error && value.message) {
-      return value.message
-    }
-    if (typeof value === 'string' && value.trim()) {
-      return value
-    }
-    if (
-      typeof value === 'object'
-      && value !== null
-      && 'message' in value
-      && typeof (value as { message?: unknown }).message === 'string'
-      && (value as { message: string }).message
-    ) {
-      return (value as { message: string }).message
-    }
-    return fallback
+    return readSharedErrorMessage(value, fallback)
   }
 
   function setError(value: unknown, fallback?: string): string {
@@ -85,27 +112,69 @@ export function useRequestSyncState(
     lastRunAt.value = date
   }
 
+  // Monotonic token guarding every write to the shared loading/error/timestamp
+  // state. Overlapping runs settle in any order, and a superseded one must not
+  // clear a newer run's loading flag or overwrite its error.
+  let runToken = 0
+  let activeController: AbortController | null = null
+
+  function cancel(): void {
+    runToken += 1
+    activeController?.abort()
+    activeController = null
+    loading.value = false
+  }
+
   async function run<T>(
-    operation: () => Promise<T>,
+    operation: RequestSyncOperation<T>,
     options: RequestSyncRunOptions = {},
   ): Promise<T> {
+    if (options.abortPrevious !== false) {
+      activeController?.abort()
+    }
+
+    const token = (runToken += 1)
+    const controller = new AbortController()
+    activeController = controller
+
+    const callerSignal = options.signal
+    if (callerSignal) {
+      if (callerSignal.aborted) controller.abort(callerSignal.reason)
+      else callerSignal.addEventListener(
+        'abort',
+        () => controller.abort(callerSignal.reason),
+        { once: true },
+      )
+    }
+
+    const isCurrent = (): boolean => token === runToken
+
     loading.value = true
     clearError()
     try {
-      const response = await operation()
-      if (options.success === 'load') {
-        markLoaded()
-      } else if (options.success === 'save') {
-        markSaved()
-      } else if (options.success === 'run') {
-        markRun()
+      const response = await operation(controller.signal)
+      if (isCurrent()) {
+        if (options.success === 'load') {
+          markLoaded()
+        } else if (options.success === 'save') {
+          markSaved()
+        } else if (options.success === 'run') {
+          markRun()
+        }
       }
       return response
     } catch (err) {
-      setError(err, options.errorMessage)
+      if (isCurrent()) {
+        setError(err, options.errorMessage)
+      }
       throw err
     } finally {
-      loading.value = false
+      if (isCurrent()) {
+        loading.value = false
+      }
+      if (activeController === controller) {
+        activeController = null
+      }
     }
   }
 
@@ -122,5 +191,6 @@ export function useRequestSyncState(
     markSaved,
     markRun,
     run,
+    cancel,
   }
 }