@jskit-ai/users-core 0.1.19 → 0.1.21

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.19",
+  version: "0.1.21",
   description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
@@ -203,10 +203,10 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.14",
-        "@jskit-ai/database-runtime": "0.1.15",
-        "@jskit-ai/http-runtime": "0.1.14",
-        "@jskit-ai/kernel": "0.1.14",
+        "@jskit-ai/auth-core": "0.1.15",
+        "@jskit-ai/database-runtime": "0.1.16",
+        "@jskit-ai/http-runtime": "0.1.15",
+        "@jskit-ai/kernel": "0.1.16",
         "@fastify/multipart": "^9.4.0",
         "@fastify/type-provider-typebox": "^6.1.0",
         "typebox": "^1.0.81"
@@ -397,7 +397,7 @@ export default Object.freeze({
         id: "users-core-surface-config-workspace",
         when: {
           config: "tenancyMode",
-          in: ["personal", "workspace"]
+          in: ["personal", "workspaces"]
         }
       },
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -24,10 +24,10 @@
     "./shared/resources/consoleSettingsFields": "./src/shared/resources/consoleSettingsFields.js"
   },
   "dependencies": {
-    "@jskit-ai/auth-core": "0.1.14",
-    "@jskit-ai/database-runtime": "0.1.15",
-    "@jskit-ai/http-runtime": "0.1.14",
-    "@jskit-ai/kernel": "0.1.14",
+    "@jskit-ai/auth-core": "0.1.15",
+    "@jskit-ai/database-runtime": "0.1.16",
+    "@jskit-ai/http-runtime": "0.1.15",
+    "@jskit-ai/kernel": "0.1.16",
     "@fastify/multipart": "^9.4.0",
     "@fastify/type-provider-typebox": "^6.1.0",
     "typebox": "^1.0.81"

package/src/server/common/repositories/userProfilesRepository.js

@@ -93,7 +93,7 @@ function createDuplicateEmailConflictError() {
 async function resolveUniqueUsername(client, baseUsername, { excludeUserId = 0 } = {}) {
   for (let suffix = 0; suffix < 1000; suffix += 1) {
     const candidate = buildUsernameCandidate(baseUsername, suffix);
-    const existing = await client("user_profiles").where({ username: candidate }).first();
+    const existing = await client("users").where({ username: candidate }).first();
     if (!existing || Number(existing.id) === Number(excludeUserId || 0)) {
       return candidate;
     }
@@ -109,7 +109,7 @@ function createRepository(knex) {
 
   async function findById(userId, options = {}) {
     const client = options?.trx || knex;
-    const row = await client("user_profiles").where({ id: userId }).first();
+    const row = await client("users").where({ id: userId }).first();
     return mapProfileRow(row);
   }
 
@@ -120,7 +120,7 @@ function createRepository(knex) {
       return null;
     }
 
-    const row = await client("user_profiles")
+    const row = await client("users")
       .where({
         auth_provider: identity.provider,
         auth_provider_user_id: identity.providerUserId
@@ -131,7 +131,7 @@ function createRepository(knex) {
 
   async function updateDisplayNameById(userId, displayName, options = {}) {
     const client = options?.trx || knex;
-    await client("user_profiles")
+    await client("users")
       .where({ id: userId })
       .update({
         display_name: normalizeText(displayName)
@@ -141,7 +141,7 @@ function createRepository(knex) {
 
   async function updateAvatarById(userId, avatar = {}, options = {}) {
     const client = options?.trx || knex;
-    await client("user_profiles")
+    await client("users")
       .where({ id: userId })
       .update({
         avatar_storage_key: avatar.avatarStorageKey || null,
@@ -154,7 +154,7 @@ function createRepository(knex) {
 
   async function clearAvatarById(userId, options = {}) {
     const client = options?.trx || knex;
-    await client("user_profiles")
+    await client("users")
       .where({ id: userId })
       .update({
         avatar_storage_key: null,
@@ -183,7 +183,7 @@ function createRepository(knex) {
         auth_provider: identity.provider,
         auth_provider_user_id: identity.providerUserId
       };
-      const existing = await trx("user_profiles").where(where).first();
+      const existing = await trx("users").where(where).first();
 
       try {
         if (existing) {
@@ -191,14 +191,14 @@ function createRepository(knex) {
           const username = existingUsername || (await resolveUniqueUsername(trx, requestedUsername || usernameBaseFromEmail(email), {
             excludeUserId: existing.id
           }));
-          await trx("user_profiles").where({ id: existing.id }).update({
+          await trx("users").where({ id: existing.id }).update({
             email,
             display_name: displayName,
             username
           });
         } else {
           const username = await resolveUniqueUsername(trx, requestedUsername || usernameBaseFromEmail(email));
-          await trx("user_profiles").insert({
+          await trx("users").insert({
             auth_provider: identity.provider,
             auth_provider_user_id: identity.providerUserId,
             email,
@@ -218,7 +218,7 @@ function createRepository(knex) {
         }
       }
 
-      const reloaded = await trx("user_profiles").where(where).first();
+      const reloaded = await trx("users").where(where).first();
       return mapProfileRow(reloaded);
     };
 

package/src/server/common/repositories/workspaceMembershipsRepository.js

@@ -116,7 +116,7 @@ function createRepository(knex) {
   async function listActiveByWorkspaceId(workspaceId, options = {}) {
     const client = options?.trx || knex;
     const rows = await client("workspace_memberships as wm")
-      .join("user_profiles as up", "up.id", "wm.user_id")
+      .join("users as up", "up.id", "wm.user_id")
       .where({ "wm.workspace_id": Number(workspaceId), "wm.status": "active" })
       .orderBy("up.display_name", "asc")
       .select([

package/src/server/registerWorkspaceCore.js

@@ -4,7 +4,7 @@ import {
 } from "@jskit-ai/kernel/server/actions";
 import { registerRouteVisibilityResolver } from "@jskit-ai/kernel/server/http";
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
-import { TENANCY_MODE_WORKSPACE, resolveTenancyProfile } from "../shared/tenancyProfile.js";
+import { TENANCY_MODE_WORKSPACES, resolveTenancyProfile } from "../shared/tenancyProfile.js";
 import { createService as createWorkspaceService } from "./common/services/workspaceContextService.js";
 import { createService as createAuthProfileSyncService } from "./common/services/authProfileSyncService.js";
 import { createWorkspaceActionContextContributor } from "./common/contributors/workspaceActionContextContributor.js";
@@ -59,7 +59,7 @@ function registerWorkspaceCore(app) {
   });
 
   app.singleton(USERS_WORKSPACE_TENANCY_ENABLED_TOKEN, (scope) => {
-    return scope.make(USERS_TENANCY_PROFILE_TOKEN).mode === TENANCY_MODE_WORKSPACE;
+    return scope.make(USERS_TENANCY_PROFILE_TOKEN).mode === TENANCY_MODE_WORKSPACES;
   });
 
   app.singleton(USERS_WORKSPACE_INVITATIONS_ENABLED_TOKEN, (scope) => {

package/src/server/workspaceBootstrapContributor.js

@@ -4,7 +4,7 @@ import { normalizeLowerText, normalizeText } from "@jskit-ai/kernel/shared/actio
 import {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
@@ -164,7 +164,7 @@ function normalizeSlugPolicy(value = "") {
 }
 
 function isSupportedTenancyMode(value = "") {
-  return value === TENANCY_MODE_NONE || value === TENANCY_MODE_PERSONAL || value === TENANCY_MODE_WORKSPACE;
+  return value === TENANCY_MODE_NONE || value === TENANCY_MODE_PERSONAL || value === TENANCY_MODE_WORKSPACES;
 }
 
 function resolveBootstrapTenancyProfile(tenancyProfile = null, appConfig = {}) {

package/src/server/workspaceMembers/registerWorkspaceMembers.js

@@ -35,7 +35,7 @@ const INVITE_RECIPIENT_BOOTSTRAP_AUDIENCE = Object.freeze({
     }
 
     const row = await knex("workspace_invites as wi")
-      .join("user_profiles as up", "up.email", "wi.email")
+      .join("users as up", "up.email", "wi.email")
       .where("wi.id", inviteId)
       .first("up.id as user_id");
 

package/src/shared/index.js

@@ -28,13 +28,13 @@ import {
 import {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   normalizeTenancyMode,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspaceTenancyMode
+  isWorkspacesTenancyMode
 } from "./tenancyProfile.js";
 import {
   ACCOUNT_SETTINGS_CHANGED_EVENT,
@@ -71,13 +71,13 @@ const USERS_SHARED_API = Object.freeze({
   resolveWorkspaceThemePalette,
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   normalizeTenancyMode,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspaceTenancyMode,
+  isWorkspacesTenancyMode,
   ACCOUNT_SETTINGS_CHANGED_EVENT,
   CONSOLE_SETTINGS_CHANGED_EVENT,
   WORKSPACE_SETTINGS_CHANGED_EVENT,
@@ -112,13 +112,13 @@ export {
   resolveWorkspaceThemePalette,
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   normalizeTenancyMode,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspaceTenancyMode,
+  isWorkspacesTenancyMode,
   ACCOUNT_SETTINGS_CHANGED_EVENT,
   CONSOLE_SETTINGS_CHANGED_EVENT,
   WORKSPACE_SETTINGS_CHANGED_EVENT,

package/src/shared/support/usersApiPaths.js

@@ -1,11 +1,16 @@
 import { normalizePathname } from "@jskit-ai/kernel/shared/surface/paths";
+import { splitPathQueryAndHash } from "@jskit-ai/kernel/shared/support";
 
 const USERS_PUBLIC_API_BASE_PATH = "/api";
 const USERS_WORKSPACE_API_BASE_PATH = "/api/w/:workspaceSlug/workspace";
 
 function normalizeApiRelativePath(relativePath = "/") {
-  const normalizedPath = normalizePathname(relativePath);
-  return normalizedPath || "/";
+  const { pathname, queryString, hash } = splitPathQueryAndHash(relativePath);
+  const normalizedPath = normalizePathname(pathname || "/") || "/";
+  const normalizedQueryString = String(queryString || "").trim().replace(/^\?+/, "");
+  const normalizedHash = String(hash || "").trim();
+  const querySuffix = normalizedQueryString ? `?${normalizedQueryString}` : "";
+  return `${normalizedPath}${querySuffix}${normalizedHash}`;
 }
 
 function normalizeSurfaceWorkspaceRequirement(value = false) {
@@ -22,6 +27,10 @@ function resolveApiBasePath({ surfaceRequiresWorkspace = false, relativePath = "
     return basePath;
   }
 
+  if (normalizedRelativePath.startsWith("/?") || normalizedRelativePath.startsWith("/#")) {
+    return `${basePath}${normalizedRelativePath.slice(1)}`;
+  }
+
   return `${basePath}${normalizedRelativePath}`;
 }
 

package/src/shared/tenancyMode.js

@@ -1,11 +1,11 @@
 const TENANCY_MODE_NONE = "none";
 const TENANCY_MODE_PERSONAL = "personal";
-const TENANCY_MODE_WORKSPACE = "workspace";
+const TENANCY_MODE_WORKSPACES = "workspaces";
 
 const TENANCY_MODES = Object.freeze([
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE
+  TENANCY_MODE_WORKSPACES
 ]);
 
 function normalizeTenancyMode(value = "") {
@@ -28,7 +28,7 @@ function isTenancyMode(value = "") {
 export {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   TENANCY_MODES,
   normalizeTenancyMode,
   isTenancyMode

package/src/shared/tenancyProfile.js

@@ -1,7 +1,7 @@
 import {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   normalizeTenancyMode
 } from "./tenancyMode.js";
 import { isRecord } from "@jskit-ai/kernel/shared/support/normalize";
@@ -56,18 +56,18 @@ function resolveTenancyProfile(appConfig = {}) {
   });
 }
 
-function isWorkspaceTenancyMode(value = "") {
-  return normalizeTenancyMode(value) === TENANCY_MODE_WORKSPACE;
+function isWorkspacesTenancyMode(value = "") {
+  return normalizeTenancyMode(value) === TENANCY_MODE_WORKSPACES;
 }
 
 export {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   normalizeTenancyMode,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspaceTenancyMode
+  isWorkspacesTenancyMode
 };

package/templates/migrations/users_core_initial.cjs

@@ -2,7 +2,7 @@
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
-  await knex.schema.createTable("user_profiles", (table) => {
+  await knex.schema.createTable("users", (table) => {
     table.increments("id").primary();
     table.string("auth_provider", 64).notNullable();
     table.string("auth_provider_user_id", 191).notNullable();
@@ -13,16 +13,16 @@ exports.up = async function up(knex) {
     table.string("avatar_version", 64).nullable();
     table.timestamp("avatar_updated_at", { useTz: false }).nullable();
     table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
-    table.unique(["auth_provider", "auth_provider_user_id"], "uq_user_profiles_identity");
-    table.unique(["email"], "uq_user_profiles_email");
-    table.unique(["username"], "uq_user_profiles_username");
+    table.unique(["auth_provider", "auth_provider_user_id"], "uq_users_identity");
+    table.unique(["email"], "uq_users_email");
+    table.unique(["username"], "uq_users_username");
   });
 
   await knex.schema.createTable("workspaces", (table) => {
     table.increments("id").primary();
     table.string("slug", 120).notNullable().unique();
     table.string("name", 160).notNullable();
-    table.integer("owner_user_id").unsigned().notNullable().references("id").inTable("user_profiles").onDelete("CASCADE");
+    table.integer("owner_user_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
     table.boolean("is_personal").notNullable().defaultTo(true);
     table.string("avatar_url", 512).notNullable().defaultTo("");
     table.string("color", 7).notNullable().defaultTo("#1867C0");
@@ -34,7 +34,7 @@ exports.up = async function up(knex) {
   await knex.schema.createTable("workspace_memberships", (table) => {
     table.increments("id").primary();
     table.integer("workspace_id").unsigned().notNullable().references("id").inTable("workspaces").onDelete("CASCADE");
-    table.integer("user_id").unsigned().notNullable().references("id").inTable("user_profiles").onDelete("CASCADE");
+    table.integer("user_id").unsigned().notNullable().references("id").inTable("users").onDelete("CASCADE");
     table.string("role_id", 64).notNullable().defaultTo("member");
     table.string("status", 32).notNullable().defaultTo("active");
     table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
@@ -66,7 +66,7 @@ exports.up = async function up(knex) {
     table.string("role_id", 64).notNullable().defaultTo("member");
     table.string("status", 32).notNullable().defaultTo("pending");
     table.string("token_hash", 191).notNullable();
-    table.integer("invited_by_user_id").unsigned().nullable().references("id").inTable("user_profiles").onDelete("SET NULL");
+    table.integer("invited_by_user_id").unsigned().nullable().references("id").inTable("users").onDelete("SET NULL");
     table.timestamp("expires_at", { useTz: false }).nullable();
     table.timestamp("accepted_at", { useTz: false }).nullable();
     table.timestamp("revoked_at", { useTz: false }).nullable();
@@ -77,7 +77,7 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.createTable("user_settings", (table) => {
-    table.integer("user_id").unsigned().primary().references("id").inTable("user_profiles").onDelete("CASCADE");
+    table.integer("user_id").unsigned().primary().references("id").inTable("users").onDelete("CASCADE");
     table.integer("last_active_workspace_id").unsigned().nullable().references("id").inTable("workspaces").onDelete("SET NULL");
     table.string("theme", 32).notNullable().defaultTo("system");
     table.string("locale", 24).notNullable().defaultTo("en");
@@ -119,5 +119,5 @@ exports.down = async function down(knex) {
   await knex.schema.dropTableIfExists("workspace_settings");
   await knex.schema.dropTableIfExists("workspace_memberships");
   await knex.schema.dropTableIfExists("workspaces");
-  await knex.schema.dropTableIfExists("user_profiles");
+  await knex.schema.dropTableIfExists("users");
 };

package/templates/migrations/users_core_profile_username.cjs

@@ -42,37 +42,37 @@ function resolveUniqueUsername(baseUsername, usedUsernames) {
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
-  const hasUserProfilesTable = await knex.schema.hasTable("user_profiles");
-  if (!hasUserProfilesTable) {
+  const hasUsersTable = await knex.schema.hasTable("users");
+  if (!hasUsersTable) {
     return;
   }
 
-  const hasUsername = await knex.schema.hasColumn("user_profiles", "username");
+  const hasUsername = await knex.schema.hasColumn("users", "username");
   if (hasUsername) {
     return;
   }
 
-  await knex.schema.alterTable("user_profiles", (table) => {
+  await knex.schema.alterTable("users", (table) => {
     table.string("username", USERNAME_MAX_LENGTH).nullable();
   });
 
-  const profiles = await knex("user_profiles").select(["id", "email"]).orderBy("id", "asc");
+  const profiles = await knex("users").select(["id", "email"]).orderBy("id", "asc");
   const usedUsernames = new Set();
 
   for (const profile of profiles) {
     const nextUsername = resolveUniqueUsername(usernameBaseFromEmail(profile.email), usedUsernames);
     usedUsernames.add(nextUsername);
-    await knex("user_profiles").where({ id: Number(profile.id) }).update({
+    await knex("users").where({ id: Number(profile.id) }).update({
       username: nextUsername
     });
   }
 
-  await knex.schema.alterTable("user_profiles", (table) => {
+  await knex.schema.alterTable("users", (table) => {
     table.string("username", USERNAME_MAX_LENGTH).notNullable().alter();
   });
 
-  await knex.schema.alterTable("user_profiles", (table) => {
-    table.unique(["username"], "uq_user_profiles_username");
+  await knex.schema.alterTable("users", (table) => {
+    table.unique(["username"], "uq_users_username");
   });
 };
 
@@ -80,17 +80,17 @@ exports.up = async function up(knex) {
  * @param {import('knex').Knex} knex
  */
 exports.down = async function down(knex) {
-  const hasUserProfilesTable = await knex.schema.hasTable("user_profiles");
-  if (!hasUserProfilesTable) {
+  const hasUsersTable = await knex.schema.hasTable("users");
+  if (!hasUsersTable) {
     return;
   }
 
-  const hasUsername = await knex.schema.hasColumn("user_profiles", "username");
+  const hasUsername = await knex.schema.hasColumn("users", "username");
   if (!hasUsername) {
     return;
   }
 
-  await knex.schema.alterTable("user_profiles", (table) => {
+  await knex.schema.alterTable("users", (table) => {
     table.dropColumn("username");
   });
 };

package/test/tenancyProfile.test.js

@@ -3,12 +3,12 @@ import test from "node:test";
 import {
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
-  TENANCY_MODE_WORKSPACE,
+  TENANCY_MODE_WORKSPACES,
   WORKSPACE_SLUG_POLICY_NONE,
   WORKSPACE_SLUG_POLICY_IMMUTABLE_USERNAME,
   WORKSPACE_SLUG_POLICY_USER_SELECTED,
   resolveTenancyProfile,
-  isWorkspaceTenancyMode
+  isWorkspacesTenancyMode
 } from "../src/shared/tenancyProfile.js";
 
 test("resolveTenancyProfile returns mode-specific workspace policy matrix", () => {
@@ -34,9 +34,9 @@ test("resolveTenancyProfile returns mode-specific workspace policy matrix", () =
     }
   });
 
-  const workspaceProfile = resolveTenancyProfile({ tenancyMode: TENANCY_MODE_WORKSPACE });
+  const workspaceProfile = resolveTenancyProfile({ tenancyMode: TENANCY_MODE_WORKSPACES });
   assert.deepEqual(workspaceProfile, {
-    mode: TENANCY_MODE_WORKSPACE,
+    mode: TENANCY_MODE_WORKSPACES,
     workspace: {
       enabled: true,
       autoProvision: false,
@@ -46,15 +46,15 @@ test("resolveTenancyProfile returns mode-specific workspace policy matrix", () =
   });
 });
 
-test("isWorkspaceTenancyMode is true only for workspace mode", () => {
-  assert.equal(isWorkspaceTenancyMode(TENANCY_MODE_WORKSPACE), true);
-  assert.equal(isWorkspaceTenancyMode(TENANCY_MODE_PERSONAL), false);
-  assert.equal(isWorkspaceTenancyMode(TENANCY_MODE_NONE), false);
+test("isWorkspacesTenancyMode is true only for workspace mode", () => {
+  assert.equal(isWorkspacesTenancyMode(TENANCY_MODE_WORKSPACES), true);
+  assert.equal(isWorkspacesTenancyMode(TENANCY_MODE_PERSONAL), false);
+  assert.equal(isWorkspacesTenancyMode(TENANCY_MODE_NONE), false);
 });
 
 test("resolveTenancyProfile allows explicit workspace self-create policy override", () => {
   const workspaceProfile = resolveTenancyProfile({
-    tenancyMode: TENANCY_MODE_WORKSPACE,
+    tenancyMode: TENANCY_MODE_WORKSPACES,
     tenancyPolicy: {
       workspace: {
         allowSelfCreate: true
@@ -62,6 +62,6 @@ test("resolveTenancyProfile allows explicit workspace self-create policy overrid
     }
   });
 
-  assert.equal(workspaceProfile.mode, TENANCY_MODE_WORKSPACE);
+  assert.equal(workspaceProfile.mode, TENANCY_MODE_WORKSPACES);
   assert.equal(workspaceProfile.workspace.allowSelfCreate, true);
 });

package/test/usersApiPaths.test.js

@@ -29,3 +29,21 @@ test("resolveApiBasePath resolves workspace and non-workspace API base paths", (
     "/api/customers"
   );
 });
+
+test("resolveApiBasePath preserves query strings and hash fragments", () => {
+  assert.equal(
+    resolveApiBasePath({
+      surfaceRequiresWorkspace: true,
+      relativePath: "/customers?search=buddy#top"
+    }),
+    "/api/w/:workspaceSlug/workspace/customers?search=buddy#top"
+  );
+
+  assert.equal(
+    resolveApiBasePath({
+      surfaceRequiresWorkspace: false,
+      relativePath: "/?cursor=2"
+    }),
+    "/api?cursor=2"
+  );
+});

package/test/usersRouteRequestInputValidator.test.js

@@ -229,10 +229,10 @@ test("users-core route registration follows tenancy mode matrix", async () => {
     tenancyMode: "personal"
   });
   const workspaceRoutes = await registerRoutesForMode({
-    tenancyMode: "workspace"
+    tenancyMode: "workspaces"
   });
   const workspaceSelfCreateRoutes = await registerRoutesForMode({
-    tenancyMode: "workspace",
+    tenancyMode: "workspaces",
     tenancyPolicy: {
       workspace: {
         allowSelfCreate: true

package/test/workspaceBootstrapContributor.test.js

@@ -62,7 +62,7 @@ test("workspace bootstrap contributor passes actor context to pending invites se
     },
     workspaceInvitationsEnabled: true,
     appConfig: {
-      tenancyMode: "workspace"
+      tenancyMode: "workspaces"
     }
   });
 
@@ -251,7 +251,7 @@ test("workspace bootstrap contributor resolves workspace slug from bootstrap que
     },
     workspaceInvitationsEnabled: true,
     appConfig: {
-      tenancyMode: "workspace"
+      tenancyMode: "workspaces"
     }
   });
 
@@ -314,7 +314,7 @@ test("workspace bootstrap contributor returns global payload with requestedWorks
     },
     workspaceInvitationsEnabled: true,
     appConfig: {
-      tenancyMode: "workspace"
+      tenancyMode: "workspaces"
     }
   });
 
@@ -386,7 +386,7 @@ test("workspace bootstrap contributor returns requestedWorkspace=not_found when
     },
     workspaceInvitationsEnabled: false,
     appConfig: {
-      tenancyMode: "workspace"
+      tenancyMode: "workspaces"
     }
   });
 
@@ -439,7 +439,7 @@ test("workspace bootstrap contributor returns requestedWorkspace=unauthenticated
     },
     workspaceInvitationsEnabled: false,
     appConfig: {
-      tenancyMode: "workspace"
+      tenancyMode: "workspaces"
     }
   });
 

package/test/workspaceService.test.js

@@ -19,7 +19,7 @@ function createWorkspaceRoles() {
 }
 
 function createWorkspaceServiceFixture({
-  tenancyMode = "workspace",
+  tenancyMode = "workspaces",
   tenancyPolicy = {},
   workspaceRoles = createWorkspaceRoles(),
   additionalWorkspaces = [],
@@ -177,7 +177,7 @@ test("workspaceService.listWorkspacesForUser returns only accessible workspaces"
 
 test("workspaceService.listWorkspacesForUser no longer provisions personal workspace in workspace mode", async () => {
   const { service, calls } = createWorkspaceServiceFixture({
-    tenancyMode: "workspace",
+    tenancyMode: "workspaces",
     personalWorkspace: null
   });
 
@@ -260,7 +260,7 @@ test("workspaceService.provisionWorkspaceForNewUser provisions personal workspac
 
 test("workspaceService.provisionWorkspaceForNewUser is a no-op outside personal tenancy", async () => {
   const { service, calls } = createWorkspaceServiceFixture({
-    tenancyMode: "workspace"
+    tenancyMode: "workspaces"
   });
 
   const result = await service.provisionWorkspaceForNewUser({
@@ -275,7 +275,7 @@ test("workspaceService.provisionWorkspaceForNewUser is a no-op outside personal
 
 test("workspaceService.createWorkspaceForAuthenticatedUser creates non-personal workspace in workspace tenancy", async () => {
   const { service, calls, insertedPayloads } = createWorkspaceServiceFixture({
-    tenancyMode: "workspace",
+    tenancyMode: "workspaces",
     tenancyPolicy: {
       workspace: {
         allowSelfCreate: true
@@ -304,7 +304,7 @@ test("workspaceService.createWorkspaceForAuthenticatedUser creates non-personal
 
 test("workspaceService.createWorkspaceForAuthenticatedUser rejects creation when self-create policy is disabled", async () => {
   const { service } = createWorkspaceServiceFixture({
-    tenancyMode: "workspace"
+    tenancyMode: "workspaces"
   });
 
   await assert.rejects(