@morscherlab/mint-sdk 1.3.9 → 1.4.0-beta.2

package/src/composables/pluginEndpointBuilder.ts

@@ -1,13 +1,11 @@
-import {
-  getInjectedPlatformContext,
-  resolveCurrentExperimentId,
-} from './platformContextHelpers'
+import { getInjectedPlatformContext } from './platformContextHelpers'
+import { useExperimentStore } from '../stores/experiment'
 import type {
-  BuildPluginEndpointUrlOptions,
+  BuildEndpointUrlOptions,
   PluginContract,
   PluginEndpointDefinition,
   PluginEndpointParamDefinition,
-} from './usePluginClient'
+} from './createClient'
 
 function normalizeApiBaseUrl(baseUrl: string | undefined): string | undefined {
   if (!baseUrl) return undefined
@@ -94,8 +92,8 @@ function withDefaultPathParams(
       continue
     }
     if (isExperimentPathParam(fieldName) || isExperimentPathParam(name)) {
-      const experimentId = resolveCurrentExperimentId()
-      if (experimentId !== undefined) {
+      const experimentId = useExperimentStore().currentId
+      if (experimentId !== null) {
         nextPayload[fieldName] = experimentId
       }
     }
@@ -254,11 +252,11 @@ function joinBaseUrl(baseUrl: string, path: string): string {
 }
 
 /** Build the concrete URL for a generated plugin endpoint without making a request. */
-export function buildPluginEndpointUrl(
+export function buildEndpointUrl(
   contract: PluginContract,
   endpoint: PluginEndpointDefinition,
   payload?: unknown,
-  options: BuildPluginEndpointUrlOptions = {},
+  options: BuildEndpointUrlOptions = {},
 ): string {
   const parts = pluginEndpointRequestParts(contract, endpoint, payload, options.baseUrl)
   const pathWithQuery = `${parts.path}${queryString(parts.query)}`

package/src/composables/pluginWorkspaceModel.ts

@@ -1,31 +1,22 @@
 import type {
-  AccountMenuItem,
-  PageSelectorItemInput,
-  PillNavItemInput,
-  SidebarToolSection,
-  TopBarSettingsConfig,
-  TopBarVariant,
+  PluginWorkspaceSidebarSpec,
+  PluginWorkspaceTopBarSpec,
 } from '../types'
-import type { FormEnhancements, FormSchema } from '../types/form-builder'
 import type {
   ControlComponentBinding,
   ControlComponentBindingsById,
-  ControlModel,
-  ControlModelBinding,
-  ControlSchema,
-  ControlWorkspaceOptions,
 } from './useControlSchema'
 
 /**
  * Scoped-slot payload shared by PluginWorkspaceView's `default`, `topbar`, and `sidebar`
  * slots: the resolved active view plus the values and component bindings/props derived
- * from the compact control schema. WorkspaceControlsInternal renders a component's default
+ * from the sidebar control model. WorkspaceControlsInternal renders a component's default
  * slot bound to exactly this shape.
  */
 export interface PluginWorkspaceControlsModel {
   /** Currently resolved workspace view id. */
   activeView: string
-  /** Sets the active view, updating any uncontrolled state and emitting `update:activeView`. */
+  /** Sets the active view, updating any uncontrolled state and emitting `update:view`. */
   setActiveView: (viewId: string) => void
   /** Current control values, shared between the auto-rendered sidebar form and the default slot. */
   values: Record<string, unknown>
@@ -41,8 +32,8 @@ export interface PluginWorkspaceControlsModel {
 
 /**
  * Resolved AppLayout + AppTopBar configuration consumed by WorkspaceShellInternal: top bar
- * chrome and navigation, plus the AppLayout layout/collapse props that own the responsive
- * mobile sidebar toggle.
+ * spec and active pill, plus the AppLayout layout props that own the responsive mobile
+ * sidebar toggle.
  */
 export interface PluginWorkspaceShellModel {
   /** AppLayout sidebar position. */
@@ -63,114 +54,32 @@ export interface PluginWorkspaceShellModel {
   title: string
   /** Secondary copy shown under the title. */
   subtitle?: string
-  /** Top bar visual treatment. */
-  topBarVariant: TopBarVariant
-  /** Home link used by the top bar brand icon. */
-  homePath: string
-  /** Show the default MINT logo when no icon/logo slot is provided. */
-  showLogo: boolean
-  /** Preferred route-level page selector entries. */
-  pageSelector?: PageSelectorItemInput[]
-  /** Resolved active page selector id. */
-  currentPageSelectorId: string
-  /** Resolved centered pill navigation, generated from the control schema when omitted. */
-  pillNav?: PillNavItemInput[]
+  /** AppTopBar spec with the workspace defaults applied and the generated pills filled in; `false` removes the top bar. */
+  topBar: false | PluginWorkspaceTopBarSpec
   /** Resolved active centered pill id. */
-  currentPillId: string
-  /** Show the theme toggle button. */
-  showThemeToggle: boolean
-  /** Show the settings button and modal. */
-  showSettings: boolean
-  /** Built-in settings modal configuration. */
-  settingsConfig?: TopBarSettingsConfig
-  /** Show the standalone badge when not integrated into the platform. */
-  showStandaloneLabel: boolean
-  /** Custom standalone badge label. */
-  standaloneLabel: string
-  /** Account dropdown entries. */
-  accountMenu?: AccountMenuItem[]
-  /** Show the notifications icon button. */
-  showNotifications: boolean
-  /** Draw a notification dot on the notifications icon. */
-  hasNotificationDot: boolean
-  /** Show the admin shortcut. */
-  showAdmin: boolean
-  /** Route used by the admin shortcut. */
-  adminPath: string
-  /** Account display name. */
-  userName?: string
-  /** Explicit account avatar initial. */
-  userInitial?: string
-  /** Account email shown in the avatar menu. */
-  userEmail?: string
+  pill: string
   /** Names of AppTopBar passthrough slots the caller actually provided. */
   topBarSlotNames: string[]
   /** Scoped-slot payload exposed to the `topbar` override slot. */
   controls: PluginWorkspaceControlsModel
 }
 
-/**
- * Resolved AppSidebar configuration consumed by WorkspaceSidebarInternal: sidebar chrome,
- * panels/forms, collapse behavior, and the compact control-schema props that drive
- * AppSidebar's auto-generated form.
- */
+/** Resolved AppSidebar configuration consumed by WorkspaceSidebarInternal. */
 export interface PluginWorkspaceSidebarModel {
-  /** Sidebar chrome title. */
-  title?: string
-  /** Sidebar chrome subtitle. */
-  subtitle?: string
-  /** Optional compact badge/count rendered in the sidebar header. */
-  badge?: string | number
-  /** Map of view IDs to sidebar tool sections. */
-  panels: Record<string, SidebarToolSection[]>
+  /** AppSidebar spec with the workspace defaults applied. */
+  spec: PluginWorkspaceSidebarSpec
   /** Resolved active view, used to pick which panels/forms render. */
   activeView: string
-  /** AppSidebar floating style (always false: PluginWorkspaceView docks the sidebar inside AppLayout). */
-  floating: boolean
-  /** Compact AppSidebar density. */
-  dense: boolean
-  /** Sidebar CSS width. */
-  width?: string
-  /** Sidebar position, mirrors the shell's `sidebarPosition`. */
-  side: 'left' | 'right'
-  /** Optional FormBuilder schemas keyed by section ID. */
-  forms: Record<string, FormSchema>
-  /** DOM id for the AppSidebar scrollable content area. */
-  contentId?: string
-  /** Render the sidebar shell even when no panel matches the active view. */
-  showWhenEmpty: boolean
-  /** Optional compact control model for the generated sidebar form. */
-  model?: ControlModel | ControlModelBinding
-  /** Compact control schema for the generated sidebar form. */
-  controlSchema?: ControlSchema
-  /** Options passed to compact control schema generation. */
-  controlOptions: ControlWorkspaceOptions
   /** Shared values for the auto-rendered sidebar form. */
   values: Record<string, unknown>
-  /** Runtime FormBuilder enhancements for the auto-rendered sidebar form. */
-  formEnhancements?: FormEnhancements<Record<string, unknown>>
-  /** Show submit/cancel actions inside the auto-rendered sidebar form. */
-  showFormActions: boolean
+  /** Controlled sidebar collapsed state. */
+  collapsed?: boolean
   /** Loading/saving state for the auto-rendered sidebar form. */
   formLoading: boolean
   /** Disabled state for the auto-rendered sidebar form. */
   formDisabled: boolean
   /** Readonly state for the auto-rendered sidebar form. */
   formReadonly: boolean
-  /** Size passed to the auto-rendered sidebar form. */
-  formSize: 'sm' | 'md' | 'lg'
-  /** Show a built-in collapse/expand button in the sidebar chrome. */
-  collapsible?: boolean
-  /** Controlled sidebar collapsed state. */
-  collapsed?: boolean
-  /** Initial sidebar collapsed state when uncontrolled. */
-  defaultCollapsed: boolean
-  /** Sidebar width when collapsed. */
-  collapsedWidth: string
-  /** Accessible label for the sidebar collapse action. */
-  collapseButtonLabel: string
-  /** Accessible label for the sidebar expand action. */
-  expandButtonLabel: string
   /** Names of AppSidebar passthrough slots the caller actually provided. */
   slotNames: string[]
 }

package/src/composables/useApi.ts

@@ -9,13 +9,11 @@ let interceptorAttached = false
 interface MintAxiosRequestConfig extends AxiosRequestConfig {
   _mintSkipAuth?: boolean
   _mintAuthToken?: string
-  _mintTypedErrors?: boolean
 }
 
 interface MintInternalAxiosRequestConfig extends InternalAxiosRequestConfig {
   _mintSkipAuth?: boolean
   _mintAuthToken?: string
-  _mintTypedErrors?: boolean
 }
 
 type MutableHeaders = Record<string, unknown> & {
@@ -158,8 +156,6 @@ export interface ApiClientOptions {
   baseUrl?: string
   timeout?: number
   withAuth?: boolean
-  /** Normalize failed responses into MintApiError. Generated clients enable this by default. */
-  typedErrors?: boolean
 }
 
 export interface UseApiReturn {
@@ -175,7 +171,7 @@ export interface UseApiReturn {
   buildWsUrl: (path: string) => string
 }
 
-/** Axios-based API client that injects the plugin base URL and JWT auth header on every request. */
+/** Axios-based API client that injects the plugin base URL and JWT auth header on every request. A failed response rejects with a `MintApiError`. */
 export function useApi(options: ApiClientOptions = {}): UseApiReturn {
   const settingsStore = useSettingsStore()
   const authStore = useAuthStore()
@@ -209,33 +205,26 @@ export function useApi(options: ApiClientOptions = {}): UseApiReturn {
       async (error: unknown) => {
         if (axios.isAxiosError(error) && error.response) {
           const request = error.config as MintInternalAxiosRequestConfig | undefined
-          if (request?._mintTypedErrors) {
-            let payload: unknown = error.response.data
-            if (payload instanceof Blob) {
-              try {
-                payload = JSON.parse(await payload.text())
-              } catch {
-                // Keep non-JSON download errors available as the original body.
-              }
+          let payload: unknown = error.response.data
+          if (payload instanceof Blob) {
+            try {
+              payload = JSON.parse(await payload.text())
+            } catch {
+              // Keep non-JSON download errors available as the original body.
             }
-            const typed = mintApiErrorFromResponse(
-              error.response.status,
-              payload,
-              {
-                requestId: String(error.response.headers?.['x-request-id'] ?? '') || null,
-                cause: error,
-              },
-            )
-            if (error.response.status === 401 && request._mintSkipAuth !== true) {
-              return Promise.reject(authenticationRequiredError(error, request._mintAuthToken, typed))
-            }
-            return Promise.reject(typed)
           }
-          if (error.response.status === 401) {
-            if (request?._mintSkipAuth !== true) {
-              return Promise.reject(authenticationRequiredError(error, request?._mintAuthToken))
-            }
+          const typed = mintApiErrorFromResponse(
+            error.response.status,
+            payload,
+            {
+              requestId: String(error.response.headers?.['x-request-id'] ?? '') || null,
+              cause: error,
+            },
+          )
+          if (error.response.status === 401 && request?._mintSkipAuth !== true) {
+            return Promise.reject(authenticationRequiredError(error, request?._mintAuthToken, typed))
           }
+          return Promise.reject(typed)
         }
         return Promise.reject(error)
       },
@@ -256,7 +245,6 @@ export function useApi(options: ApiClientOptions = {}): UseApiReturn {
     const base: MintAxiosRequestConfig = {
       baseURL: getBaseUrl(),
       timeout: options.timeout ?? settingsStore.requestTimeout,
-      _mintTypedErrors: options.typedErrors,
       ...config,
     }
     // Strip auth header if explicitly disabled

package/src/composables/useAppExperiment.ts

@@ -42,7 +42,7 @@ export interface AppExperimentPopoverBinding {
 }
 
 export interface AppExperimentSelectorModalBinding {
-  modelValue: boolean
+  open: boolean
   currentExperimentId: number | null
 }
 
@@ -139,15 +139,16 @@ export function useAppExperiment(options: UseAppExperimentOptions = {}): UseAppE
     saveSuccessMessage: saveSuccessMessage.value,
   }))
   const selectorModal = computed<AppExperimentSelectorModalBinding>(() => ({
-    modelValue: showModal.value,
+    open: showModal.value,
     currentExperimentId: experimentId.value,
   }))
 
   if (options.onSelect) {
+    // Keyed by id, so a refresh of the same experiment is not a new selection.
     watch(
-      () => store.current,
-      (experiment) => {
-        if (experiment) void options.onSelect?.(experiment)
+      () => store.current?.id,
+      (id) => {
+        if (id !== undefined && store.current) void options.onSelect?.(store.current)
       },
     )
   }

package/src/composables/{useAnalysisArtifacts.ts → useArtifacts.ts}

@@ -8,11 +8,9 @@ import {
   type Ref,
 } from 'vue'
 import { useApi } from './useApi'
-import { useRequestSyncState } from './useRequestSyncState'
-import {
-  getInjectedPlatformContext,
-  resolveCurrentExperimentId,
-} from './platformContextHelpers'
+import { useRequest } from './useRequest'
+import { getInjectedPlatformContext } from './platformContextHelpers'
+import { useExperimentStore } from '../stores/experiment'
 import type {
   AnalysisArtifactDetail,
   AnalysisArtifactListResponse,
@@ -24,8 +22,8 @@ import type {
 
 export { ANALYSIS_FILE_ARTIFACT_SCHEMA } from '../types/analysisArtifactTypes'
 
-export interface UseAnalysisArtifactsOptions {
-  /** Experiment id; defaults to platform injection or URL. Refetches when it changes. */
+export interface UseArtifactsOptions {
+  /** Experiment id; defaults to the current experiment (`useExperimentStore`). Refetches when it changes. */
   experimentId?: MaybeRefOrGetter<number | undefined>
   /** Override API base URL. */
   apiBaseUrl?: string
@@ -37,14 +35,14 @@ export interface UseAnalysisArtifactsOptions {
   immediate?: boolean
 }
 
-export interface UseAnalysisArtifactsReturn {
+export interface UseArtifactsReturn {
   /** Fetched artifacts, scoped to pluginId when set. */
   artifacts: ComputedRef<AnalysisArtifactSummary[]>
   /** Artifacts after applying statusFilter, pluginFilter, and search. */
   visibleArtifacts: ComputedRef<AnalysisArtifactSummary[]>
   /** Detail loaded by the last successful getDetail call, or null. */
   selectedDetail: Ref<AnalysisArtifactDetail | null>
-  /** Resolved experiment id from options, platform injection, or URL. */
+  /** Resolved experiment id from options or the current experiment. */
   currentExperimentId: ComputedRef<number | undefined>
   /** Whether an experiment id is available. */
   hasCurrentExperiment: ComputedRef<boolean>
@@ -90,23 +88,25 @@ export interface UseAnalysisArtifactsReturn {
  *
  * @example Recommended
  * ```ts
- * const artifacts = useAnalysisArtifacts({ pluginId: 'LEAF' })
+ * const artifacts = useArtifacts({ pluginId: 'LEAF' })
  * await artifacts.list()
  * ```
  */
-export function useAnalysisArtifacts(
-  options: UseAnalysisArtifactsOptions = {},
-): UseAnalysisArtifactsReturn {
+export function useArtifacts(
+  options: UseArtifactsOptions = {},
+): UseArtifactsReturn {
   const injectedContext = getInjectedPlatformContext()
   const api = useApi({ baseUrl: options.apiBaseUrl ?? injectedContext?.platformApiUrl })
+  const experimentStore = useExperimentStore()
 
   const currentExperimentId = computed<number | undefined>(
-    () => toValue(options.experimentId) ?? resolveCurrentExperimentId(injectedContext),
+    () => toValue(options.experimentId) ?? experimentStore.currentId ?? undefined,
   )
   const hasCurrentExperiment = computed(() => currentExperimentId.value !== undefined)
   const scopePluginId = computed(() => toValue(options.pluginId) ?? null)
 
-  const request = useRequestSyncState('Analysis artifact request failed.')
+  const request = useRequest('Analysis artifact request failed.')
+  const lastLoadedAt = ref<Date | null>(null)
   const fetchedArtifacts = ref<AnalysisArtifactSummary[]>([])
   const selectedDetail = ref<AnalysisArtifactDetail | null>(null)
 
@@ -182,7 +182,7 @@ export function useAnalysisArtifacts(
       if (token !== listToken) return artifacts.value
       // Copy: replaceArtifact splices in place, and the response array is not ours.
       fetchedArtifacts.value = [...(data?.artifacts ?? [])]
-      request.markLoaded()
+      lastLoadedAt.value = new Date()
       return artifacts.value
     } catch (err) {
       if (token !== listToken) return []
@@ -206,7 +206,7 @@ export function useAnalysisArtifacts(
       )
       if (token !== detailToken) return null
       selectedDetail.value = detail
-      request.markLoaded()
+      lastLoadedAt.value = new Date()
       return detail
     } catch (err) {
       if (token !== detailToken) return null
@@ -272,7 +272,6 @@ export function useAnalysisArtifacts(
     try {
       const summary = await operation(experimentId)
       replaceArtifact(summary)
-      request.markSaved()
       return summary
     } catch (err) {
       request.setError(err)
@@ -344,7 +343,7 @@ export function useAnalysisArtifacts(
     isLoading,
     isMutating,
     error: request.error,
-    lastLoadedAt: request.lastLoadedAt,
+    lastLoadedAt,
     search,
     statusFilter,
     pluginFilter,

package/src/composables/useControlSchema.ts

@@ -106,16 +106,15 @@ export function useControlSchema<TControls extends ControlSchema>(
     fields: normalizeControls(controls, options).map(controlToFormField),
     formSchema,
     form: {
-      schema: formSchema,
+      spec: { controls, controlOptions: options },
     },
     settingsSchema,
     settings: {
-      schema: settingsSchema,
+      spec: settingsSchema,
     },
     topBarSettingsConfig,
     topBarSettings: {
-      showSettings: true,
-      settingsConfig: topBarSettingsConfig,
+      spec: { settings: topBarSettingsConfig },
     },
     sidebarPanels,
     viewIds,
@@ -123,11 +122,8 @@ export function useControlSchema<TControls extends ControlSchema>(
     defaultView,
     sectionSchemas,
     sidebar: {
-      panels: sidebarPanels,
-      forms: sectionSchemas,
-      viewIds,
-      viewItems,
-      defaultView,
+      spec: { panels: sidebarPanels, forms: sectionSchemas },
+      activeView: defaultView,
     },
     initialValues: getControlDefaults(controls),
     sectionSchema: (sectionId: string) => controlsToSectionFormSchema(controls, sectionId, options),

package/src/composables/useControlWorkspace.ts

@@ -145,8 +145,6 @@ export function useControlWorkspace<TControls extends ControlSchema>(
   const sidebar = reactive({
     ...schema.sidebar,
     activeView: activeView.value,
-    modelValue: values,
-    'onUpdate:modelValue': setValues,
     values,
     'onUpdate:values': setValues,
   }) as ControlWorkspaceSidebarBinding
@@ -156,15 +154,14 @@ export function useControlWorkspace<TControls extends ControlSchema>(
     onSelect: (item: PillNavItem) => setActiveView(item.id),
   }) as ControlWorkspacePillNavBinding
   const topBarSettingsBinding = {
-    showSettings: true,
-    settingsConfig: topBarSettingsConfig,
+    spec: { settings: topBarSettingsConfig },
     onSettingsValuesChange: setValues,
   } as ControlWorkspaceTopBarSettingsBinding
   const topBarProps = computed<ControlWorkspaceTopBarBinding>(() => ({
-    pillNav: pillNav.items,
-    currentPillId: pillNav.currentItemId,
+    spec: { pills: pillNav.items, settings: topBarSettingsConfig },
+    pill: pillNav.currentItemId,
     onPillSelect: pillNav.onSelect,
-    ...topBarSettingsBinding,
+    onSettingsValuesChange: setValues,
   }))
   const bindings: ControlWorkspaceComponentBindings = {
     form,

package/src/composables/useExperiment.ts

@@ -0,0 +1,49 @@
+import { computed, type ComputedRef } from 'vue'
+import { useExperimentStore } from '../stores/experiment'
+import type { ExperimentSummary } from '../types'
+
+/** Load state of the current experiment record. */
+export type ExperimentLoadStatus = 'idle' | 'loading' | 'ready' | 'error'
+
+export interface UseExperimentReturn {
+  /** Id of the current experiment; `null` when none is selected. */
+  id: ComputedRef<number | null>
+  /** Record of the current experiment, once the platform returned it. */
+  current: ComputedRef<ExperimentSummary | null>
+  /** `idle` with no selection, then `loading`, `ready` or `error`. */
+  status: ComputedRef<ExperimentLoadStatus>
+  /** Message of the last failed load, or `null`. */
+  error: ComputedRef<string | null>
+  /** Read the current experiment again. The selection does not change. */
+  refresh: () => Promise<void>
+}
+
+/**
+ * Read the experiment the plugin page works on.
+ *
+ * The platform selects the experiment and keeps it in step with the URL; this
+ * composable only reads it. Watch `id` to respond to a change. In standalone
+ * mode no experiment is selected and `id` stays `null`.
+ *
+ * @example
+ * ```typescript
+ * const experiment = useExperiment()
+ * watch(experiment.id, (id) => { if (id !== null) void load(id) }, { immediate: true })
+ * ```
+ */
+export function useExperiment(): UseExperimentReturn {
+  const store = useExperimentStore()
+  const id = computed(() => store.currentId)
+
+  return {
+    id,
+    current: computed(() => store.current),
+    status: computed(() => {
+      if (store.currentId === null) return 'idle'
+      if (store.isResolving) return 'loading'
+      return store.error ? 'error' : 'ready'
+    }),
+    error: computed(() => store.error),
+    refresh: store.refresh,
+  }
+}

package/src/composables/useExperimentData.ts

@@ -1,6 +1,6 @@
 import { shallowRef, computed, type Ref, type ComputedRef } from 'vue'
 import { useApi, type UseApiReturn } from './useApi'
-import { useRequestSyncState } from './useRequestSyncState'
+import { useRequest } from './useRequest'
 import {
   extractSampleNamesFromDesignData,
   extractSampleOptionsFromDesignData,
@@ -47,8 +47,8 @@ export function useExperimentData(
   options: UseExperimentDataOptions = {},
 ): UseExperimentDataReturn {
   const data = shallowRef<Record<string, unknown> | null>(null)
-  const request = useRequestSyncState('Failed to fetch experiment data')
-  const isLoading = request.loading
+  const request = useRequest('Failed to fetch experiment data')
+  const isLoading = request.isLoading
   const error = request.error
   const lastLoadedAt = request.lastLoadedAt
   let lastExperimentId: number | null = null
@@ -97,7 +97,7 @@ export function useExperimentData(
     try {
       data.value = await request.run(
         () => getApi().get<Record<string, unknown>>(`/experiments/${experimentId}/data`),
-        { success: 'load', errorMessage: 'Failed to fetch experiment data' },
+        { kind: 'load', errorMessage: 'Failed to fetch experiment data' },
       )
       return data.value
     } catch {

package/src/composables/useExperimentSelector.ts

@@ -1,7 +1,7 @@
 import { ref, reactive, computed, watch, type Ref, type ComputedRef } from 'vue'
 import { useApi } from './useApi'
 import { useDebouncedWatch } from './useDebouncedWatch'
-import { useRequestSyncState } from './useRequestSyncState'
+import { useRequest } from './useRequest'
 import { datePresetToISO } from './experiment-utils'
 import type {
   ExperimentSummary,
@@ -92,10 +92,10 @@ export function useExperimentSelector(
   const experiments = ref<ExperimentSummary[]>([])
   const total = ref(0)
   const selectedExperiment = ref<ExperimentSummary | null>(null)
-  const request = useRequestSyncState('Failed to fetch experiments')
-  const isLoading = request.loading
+  const request = useRequest('Failed to fetch experiments')
+  const isLoading = request.isLoading
   const error = request.error
-  const lastLoadedAt = request.lastLoadedAt
+  const lastLoadedAt = ref<Date | null>(null)
   const page = ref(0)
   let fetchGeneration = 0
 
@@ -245,7 +245,7 @@ export function useExperimentSelector(
         experiments.value = [...experiments.value, ...data.experiments]
       }
       total.value = data.total
-      request.markLoaded()
+      lastLoadedAt.value = new Date()
     } catch (err) {
       if (generation !== fetchGeneration) return
       request.setError(err, 'Failed to fetch experiments')