@morscherlab/mint-sdk 1.3.11 → 1.4.0-beta.10

package/src/composables/{useGeneratedAnalysis.ts → useJobsEndpoint.ts}

@@ -8,13 +8,11 @@ import {
   type ShallowRef,
 } from 'vue'
 
-import type {
-  JobsStatusTrayAdapter,
-  PluginJobCenterSource,
-} from './useJobsStatusTray'
-import { useEventStream, type EventStreamMessage } from './useEventStream'
+import type { PluginJobCenterSource } from './useJobCenter'
+import { createEventStream, type EventStreamMessage } from './eventStream'
 import { isActiveJobStatus, normalizeJobState } from '../jobs'
 import { MintApiError, mintApiErrorFromResponse } from '../apiErrors'
+import { AUTH_TOKEN_STORAGE_KEY } from '../stores/auth'
 import type {
   GeneratedAnalysisJob,
   GeneratedAnalysisJobInput,
@@ -40,19 +38,21 @@ export interface GeneratedAnalysisTransportOptions {
   getAccessToken?: () => string | null | undefined
 }
 
-export interface UsePluginJobsOptions {
+export interface UseJobsEndpointOptions {
   baseUrl: string
   transport?: GeneratedAnalysisTransport
   storage?: Storage
   createId?: () => string
-  pollInterval?: number
+  /** Milliseconds between job list polls while no event stream is open. Default 750. */
+  poll?: number
   stream?: boolean
   streamReconnectDelay?: number
+  /** List the existing jobs at once instead of on the first `submit()` or `refresh()`. */
   immediate?: boolean
+  /** Load the generated UI manifest (`/generated/manifest`) before the jobs. */
+  manifest?: boolean
 }
 
-export type GeneratedAnalysisOptions = UsePluginJobsOptions
-
 export interface PluginJobWaitOptions {
   signal?: AbortSignal
   rejectOnFailure?: boolean
@@ -67,7 +67,7 @@ interface GeneratedSessionStorage {
   setItem: (key: string, value: string) => void
 }
 
-export interface UsePluginJobsReturn extends PluginJobCenterSource {
+export interface UseJobsEndpointReturn extends PluginJobCenterSource {
   manifest: ShallowRef<GeneratedAnalysisManifest | null>
   session: ShallowRef<GeneratedSession | null>
   jobs: ShallowRef<GeneratedAnalysisJob[]>
@@ -76,8 +76,6 @@ export interface UsePluginJobsReturn extends PluginJobCenterSource {
   isSubmitting: Ref<boolean>
   error: ShallowRef<string | null>
   status: ShallowRef<'idle' | 'initializing' | 'ready' | 'paused' | 'error' | 'disposed'>
-  initialize: () => Promise<void>
-  ready: () => Promise<void>
   uploadPath: (
     input: PluginJobPathInput,
     definitionId?: string,
@@ -90,30 +88,26 @@ export interface UsePluginJobsReturn extends PluginJobCenterSource {
     pagination?: PluginJobStagingPagination,
   ) => Promise<PluginJobStaging<Metadata>>
   sealJob: (job: GeneratedAnalysisJob | string) => Promise<GeneratedAnalysisJob>
+  /** Submit a job. The first call opens the job session. */
   submit: (definitionId: string, inputs: Record<string, unknown>) => Promise<GeneratedAnalysisJob>
-  loadResult: (job: GeneratedAnalysisJob) => Promise<GeneratedAnalysisResult | null>
+  result: (job: GeneratedAnalysisJob) => Promise<GeneratedAnalysisResult | null>
   resultForJob: (jobId: string) => GeneratedAnalysisResult | null
-  refreshJobs: () => Promise<GeneratedAnalysisJob[]>
+  /** List the jobs again. The first call opens the job session. */
   refresh: () => Promise<GeneratedAnalysisJob[]>
-  getJob: (jobId: string, options?: PluginJobRequestOptions) => Promise<GeneratedAnalysisJob>
-  waitForJob: (
+  get: (jobId: string, options?: PluginJobRequestOptions) => Promise<GeneratedAnalysisJob>
+  wait: (
     job: GeneratedAnalysisJob | string,
     options?: PluginJobWaitOptions,
   ) => Promise<GeneratedAnalysisJob>
   jobsFor: (definitionId: string) => GeneratedAnalysisJob[]
-  cancelJob: (job: GeneratedAnalysisJob | string) => Promise<GeneratedAnalysisJob>
-  deleteJob: (job: GeneratedAnalysisJob | string) => Promise<boolean>
-  clearFinishedJobs: (definitionId?: string) => Promise<number>
+  cancel: (job: GeneratedAnalysisJob | string) => Promise<GeneratedAnalysisJob>
+  delete: (job: GeneratedAnalysisJob | string) => Promise<boolean>
+  clear: (definitionId?: string) => Promise<number>
   pause: () => void
   resume: () => void
   dispose: () => void
-  /** @deprecated Pass the runtime itself to SDK job UI as its source. */
-  jobsAdapter: JobsStatusTrayAdapter
 }
 
-export type UseGeneratedAnalysisReturn = UsePluginJobsReturn
-
-const AUTH_TOKEN_KEY = 'mint-auth-token'
 const SESSION_NOT_FOUND_DETAIL = 'Session not found'
 const MAX_RESULT_CACHE_ENTRIES = 32
 const MAX_RESULT_RETRIES = 3
@@ -151,36 +145,25 @@ export function createGeneratedAnalysisTransport(
   }
 }
 
-export function useGeneratedAnalysis(
-  options: GeneratedAnalysisOptions,
-): UseGeneratedAnalysisReturn {
-  return createPluginJobs(options, '/generated/manifest')
-}
-
 /**
- * Connect a custom plugin frontend to the SDK-owned job lifecycle.
+ * Connect a frontend to the SDK-owned job lifecycle of one plugin API prefix.
+ * Generated clients use it through `useJobs()`.
  *
- * @example Recommended
+ * @example
  * ```ts
- * const jobs = usePluginJobs({ baseUrl: '/api/leaf/jobs' })
- * await jobs.initialize()
+ * const jobs = useJobsEndpoint({ baseUrl: '/api/leaf', immediate: true })
+ * const job = await jobs.submit('fit-plate', inputs)
  * ```
  */
-export function usePluginJobs(
-  options: UsePluginJobsOptions,
-): UsePluginJobsReturn {
-  return createPluginJobs(options)
-}
-
-function createPluginJobs(
-  options: UsePluginJobsOptions,
-  manifestPath?: string,
-): UsePluginJobsReturn {
+export function useJobsEndpoint(
+  options: UseJobsEndpointOptions,
+): UseJobsEndpointReturn {
+  const manifestPath = options.manifest ? '/generated/manifest' : undefined
   const baseUrl = options.baseUrl.replace(/\/$/, '')
   const transport = options.transport ?? createGeneratedAnalysisTransport()
   const storage = createGeneratedSessionStorage(options.storage)
   const createId = options.createId ?? (() => globalThis.crypto.randomUUID())
-  const pollInterval = options.pollInterval ?? 750
+  const pollInterval = options.poll ?? 750
   const streamEnabled = options.stream ?? true
   const streamReconnectDelay = options.streamReconnectDelay ?? 1_500
   const tabKey = `mint:generated:${baseUrl}:tab`
@@ -209,7 +192,7 @@ function createPluginJobs(
   const resultRetryAttempts = new Map<string, number>()
   const resultRetryTimers = new Map<string, ReturnType<typeof setTimeout>>()
   const downloadRefreshTimers = new Map<string, ReturnType<typeof setTimeout>>()
-  const jobStream = useEventStream<PluginJobStreamData>(`${baseUrl}/jobs/events`, {
+  const jobStream = createEventStream<PluginJobStreamData>(`${baseUrl}/jobs/events`, {
     transport,
     immediate: false,
     reconnectDelayMs: streamReconnectDelay,
@@ -260,7 +243,17 @@ function createPluginJobs(
     return pending
   }
 
-  async function resolveSession(): Promise<GeneratedSession> {
+  // Runtimes of one plugin on one page share a session: a concurrent first
+  // resolve joins the request in flight instead of creating a second session.
+  function resolveSession(): Promise<GeneratedSession> {
+    const pending = pendingSessions.get(sessionKey)
+    if (pending) return pending
+    const resolving = resolveStoredSession().finally(() => pendingSessions.delete(sessionKey))
+    pendingSessions.set(sessionKey, resolving)
+    return resolving
+  }
+
+  async function resolveStoredSession(): Promise<GeneratedSession> {
     let tabId = storage.getItem(tabKey)
     if (!tabId) {
       tabId = createId()
@@ -284,7 +277,8 @@ function createPluginJobs(
     definitionId: string,
     inputs: Record<string, unknown>,
   ): Promise<GeneratedAnalysisJob> {
-    if (!session.value) throw new Error('Generated analysis session is not initialized')
+    await initialize()
+    if (!session.value) throw new Error('Plugin jobs runtime is disposed')
     const clientRequestId = createId()
     isSubmitting.value = true
     error.value = null
@@ -336,7 +330,8 @@ function createPluginJobs(
     input: PluginJobPathInput,
     definitionId?: string,
   ): Promise<PluginJobPathUpload> {
-    if (!session.value) throw new Error('Generated analysis session is not initialized')
+    await initialize()
+    if (!session.value) throw new Error('Plugin jobs runtime is disposed')
     return uploadPathForSession(input, session.value.id, definitionId)
   }
 
@@ -992,13 +987,6 @@ function createPluginJobs(
     return payload.deleted
   }
 
-  const jobsAdapter: JobsStatusTrayAdapter = {
-    listJobs: async () => ({ jobs: await refreshJobs() }),
-    cancelJob: async job => cancelJob(job as GeneratedAnalysisJob),
-    deleteJob: async job => deleteJob(job as GeneratedAnalysisJob),
-    clearFinishedJobs: async () => clearFinishedJobs(),
-  }
-
   function pause(): void {
     if (disposed || paused) return
     paused = true
@@ -1074,30 +1062,28 @@ function createPluginJobs(
     isSubmitting,
     error,
     status,
-    initialize,
-    ready: initialize,
     uploadPath,
     uploadStagedPart,
     getJobStaging,
     sealJob,
     submit,
-    loadResult,
+    result: loadResult,
     resultForJob,
-    refreshJobs,
     refresh,
-    getJob,
-    waitForJob,
+    get: getJob,
+    wait: waitForJob,
     jobsFor,
-    cancelJob,
-    deleteJob,
-    clearFinishedJobs,
+    cancel: cancelJob,
+    delete: deleteJob,
+    clear: clearFinishedJobs,
     pause,
     resume,
     dispose,
-    jobsAdapter,
   }
 }
 
+const pendingSessions = new Map<string, Promise<GeneratedSession>>()
+
 function jobIdFromReference(job: GeneratedAnalysisJob | string): string {
   return typeof job === 'string' ? job : job.job_id
 }
@@ -1168,7 +1154,7 @@ function isPluginJobPathInput(value: unknown): value is PluginJobPathInput {
 
 function readStoredAccessToken(): string | null {
   try {
-    return globalThis.localStorage?.getItem(AUTH_TOKEN_KEY) ?? null
+    return globalThis.localStorage?.getItem(AUTH_TOKEN_STORAGE_KEY) ?? null
   } catch {
     return null
   }

package/src/composables/useMenuKeyboard.ts

@@ -27,7 +27,7 @@ export interface UseMenuKeyboardReturn {
 
 /**
  * Shared keyboard contract for menu- and listbox-style disclosure panels (the
- * WAI-ARIA menu button pattern). Used by ActionMenu and AppAvatarMenu,
+ * WAI-ARIA menu button pattern). Used by ActionMenu and the platform account menu,
  * each pairing it with `useDropdownState` for the disclosure state itself.
  */
 export function useMenuKeyboard(options: UseMenuKeyboardOptions): UseMenuKeyboardReturn {

package/src/composables/usePlatform.ts

@@ -0,0 +1,95 @@
+import { ref, computed } from 'vue'
+import { getRoleInfo, hasAllPermissions, isAdminUser } from '../permissions'
+import type { Access, PlatformContext, ThemeMode } from '../types'
+import type { PlatformFrontendContext } from '../types/generated/platformContext'
+
+const DEFAULT_CONTEXT: PlatformContext = {
+  isIntegrated: false,
+  theme: 'system',
+}
+
+const platformContext = ref<PlatformContext>({ ...DEFAULT_CONTEXT })
+
+function storedTheme(): ThemeMode {
+  try {
+    const s = localStorage.getItem('mint-settings')
+    if (s) return (JSON.parse(s).theme as ThemeMode) || 'system'
+  } catch { /* ignore */ }
+  return 'system'
+}
+
+function detectPlatform(): void {
+  // The platform injects its context when it serves the plugin page. It sends no theme.
+  const platformData = (window as unknown as { __MINT_PLATFORM__?: PlatformFrontendContext }).__MINT_PLATFORM__
+
+  if (platformData) {
+    platformContext.value = {
+      ...platformData,
+      isIntegrated: true,
+      theme: storedTheme(),
+    }
+    return
+  }
+
+  const urlParams = new URLSearchParams(window.location.search)
+  platformContext.value = {
+    isIntegrated: urlParams.has('mint-plugin'),
+    theme: storedTheme(),
+  }
+}
+
+const ACCESS_PERMISSIONS: Record<Exclude<Access, 'admin'>, readonly string[]> = {
+  use: ['plugins.use'],
+  configure: ['plugins.use', 'plugins.configure'],
+}
+
+/**
+ * Read the platform context the MINT platform injects into a plugin page.
+ *
+ * `can(access)` answers with the same three levels as the Python `access`
+ * option. A page with no signed-in user passes every check when it runs
+ * standalone or the platform reports `authRequired: false`; the platform
+ * still checks every request.
+ *
+ * @example
+ * ```typescript
+ * const platform = usePlatform()
+ * const canConfigure = computed(() => platform.can('configure'))
+ * ```
+ */
+export function usePlatform() {
+  // Read the context on every call, so a router guard or a setup-time check
+  // sees the injected user before any component has mounted.
+  detectPlatform()
+
+  const integrated = computed(() => platformContext.value.isIntegrated)
+  const plugin = computed(() => platformContext.value.plugin)
+  const user = computed(() => platformContext.value.user)
+  const theme = computed(() => platformContext.value.theme)
+  const features = computed(() => platformContext.value.features)
+
+  function can(access: Access): boolean {
+    const current = user.value
+    // With auth disabled every caller is the implicit administrator.
+    if (!current) return !integrated.value || platformContext.value.authRequired === false
+    if (isAdminUser(current)) return true
+    if (access === 'admin' || !hasAllPermissions(current, ACCESS_PERMISSIONS[access])) return false
+    const visible = getRoleInfo(current)?.plugin_access
+    if (!visible || visible === 'all') return true
+    // The platform matches a role's list by registry name or by route prefix.
+    const names = [plugin.value?.id, plugin.value?.route_prefix?.replace(/^\/+|\/+$/g, '')]
+    return Array.isArray(visible) && names.some((name) => !!name && visible.includes(name))
+  }
+
+  const isAdmin = computed(() => can('admin'))
+
+  return {
+    integrated,
+    plugin,
+    user,
+    theme,
+    features,
+    isAdmin,
+    can,
+  }
+}

package/src/composables/usePlatformFilePickerAdapter.ts

@@ -7,6 +7,7 @@ import type {
   ServerMount,
 } from '../types/fileBrowserTypes'
 import type { PickerRequest } from '../types/filePicker'
+import { MintApiError } from '../apiErrors'
 import { useApi } from './useApi'
 import { getInjectedPlatformContext } from './platformContextHelpers'
 import { createFilePickerAdapter, type FilePickerAdapterOptions } from './createFilePickerAdapter'
@@ -35,7 +36,7 @@ export function usePlatformFilePickerAdapter(
         })
         return mounts
       } catch (cause) {
-        if ((cause as { response?: { status?: number } }).response?.status === 404) return []
+        if (cause instanceof MintApiError && cause.status === 404) return []
         throw cause
       }
     },

package/src/composables/usePluginWorkspace.ts

@@ -1,6 +1,6 @@
 import { computed } from 'vue'
 import type { ComputedRef } from 'vue'
-import type { PageSelectorItem, PillNavItem } from '../types'
+import type { PillNavItem, PluginWorkspaceSidebarSpec } from '../types'
 import type {
   PluginWorkspaceViewEmit,
   PluginWorkspaceViewProps,
@@ -12,6 +12,7 @@ import {
   getPluginWorkspaceTopBarSlotNames,
   hasPluginWorkspaceSidebarSurface,
 } from '../components/PluginWorkspaceView.shell'
+import { applySpecDefaults } from './componentSpecs'
 import type {
   PluginWorkspaceControlsModel,
   PluginWorkspaceShellModel,
@@ -43,25 +44,20 @@ export interface UsePluginWorkspaceReturn {
   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`. */
+  /** Applies an AppSidebar `update:values` payload to the shared control values and emits `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`. */
+  /** Resolves an AppTopBar `pill-select` payload into the active view and emits `update:pill` and `pill-select`. */
   handlePillSelect: (item: PillNavItem) => void
 }
 
 /**
- * Maps PluginWorkspaceView's flat 72-prop surface into the three typed model objects
+ * Maps PluginWorkspaceView's `spec` and `v-model`s 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.
+ * (WorkspaceShellInternal, WorkspaceSidebarInternal, WorkspaceControlsInternal).
  *
  * @example Recommended
  * ```ts
- * const props = withDefaults(defineProps<PluginWorkspaceViewProps>(), { ... })
+ * const props = defineProps<PluginWorkspaceViewProps>()
  * const emit = defineEmits<PluginWorkspaceViewEmits>()
  * const slots = useSlots()
  * const { shell, sidebar, controls } = usePluginWorkspace({ props, slots, emit })
@@ -70,50 +66,36 @@ export interface UsePluginWorkspaceReturn {
 export function usePluginWorkspace(options: UsePluginWorkspaceOptions): UsePluginWorkspaceReturn {
   const { props, slots, emit } = options
 
+  const sidebarSpec = computed<false | PluginWorkspaceSidebarSpec>(() => props.spec?.sidebar ?? {})
+  const topBarSpec = computed(() => props.spec?.topBar === false
+    ? false
+    : applySpecDefaults({ themeToggle: true, settings: {}, standaloneLabel: false }, props.spec?.topBar))
+
   const controlsState = usePluginWorkspaceControls({
-    model: () => props.model,
-    controls: () => props.controls,
-    controlOptions: () => props.controlOptions ?? {},
-    modelValue: () => props.modelValue,
+    model: () => sidebarSpec.value === false ? undefined : sidebarSpec.value.controls,
     values: () => props.values,
-    componentBindings: () => props.componentBindings,
-    componentProps: () => props.componentProps,
-    componentPropsById: () => props.componentPropsById,
-    emitValues: (values) => {
-      emit('update:modelValue', values)
-      emit('update:values', values)
-    },
+    emitValues: 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 ?? {}),
+    activeView: () => props.view,
+    currentPillId: () => props.pill,
+    pillNav: () => topBarSpec.value === false ? undefined : topBarSpec.value.pills,
+    panelIds: () => Object.keys(sidebarSpec.value === false ? {} : sidebarSpec.value.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),
+    emitActiveView: viewId => emit('update:view', viewId),
+    emitPillSelect: (item) => {
+      emit('update:pill', item.id)
+      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,
+    sidebar: sidebarSpec.value,
     hasSidebarSlot: Boolean(slots.sidebar),
     sidebarSlotCount: sidebarSlotNames.value.length,
   }))
@@ -128,71 +110,45 @@ export function usePluginWorkspace(options: UsePluginWorkspaceOptions): UsePlugi
     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,
-    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 shell = computed<PluginWorkspaceShellModel>(() => {
+    const sidebar = sidebarSpec.value === false ? {} : sidebarSpec.value
+    return {
+      sidebarPosition: sidebar.position ?? 'left',
+      sidebarWidth: sidebar.width,
+      floating: props.spec?.floating ?? true,
+      responsiveSidebar: sidebar.responsive ?? true,
+      sidebarToggleLabel: sidebar.toggleLabel ?? 'Open workspace sidebar',
+      sidebarCloseLabel: sidebar.closeLabel ?? 'Close workspace sidebar',
+      hasSidebarSurface: hasSidebarSurface.value,
+      title: props.spec?.title,
+      subtitle: props.spec?.subtitle,
+      topBar: topBarSpec.value === false
+        ? false
+        : { ...topBarSpec.value, pills: navigationState.resolvedPillNav.value },
+      pill: navigationState.resolvedCurrentPillId.value,
+      topBarSlotNames: topBarSlotNames.value,
+      controls: controls.value,
+    }
+  })
 
-  const sidebar = computed<PluginWorkspaceSidebarModel>(() => ({
-    title: props.sidebarTitle,
-    subtitle: props.sidebarSubtitle,
-    badge: props.sidebarBadge,
-    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 ?? true,
-    collapsed: props.sidebarCollapsed,
-    defaultCollapsed: props.defaultSidebarCollapsed ?? false,
-    collapsedWidth: props.sidebarCollapsedWidth ?? '3rem',
-    collapseButtonLabel: props.sidebarCollapseButtonLabel ?? 'Collapse sidebar',
-    expandButtonLabel: props.sidebarExpandButtonLabel ?? 'Expand sidebar',
-    slotNames: sidebarSlotNames.value,
-  }))
+  const sidebar = computed<PluginWorkspaceSidebarModel>(() => {
+    const spec = sidebarSpec.value === false ? {} : sidebarSpec.value
+    return {
+      spec: {
+        ...spec,
+        floating: false,
+        collapsible: spec.collapsible ?? true,
+        whenEmpty: (spec.whenEmpty ?? false) || spec.contentId !== undefined,
+      },
+      activeView: navigationState.resolvedActiveView.value,
+      values: controlsState.internalControlValues,
+      collapsed: props.sidebarCollapsed,
+      formLoading: props.formLoading ?? false,
+      formDisabled: props.formDisabled ?? false,
+      formReadonly: props.formReadonly ?? false,
+      slotNames: sidebarSlotNames.value,
+    }
+  })
 
   return {
     shell,
@@ -200,7 +156,6 @@ export function usePluginWorkspace(options: UsePluginWorkspaceOptions): UsePlugi
     controls,
     hasSidebarSurface,
     handleControlValuesUpdate: controlsState.handleControlValuesUpdate,
-    handlePageSelectorSelect: navigationState.handlePageSelectorSelect,
     handlePillSelect: navigationState.handlePillSelect,
   }
 }