@ossy/workspaces 1.17.2 → 1.17.3

package/src/en.translations.json

@@ -8,41 +8,41 @@
   "workspaces.select.title": "My workspaces",
   "workspaces.select.newWorkspace": "New workspace",
   "workspaces.select.loading": "Loading...",
-  "workspaces.select.description": "Workspaces are separate environments where you can manage resources, templates, services and billing.",
+  "workspaces.select.description": "Workspaces are separate environments where you can manage resources, schemas, services, and billing.",
   "workspaces.select.errorTitle": "We could not load your workspaces",
   "workspaces.select.errorText": "Something went wrong when loading your workspaces. Maybe your session has expired, or we messed up somehow. Try starting over from our home page.",
   "workspaces.select.errorAction": "Go to our home page",
   "workspaces.select.emptyTitle": "Let's get the party started",
-  "workspaces.select.emptyText": "To get started we need to create a workspace. A workspace is an encapsulation of resources, resource templates, billing information, and what users have access to these things.",
+  "workspaces.select.emptyText": "To get started we need to create a workspace. A workspace is an encapsulation of resources, schemas, billing information, and what users have access to these things.",
   "workspaces.select.emptyAction": "Create a workspace",
-  "workspaces/create.label": "Create workspace",
-  "workspaces/create.description": "Create a new workspace for the authenticated user",
-  "workspaces/accept-invitation.label": "Accept invitation",
-  "workspaces/accept-invitation.description": "Accept a workspace invitation",
-  "workspaces/create-api-token.label": "Create workspace API token",
-  "workspaces/create-api-token.description": "Create an API token scoped to the workspace",
-  "workspaces/disable-service.label": "Disable service",
-  "workspaces/disable-service.description": "Disable a service for the workspace",
-  "workspaces/enable-service.label": "Enable service",
-  "workspaces/enable-service.description": "Enable a service for the workspace",
-  "workspaces/get-api-tokens.label": "Get workspace API tokens",
-  "workspaces/get-api-tokens.description": "List API tokens for the workspace",
-  "workspaces/get-invitations.label": "Get invitations",
-  "workspaces/get-invitations.description": "List pending workspace invitations",
-  "workspaces/get-resource-templates.label": "Get resource templates",
-  "workspaces/get-resource-templates.description": "List resource templates available to the workspace",
-  "workspaces/get-users.label": "Get workspace users",
-  "workspaces/get-users.description": "List members of the workspace",
-  "workspaces/get.label": "Get workspace",
-  "workspaces/get.description": "Load a workspace by id",
-  "workspaces/import-resource-templates.label": "Import resource templates",
-  "workspaces/import-resource-templates.description": "Import resource templates into the workspace",
-  "workspaces/invite-user.label": "Invite user",
-  "workspaces/invite-user.description": "Send a workspace invitation to a user",
-  "workspaces/remove-member.label": "Remove member",
-  "workspaces/remove-member.description": "Remove a user from the workspace",
-  "workspaces/list.label": "List workspaces",
-  "workspaces/list.description": "List workspaces for the authenticated user",
+  "@ossy/workspaces/actions/create.label": "Create workspace",
+  "@ossy/workspaces/actions/create.description": "Create a new workspace for the authenticated user",
+  "@ossy/workspaces/actions/accept-invitation.label": "Accept invitation",
+  "@ossy/workspaces/actions/accept-invitation.description": "Accept a workspace invitation",
+  "@ossy/workspaces/actions/create-api-token.label": "Create workspace API token",
+  "@ossy/workspaces/actions/create-api-token.description": "Create an API token scoped to the workspace",
+  "@ossy/workspaces/actions/disable-service.label": "Disable service",
+  "@ossy/workspaces/actions/disable-service.description": "Disable a service for the workspace",
+  "@ossy/workspaces/actions/enable-service.label": "Enable service",
+  "@ossy/workspaces/actions/enable-service.description": "Enable a service for the workspace",
+  "@ossy/workspaces/actions/get-api-tokens.label": "Get workspace API tokens",
+  "@ossy/workspaces/actions/get-api-tokens.description": "List API tokens for the workspace",
+  "@ossy/workspaces/actions/get-invitations.label": "Get invitations",
+  "@ossy/workspaces/actions/get-invitations.description": "List pending workspace invitations",
+  "@ossy/workspaces/actions/get-schemas.label": "Get schemas",
+  "@ossy/workspaces/actions/get-schemas.description": "List schemas available to the workspace",
+  "@ossy/workspaces/actions/get-users.label": "Get workspace users",
+  "@ossy/workspaces/actions/get-users.description": "List members of the workspace",
+  "@ossy/workspaces/actions/get.label": "Get workspace",
+  "@ossy/workspaces/actions/get.description": "Load a workspace by id",
+  "@ossy/workspaces/actions/import-schemas.label": "Import schemas",
+  "@ossy/workspaces/actions/import-schemas.description": "Import schemas into the workspace",
+  "@ossy/workspaces/actions/invite-user.label": "Invite user",
+  "@ossy/workspaces/actions/invite-user.description": "Send a workspace invitation to a user",
+  "@ossy/workspaces/actions/remove-member.label": "Remove member",
+  "@ossy/workspaces/actions/remove-member.description": "Remove a user from the workspace",
+  "@ossy/workspaces/actions/list.label": "List workspaces",
+  "@ossy/workspaces/actions/list.description": "List workspaces for the authenticated user",
   "workspace/settings.documentTitle": "Workspace settings",
   "workspace.settings.title": "Workspace settings",
   "workspace/users.documentTitle": "Users",
@@ -54,10 +54,16 @@
   "workspace/invitations/add.documentTitle": "Invite user",
   "workspace.invitations.title": "Invitations",
   "workspace.settings.detailsTitle": "Workspace details",
+  "workspace.settings.detailsDescription": "Manage workspace name, services, and metadata.",
   "workspace.settings.edit": "Edit",
   "workspace.settings.name": "Name",
   "workspace.settings.created": "Created",
   "workspace.settings.services": "Services",
+  "workspace.settings.service.booking": "Booking",
+  "workspace.settings.service.on": "on",
+  "workspace.settings.service.off": "off",
+  "workspace.settings.service.enable": "Enable",
+  "workspace.settings.service.disable": "Disable",
   "workspace.settings.loading": "Loading...",
   "workspace.invitations.description": "Invite users to your workspace to collaborate.",
   "workspace.invitations.invite": "Invite user",

package/src/enable-service.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/enable-service', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/enable-service', access: 'workspace' }

package/src/enable-service.task.js

@@ -1,25 +1,13 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+import { assertEnableableService } from './service-keys.js'
 
-export const metadata = { id: 'workspaces/enable-service' }
-
-const AVAILABLE_SERVICES = [
-  '@ossy/tasks/visual-content-descriptors',
-  '@ossy/tasks/resize-common-web',
-  '@ossy/resumes',
-  '@ossy/consultancy',
-  '@ossy/apps',
-  '@ossy/domains',
-]
+export const metadata = { id: '@ossy/workspaces/tasks/enable-service' }
 
 export async function run({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId
   const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const service = payload?.service ?? payload
-
-  if (!AVAILABLE_SERVICES.includes(service)) {
-    throw Object.assign(new Error(`Service ${service} is not available`), { status: 400 })
-  }
+  const service = assertEnableableService(payload?.service ?? payload)
 
   const event = WorkspacesEvents.ServiceEnabled({ createdBy, service })
   await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))

package/src/entitlements.js

@@ -0,0 +1,199 @@
+/**
+ * Workspace entitlements — canonical helpers (ENTITLEMENTS.md, ADR 0010 Wave 1).
+ *
+ * Service keys use npm package names (e.g. `@ossy/booking`, `@acme/widgets`) so
+ * third-party feature packages work without slug conventions.
+ */
+
+/** Platform packages that are never workspace-toggleable products. */
+const NON_PRODUCT_PACKAGES = new Set([
+  '@ossy/app-test',
+  '@ossy/platform',
+  '@ossy/app',
+  '@ossy/workspaces',
+])
+
+/** @type {Set<string> | null} */
+let enableablePackages = null
+
+/**
+ * Register packages that may be enabled/disabled at runtime (from app manifest at startup).
+ *
+ * @param {Iterable<string>} packages
+ */
+export function setEnableablePackages (packages) {
+  if (packages == null) {
+    enableablePackages = null
+    return
+  }
+  enableablePackages = packages instanceof Set ? packages : new Set(packages)
+}
+
+/**
+ * @param {string} packageName npm package name (e.g. `@ossy/booking`).
+ * @returns {string} URL slug (e.g. `booking`).
+ */
+export function packageNameToSlug (packageName) {
+  const slash = packageName.indexOf('/')
+  return slash === -1 ? packageName : packageName.slice(slash + 1)
+}
+
+/**
+ * @param {unknown} entry
+ * @returns {boolean}
+ */
+export function entryEnabled (entry) {
+  if (entry != null && typeof entry === 'object') return entry.enabled === true
+  return false
+}
+
+/**
+ * Canonicalize `workspace.services` — npm package keys and `{ enabled }` values only.
+ *
+ * @param {Record<string, { enabled?: boolean }> | undefined} services
+ * @returns {Record<string, { enabled: boolean }>}
+ */
+export function normalizeWorkspaceServices (services) {
+  /** @type {Record<string, { enabled: boolean }>} */
+  const out = {}
+  for (const [packageName, val] of Object.entries(services || {})) {
+    if (!packageName.startsWith('@')) continue
+    if (val == null || typeof val !== 'object') continue
+    out[packageName] = { enabled: val.enabled === true }
+  }
+  return out
+}
+
+/**
+ * @param {Record<string, { enabled?: boolean }> | undefined} services
+ * @param {string} packageName scoped npm package name (e.g. `@ossy/booking`)
+ * @returns {boolean}
+ */
+export function isServiceEntitled (services, packageName) {
+  const normalized = normalizeWorkspaceServices(services)
+  return normalized[normalizeServicePackageName(packageName)]?.enabled === true
+}
+
+/**
+ * @param {Record<string, { enabled?: boolean }> | undefined} services
+ * @returns {string[]} entitled npm package names
+ */
+export function entitledPackages (services) {
+  return Object.entries(normalizeWorkspaceServices(services))
+    .filter(([, v]) => v.enabled === true)
+    .map(([packageName]) => packageName)
+}
+
+/**
+ * @param {Record<string, { enabled?: boolean }> | undefined} services
+ * @returns {string[]} entitled slugs (derived from package names)
+ */
+export function entitledSlugs (services) {
+  return entitledPackages(services).map(packageNameToSlug)
+}
+
+/**
+ * @param {unknown} service payload field or `{ service }` wrapper
+ * @returns {string} scoped npm package name
+ */
+export function normalizeServicePackageName (service) {
+  let raw = service
+  if (raw != null && typeof raw === 'object' && 'service' in raw) {
+    raw = raw.service
+  }
+  if (typeof raw !== 'string' || !raw.trim()) {
+    throw Object.assign(new Error('Service package name is required'), { status: 400 })
+  }
+  const trimmed = raw.trim()
+  if (!trimmed.startsWith('@') || !trimmed.includes('/')) {
+    throw Object.assign(
+      new Error('Service package name must be a scoped npm name (e.g. @ossy/booking)'),
+      { status: 400 },
+    )
+  }
+  return trimmed
+}
+
+/** @deprecated use {@link normalizeServicePackageName} */
+export const normalizeServiceSlug = normalizeServicePackageName
+
+/**
+ * Collect unique npm package names referenced in a build manifest.
+ *
+ * @param {object} manifest
+ * @returns {Set<string>}
+ */
+export function collectManifestPackages (manifest) {
+  /** @type {Set<string>} */
+  const names = new Set()
+  const add = (item) => {
+    if (item?.package?.startsWith('@')) names.add(item.package)
+  }
+  for (const page of manifest.pages || []) add(page)
+  for (const api of manifest.apis || []) add(api)
+  for (const action of manifest.actions || []) add(action)
+  for (const task of manifest.tasks || []) add(task)
+  for (const task of manifest.taskCatalog || []) add(task)
+  for (const schema of manifest.schemas || []) add(schema)
+  for (const component of manifest.components || []) add(component)
+  for (const aggregate of manifest.aggregates || []) add(aggregate)
+  for (const integration of manifest.integrations || []) add(integration)
+  for (const email of manifest.emails || []) add(email)
+  return names
+}
+
+/**
+ * Packages installed in this app that may be toggled via ServiceEnabled / ServiceDisabled.
+ *
+ * @param {object} manifest
+ * @returns {Set<string>}
+ */
+export function buildEnableablePackageSet (manifest) {
+  const definitions = manifest.definitions || {}
+  /** @type {Set<string>} */
+  const out = new Set()
+  for (const packageName of collectManifestPackages(manifest)) {
+    const slug = packageNameToSlug(packageName)
+    const def = definitions[slug]
+    if (isToggleablePackage(packageName, { entitlementRequired: def?.entitlementRequired !== false })) {
+      out.add(packageName)
+    }
+  }
+  return out
+}
+
+/**
+ * @param {string} packageName
+ * @param {{ entitlementRequired?: boolean }} [options]
+ * @returns {boolean}
+ */
+export function isToggleablePackage (packageName, { entitlementRequired = true } = {}) {
+  if (entitlementRequired === false) return false
+  if (!packageName?.startsWith('@')) return false
+  return !NON_PRODUCT_PACKAGES.has(packageName)
+}
+
+/**
+ * Validate and normalize a service for ServiceEnabled / ServiceDisabled events.
+ *
+ * @param {unknown} service
+ * @param {{ enableablePackages?: Set<string> }} [options]
+ * @returns {string} npm package name
+ */
+export function assertEnableableService (service, options = {}) {
+  const packageName = normalizeServicePackageName(service)
+  if (NON_PRODUCT_PACKAGES.has(packageName)) {
+    throw Object.assign(new Error(`Service ${packageName} is not enableable`), { status: 400 })
+  }
+  const allowlist = options.enableablePackages ?? enableablePackages
+  if (allowlist && allowlist.size > 0 && !allowlist.has(packageName)) {
+    throw Object.assign(
+      new Error(`Service ${packageName} is not available in this app`),
+      { status: 400, code: 'SERVICE_NOT_AVAILABLE' },
+    )
+  }
+  return packageName
+}
+
+/** @deprecated use {@link assertEnableableService} */
+export const assertEnableableServiceSlug = assertEnableableService

package/src/entitlements.spec.js

@@ -0,0 +1,88 @@
+import { describe, expect, it } from '@jest/globals'
+import {
+  assertEnableableService,
+  buildEnableablePackageSet,
+  entitledPackages,
+  isServiceEntitled,
+  normalizeServicePackageName,
+  normalizeWorkspaceServices,
+  packageNameToSlug,
+  setEnableablePackages,
+} from './entitlements.js'
+
+const BOOKING = '@ossy/booking'
+const allowlist = new Set([BOOKING, '@acme/widgets'])
+
+describe('entitlements', () => {
+  it('packageNameToSlug strips scope', () => {
+    expect(packageNameToSlug('@ossy/booking')).toBe('booking')
+    expect(packageNameToSlug('@acme/widgets')).toBe('widgets')
+  })
+
+  it('normalizeWorkspaceServices keeps scoped package keys with enabled objects', () => {
+    expect(normalizeWorkspaceServices({
+      '@ossy/booking': { enabled: true },
+      '@acme/widgets': { enabled: false },
+    })).toEqual({
+      '@ossy/booking': { enabled: true },
+      '@acme/widgets': { enabled: false },
+    })
+  })
+
+  it('normalizeWorkspaceServices drops slug keys and boolean values', () => {
+    expect(normalizeWorkspaceServices({
+      booking: { enabled: true },
+      '@ossy/booking': true,
+      resumes: true,
+    })).toEqual({})
+  })
+
+  it('isServiceEntitled requires scoped package name', () => {
+    const services = normalizeWorkspaceServices({ '@ossy/booking': { enabled: true } })
+    expect(isServiceEntitled(services, BOOKING)).toBe(true)
+    expect(() => isServiceEntitled(services, 'booking')).toThrow(/scoped npm name/)
+  })
+
+  it('entitledPackages lists package names', () => {
+    const services = normalizeWorkspaceServices({
+      '@ossy/booking': { enabled: true },
+      '@acme/widgets': { enabled: false },
+    })
+    expect(entitledPackages(services)).toEqual(['@ossy/booking'])
+  })
+
+  it('normalizeServicePackageName requires scoped npm name', () => {
+    expect(normalizeServicePackageName('@acme/widgets')).toBe('@acme/widgets')
+    expect(normalizeServicePackageName({ service: BOOKING })).toBe(BOOKING)
+    expect(() => normalizeServicePackageName('booking')).toThrow(/scoped npm name/)
+  })
+
+  it('assertEnableableService rejects platform packages', () => {
+    expect(() => assertEnableableService('@ossy/workspaces', { enableablePackages: allowlist })).toThrow()
+    expect(assertEnableableService(BOOKING, { enableablePackages: allowlist })).toBe(BOOKING)
+  })
+
+  it('assertEnableableService rejects packages not in the app manifest allowlist', () => {
+    expect(() => assertEnableableService('@ossy/unknown', { enableablePackages: allowlist })).toThrow(/not available/)
+    expect(() => assertEnableableService('booking', { enableablePackages: allowlist })).toThrow(/scoped npm name/)
+  })
+
+  it('assertEnableableService uses setEnableablePackages registry', () => {
+    setEnableablePackages(allowlist)
+    expect(assertEnableableService('@acme/widgets')).toBe('@acme/widgets')
+    expect(() => assertEnableableService('@ossy/domains')).toThrow(/not available/)
+    setEnableablePackages(null)
+  })
+
+  it('buildEnableablePackageSet includes entitled products from manifest', () => {
+    const manifest = {
+      pages: [{ package: '@ossy/booking', id: 'booking/home' }],
+      actions: [{ package: '@ossy/workspaces', id: '@ossy/workspaces/actions/get' }],
+      definitions: {
+        booking: { entitlementRequired: true },
+        workspaces: { entitlementRequired: false },
+      },
+    }
+    expect([...buildEnableablePackageSet(manifest)]).toEqual(['@ossy/booking'])
+  })
+})

package/src/get-api-tokens.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/get-api-tokens', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/get-api-tokens', access: 'workspace' }

package/src/get-api-tokens.task.js

@@ -1,7 +1,7 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
 
-export const metadata = { id: 'workspaces/get-api-tokens' }
+export const metadata = { id: '@ossy/workspaces/tasks/get-api-tokens' }
 
 export async function run({ payload, req }) {
   const workspaceId = payload?.workspaceId ?? req?.workspaceId

package/src/get-invitations.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/get-invitations', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/get-invitations', access: 'workspace' }

package/src/get-invitations.task.js

@@ -1,7 +1,7 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
 
-export const metadata = { id: 'workspaces/get-invitations' }
+export const metadata = { id: '@ossy/workspaces/tasks/get-invitations' }
 
 export async function run({ payload, req }) {
   const workspaceId = payload?.workspaceId ?? req?.workspaceId

package/src/get-schemas.action.js

@@ -0,0 +1 @@
+export const metadata = { id: '@ossy/workspaces/actions/get-schemas', access: 'workspace' }

package/src/get-schemas.task.js

@@ -0,0 +1,14 @@
+import { Aggregate } from '@ossy/event-store'
+import { Workspace } from '@ossy/workspaces/server'
+import { getSystemSchemas } from '@ossy/platform'
+import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
+
+export const metadata = { id: '@ossy/workspaces/tasks/get-schemas' }
+
+export async function run ({ payload, req }) {
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+
+  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
+  const systemSchemas = getSystemSchemas()
+  return mergeWorkspaceSchemas(systemSchemas, workspace.schemas || [])
+}

package/src/get-users.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/get-users', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/get-users', access: 'workspace' }

package/src/get-users.task.js

@@ -2,7 +2,7 @@ import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
 import { User } from '@ossy/users/server'
 
-export const metadata = { id: 'workspaces/get-users' }
+export const metadata = { id: '@ossy/workspaces/tasks/get-users' }
 
 export async function run({ payload, req }) {
   const workspaceId = payload?.workspaceId ?? req?.workspaceId

package/src/get.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/get', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/get', access: 'workspace' }

package/src/get.task.js

@@ -1,7 +1,7 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace } from '@ossy/workspaces/server'
 
-export const metadata = { id: 'workspaces/get' }
+export const metadata = { id: '@ossy/workspaces/tasks/get' }
 
 export async function run({ payload, req }) {
   const workspaceId = payload?.workspaceId ?? req?.workspaceId

package/src/import-schemas.action.js

@@ -0,0 +1 @@
+export const metadata = { id: '@ossy/workspaces/actions/import-schemas', access: 'workspace' }

package/src/import-schemas.task.js

@@ -0,0 +1,26 @@
+import { Aggregate } from '@ossy/event-store'
+import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+import { validateSchemasForImport } from '@ossy/platform'
+
+export const metadata = { id: '@ossy/workspaces/tasks/import-schemas' }
+
+export async function run ({ payload, req }) {
+  const userId = payload?.userId ?? req?.userId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const schemas = payload?.schemas ?? payload
+
+  if (!Array.isArray(schemas)) {
+    throw Object.assign(new Error('schemas must be an array'), { status: 400 })
+  }
+
+  const reservedIds = new Set([])
+  const validation = validateSchemasForImport(schemas, reservedIds)
+  if (!validation.ok) {
+    throw Object.assign(new Error(validation.message), { status: 400, type: validation.code })
+  }
+
+  const event = WorkspacesEvents.SchemasImported({ createdBy: userId, schemas })
+
+  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
+  return event.payload.schemas
+}

package/src/index.js

@@ -8,8 +8,8 @@ export { metadata as GetUsers } from './get-users.action.js'
 export { metadata as RemoveMember } from './remove-member.action.js'
 export { metadata as CreateWorkspaceApiToken } from './create-api-token.action.js'
 export { metadata as GetWorkspaceApiTokens } from './get-api-tokens.action.js'
-export { metadata as GetResourceTemplates } from './get-resource-templates.action.js'
-export { metadata as ImportResourceTemplates } from './import-resource-templates.action.js'
+export { metadata as GetSchemas } from './get-schemas.action.js'
+export { metadata as ImportSchemas } from './import-schemas.action.js'
 export { metadata as EnableService } from './enable-service.action.js'
 export { metadata as DisableService } from './disable-service.action.js'
 export { CreateWorkspacePage } from './CreateWorkspacePage.jsx'
@@ -19,5 +19,6 @@ export { Invitations } from './Invitations.jsx'
 export { Invite } from './Invite.jsx'
 export { Users } from './Users.jsx'
 export { AuthenticationGuard } from './AuthenticationGuard.jsx'
+export { selectWorkspace, selectWorkspaceHref } from './selectWorkspace.js'
 export { patchUserWorkspaceId } from './patchUserWorkspaceId.js'
 export { Definition } from './Definition.js'

package/src/invite-user.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/invite-user', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/invite-user', access: 'workspace' }

package/src/invite-user.task.js

@@ -1,5 +1,6 @@
 import jwt from 'jsonwebtoken'
 import { Aggregate } from '@ossy/event-store'
+import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 import { Token, TokenEvents } from '@ossy/tokens/server'
 import { EmailRenderer } from '@ossy/email'
@@ -7,9 +8,9 @@ import { ConfigService } from '@ossy/platform'
 import { createLogger } from '@ossy/observability'
 import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
 
-export const metadata = { id: 'workspaces/invite-user' }
+export const metadata = { id: '@ossy/workspaces/tasks/invite-user' }
 
-const log = createLogger('workspaces/invite-user')
+const log = createLogger('@ossy/workspaces/tasks/invite-user')
 
 const isEmailLike = maybeEmail => /.@.+\.../.test(maybeEmail)
 
@@ -50,7 +51,7 @@ export async function run({ payload, integrations, req }) {
     expiresAt,
   })
 
-  const existingUser = await Aggregate.Collection.findOne({ type: 'User', 'state.email': email }).then(agg => agg?.state)
+  const existingUser = await Aggregate.Collection.findOne({ type: UserSchema.user, 'state.email': email }).then(agg => agg?.state)
   if (existingUser && workspace.users.includes(existingUser.id)) {
     throw Object.assign(new Error('User already in workspace'), { status: 400 })
   }

package/src/list.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/list', access: 'authenticated' }
+export const metadata = { id: '@ossy/workspaces/actions/list', access: 'authenticated' }

package/src/list.task.js

@@ -1,6 +1,6 @@
 import { WorkspacesQueries } from './workspaces.queries.js'
 
-export const metadata = { id: 'workspaces/list' }
+export const metadata = { id: '@ossy/workspaces/tasks/list' }
 
 export async function run({ payload, req }) {
   const userId = payload?.userId ?? req?.userId

package/src/merge-workspace-schemas.js

@@ -0,0 +1,13 @@
+/**
+ * Merge system schemas with workspace overlays (same rules as get-schemas task).
+ *
+ * @param {object[]} systemSchemas
+ * @param {object[]} [workspaceSchemas]
+ */
+export function mergeWorkspaceSchemas (systemSchemas, workspaceSchemas = []) {
+  const workspaceIds = new Set(workspaceSchemas.map((s) => s?.id).filter(Boolean))
+  return [
+    ...systemSchemas.filter((s) => !workspaceIds.has(s.id)),
+    ...workspaceSchemas,
+  ]
+}

package/src/merge-workspace-schemas.spec.js

@@ -0,0 +1,16 @@
+import { describe, expect, it } from '@jest/globals'
+import { mergeWorkspaceSchemas } from './merge-workspace-schemas.js'
+
+describe('mergeWorkspaceSchemas', () => {
+  it('appends workspace-only schemas', () => {
+    const system = [{ id: 'a', name: 'A', fields: [] }]
+    const workspace = [{ id: 'b', name: 'B', fields: [] }]
+    expect(mergeWorkspaceSchemas(system, workspace).map(s => s.id)).toEqual(['a', 'b'])
+  })
+
+  it('lets workspace schemas override system ids', () => {
+    const system = [{ id: 'a', name: 'System', fields: [] }]
+    const workspace = [{ id: 'a', name: 'Custom', fields: [] }]
+    expect(mergeWorkspaceSchemas(system, workspace)[0].name).toBe('Custom')
+  })
+})

package/src/remove-member.action.js

@@ -1 +1 @@
-export const metadata = { id: 'workspaces/remove-member', access: 'workspace' }
+export const metadata = { id: '@ossy/workspaces/actions/remove-member', access: 'workspace' }

package/src/remove-member.task.js

@@ -1,7 +1,7 @@
 import { Aggregate } from '@ossy/event-store'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
 
-export const metadata = { id: 'workspaces/remove-member' }
+export const metadata = { id: '@ossy/workspaces/tasks/remove-member' }
 
 export async function run({ payload, req }) {
   const createdBy = payload?.userId ?? req?.userId

package/src/schema-ids.js

@@ -0,0 +1,3 @@
+export const WorkspaceSchema = Object.freeze({
+  workspace: '@ossy/workspaces/schema/workspace',
+})