@morscherlab/mint-sdk 1.2.10 → 1.3.0-beta.10

package/src/composables/useFilePicker.ts

@@ -1,12 +1,14 @@
-import { computed, nextTick, onScopeDispose, ref, shallowRef, toRaw, watch } from 'vue'
+import { computed, nextTick, onScopeDispose, shallowRef, toRaw, watch, type Ref } from 'vue'
 import type {
   PickerAdapter,
   PickerCapabilities,
   PickerNode,
   PickerSelection,
   PickerSelectionMode,
+  PickerSort,
   PickerSource,
 } from '../types/filePicker'
+import type { SegmentedOption } from '../types'
 import { usePickerNavigation } from './filePicker/usePickerNavigation'
 import { usePickerSelection } from './filePicker/usePickerSelection'
 import { localFilesAdapter } from './filePicker/localFiles'
@@ -19,6 +21,7 @@ interface PickerStateProps {
   capabilities: PickerCapabilities
   initialPath: string
   initialSelection: PickerSelection | null
+  defaultSort: PickerSort
   systemFilter?: (node: PickerNode, source: PickerSource) => boolean
 }
 type PickerEmit = {
@@ -28,16 +31,20 @@ type PickerEmit = {
 }
 
 /** Internal orchestration; public consumers use FilePicker's props and events. */
-export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
+export function useFilePicker(
+  props: PickerStateProps,
+  emit: PickerEmit,
+  searchArea: Ref<HTMLElement | null>,
+) {
   const sourceNames: Record<PickerSource, string> = {
     server: 'Server',
     localFile: 'Local files',
   }
-  const sourceIcons: Record<PickerSource, string> = {
-    server: 'M4 6h16v5H4zM4 13h16v5H4zM7 8.5h.01M7 15.5h.01',
-    localFile: 'M4 17h16M6 5h12v9H6z',
-  }
   const allowedSources = computed(() => [...new Set(props.sources)])
+  // Segment values are namespaced so an adapter's mount path can never collide with a source name.
+  const SOURCE = 'source:'
+  const MOUNT = 'mount:'
+  const mounts = shallowRef<PickerNode[]>([])
   const source = shallowRef<PickerSource>(
     allowedSources.value.includes(props.initialSelection?.source as PickerSource)
       ? props.initialSelection!.source
@@ -45,6 +52,7 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
   )
   const query = shallowRef('')
   const recursive = shallowRef(false)
+  const sort = shallowRef<PickerSort>(props.defaultSort)
   const skipBlanks = shallowRef(false)
   const reviewing = shallowRef(false)
   const localFiles = shallowRef<File[]>([])
@@ -56,6 +64,7 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     () => (source.value === 'localFile' ? localAdapter.value : props.adapter),
     () => ({ source: source.value }),
     (node) => props.systemFilter?.(node, source.value) !== false,
+    () => sort.value,
   )
   const capability = computed(() => props.capabilities[source.value])
   const selection = usePickerSelection(
@@ -65,6 +74,24 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     () => skipBlanks.value,
   )
   const { path, trail, loading, error, rows } = nav
+  /** A mount-rooted adapter lists its mounts as header sources; the listing starts inside one. */
+  const mountView = computed(
+    () => source.value === 'server' && !!props.adapter.mounts && mounts.value.length > 0,
+  )
+  const segments = computed<SegmentedOption[]>(() =>
+    allowedSources.value.flatMap((item) =>
+      item === 'server' && props.adapter.mounts && mounts.value.length
+        ? mounts.value.map((mount) => ({
+            value: MOUNT + mount.path,
+            label: mount.name,
+            disabled: !!mount.unavailableReason,
+          }))
+        : [{ value: SOURCE + item, label: sourceNames[item] }],
+    ),
+  )
+  const activeSegment = computed(() =>
+    mountView.value ? MOUNT + (trail.value[0]?.path ?? '') : SOURCE + source.value,
+  )
   const { roots, chosen, focused, resolving, resolutionError } = selection
   const previewNode = computed(() => {
     const node = focused.value
@@ -84,7 +111,6 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     }
   })
 
-  const searchArea = ref<HTMLElement | null>(null)
   const confirmLabel = computed(
     () =>
       ({
@@ -137,6 +163,16 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
       })
       localFiles.value = seed.files
     }
+    if (source.value === 'server' && props.adapter.mounts) {
+      await loadMounts()
+      if (token !== openGeneration || !props.open) return
+      const first = mounts.value.find((mount) => !mount.unavailableReason)
+      if (!path.value && first) openMount(first)
+      // An initial folder inside a mount gets that mount as its first crumb.
+      const holder = mounts.value.find((mount) => mount.path === props.adapter.mountOf?.(path.value))
+      if (holder && trail.value[0]?.path !== holder.path)
+        trail.value = [{ path: holder.path, label: holder.name }, ...trail.value]
+    }
     await nav.load(query.value, recursive.value)
     if (token !== openGeneration || !props.open) return
     if (seed?.source === 'localFile' && source.value === 'localFile') {
@@ -150,6 +186,7 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     (open) => {
       clearTimeout(timer)
       if (open) {
+        sort.value = props.defaultSort
         if (!initialized) {
           path.value = props.initialPath
           if (path.value) trail.value = [{ path: path.value, label: 'Current folder' }]
@@ -196,6 +233,39 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     selection.reset()
   })
 
+  async function loadMounts() {
+    try {
+      mounts.value = (await props.adapter.listRoot({ source: 'server' })).filter(
+        (node) => node.kind === 'folder' && props.systemFilter?.(node, 'server') !== false,
+      )
+    } catch {
+      // The root listing reports the failure; the header falls back to one Server source.
+      mounts.value = []
+    }
+    nav.register(mounts.value, '')
+  }
+  function openMount(mount: PickerNode) {
+    trail.value = [{ path: mount.path, label: mount.name }]
+    path.value = mount.path
+  }
+  async function chooseSegment(value: string | number) {
+    const key = String(value)
+    if (key.startsWith(SOURCE)) return switchSource(key.slice(SOURCE.length) as PickerSource)
+    const mount = mounts.value.find((item) => MOUNT + item.path === key)
+    if (!mount || mount.unavailableReason) return
+    if (source.value !== 'server') {
+      remembered.set('server', { path: mount.path, trail: [{ path: mount.path, label: mount.name }] })
+      return switchSource('server')
+    }
+    clearTimeout(timer)
+    query.value = ''
+    openMount(mount)
+    await nav.load()
+  }
+  function clearSelection() {
+    selection.reset()
+    reviewing.value = false
+  }
   async function switchSource(next: PickerSource) {
     if (next === source.value || !allowedSources.value.includes(next)) return
     rememberFolders()
@@ -209,8 +279,10 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     await restore()
   }
   function selectNode(node: PickerNode, event: MouseEvent | KeyboardEvent) {
-    // The second click in a double-click only opens the row; it must not toggle twice.
-    if (event.type === 'click' && event.detail > 1) return
+    // The second click of a double-click is ignored, except on a folder+files folder:
+    // there the double-click opens it, and the second click undoes the first one's toggle.
+    const opensFolder = node.kind === 'folder' && props.selectionMode === 'folder+files'
+    if (event.type === 'click' && event.detail > 1 && !opensFolder) return
     selection.select(node, {
       ...{ metaKey: event.metaKey, ctrlKey: event.ctrlKey, shiftKey: event.shiftKey },
       toggle: event.type === 'click' || (event instanceof KeyboardEvent && event.key === ' '),
@@ -234,6 +306,14 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     await nav.load()
   }
   async function up(target?: string) {
+    // A mount root is the top of its source; the mount list lives in the header.
+    // An initial folder inside a mount the adapter cannot name has no mount crumb, so up leads to the mount list.
+    const atMountRoot = mounts.value.some((mount) => mount.path === trail.value[0]?.path)
+    if (
+      mountView.value &&
+      (target === '' || (target === undefined && trail.value.length <= 1 && atMountRoot))
+    )
+      return
     query.value = ''
     clearTimeout(timer)
     nav.up(target)
@@ -273,9 +353,10 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
   }
   async function selectLocalFiles() {
     const token = openGeneration
-    const items = props.selectionMode === 'single-file' || props.selectionMode === 'multi-file'
+    const found = props.selectionMode === 'single-file' || props.selectionMode === 'multi-file'
       ? await localAdapter.value.search('', { path: '', recursive: true })
       : nav.entries.value
+    const items = Array.isArray(found) ? found : found.nodes
     if (token !== openGeneration || !props.open || source.value !== 'localFile') return
     nav.register(items)
     const candidates = items.filter((node) => selection.selectable(node))
@@ -328,11 +409,15 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
   return {
     previewNode,
     sourceNames,
-    sourceIcons,
+    segments,
+    activeSegment,
+    mounts,
+    mountView,
     allowedSources,
     source,
     query,
     recursive,
+    sort,
     skipBlanks,
     reviewing,
     nav,
@@ -348,11 +433,11 @@ export function useFilePicker(props: PickerStateProps, emit: PickerEmit) {
     focused,
     resolving,
     resolutionError,
-    searchArea,
     confirmLabel,
     folderCount,
     canConfirm,
-    switchSource,
+    chooseSegment,
+    clearSelection,
     selectNode,
     enter,
     up,

package/src/composables/useFocusTrap.ts

@@ -28,7 +28,8 @@ const FOCUSABLE_SELECTOR = [
  * Traps Tab focus within a container while `active` is true: Tab wraps from the last
  * focusable element back to the first (and Shift+Tab from the first to the last), the
  * first focusable element (or the container itself, if none) receives focus when the
- * trap activates, and focus returns to whatever was focused beforehand when it releases.
+ * trap activates, an `[autofocus]` descendant taking precedence, and focus returns to
+ * whatever was focused beforehand when it releases.
  * Used by BaseModal and WellEditPopupInternal.
  */
 export function useFocusTrap(options: UseFocusTrapOptions): UseFocusTrapReturn {
@@ -66,16 +67,18 @@ export function useFocusTrap(options: UseFocusTrapOptions): UseFocusTrapReturn {
     }
   }
 
-  // `flush: 'sync'` so releasing the trap from `onBeforeUnmount` restores focus
+  // `immediate` so a container mounted already active (`v-if` + a constant
+  // `modelValue`) still takes focus. `flush: 'sync'` so releasing the trap from `onBeforeUnmount` restores focus
   // before the component's reactive scope is torn down — a batched (default
   // 'pre') watcher would be scheduled but never flushed once that scope stops.
   watch(active, async (isActive) => {
     if (isActive) {
       previouslyFocused = document.activeElement as HTMLElement | null
       await nextTick()
-      const focusable = getFocusableElements()
-      if (focusable.length > 0) {
-        focusable[0].focus()
+      // Like <dialog>: an [autofocus] descendant wins over the first focusable element.
+      const target = containerRef.value?.querySelector<HTMLElement>('[autofocus]') ?? getFocusableElements()[0]
+      if (target) {
+        target.focus()
       } else {
         containerRef.value?.focus()
       }
@@ -83,7 +86,7 @@ export function useFocusTrap(options: UseFocusTrapOptions): UseFocusTrapReturn {
       if (restoreFocus) previouslyFocused?.focus()
       previouslyFocused = null
     }
-  }, { flush: 'sync' })
+  }, { flush: 'sync', immediate: true })
 
   useEventListener(() => document, 'keydown', handleKeydown)
 

package/src/composables/useGeneratedAnalysis.ts

@@ -21,6 +21,7 @@ import type {
   GeneratedAnalysisResult,
   GeneratedSession,
   GeneratedAnalysisManifest,
+  PluginJobArtifactPathInput,
   PluginJobPathInput,
   PluginJobPathUpload,
   PluginJobStagedPartInput,
@@ -416,6 +417,26 @@ function createPluginJobs(
     })
   }
 
+  async function stageArtifactPathForSession(
+    input: PluginJobArtifactPathInput,
+    sessionId: string,
+    definitionId: string,
+  ): Promise<PluginJobPathUpload> {
+    return request<PluginJobPathUpload>('/jobs/artifacts', {
+      method: 'POST',
+      body: JSON.stringify({
+        experiment_id: input.experimentId,
+        artifact_id: input.artifactId,
+        session_id: sessionId,
+      }),
+      signal: input.signal,
+      headers: {
+        'X-Mint-Job-Session': sessionId,
+        'X-Mint-Job-Definition': definitionId,
+      },
+    })
+  }
+
   async function stagePathInputs(
     inputs: Record<string, unknown>,
     sessionId: string,
@@ -441,6 +462,10 @@ function createPluginJobs(
       const upload = await uploadPathForSession(value, sessionId, definitionId)
       return { token: upload.token }
     }
+    if (isPluginJobArtifactPathInput(value)) {
+      const upload = await stageArtifactPathForSession(value, sessionId, definitionId)
+      return { token: upload.token }
+    }
     if (Array.isArray(value)) {
       return await Promise.all(value.map(
         item => stagePathValue(item, sessionId, definitionId),
@@ -1115,6 +1140,19 @@ function pluginJobWaitAbort(signal: AbortSignal): unknown {
   return cause
 }
 
+function isPluginJobArtifactPathInput(value: unknown): value is PluginJobArtifactPathInput {
+  return Boolean(
+    value
+    && typeof value === 'object'
+    && 'kind' in value
+    && value.kind === 'artifact-path'
+    && 'experimentId' in value
+    && Number.isInteger(value.experimentId)
+    && 'artifactId' in value
+    && Number.isInteger(value.artifactId),
+  )
+}
+
 function isPluginJobPathInput(value: unknown): value is PluginJobPathInput {
   return Boolean(
     value

package/src/composables/useGroupAssignment.ts

@@ -37,7 +37,11 @@ export interface UseGroupAssignmentReturn {
   clearAll: () => GroupAssignmentState
 }
 
-/** Shared two-zone group assignment model for control/treatment style workflows. */
+/**
+ * Shared two-zone group assignment model for control/treatment style workflows.
+ *
+ * @deprecated Scheduled for removal in MINT 1.4; no SDK replacement.
+ */
 export function useGroupAssignment(options: UseGroupAssignmentOptions): UseGroupAssignmentReturn {
   const groups = computed(() => [...toValue(options.groups)])
   const group1 = computed(() => [...toValue(options.group1)])

package/src/composables/useJobsStatusTray.ts

@@ -146,7 +146,7 @@ function duplicatePluginJobId(jobId: string): Error {
   return new Error(`Duplicate plugin job id across combined sources: ${jobId}`)
 }
 
-/** @deprecated Prefer a {@link PluginJobCenterSource}. */
+/** @deprecated Removed in MINT 1.4; prefer a {@link PluginJobCenterSource}. */
 export interface JobsStatusTrayAdapter {
   listJobs?: () => Promise<JobListPayload | readonly JobStateInput[]>
   cancelJob?: (job: JobState) => Promise<JobStateInput | void>
@@ -156,11 +156,11 @@ export interface JobsStatusTrayAdapter {
 
 export interface UsePluginJobCenterOptions {
   source?: MaybeRefOrGetter<PluginJobCenterSource | undefined>
-  /** @deprecated Pass a source with its canonical jobs ref. */
+  /** @deprecated Removed in MINT 1.4; pass a source with its canonical jobs ref. */
   jobs?: MaybeRefOrGetter<readonly JobStateInput[] | undefined>
-  /** @deprecated Pass source actions instead. */
+  /** @deprecated Removed in MINT 1.4; pass source actions instead. */
   adapter?: MaybeRefOrGetter<JobsStatusTrayAdapter | undefined>
-  /** @deprecated Event handling belongs to the source runtime. */
+  /** @deprecated Removed in MINT 1.4; event handling belongs to the source runtime. */
   eventStream?: MaybeRefOrGetter<UsePluginEventStreamReturn<JobStreamData> | undefined>
   loadOnMount?: boolean
 }
@@ -485,7 +485,7 @@ export function usePluginJobCenter(
   }
 }
 
-/** @deprecated Use `usePluginJobCenter()` for the plugin job-center controller. */
+/** @deprecated Removed in MINT 1.4; use `usePluginJobCenter()` for the plugin job-center controller. */
 export function useJobsStatusTray(
   options: UseJobsStatusTrayOptions = {},
 ): UseJobsStatusTrayReturn {

package/src/composables/useMenuKeyboard.ts

@@ -19,15 +19,15 @@ export interface UseMenuKeyboardReturn {
   handleTriggerKeydown: (event: KeyboardEvent) => void
   /**
    * Bind to the open panel's `@keydown`. ArrowUp/ArrowDown cycle focus with
-   * wraparound, Home/End jump to the first/last item, Escape closes and returns
-   * focus to the trigger, and Tab closes without moving focus.
+   * wraparound, Home/End jump to the first/last item, Escape closes, returns
+   * focus to the trigger and stops propagating, and Tab closes without moving focus.
    */
   handlePanelKeydown: (event: KeyboardEvent) => void
 }
 
 /**
  * Shared keyboard contract for menu- and listbox-style disclosure panels (the
- * WAI-ARIA menu button pattern). Used by ActionMenu, AppAvatarMenu and DropdownButton,
+ * WAI-ARIA menu button pattern). Used by ActionMenu and AppAvatarMenu,
  * each pairing it with `useDropdownState` for the disclosure state itself.
  */
 export function useMenuKeyboard(options: UseMenuKeyboardOptions): UseMenuKeyboardReturn {
@@ -61,6 +61,8 @@ export function useMenuKeyboard(options: UseMenuKeyboardOptions): UseMenuKeyboar
 
     if (event.key === 'Escape') {
       event.preventDefault()
+      // The menu handles this Escape; an enclosing BaseModal must not close too.
+      event.stopPropagation()
       options.close(true)
       return
     }

package/src/composables/usePlatformFilePickerAdapter.ts

@@ -1,11 +1,24 @@
 import type { PickerAdapter } from '../types/filePicker'
-import type { FileDirectoryListing, ServerMount } from '../types/fileBrowserTypes'
+import type {
+  FileBrowserLocation,
+  FileDirectoryListing,
+  FileDirectoryTree,
+  FileSearchResult,
+  ServerMount,
+} from '../types/fileBrowserTypes'
+import type { PickerRequest } from '../types/filePicker'
 import { useApi } from './useApi'
 import { getInjectedPlatformContext } from './platformContextHelpers'
 import { createFilePickerAdapter, type FilePickerAdapterOptions } from './createFilePickerAdapter'
 
 export { encodePlatformPickerPath, decodePlatformPickerPath } from './createFilePickerAdapter'
 
+function query(location: FileBrowserLocation, request?: PickerRequest): URLSearchParams {
+  const params = new URLSearchParams({ mount_id: location.mount_id, path: location.path })
+  if (request?.refresh) params.set('refresh', 'true')
+  return params
+}
+
 /** Adapt the authenticated MINT mount API without exposing absolute host paths. */
 export function usePlatformFilePickerAdapter(
   options: FilePickerAdapterOptions & { apiBaseUrl?: string } = {},
@@ -27,11 +40,20 @@ export function usePlatformFilePickerAdapter(
       }
     },
     browse(location, request) {
-      const query = new URLSearchParams({ mount_id: location.mount_id, path: location.path })
-      if (request?.refresh) query.set('refresh', 'true')
-      return api.get<FileDirectoryListing>(`/filesystem/browse?${query}`, {
+      return api.get<FileDirectoryListing>(`/filesystem/browse?${query(location, request)}`, {
+        signal: request?.signal,
+      })
+    },
+    tree(location, request) {
+      return api.get<FileDirectoryTree>(`/filesystem/tree?${query(location, request)}`, {
         signal: request?.signal,
       })
     },
+    search(location, text, recursive, request) {
+      const params = query(location, request)
+      params.set('q', text)
+      params.set('recursive', String(recursive))
+      return api.get<FileSearchResult>(`/filesystem/search?${params}`, { signal: request?.signal })
+    },
   }, options)
 }

package/src/composables/usePluginClient.ts

@@ -543,7 +543,7 @@ function normalizePluginSettingsOptions(options: UsePluginSettingsOptions | stri
   return typeof options === 'string' ? { pluginName: options } : options
 }
 
-/** @deprecated Use `useGeneratedPluginClient()` for generated clients. */
+/** @deprecated Removed in MINT 1.4; use `useGeneratedPluginClient()` for generated clients. */
 export function usePluginClient<TClient>(client: TClient): TClient {
   return client
 }

package/src/composables/usePluginWorkspace.ts

@@ -143,7 +143,6 @@ export function usePluginWorkspace(options: UsePluginWorkspaceOptions): UsePlugi
     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,