@jskit-ai/users-web 0.1.37 → 0.1.40

package/package.descriptor.mjs

@@ -1,9 +1,9 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-web",
-  version: "0.1.37",
+  version: "0.1.40",
   kind: "runtime",
-  description: "Users web module: workspace selector shell element plus workspace/profile/members UI elements.",
+  description: "Users web module: account/profile UI plus shared shell link components.",
   dependsOn: [
     "@jskit-ai/http-runtime",
     "@jskit-ai/shell-web",
@@ -47,14 +47,6 @@ export default Object.freeze({
           subpath: "./client/components/ProfileClientElement",
           summary: "Exports profile settings client element scaffold component."
         },
-        {
-          subpath: "./client/components/WorkspacesClientElement",
-          summary: "Exports workspace chooser client element component."
-        },
-        {
-          subpath: "./client/components/WorkspaceMembersClientElement",
-          summary: "Exports workspace members admin client element component."
-        },
         {
           subpath: "./client/composables/useAddEdit",
           summary: "Exports add/edit operation composable."
@@ -91,24 +83,14 @@ export default Object.freeze({
           subpath: "./client/composables/useWorkspaceRouteContext",
           summary: "Exports workspace route context composable."
         },
-        {
-          subpath: "./client/support/realtimeWorkspace",
-          summary: "Exports workspace realtime event helpers."
-        }
       ],
       containerTokens: {
         server: [],
         client: [
-          "users.web.workspace.selector",
-          "users.web.workspace.tools.widget",
           "users.web.shell.menu-link-item",
           "users.web.shell.surface-aware-menu-link-item",
           "users.web.profile.menu.surface-switch-item",
-          "users.web.workspace-settings.menu-item",
-          "users.web.workspace-members.menu-item",
           "users.web.profile.element",
-          "users.web.members-admin.element",
-          "users.web.workspace-settings.element",
           "users.web.bootstrap-placement.runtime"
         ]
       }
@@ -117,16 +99,10 @@ export default Object.freeze({
       placements: {
         outlets: [
           {
-            host: "workspace-tools",
+            host: "console-settings",
             position: "primary-menu",
-            surfaces: ["admin"],
-            source: "src/client/components/UsersWorkspaceToolsWidget.vue"
-          },
-          {
-            host: "workspace-settings",
-            position: "forms",
-            surfaces: ["admin"],
-            source: "templates/src/pages/admin/workspace/settings/index.vue"
+            surfaces: ["console"],
+            source: "templates/src/pages/console/settings/index.vue"
           },
           {
             host: "console-settings",
@@ -136,26 +112,6 @@ export default Object.freeze({
           }
         ],
         contributions: [
-          {
-            id: "users.workspace.selector",
-            host: "shell-layout",
-            position: "top-left",
-            surfaces: ["*"],
-            order: 200,
-            componentToken: "users.web.workspace.selector",
-            when: "auth.authenticated === true",
-            source: "mutations.text#users-web-placement-block"
-          },
-          {
-            id: "users.account.invites.cue",
-            host: "shell-layout",
-            position: "top-right",
-            surfaces: ["*"],
-            order: 850,
-            componentToken: "local.main.account.pending-invites.cue",
-            when: "auth.authenticated === true",
-            source: "mutations.text#users-web-placement-block"
-          },
           {
             id: "users.profile.menu.surface-switch",
             host: "auth-profile-menu",
@@ -176,33 +132,6 @@ export default Object.freeze({
             when: "auth.authenticated === true",
             source: "mutations.text#users-web-profile-settings-placement"
           },
-          {
-            id: "users.workspace.tools.widget",
-            host: "shell-layout",
-            position: "top-right",
-            surfaces: ["admin"],
-            order: 900,
-            componentToken: "users.web.workspace.tools.widget",
-            source: "mutations.text#users-web-placement-block"
-          },
-          {
-            id: "users.workspace.menu.workspace-settings",
-            host: "workspace-tools",
-            position: "primary-menu",
-            surfaces: ["admin"],
-            order: 100,
-            componentToken: "users.web.workspace-settings.menu-item",
-            source: "mutations.text#users-web-placement-block"
-          },
-          {
-            id: "users.workspace.menu.members",
-            host: "workspace-tools",
-            position: "primary-menu",
-            surfaces: ["admin"],
-            order: 200,
-            componentToken: "users.web.workspace-members.menu-item",
-            source: "mutations.text#users-web-placement-block"
-          },
           {
             id: "users.console.menu.settings",
             host: "shell-layout",
@@ -212,15 +141,6 @@ export default Object.freeze({
             componentToken: "users.web.shell.menu-link-item",
             when: "auth.authenticated === true",
             source: "mutations.text#users-web-console-settings-placement"
-          },
-          {
-            id: "users.workspace.settings.form",
-            host: "workspace-settings",
-            position: "forms",
-            surfaces: ["admin"],
-            order: 100,
-            componentToken: "users.web.workspace-settings.element",
-            source: "mutations.text#users-web-workspace-settings-form-placement"
           }
         ]
       }
@@ -231,13 +151,13 @@ export default Object.freeze({
       runtime: {
         "@tanstack/vue-query": "5.92.12",
         "@mdi/js": "^7.4.47",
-        "@jskit-ai/http-runtime": "0.1.22",
-        "@jskit-ai/realtime": "0.1.22",
-        "@jskit-ai/kernel": "0.1.23",
-        "@jskit-ai/shell-web": "0.1.22",
-        "@jskit-ai/uploads-image-web": "0.1.1",
-        "@jskit-ai/users-core": "0.1.32",
-        "vuetify": "^4.0.0"
+        "@jskit-ai/http-runtime": "0.1.24",
+        "@jskit-ai/realtime": "0.1.24",
+        "@jskit-ai/kernel": "0.1.25",
+        "@jskit-ai/shell-web": "0.1.24",
+        "@jskit-ai/uploads-image-web": "0.1.3",
+        "@jskit-ai/users-core": "0.1.35",
+        vuetify: "^4.0.0"
       },
       dev: {}
     },
@@ -292,107 +212,6 @@ export default Object.freeze({
         category: "users-web",
         id: "users-web-component-account-settings-invites"
       },
-      {
-        from: "templates/packages/main/src/client/components/AccountPendingInvitesCue.vue",
-        to: "packages/main/src/client/components/AccountPendingInvitesCue.vue",
-        reason: "Install app-owned account pending invites cue component scaffold.",
-        category: "users-web",
-        id: "users-web-main-component-account-pending-invites-cue"
-      },
-      {
-        from: "templates/src/components/WorkspaceNotFoundCard.vue",
-        to: "src/components/WorkspaceNotFoundCard.vue",
-        reason: "Install app-owned workspace not-found card component used by workspace-dependent surfaces.",
-        category: "users-web",
-        id: "users-web-component-workspace-not-found-card",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/composables/useWorkspaceNotFoundState.js",
-        to: "src/composables/useWorkspaceNotFoundState.js",
-        reason: "Install app-owned workspace bootstrap status composable for workspace-dependent surfaces.",
-        category: "users-web",
-        id: "users-web-composable-workspace-not-found-state",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/surfaces/app/root.vue",
-        toSurface: "app",
-        toSurfaceRoot: true,
-        reason: "Install workspace app surface wrapper shell for users-web.",
-        category: "users-web",
-        id: "users-web-page-app-wrapper",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/surfaces/app/index.vue",
-        toSurface: "app",
-        toSurfacePath: "index.vue",
-        reason: "Install workspace app surface starter page scaffold for users-web.",
-        category: "users-web",
-        id: "users-web-page-app-index",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/surfaces/admin/root.vue",
-        toSurface: "admin",
-        toSurfaceRoot: true,
-        reason: "Install workspace admin surface wrapper shell for users-web.",
-        category: "users-web",
-        id: "users-web-page-admin-wrapper",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/surfaces/admin/index.vue",
-        toSurface: "admin",
-        toSurfacePath: "index.vue",
-        reason: "Install workspace admin surface starter page scaffold for users-web.",
-        category: "users-web",
-        id: "users-web-page-admin-index",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/pages/admin/members/index.vue",
-        toSurface: "admin",
-        toSurfacePath: "members/index.vue",
-        reason: "Install admin members starter page scaffold for users-web members UI.",
-        category: "users-web",
-        id: "users-web-page-admin-members",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        from: "templates/src/pages/admin/workspace/settings/index.vue",
-        toSurface: "admin",
-        toSurfacePath: "workspace/settings/index.vue",
-        reason: "Install workspace settings page scaffold for users-web workspace admin UI.",
-        category: "users-web",
-        id: "users-web-page-admin-workspace-settings",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
       {
         from: "templates/src/pages/console/settings/index.vue",
         toSurface: "console",
@@ -400,7 +219,7 @@ export default Object.freeze({
         reason: "Install console settings page scaffold for users-web console UI.",
         category: "users-web",
         id: "users-web-page-console-settings"
-      },
+      }
     ],
     text: [
       {
@@ -414,41 +233,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.workspace.selector\"",
-        value: "\naddPlacement({\n  id: \"users.workspace.selector\",\n  host: \"shell-layout\",\n  position: \"top-left\",\n  surfaces: [\"*\"],\n  order: 200,\n  componentToken: \"users.web.workspace.selector\",\n  props: {\n    allowOnNonWorkspaceSurface: true,\n    targetSurfaceId: \"app\"\n  },\n  when: ({ auth }) => {\n    return Boolean(auth?.authenticated);\n  }\n});\n\naddPlacement({\n  id: \"users.account.invites.cue\",\n  host: \"shell-layout\",\n  position: \"top-right\",\n  surfaces: [\"*\"],\n  order: 850,\n  componentToken: \"local.main.account.pending-invites.cue\",\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n\naddPlacement({\n  id: \"users.workspace.tools.widget\",\n  host: \"shell-layout\",\n  position: \"top-right\",\n  surfaces: [\"admin\"],\n  order: 900,\n  componentToken: \"users.web.workspace.tools.widget\"\n});\n\naddPlacement({\n  id: \"users.workspace.menu.workspace-settings\",\n  host: \"workspace-tools\",\n  position: \"primary-menu\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"users.web.workspace-settings.menu-item\"\n});\n\naddPlacement({\n  id: \"users.workspace.menu.members\",\n  host: \"workspace-tools\",\n  position: \"primary-menu\",\n  surfaces: [\"admin\"],\n  order: 200,\n  componentToken: \"users.web.workspace-members.menu-item\"\n});\n",
-        reason: "Append users-web placement entries into app-owned placement registry.",
-        category: "users-web",
-        id: "users-web-placement-block",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
-      },
-      {
-        op: "append-text",
-        file: "packages/main/src/client/providers/MainClientProvider.js",
-        position: "top",
-        skipIfContains: "import AccountPendingInvitesCue from \"../components/AccountPendingInvitesCue.vue\";",
-        value: "import AccountPendingInvitesCue from \"../components/AccountPendingInvitesCue.vue\";\n",
-        reason: "Bind app-owned account pending invites cue component into local main client provider imports.",
-        category: "users-web",
-        id: "users-web-main-client-provider-account-invites-import"
-      },
-      {
-        op: "append-text",
-        file: "packages/main/src/client/providers/MainClientProvider.js",
-        position: "bottom",
-        skipIfContains: "registerMainClientComponent(\"local.main.account.pending-invites.cue\", () => AccountPendingInvitesCue);",
-        value:
-          "\nregisterMainClientComponent(\"local.main.account.pending-invites.cue\", () => AccountPendingInvitesCue);\n",
-        reason: "Bind app-owned account pending invites cue component token into local main client provider registry.",
-        category: "users-web",
-        id: "users-web-main-client-provider-account-invites-register"
-      },
       {
         op: "append-text",
         file: "src/placement.js",
@@ -481,21 +265,6 @@ export default Object.freeze({
         reason: "Append users-web console settings menu placement into app-owned placement registry.",
         category: "users-web",
         id: "users-web-console-settings-placement"
-      },
-      {
-        op: "append-text",
-        file: "src/placement.js",
-        position: "bottom",
-        skipIfContains: "id: \"users.workspace.settings.form\"",
-        value:
-          "\naddPlacement({\n  id: \"users.workspace.settings.form\",\n  host: \"workspace-settings\",\n  position: \"forms\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"users.web.workspace-settings.element\"\n});\n",
-        reason: "Append users-web workspace settings form placement into app-owned placement registry.",
-        category: "users-web",
-        id: "users-web-workspace-settings-form-placement",
-        when: {
-          config: "tenancyMode",
-          in: ["personal", "workspaces"]
-        }
       }
     ]
   }

package/package.json

@@ -1,33 +1,37 @@
 {
   "name": "@jskit-ai/users-web",
-  "version": "0.1.37",
+  "version": "0.1.40",
   "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/composables/useAddEdit": "./src/client/composables/useAddEdit.js",
-    "./client/composables/useCrudSchemaForm": "./src/client/composables/useCrudSchemaForm.js",
-    "./client/composables/crudLookupFieldRuntime": "./src/client/composables/crudLookupFieldRuntime.js",
-    "./client/composables/useList": "./src/client/composables/useList.js",
-    "./client/composables/useView": "./src/client/composables/useView.js",
+    "./client/composables/useAddEdit": "./src/client/composables/records/useAddEdit.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/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/realtimeWorkspace": "./src/client/support/realtimeWorkspace.js"
+    "./client/support/menuLinkTarget": "./src/client/support/menuLinkTarget.js"
   },
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.22",
-    "@jskit-ai/kernel": "0.1.23",
-    "@jskit-ai/realtime": "0.1.22",
-    "@jskit-ai/shell-web": "0.1.22",
-    "@jskit-ai/uploads-image-web": "0.1.1",
-    "@jskit-ai/users-core": "0.1.32",
+    "@jskit-ai/http-runtime": "0.1.24",
+    "@jskit-ai/kernel": "0.1.25",
+    "@jskit-ai/realtime": "0.1.24",
+    "@jskit-ai/shell-web": "0.1.24",
+    "@jskit-ai/uploads-image-web": "0.1.3",
+    "@jskit-ai/users-core": "0.1.35",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/components/ConsoleSettingsClientElement.vue

@@ -6,7 +6,7 @@
           <h1 class="text-h5 text-sm-h4 mb-3">Console settings</h1>
           <p class="text-body-2 text-sm-body-1 mb-0">
             No console settings are provided by <code>@jskit-ai/users-web</code>. Install a module that contributes
-            forms to <code>console.settings.forms</code>.
+            forms to <code>console-settings:forms</code>.
           </p>
         </v-sheet>
       </v-col>

package/src/client/components/UsersSurfaceAwareMenuLinkItem.vue

@@ -1,9 +1,10 @@
 <script setup>
 import { computed } from "vue";
+import { useRoute } from "vue-router";
 import { useWebPlacementContext } from "@jskit-ai/shell-web/client/placement";
 import { usePaths } from "../composables/usePaths.js";
-import { surfaceRequiresWorkspaceFromPlacementContext } from "../lib/workspaceSurfaceContext.js";
 import { resolveMenuLinkIcon } from "../lib/menuIcons.js";
+import { resolveMenuLinkTarget } from "../support/menuLinkTarget.js";
 
 const props = defineProps({
   label: {
@@ -36,34 +37,22 @@ const props = defineProps({
   }
 });
 
+const route = useRoute();
 const paths = usePaths();
 const { context: placementContext } = useWebPlacementContext();
 
-const targetSurfaceId = computed(() => {
-  const explicitSurface = String(props.surface || "").trim().toLowerCase();
-  if (explicitSurface && explicitSurface !== "*") {
-    return explicitSurface;
-  }
-
-  return String(paths.currentSurfaceId.value || "").trim().toLowerCase();
-});
-
 const resolvedTo = computed(() => {
-  const explicitTo = String(props.to || "").trim();
-  if (explicitTo) {
-    return explicitTo;
-  }
-
-  const workspaceRequired = surfaceRequiresWorkspaceFromPlacementContext(
-    placementContext.value,
-    targetSurfaceId.value
-  );
-  const suffix = workspaceRequired ? props.workspaceSuffix : props.nonWorkspaceSuffix;
-  const normalizedSuffix = String(suffix || "/").trim() || "/";
-
-  return paths.page(normalizedSuffix, {
-    surface: targetSurfaceId.value,
-    mode: "auto"
+  return resolveMenuLinkTarget({
+    to: props.to,
+    surface: props.surface,
+    currentSurfaceId: paths.currentSurfaceId.value,
+    placementContext: placementContext.value,
+    workspaceSuffix: props.workspaceSuffix,
+    nonWorkspaceSuffix: props.nonWorkspaceSuffix,
+    routeParams: route.params || {},
+    resolvePagePath(relativePath, options = {}) {
+      return paths.page(relativePath, options);
+    }
   });
 });
 

package/src/client/components/WorkspaceMembersClientElement.vue

@@ -23,11 +23,11 @@ import { computed, reactive, ref, watch } from "vue";
 import { formatDateTime } from "@jskit-ai/kernel/shared/support";
 import MembersAdminClientElement from "./MembersAdminClientElement.vue";
 import { useCommand } from "../composables/useCommand.js";
-import { useList } from "../composables/useList.js";
-import { useView } from "../composables/useView.js";
+import { useList } from "../composables/records/useList.js";
+import { useView } from "../composables/records/useView.js";
 import { usePaths } from "../composables/usePaths.js";
 import { useAccess } from "../composables/useAccess.js";
-import { useUiFeedback } from "../composables/useUiFeedback.js";
+import { useUiFeedback } from "../composables/runtime/useUiFeedback.js";
 import { useWorkspaceRouteContext } from "../composables/useWorkspaceRouteContext.js";
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { createWorkspaceRealtimeMatcher } from "../support/realtimeWorkspace.js";

package/src/client/components/WorkspaceProfileClientElement.vue

@@ -71,7 +71,7 @@ import { computed, reactive } from "vue";
 import { validateOperationSection } from "@jskit-ai/http-runtime/shared/validators/operationValidation";
 import { workspaceResource } from "@jskit-ai/users-core/shared/resources/workspaceResource";
 import { USERS_ROUTE_VISIBILITY_WORKSPACE } from "@jskit-ai/users-core/shared/support/usersVisibility";
-import { useAddEdit } from "../composables/useAddEdit.js";
+import { useAddEdit } from "../composables/records/useAddEdit.js";
 import { buildWorkspaceQueryKey } from "../support/workspaceQueryKeys.js";
 
 const emit = defineEmits(["saved"]);

package/src/client/components/WorkspaceSettingsFieldsClientElement.vue

@@ -176,7 +176,7 @@ import {
   DEFAULT_WORKSPACE_LIGHT_PALETTE,
   resolveWorkspaceThemePalettes
 } from "@jskit-ai/users-core/shared/settings";
-import { useAddEdit } from "../composables/useAddEdit.js";
+import { useAddEdit } from "../composables/records/useAddEdit.js";
 import { useWorkspaceRouteContext } from "../composables/useWorkspaceRouteContext.js";
 import { createWorkspaceRealtimeMatcher } from "../support/realtimeWorkspace.js";
 import { buildWorkspaceQueryKey } from "../support/workspaceQueryKeys.js";

package/src/client/components/WorkspacesClientElement.vue

@@ -8,12 +8,12 @@ import {
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import { normalizeWorkspaceList } from "../lib/bootstrap.js";
 import { useCommand } from "../composables/useCommand.js";
-import { useView } from "../composables/useView.js";
+import { useView } from "../composables/records/useView.js";
 import { usePaths } from "../composables/usePaths.js";
 import { useRealtimeQueryInvalidation } from "../composables/useRealtimeQueryInvalidation.js";
 import { useWorkspaceSurfaceId } from "../composables/useWorkspaceSurfaceId.js";
 import { USERS_ROUTE_VISIBILITY_PUBLIC } from "@jskit-ai/users-core/shared/support/usersVisibility";
-import { normalizePendingInvite } from "../composables/accountSettingsRuntimeHelpers.js";
+import { normalizePendingInvite } from "../composables/account-settings/accountSettingsRuntimeHelpers.js";
 
 const route = useRoute();
 const router = useRouter();

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

@@ -0,0 +1,61 @@
+import "@jskit-ai/uploads-image-web/client/styles";
+import { createManagedImageAssetRuntime } from "@jskit-ai/uploads-image-web/client/composables/createManagedImageAssetRuntime";
+import { resolveFieldErrors } from "@jskit-ai/http-runtime/client";
+import { usersWebHttpClient } from "../../lib/httpClient.js";
+
+function createAccountSettingsAvatarUploadRuntime({
+  queryClient,
+  sessionQueryKey,
+  accountSettingsQueryKey,
+  selectedAvatarFileName,
+  applySettingsData,
+  reportAccountFeedback
+} = {}) {
+  async function resolveCsrfToken() {
+    const sessionPayload = await queryClient.fetchQuery({
+      queryKey: sessionQueryKey,
+      queryFn: () =>
+        usersWebHttpClient.request("/api/session", {
+          method: "GET"
+        }),
+      staleTime: 60_000
+    });
+
+    const csrfToken = String(sessionPayload?.csrfToken || "");
+    if (!csrfToken) {
+      throw new Error("Unable to prepare secure avatar upload request.");
+    }
+
+    return csrfToken;
+  }
+
+  return createManagedImageAssetRuntime({
+    uploadEndpoint: "/api/settings/profile/avatar",
+    fieldName: "avatar",
+    selectedFileName: selectedAvatarFileName,
+    resolveRequestHeaders: async () => ({
+      "csrf-token": await resolveCsrfToken()
+    }),
+    onUploadSuccess: ({ data }) => {
+      applySettingsData(data);
+      queryClient.setQueryData(accountSettingsQueryKey, data);
+    },
+    reportFeedback: reportAccountFeedback,
+    resolveUploadErrorMessage: ({ error, response, defaultMessage }) => {
+      const body = response?.body && typeof response.body === "object" ? response.body : {};
+      const fieldErrors = resolveFieldErrors(body);
+      return String(fieldErrors.avatar || body?.error || error?.message || defaultMessage);
+    },
+    messages: {
+      uploadSuccess: "Avatar uploaded.",
+      uploadInvalidResponse: "Avatar uploaded, but the response payload was invalid.",
+      uploadError: "Unable to upload avatar.",
+      uploadRestriction: "Selected avatar file does not meet upload restrictions.",
+      editorUnavailable: "Avatar editor is unavailable in this environment.",
+      changeError: "Avatar uploaded, but the settings view could not refresh."
+    },
+    source: "users-web.account-settings-runtime:avatar"
+  });
+}
+
+export { createAccountSettingsAvatarUploadRuntime };

package/src/client/composables/{accountSettingsInvitesRuntime.js → account-settings/accountSettingsInvitesRuntime.js}

@@ -1,4 +1,4 @@
-import { resolveErrorStatusCode } from "../support/runtimeNormalization.js";
+import { resolveErrorStatusCode } from "../../support/runtimeNormalization.js";
 
 function createAccountSettingsInvitesRuntime({
   invitesAvailable,

package/src/client/composables/{accountSettingsRuntimeHelpers.js → account-settings/accountSettingsRuntimeHelpers.js}

@@ -3,7 +3,7 @@ import {
   normalizeReturnToPath as normalizeSharedReturnToPath,
   resolveAllowedOriginsFromPlacementContext
 } from "@jskit-ai/kernel/shared/support";
-import { normalizeRecord } from "../support/runtimeNormalization.js";
+import { normalizeRecord } from "../../support/runtimeNormalization.js";
 
 function normalizeReturnToPath(value, { fallback = "/", accountSettingsPath = "/account", allowedOrigins = [] } = {}) {
   return normalizeSharedReturnToPath(value, {