@jskit-ai/users-web 0.1.53 → 0.1.54

package/package.descriptor.mjs

@@ -1,12 +1,9 @@
-import {
-  HOME_TOOLS_OUTLET,
-  WORKSPACE_TOOLS_OUTLET
-} from "./src/shared/toolsOutletContracts.js";
+import { HOME_TOOLS_OUTLET } from "./src/shared/toolsOutletContracts.js";
 
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-web",
-  version: "0.1.53",
+  version: "0.1.54",
   kind: "runtime",
   description: "Users web module: account/profile UI plus shared users web widgets.",
   dependsOn: [
@@ -79,24 +76,22 @@ export default Object.freeze({
         },
         {
           subpath: "./client/composables/usePaths",
-          summary: "Exports surface/workspace path resolver composable."
+          summary: "Exports surface route path resolver composable."
         },
         {
           subpath: "./client/composables/useAccountSettingsRuntime",
           summary: "Exports account settings runtime composable for app-owned settings UI."
         },
         {
-          subpath: "./client/composables/useWorkspaceRouteContext",
-          summary: "Exports workspace route context composable."
-        },
+          subpath: "./client/account-settings/sections",
+          summary: "Exports account settings section extension seam helpers."
+        }
       ],
       containerTokens: {
         server: [],
         client: [
-          "users.web.profile.menu.surface-switch-item",
           "users.web.home.tools.widget",
-          "users.web.profile.element",
-          "users.web.bootstrap-placement.runtime"
+          "users.web.profile.element"
         ]
       }
     },
@@ -108,24 +103,9 @@ export default Object.freeze({
             defaultLinkComponentToken: HOME_TOOLS_OUTLET.defaultLinkComponentToken,
             surfaces: ["home"],
             source: "src/client/components/UsersHomeToolsWidget.vue"
-          },
-          {
-            target: WORKSPACE_TOOLS_OUTLET.target,
-            defaultLinkComponentToken: WORKSPACE_TOOLS_OUTLET.defaultLinkComponentToken,
-            surfaces: ["admin"],
-            source: "src/client/components/UsersWorkspaceToolsWidget.vue"
-          },
+          }
         ],
         contributions: [
-          {
-            id: "users.profile.menu.surface-switch",
-            target: "auth-profile-menu:primary-menu",
-            surfaces: ["*"],
-            order: 100,
-            componentToken: "users.web.profile.menu.surface-switch-item",
-            when: "auth.authenticated === true",
-            source: "mutations.text#users-web-profile-surface-switch-placement"
-          },
           {
             id: "users.profile.menu.settings",
             target: "auth-profile-menu:primary-menu",
@@ -162,12 +142,12 @@ export default Object.freeze({
       runtime: {
         "@tanstack/vue-query": "5.92.12",
         "@mdi/js": "^7.4.47",
-        "@jskit-ai/http-runtime": "0.1.37",
-        "@jskit-ai/realtime": "0.1.37",
-        "@jskit-ai/kernel": "0.1.38",
-        "@jskit-ai/shell-web": "0.1.37",
-        "@jskit-ai/uploads-image-web": "0.1.16",
-        "@jskit-ai/users-core": "0.1.48",
+        "@jskit-ai/http-runtime": "0.1.38",
+        "@jskit-ai/realtime": "0.1.38",
+        "@jskit-ai/kernel": "0.1.39",
+        "@jskit-ai/shell-web": "0.1.38",
+        "@jskit-ai/uploads-image-web": "0.1.17",
+        "@jskit-ai/users-core": "0.1.49",
         vuetify: "^4.0.0"
       },
       dev: {}
@@ -215,13 +195,6 @@ export default Object.freeze({
         reason: "Install app-owned account settings notifications section scaffold.",
         category: "users-web",
         id: "users-web-component-account-settings-notifications"
-      },
-      {
-        from: "templates/src/components/account/settings/AccountSettingsInvitesSection.vue",
-        to: "src/components/account/settings/AccountSettingsInvitesSection.vue",
-        reason: "Install app-owned account settings invites section scaffold.",
-        category: "users-web",
-        id: "users-web-component-account-settings-invites"
       }
     ],
     text: [
@@ -236,17 +209,6 @@ export default Object.freeze({
         category: "users-web",
         id: "users-web-surface-config-account"
       },
-      {
-        op: "append-text",
-        file: "src/placement.js",
-        position: "bottom",
-        skipIfContains: "id: \"users.profile.menu.surface-switch\"",
-        value:
-          "\naddPlacement({\n  id: \"users.profile.menu.surface-switch\",\n  target: \"auth-profile-menu:primary-menu\",\n  surfaces: [\"*\"],\n  order: 100,\n  componentToken: \"users.web.profile.menu.surface-switch-item\",\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
-        reason: "Append users-web profile surface switch placement into app-owned placement registry.",
-        category: "users-web",
-        id: "users-web-profile-surface-switch-placement"
-      },
       {
         op: "append-text",
         file: "src/placement.js",
@@ -264,7 +226,7 @@ export default Object.freeze({
         position: "bottom",
         skipIfContains: "id: \"users.home.tools.widget\"",
         value:
-          "\naddPlacement({\n  id: \"users.home.tools.widget\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"home\"],\n  order: 900,\n  componentToken: \"users.web.home.tools.widget\",\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n\naddPlacement({\n  id: \"users.home.menu.settings\",\n  target: \"home-tools:primary-menu\",\n  surfaces: [\"home\"],\n  order: 100,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Settings\",\n    surface: \"home\",\n    workspaceSuffix: \"/settings\",\n    nonWorkspaceSuffix: \"/settings\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
+          "\naddPlacement({\n  id: \"users.home.tools.widget\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"home\"],\n  order: 900,\n  componentToken: \"users.web.home.tools.widget\",\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n\naddPlacement({\n  id: \"users.home.menu.settings\",\n  target: \"home-tools:primary-menu\",\n  surfaces: [\"home\"],\n  order: 100,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Settings\",\n    surface: \"home\",\n    scopedSuffix: \"/settings\",\n    unscopedSuffix: \"/settings\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
         reason: "Append users-web home tools widget and settings menu placements into app-owned placement registry.",
         category: "users-web",
         id: "users-web-home-tools-placement"

package/package.json

@@ -1,37 +1,42 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.53",
+  "version": "0.1.54",
   "type": "module",
   "scripts": {
     "test": "node --test"
   },
   "exports": {
     "./client": "./src/client/index.js",
-    "./client/providers/UsersWorkspacesClientProvider": "./src/client/providers/UsersWorkspacesClientProvider.js",
-    "./client/components/WorkspaceMembersClientElement": "./src/client/components/WorkspaceMembersClientElement.vue",
+    "./client/account-settings/sections": "./src/client/account-settings/sections.js",
     "./client/composables/useAddEdit": "./src/client/composables/records/useAddEdit.js",
+    "./client/composables/useAccess": "./src/client/composables/useAccess.js",
+    "./client/composables/useCommand": "./src/client/composables/useCommand.js",
     "./client/composables/useCrudAddEdit": "./src/client/composables/records/useCrudAddEdit.js",
     "./client/composables/crudLookupFieldRuntime": "./src/client/composables/crud/crudLookupFieldRuntime.js",
     "./client/composables/useList": "./src/client/composables/records/useList.js",
     "./client/composables/useCrudList": "./src/client/composables/records/useCrudList.js",
     "./client/composables/useCrudListParentTitle": "./src/client/composables/useCrudListParentTitle.js",
+    "./client/composables/useRealtimeQueryInvalidation": "./src/client/composables/useRealtimeQueryInvalidation.js",
+    "./client/composables/useSurfaceRouteContext": "./src/client/composables/useSurfaceRouteContext.js",
     "./client/composables/useView": "./src/client/composables/records/useView.js",
     "./client/composables/useCrudView": "./src/client/composables/records/useCrudView.js",
     "./client/composables/usePagedCollection": "./src/client/composables/usePagedCollection.js",
     "./client/composables/useAccountSettingsRuntime": "./src/client/composables/useAccountSettingsRuntime.js",
     "./client/composables/usePaths": "./src/client/composables/usePaths.js",
-    "./client/composables/useWorkspaceRouteContext": "./src/client/composables/useWorkspaceRouteContext.js",
-    "./client/support/menuLinkTarget": "./src/client/support/menuLinkTarget.js"
+    "./client/composables/runtime/useUiFeedback": "./src/client/composables/runtime/useUiFeedback.js",
+    "./client/lib/bootstrap": "./src/client/lib/bootstrap.js",
+    "./client/lib/permissions": "./src/client/lib/permissions.js",
+    "./client/support/contractGuards": "./src/client/support/contractGuards.js"
   },
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.37",
-    "@jskit-ai/kernel": "0.1.38",
-    "@jskit-ai/realtime": "0.1.37",
-    "@jskit-ai/shell-web": "0.1.37",
-    "@jskit-ai/uploads-image-web": "0.1.16",
-    "@jskit-ai/users-core": "0.1.48",
+    "@jskit-ai/http-runtime": "0.1.38",
+    "@jskit-ai/kernel": "0.1.39",
+    "@jskit-ai/realtime": "0.1.38",
+    "@jskit-ai/shell-web": "0.1.38",
+    "@jskit-ai/uploads-image-web": "0.1.17",
+    "@jskit-ai/users-core": "0.1.49",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/account-settings/sections.js

@@ -0,0 +1,74 @@
+import { inject } from "vue";
+
+const ACCOUNT_SETTINGS_SECTIONS_INJECTION_KEY = Symbol("users-web.account-settings.sections");
+const ACCOUNT_SETTINGS_SECTION_REGISTRY_TAG = "users.web.account-settings.sections";
+const EMPTY_ACCOUNT_SETTINGS_SECTIONS = Object.freeze([]);
+const RESERVED_ACCOUNT_SETTINGS_SECTION_VALUES = Object.freeze([
+  "profile",
+  "preferences",
+  "notifications"
+]);
+
+function normalizeAccountSettingsSectionEntry(entry = null) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+    return null;
+  }
+
+  const value = String(entry.value || "").trim().toLowerCase();
+  const title = String(entry.title || "").trim();
+  const component = entry.component;
+  if (!value || !title || !component) {
+    return null;
+  }
+
+  return Object.freeze({
+    value,
+    title,
+    component,
+    order: Number.isFinite(Number(entry.order)) ? Number(entry.order) : 500,
+    usesSharedRuntime: entry.usesSharedRuntime === true
+  });
+}
+
+function sortAccountSettingsSections(entries = []) {
+  return Object.freeze(
+    [...entries].sort((left, right) => {
+      const orderDelta = left.order - right.order;
+      if (orderDelta !== 0) {
+        return orderDelta;
+      }
+      return left.value.localeCompare(right.value);
+    })
+  );
+}
+
+function resolveAccountSettingsSections(entries = []) {
+  const seen = new Set(RESERVED_ACCOUNT_SETTINGS_SECTION_VALUES);
+  const normalized = [];
+
+  for (const entry of Array.isArray(entries) ? entries : []) {
+    const resolved = normalizeAccountSettingsSectionEntry(entry);
+    if (!resolved || seen.has(resolved.value)) {
+      continue;
+    }
+    seen.add(resolved.value);
+    normalized.push(resolved);
+  }
+
+  return sortAccountSettingsSections(normalized);
+}
+
+function useAccountSettingsSections() {
+  return inject(ACCOUNT_SETTINGS_SECTIONS_INJECTION_KEY, EMPTY_ACCOUNT_SETTINGS_SECTIONS);
+}
+
+export {
+  ACCOUNT_SETTINGS_SECTIONS_INJECTION_KEY,
+  ACCOUNT_SETTINGS_SECTION_REGISTRY_TAG,
+  EMPTY_ACCOUNT_SETTINGS_SECTIONS,
+  RESERVED_ACCOUNT_SETTINGS_SECTION_VALUES,
+  normalizeAccountSettingsSectionEntry,
+  resolveAccountSettingsSections,
+  sortAccountSettingsSections,
+  useAccountSettingsSections
+};

package/src/client/composables/account-settings/accountSettingsRuntimeHelpers.js

@@ -1,10 +1,9 @@
 import { ACCOUNT_SETTINGS_DEFAULTS } from "./accountSettingsRuntimeConstants.js";
 import {
+  isRecord,
   normalizeReturnToPath as normalizeSharedReturnToPath,
   resolveAllowedOriginsFromPlacementContext
 } from "@jskit-ai/kernel/shared/support";
-import { normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
-import { normalizeRecord } from "../../support/runtimeNormalization.js";
 
 function normalizeReturnToPath(value, { fallback = "/", accountSettingsPath = "/account", allowedOrigins = [] } = {}) {
   return normalizeSharedReturnToPath(value, {
@@ -20,41 +19,7 @@ function resolveAllowedReturnToOrigins(contextValue = null) {
 }
 
 function normalizeSettingsPayload(value) {
-  return normalizeRecord(value);
-}
-
-function normalizePendingInvite(entry) {
-  if (!entry || typeof entry !== "object") {
-    return null;
-  }
-
-  const id = normalizeRecordId(entry.id, { fallback: null });
-  const workspaceId = normalizeRecordId(entry.workspaceId, { fallback: null });
-  if (!id || !workspaceId) {
-    return null;
-  }
-
-  const workspaceSlug = String(entry.workspaceSlug || "").trim();
-  if (!workspaceSlug) {
-    return null;
-  }
-
-  const token = String(entry.token || "").trim();
-  if (!token) {
-    return null;
-  }
-
-  return {
-    id,
-    token,
-    workspaceId,
-    workspaceSlug,
-    workspaceName: String(entry.workspaceName || workspaceSlug).trim() || workspaceSlug,
-    workspaceAvatarUrl: String(entry.workspaceAvatarUrl || "").trim(),
-    roleSid: String(entry.roleSid || "member").trim().toLowerCase() || "member",
-    status: String(entry.status || "pending").trim().toLowerCase() || "pending",
-    expiresAt: String(entry.expiresAt || "").trim()
-  };
+  return isRecord(value) ? value : {};
 }
 
 function normalizeAvatarSize(value) {
@@ -70,7 +35,6 @@ function normalizeAvatarSize(value) {
 export {
   resolveAllowedReturnToOrigins,
   normalizeAvatarSize,
-  normalizePendingInvite,
   normalizeReturnToPath,
   normalizeSettingsPayload
 };

package/src/client/composables/crud/crudLookupFieldRuntime.js

@@ -119,11 +119,11 @@ function createCrudLookupFieldRuntime({
       adapter: adapter || undefined,
       ...(relationSurfaceId ? { surfaceId: relationSurfaceId } : {}),
       apiSuffix: apiPath,
-      queryKeyFactory: (surfaceId = "", workspaceSlug = "") => [
+      queryKeyFactory: (surfaceId = "", scopeParamValue = "") => [
         ...normalizedQueryKeyPrefix,
         key,
         String(surfaceId || ""),
-        String(workspaceSlug || "")
+        String(scopeParamValue || "")
       ],
       search: {
         enabled: true,

package/src/client/composables/internal/crudListParentTitleSupport.js

@@ -83,7 +83,7 @@ function resolveCrudListParentDescriptor({ resource = {}, route = null, recordId
 
   const normalizedRecordIdParam = normalizeText(recordIdParam) || "recordId";
   for (const routeParamKey of [...orderedRouteParamNames].reverse()) {
-    if (routeParamKey === "workspaceSlug" || routeParamKey === normalizedRecordIdParam) {
+    if (routeParamKey === normalizedRecordIdParam) {
       continue;
     }
 

package/src/client/composables/internal/useOperationScope.js

@@ -1,5 +1,5 @@
 import { computed, unref } from "vue";
-import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
+import { ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/kernel/shared/support/visibility";
 import { useScopeRuntime } from "../useScopeRuntime.js";
 import { useOperationRealtime } from "../useRealtimeQueryInvalidation.js";
 import {
@@ -33,7 +33,7 @@ function hasAnyPermissions(permissionSets = {}) {
 }
 
 function useOperationScope({
-  ownershipFilter = USERS_ROUTE_VISIBILITY_WORKSPACE,
+  ownershipFilter = ROUTE_VISIBILITY_WORKSPACE,
   surfaceId = "",
   access = "auto",
   placementSource = "users-web.operation",
@@ -54,8 +54,8 @@ function useOperationScope({
   });
   const normalizedOwnershipFilter = scopeRuntime.normalizedOwnershipFilter;
   const routeContext = scopeRuntime.routeContext;
-  const workspaceSlugFromRoute = scopeRuntime.workspaceSlugFromRoute;
-  const hasRouteWorkspaceSlug = scopeRuntime.hasRouteWorkspaceSlug;
+  const scopeParamValue = scopeRuntime.scopeParamValue;
+  const hasRequiredRouteScope = scopeRuntime.hasRequiredRouteScope;
   const accessRuntime = scopeRuntime.access;
 
   const apiPath = computed(() =>
@@ -67,7 +67,7 @@ function useOperationScope({
   const queryEnabled = computed(() =>
     resolveEnabled(readEnabled, {
       surfaceId: routeContext.currentSurfaceId.value,
-      workspaceSlug: workspaceSlugFromRoute.value,
+      scopeParamValue: scopeParamValue.value,
       ownershipFilter: normalizedOwnershipFilter,
       model
     })
@@ -76,20 +76,20 @@ function useOperationScope({
   const queryKey = computed(() =>
     resolveQueryKey(queryKeyFactory, {
       surfaceId: routeContext.currentSurfaceId.value,
-      workspaceSlug: workspaceSlugFromRoute.value,
+      scopeParamValue: scopeParamValue.value,
       ownershipFilter: normalizedOwnershipFilter
     })
   );
   const realtimeBinding = useOperationRealtime({
     realtime,
     queryKey: typeof queryKeyFactory === "function" ? queryKey : null,
-    enabled: computed(() => hasRouteWorkspaceSlug.value && Boolean(apiPath.value))
+    enabled: computed(() => hasRequiredRouteScope.value && Boolean(apiPath.value))
   });
 
   function queryCanRun(accessGate = true) {
     return computed(() =>
       queryEnabled.value &&
-      hasRouteWorkspaceSlug.value &&
+      hasRequiredRouteScope.value &&
       Boolean(apiPath.value) &&
       Boolean(unref(accessGate))
     );
@@ -102,8 +102,8 @@ function useOperationScope({
 
   function loadError(baseError = "") {
     return computed(() => {
-      if (scopeRuntime.workspaceRouteError.value) {
-        return scopeRuntime.workspaceRouteError.value;
+      if (scopeRuntime.routeScopeError.value) {
+        return scopeRuntime.routeScopeError.value;
       }
 
       const bootstrapError = String(accessRuntime.bootstrapError.value || "").trim();
@@ -127,8 +127,8 @@ function useOperationScope({
     scopeRuntime,
     routeContext,
     normalizedOwnershipFilter,
-    workspaceSlugFromRoute,
-    hasRouteWorkspaceSlug,
+    scopeParamValue,
+    hasRequiredRouteScope,
     access: accessRuntime,
     apiPath,
     queryEnabled,

package/src/client/composables/records/useAddEdit.js

@@ -1,6 +1,6 @@
 import { computed, proxyRefs } from "vue";
 import { useRoute } from "vue-router";
-import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
+import { ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/kernel/shared/support/visibility";
 import { useAddEditCore } from "../runtime/useAddEditCore.js";
 import { useEndpointResource } from "../runtime/useEndpointResource.js";
 import { resolveOperationAdapter } from "../runtime/operationAdapters.js";
@@ -17,7 +17,7 @@ import {
 import { resolveRouteParamNamesInOrder } from "../support/routeTemplateHelpers.js";
 
 function useAddEdit({
-  ownershipFilter = USERS_ROUTE_VISIBILITY_WORKSPACE,
+  ownershipFilter = ROUTE_VISIBILITY_WORKSPACE,
   surfaceId = "",
   access = "auto",
   resource = null,

package/src/client/composables/records/useList.js

@@ -2,7 +2,7 @@ import { computed, onScopeDispose, proxyRefs, ref, watch } from "vue";
 import { useRouter } from "vue-router";
 import { appendQueryString } from "@jskit-ai/kernel/shared/support";
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
-import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
+import { ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/kernel/shared/support/visibility";
 import { useListCore } from "../runtime/useListCore.js";
 import { resolveOperationAdapter } from "../runtime/operationAdapters.js";
 import { setupOperationErrorReporting } from "../runtime/operationUiHelpers.js";
@@ -31,7 +31,7 @@ import {
 const EMPTY_ROUTE_SYNC_QUERY_PARAM_BLACKLIST = Object.freeze([]);
 
 function useList({
-  ownershipFilter = USERS_ROUTE_VISIBILITY_WORKSPACE,
+  ownershipFilter = ROUTE_VISIBILITY_WORKSPACE,
   surfaceId = "",
   access = "auto",
   apiSuffix = "",
@@ -131,7 +131,7 @@ function useList({
   const queryParamsContext = computed(() => {
     return Object.freeze({
       surfaceId: operationScope.routeContext.currentSurfaceId.value,
-      workspaceSlug: operationScope.workspaceSlugFromRoute.value,
+      scopeParamValue: operationScope.scopeParamValue.value,
       ownershipFilter: operationScope.normalizedOwnershipFilter
     });
   });

package/src/client/composables/records/useView.js

@@ -1,6 +1,6 @@
 import { computed, proxyRefs } from "vue";
 import { useRoute } from "vue-router";
-import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
+import { ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/kernel/shared/support/visibility";
 import { useViewCore } from "../runtime/useViewCore.js";
 import { useEndpointResource } from "../runtime/useEndpointResource.js";
 import { resolveOperationAdapter } from "../runtime/operationAdapters.js";
@@ -9,7 +9,7 @@ import { createViewUiRuntime } from "../runtime/viewUiRuntime.js";
 import { resolveRouteParamNamesInOrder } from "../support/routeTemplateHelpers.js";
 
 function useView({
-  ownershipFilter = USERS_ROUTE_VISIBILITY_WORKSPACE,
+  ownershipFilter = ROUTE_VISIBILITY_WORKSPACE,
   surfaceId = "",
   access = "auto",
   apiSuffix = "",

package/src/client/composables/support/scopeHelpers.js

@@ -1,14 +1,14 @@
 import { resolveEnabledRef, resolveTextRef } from "./refValueHelpers.js";
 import {
-  USERS_ROUTE_VISIBILITY_LEVELS,
-  USERS_ROUTE_VISIBILITY_WORKSPACE,
-  USERS_ROUTE_VISIBILITY_WORKSPACE_USER
-} from "@jskit-ai/users-core/shared/support/usersVisibility";
-
-const USERS_OWNERSHIP_FILTER_VALUES = USERS_ROUTE_VISIBILITY_LEVELS;
-const WORKSPACE_OWNERSHIP_FILTER_SET = new Set([
-  USERS_ROUTE_VISIBILITY_WORKSPACE,
-  USERS_ROUTE_VISIBILITY_WORKSPACE_USER
+  ROUTE_VISIBILITY_TOKENS,
+  ROUTE_VISIBILITY_WORKSPACE,
+  ROUTE_VISIBILITY_WORKSPACE_USER
+} from "@jskit-ai/kernel/shared/support/visibility";
+
+const OWNERSHIP_FILTER_VALUES = ROUTE_VISIBILITY_TOKENS;
+const SCOPED_OWNERSHIP_FILTER_SET = new Set([
+  ROUTE_VISIBILITY_WORKSPACE,
+  ROUTE_VISIBILITY_WORKSPACE_USER
 ]);
 const ACCESS_MODE_VALUES = Object.freeze(["auto", "always", "never"]);
 
@@ -89,31 +89,31 @@ function resolveEnabled(value, context = {}) {
   return resolveEnabledRef(value);
 }
 
-function normalizeOwnershipFilter(value = USERS_ROUTE_VISIBILITY_WORKSPACE) {
-  const normalized = String(value || USERS_ROUTE_VISIBILITY_WORKSPACE).trim().toLowerCase();
-  if (USERS_OWNERSHIP_FILTER_VALUES.includes(normalized)) {
+function normalizeOwnershipFilter(value = ROUTE_VISIBILITY_WORKSPACE) {
+  const normalized = String(value || ROUTE_VISIBILITY_WORKSPACE).trim().toLowerCase();
+  if (OWNERSHIP_FILTER_VALUES.includes(normalized)) {
     return normalized;
   }
 
   throw new TypeError(
-    `ownershipFilter must be one of: ${USERS_OWNERSHIP_FILTER_VALUES.join(", ")}. Received: ${String(value || "") || "(empty)"}`
+    `ownershipFilter must be one of: ${OWNERSHIP_FILTER_VALUES.join(", ")}. Received: ${String(value || "") || "(empty)"}`
   );
 }
 
-function isWorkspaceOwnershipFilter(ownershipFilter) {
-  return WORKSPACE_OWNERSHIP_FILTER_SET.has(ownershipFilter);
+function isScopedOwnershipFilter(ownershipFilter) {
+  return SCOPED_OWNERSHIP_FILTER_SET.has(ownershipFilter);
 }
 
 function resolveQueryKey(
   queryKeyFactory,
-  { surfaceId = "", workspaceSlug = "", ownershipFilter = USERS_ROUTE_VISIBILITY_WORKSPACE } = {}
+  { surfaceId = "", scopeParamValue = "", ownershipFilter = ROUTE_VISIBILITY_WORKSPACE } = {}
 ) {
   if (typeof queryKeyFactory !== "function") {
     throw new TypeError("queryKeyFactory is required.");
   }
 
-  if (isWorkspaceOwnershipFilter(ownershipFilter)) {
-    return queryKeyFactory(surfaceId, workspaceSlug, ownershipFilter);
+  if (isScopedOwnershipFilter(ownershipFilter)) {
+    return queryKeyFactory(surfaceId, scopeParamValue, ownershipFilter);
   }
 
   return queryKeyFactory(surfaceId, ownershipFilter);
@@ -139,7 +139,7 @@ export {
   resolveApiSuffix,
   resolveEnabled,
   normalizeOwnershipFilter,
-  isWorkspaceOwnershipFilter,
+  isScopedOwnershipFilter,
   resolveQueryKey,
   resolveResourceMessages
 };

package/src/client/composables/useAccess.js

@@ -20,7 +20,7 @@ function asPermissionList(value) {
 }
 
 function useAccess({
-  workspaceSlug = "",
+  scopeParamValue = "",
   enabled = true,
   access = "always",
   hasPermissionRequirements = false
@@ -30,7 +30,7 @@ function useAccess({
     hasPermissionRequirements: hasPermissionRequirements === true
   });
   const { context: placementContext } = useWebPlacementContext();
-  const normalizedWorkspaceSlug = computed(() => resolveTextRef(workspaceSlug));
+  const normalizedScopeParamValue = computed(() => resolveTextRef(scopeParamValue));
   const queryEnabled = computed(() => resolveEnabledRef(enabled) && accessRequired);
   const hasPlacementBootstrapPermissions = computed(() => {
     const source = placementContext.value;
@@ -95,7 +95,7 @@ function useAccess({
   return Object.freeze({
     accessMode: normalizedAccessMode,
     accessRequired,
-    workspaceSlug: normalizedWorkspaceSlug,
+    scopeParamValue: normalizedScopeParamValue,
     permissions,
     bootstrapError,
     isBootstrapping,