@jskit-ai/users-core 0.1.11 → 0.1.13

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.11",
+  version: "0.1.13",
   description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
@@ -214,7 +214,14 @@ export default Object.freeze({
       dev: {}
     },
     packageJson: {
-      scripts: {}
+      scripts: {
+        "server:app": "SERVER_SURFACE=app node ./bin/server.js",
+        "server:admin": "SERVER_SURFACE=admin node ./bin/server.js",
+        "dev:app": "VITE_SURFACE=app vite",
+        "dev:admin": "VITE_SURFACE=admin vite",
+        "build:app": "VITE_SURFACE=app vite build",
+        "build:admin": "VITE_SURFACE=admin vite build"
+      }
     },
     procfile: {},
     files: [
@@ -222,7 +229,6 @@ export default Object.freeze({
         op: "install-migration",
         from: "templates/migrations/users_core_initial.cjs",
         toDir: "migrations",
-        slug: "users_core_initial",
         extension: ".cjs",
         reason: "Install users/workspace core schema migration.",
         category: "migration",
@@ -232,7 +238,6 @@ export default Object.freeze({
         op: "install-migration",
         from: "templates/migrations/users_core_profile_username.cjs",
         toDir: "migrations",
-        slug: "users_core_profile_username",
         extension: ".cjs",
         reason: "Install users profile username migration.",
         category: "migration",
@@ -242,7 +247,6 @@ export default Object.freeze({
         op: "install-migration",
         from: "templates/migrations/users_core_console_owner.cjs",
         toDir: "migrations",
-        slug: "users_core_console_owner",
         extension: ".cjs",
         reason: "Install users/workspace console owner migration.",
         category: "migration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "module",
   "scripts": {
     "test": "node --test"

package/src/server/common/formatters/workspaceFormatter.js

@@ -1,12 +1,21 @@
-import { coerceWorkspaceColor } from "../../../shared/settings.js";
+import {
+  coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor
+} from "../../../shared/settings.js";
 import { normalizeLowerText, normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
 
 function mapWorkspaceSummary(workspace, membership) {
+  const color = coerceWorkspaceColor(workspace.color);
   return {
     id: Number(workspace.id),
     slug: normalizeText(workspace.slug),
     name: normalizeText(workspace.name),
-    color: coerceWorkspaceColor(workspace.color),
+    color,
+    secondaryColor: coerceWorkspaceSecondaryColor(workspace.secondaryColor, { color }),
+    surfaceColor: coerceWorkspaceSurfaceColor(workspace.surfaceColor, { color }),
+    surfaceVariantColor: coerceWorkspaceSurfaceVariantColor(workspace.surfaceVariantColor, { color }),
     avatarUrl: normalizeText(workspace.avatarUrl),
     roleId: normalizeLowerText(membership?.roleId || "member") || "member",
     isAccessible: normalizeLowerText(membership?.status || "active") === "active"
@@ -17,9 +26,13 @@ function mapWorkspaceSettingsPublic(workspaceSettings, { workspaceInvitationsEna
   const source = workspaceSettings && typeof workspaceSettings === "object" ? workspaceSettings : {};
   const invitesAvailable = workspaceInvitationsEnabled === true;
   const invitesEnabled = invitesAvailable && source.invitesEnabled !== false;
+  const color = coerceWorkspaceColor(source.color);
   return {
     name: normalizeText(source.name),
-    color: coerceWorkspaceColor(source.color),
+    color,
+    secondaryColor: coerceWorkspaceSecondaryColor(source.secondaryColor, { color }),
+    surfaceColor: coerceWorkspaceSurfaceColor(source.surfaceColor, { color }),
+    surfaceVariantColor: coerceWorkspaceSurfaceVariantColor(source.surfaceVariantColor, { color }),
     avatarUrl: normalizeText(source.avatarUrl),
     invitesEnabled,
     invitesAvailable,

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

@@ -6,12 +6,18 @@ import {
   nowDb,
   isDuplicateEntryError
 } from "./repositoryUtils.js";
-import { coerceWorkspaceColor } from "../../../shared/settings.js";
+import {
+  coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor
+} from "../../../shared/settings.js";
 
 function mapRow(row) {
   if (!row) {
     return null;
   }
+  const color = coerceWorkspaceColor(row.color);
 
   return {
     id: Number(row.id),
@@ -20,7 +26,16 @@ function mapRow(row) {
     ownerUserId: Number(row.owner_user_id),
     isPersonal: Boolean(row.is_personal),
     avatarUrl: row.avatar_url ? normalizeText(row.avatar_url) : "",
-    color: coerceWorkspaceColor(row.color),
+    color,
+    secondaryColor: coerceWorkspaceSecondaryColor(row.secondary_color, {
+      color
+    }),
+    surfaceColor: coerceWorkspaceSurfaceColor(row.surface_color, {
+      color
+    }),
+    surfaceVariantColor: coerceWorkspaceSurfaceVariantColor(row.surface_variant_color, {
+      color
+    }),
     createdAt: toIsoString(row.created_at),
     updatedAt: toIsoString(row.updated_at),
     deletedAt: toNullableIso(row.deleted_at)
@@ -53,6 +68,9 @@ function createRepository(knex) {
       "w.is_personal",
       client.raw("COALESCE(ws.avatar_url, w.avatar_url) as avatar_url"),
       client.raw("COALESCE(ws.color, w.color) as color"),
+      client.raw("COALESCE(ws.secondary_color, ws.color, w.color) as secondary_color"),
+      client.raw("COALESCE(ws.surface_color, ws.color, w.color) as surface_color"),
+      client.raw("COALESCE(ws.surface_variant_color, ws.color, w.color) as surface_variant_color"),
       "w.created_at",
       "w.updated_at",
       "w.deleted_at"

package/src/server/common/support/deepFreeze.js

@@ -1,17 +1 @@
-function deepFreeze(value, seen = new WeakSet()) {
-  if (!value || typeof value !== "object") {
-    return value;
-  }
-  if (seen.has(value)) {
-    return value;
-  }
-
-  seen.add(value);
-  for (const key of Object.keys(value)) {
-    deepFreeze(value[key], seen);
-  }
-
-  return Object.freeze(value);
-}
-
-export { deepFreeze };
+export { deepFreeze } from "@jskit-ai/kernel/shared/support/deepFreeze";

package/src/server/common/support/resolveActionUser.js

@@ -1,6 +1,4 @@
-function normalizeObject(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
+import { normalizeObject } from "@jskit-ai/kernel/shared/support/normalize";
 
 function resolveActionUser(context, input) {
   const payload = normalizeObject(input);

package/src/shared/index.js

@@ -8,9 +8,20 @@ import {
 } from "./roles.js";
 
 import {
+  coerceWorkspaceBackgroundColor,
   DEFAULT_WORKSPACE_COLOR,
   DEFAULT_USER_SETTINGS,
-  coerceWorkspaceColor
+  coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor,
+  deriveWorkspaceBackgroundColor,
+  deriveWorkspaceSecondaryColor,
+  deriveWorkspaceSurfaceColor,
+  deriveWorkspaceSurfaceVariantColor,
+  mixHexColors,
+  normalizeWorkspaceHexColor,
+  resolveWorkspaceThemePalette
 } from "./settings.js";
 import {
   TENANCY_MODE_NONE,
@@ -43,6 +54,17 @@ const USERS_SHARED_API = Object.freeze({
   DEFAULT_WORKSPACE_COLOR,
   DEFAULT_USER_SETTINGS,
   coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor,
+  coerceWorkspaceBackgroundColor,
+  deriveWorkspaceSecondaryColor,
+  deriveWorkspaceSurfaceColor,
+  deriveWorkspaceSurfaceVariantColor,
+  deriveWorkspaceBackgroundColor,
+  normalizeWorkspaceHexColor,
+  mixHexColors,
+  resolveWorkspaceThemePalette,
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
   TENANCY_MODE_WORKSPACE,
@@ -71,6 +93,17 @@ export {
   DEFAULT_WORKSPACE_COLOR,
   DEFAULT_USER_SETTINGS,
   coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor,
+  coerceWorkspaceBackgroundColor,
+  deriveWorkspaceSecondaryColor,
+  deriveWorkspaceSurfaceColor,
+  deriveWorkspaceSurfaceVariantColor,
+  deriveWorkspaceBackgroundColor,
+  normalizeWorkspaceHexColor,
+  mixHexColors,
+  resolveWorkspaceThemePalette,
   TENANCY_MODE_NONE,
   TENANCY_MODE_PERSONAL,
   TENANCY_MODE_WORKSPACE,

package/src/shared/resources/consoleSettingsResource.js

@@ -2,9 +2,10 @@ import { Type } from "typebox";
 import { createOperationMessages } from "../operationMessages.js";
 import {
   createCursorListValidator,
-  normalizeObjectInput
+  normalizeObjectInput,
+  normalizeSettingsFieldInput,
+  normalizeSettingsFieldOutput
 } from "@jskit-ai/kernel/shared/validators";
-import { normalizeSettingsFieldInput } from "./normalizeSettingsFieldInput.js";
 import { consoleSettingsFields } from "./consoleSettingsFields.js";
 
 function buildCreateSchema() {
@@ -57,21 +58,9 @@ const consoleSettingsOutputValidator = Object.freeze({
   normalize(payload = {}) {
     const source = normalizeObjectInput(payload);
     const settingsSource = normalizeObjectInput(source.settings);
-    const settings = {};
-
-    for (const field of consoleSettingsFields) {
-      const rawValue = Object.hasOwn(settingsSource, field.key)
-        ? settingsSource[field.key]
-        : field.resolveDefault({
-            settings: settingsSource
-          });
-      settings[field.key] = field.normalizeOutput(rawValue, {
-        settings: settingsSource
-      });
-    }
 
     return {
-      settings
+      settings: normalizeSettingsFieldOutput(settingsSource, consoleSettingsFields)
     };
   }
 });

package/src/shared/resources/userSettingsResource.js

@@ -1,11 +1,11 @@
 import { Type } from "typebox";
 import {
   createCursorListValidator,
-  normalizeObjectInput
+  normalizeObjectInput,
+  normalizeSettingsFieldInput
 } from "@jskit-ai/kernel/shared/validators";
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { createOperationMessages } from "../operationMessages.js";
-import { normalizeSettingsFieldInput } from "./normalizeSettingsFieldInput.js";
 import { userProfileResource } from "./userProfileResource.js";
 import {
   USER_SETTINGS_SECTIONS,

package/src/shared/resources/workspaceSettingsResource.js

@@ -2,9 +2,9 @@ import { Type } from "typebox";
 import { normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
 import {
   normalizeObjectInput,
-  createCursorListValidator
+  createCursorListValidator,
+  normalizeSettingsFieldInput
 } from "@jskit-ai/kernel/shared/validators";
-import { normalizeSettingsFieldInput } from "./normalizeSettingsFieldInput.js";
 import { workspaceSettingsFields } from "./workspaceSettingsFields.js";
 import { createWorkspaceRoleCatalog } from "../roles.js";
 

package/src/shared/settings.js

@@ -1,4 +1,5 @@
-const DEFAULT_WORKSPACE_COLOR = "#0F6B54";
+const DEFAULT_WORKSPACE_COLOR = "#2F5D9E";
+const HEX_COLOR_PATTERN = /^#[0-9A-Fa-f]{6}$/;
 
 const DEFAULT_USER_SETTINGS = Object.freeze({
   theme: "system",
@@ -16,16 +17,132 @@ const DEFAULT_USER_SETTINGS = Object.freeze({
   lastActiveWorkspaceId: null
 });
 
-function coerceWorkspaceColor(value) {
+function normalizeWorkspaceHexColor(value) {
   const normalized = String(value || "").trim();
-  if (/^#[0-9A-Fa-f]{6}$/.test(normalized)) {
-    return normalized.toUpperCase();
+  if (!HEX_COLOR_PATTERN.test(normalized)) {
+    return "";
+  }
+  return normalized.toUpperCase();
+}
+
+function clampChannel(value) {
+  if (!Number.isFinite(value)) {
+    return 0;
+  }
+  if (value < 0) {
+    return 0;
   }
-  return DEFAULT_WORKSPACE_COLOR;
+  if (value > 255) {
+    return 255;
+  }
+  return Math.round(value);
+}
+
+function toHexChannel(value) {
+  return clampChannel(value).toString(16).padStart(2, "0").toUpperCase();
+}
+
+function parseHexColor(value) {
+  const normalized = normalizeWorkspaceHexColor(value);
+  if (!normalized) {
+    return null;
+  }
+  return {
+    red: Number.parseInt(normalized.slice(1, 3), 16),
+    green: Number.parseInt(normalized.slice(3, 5), 16),
+    blue: Number.parseInt(normalized.slice(5, 7), 16)
+  };
+}
+
+function mixHexColors(baseColor, mixColor, mixRatio = 0) {
+  const base = parseHexColor(baseColor);
+  const mixed = parseHexColor(mixColor);
+  if (!base || !mixed) {
+    return "";
+  }
+
+  const ratio = Math.min(1, Math.max(0, Number(mixRatio) || 0));
+  const keepRatio = 1 - ratio;
+  return `#${toHexChannel(base.red * keepRatio + mixed.red * ratio)}${toHexChannel(
+    base.green * keepRatio + mixed.green * ratio
+  )}${toHexChannel(base.blue * keepRatio + mixed.blue * ratio)}`;
+}
+
+function coerceWorkspaceColor(value) {
+  return normalizeWorkspaceHexColor(value) || DEFAULT_WORKSPACE_COLOR;
+}
+
+function deriveWorkspaceSecondaryColor(workspaceColor = DEFAULT_WORKSPACE_COLOR) {
+  return mixHexColors(coerceWorkspaceColor(workspaceColor), "#000000", 0.28) || "#224372";
+}
+
+function deriveWorkspaceSurfaceColor(workspaceColor = DEFAULT_WORKSPACE_COLOR) {
+  return mixHexColors(coerceWorkspaceColor(workspaceColor), "#FFFFFF", 0.93) || "#F0F4F8";
+}
+
+function deriveWorkspaceSurfaceVariantColor(workspaceColor = DEFAULT_WORKSPACE_COLOR) {
+  return mixHexColors(coerceWorkspaceColor(workspaceColor), "#FFFFFF", 0.86) || "#E2E8F1";
+}
+
+function deriveWorkspaceBackgroundColor(workspaceColor = DEFAULT_WORKSPACE_COLOR) {
+  const surfaceColor = deriveWorkspaceSurfaceColor(workspaceColor);
+  return mixHexColors(surfaceColor, "#FFFFFF", 0.45) || "#F4FAF8";
+}
+
+function coerceWorkspaceSecondaryColor(value, { color = DEFAULT_WORKSPACE_COLOR } = {}) {
+  return normalizeWorkspaceHexColor(value) || deriveWorkspaceSecondaryColor(color);
+}
+
+function coerceWorkspaceSurfaceColor(value, { color = DEFAULT_WORKSPACE_COLOR } = {}) {
+  return normalizeWorkspaceHexColor(value) || deriveWorkspaceSurfaceColor(color);
+}
+
+function coerceWorkspaceSurfaceVariantColor(value, { color = DEFAULT_WORKSPACE_COLOR } = {}) {
+  return normalizeWorkspaceHexColor(value) || deriveWorkspaceSurfaceVariantColor(color);
+}
+
+function coerceWorkspaceBackgroundColor(value, { color = DEFAULT_WORKSPACE_COLOR } = {}) {
+  return normalizeWorkspaceHexColor(value) || deriveWorkspaceBackgroundColor(color);
+}
+
+function resolveWorkspaceThemePalette(input = {}) {
+  const source = input && typeof input === "object" ? input : {};
+  const color = coerceWorkspaceColor(source.color);
+  const secondaryColor = coerceWorkspaceSecondaryColor(source.secondaryColor, {
+    color
+  });
+  const surfaceColor = coerceWorkspaceSurfaceColor(source.surfaceColor, {
+    color
+  });
+  const surfaceVariantColor = coerceWorkspaceSurfaceVariantColor(source.surfaceVariantColor, {
+    color
+  });
+  const backgroundColor = coerceWorkspaceBackgroundColor(source.backgroundColor, {
+    color
+  });
+
+  return Object.freeze({
+    color,
+    secondaryColor,
+    surfaceColor,
+    surfaceVariantColor,
+    backgroundColor
+  });
 }
 
 export {
   DEFAULT_WORKSPACE_COLOR,
   DEFAULT_USER_SETTINGS,
-  coerceWorkspaceColor
+  coerceWorkspaceBackgroundColor,
+  coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor,
+  deriveWorkspaceBackgroundColor,
+  deriveWorkspaceSecondaryColor,
+  deriveWorkspaceSurfaceColor,
+  deriveWorkspaceSurfaceVariantColor,
+  mixHexColors,
+  normalizeWorkspaceHexColor,
+  resolveWorkspaceThemePalette
 };

package/templates/migrations/users_core_console_owner.cjs

@@ -1,5 +1,3 @@
-// JSKIT_MIGRATION_ID: users-core-console-owner
-
 /**
  * @param {import('knex').Knex} knex
  */

package/templates/migrations/users_core_initial.cjs

@@ -1,5 +1,3 @@
-// JSKIT_MIGRATION_ID: users-core-initial-schema
-
 /**
  * @param {import('knex').Knex} knex
  */
@@ -27,7 +25,7 @@ exports.up = async function up(knex) {
     table.integer("owner_user_id").unsigned().notNullable().references("id").inTable("user_profiles").onDelete("CASCADE");
     table.boolean("is_personal").notNullable().defaultTo(true);
     table.string("avatar_url", 512).notNullable().defaultTo("");
-    table.string("color", 7).notNullable().defaultTo("#0F6B54");
+    table.string("color", 7).notNullable().defaultTo("#2F5D9E");
     table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
     table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
     table.timestamp("deleted_at", { useTz: false }).nullable();
@@ -48,7 +46,10 @@ exports.up = async function up(knex) {
     table.integer("workspace_id").unsigned().primary().references("id").inTable("workspaces").onDelete("CASCADE");
     table.string("name", 160).notNullable().defaultTo("Workspace");
     table.string("avatar_url", 512).notNullable().defaultTo("");
-    table.string("color", 7).notNullable().defaultTo("#0F6B54");
+    table.string("color", 7).notNullable().defaultTo("#2F5D9E");
+    table.string("secondary_color", 7).notNullable().defaultTo("#224372");
+    table.string("surface_color", 7).notNullable().defaultTo("#F0F4F8");
+    table.string("surface_variant_color", 7).notNullable().defaultTo("#E2E8F1");
     table.boolean("invites_enabled").notNullable().defaultTo(true);
     table.timestamp("created_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());
     table.timestamp("updated_at", { useTz: false }).notNullable().defaultTo(knex.fn.now());

package/templates/migrations/users_core_profile_username.cjs

@@ -1,5 +1,3 @@
-// JSKIT_MIGRATION_ID: users-core-profile-username
-
 const USERNAME_MAX_LENGTH = 120;
 
 function normalizeUsername(value) {

package/templates/packages/main/src/shared/resources/workspaceSettingsFields.js

@@ -3,7 +3,12 @@
 
 import { Type } from "typebox";
 import { normalizeText } from "@jskit-ai/kernel/shared/actions/textNormalization";
-import { coerceWorkspaceColor } from "@jskit-ai/users-core/shared/settings";
+import {
+  coerceWorkspaceColor,
+  coerceWorkspaceSecondaryColor,
+  coerceWorkspaceSurfaceColor,
+  coerceWorkspaceSurfaceVariantColor
+} from "@jskit-ai/users-core/shared/settings";
 import {
   defineField,
   resetWorkspaceSettingsFields
@@ -29,6 +34,10 @@ function normalizeHexColor(value) {
   return /^#[0-9A-Fa-f]{6}$/.test(color) ? color.toUpperCase() : null;
 }
 
+function resolveThemeBaseColor({ workspace = {}, settings = {} } = {}) {
+  return normalizeText(settings.color || workspace.color);
+}
+
 resetWorkspaceSettingsFields();
 
 defineField({
@@ -78,8 +87,8 @@ defineField({
     pattern: "^#[0-9A-Fa-f]{6}$",
     messages: {
       required: "Workspace color is required.",
-      pattern: "Workspace color must be a hex color like #0F6B54.",
-      default: "Workspace color must be a hex color like #0F6B54."
+      pattern: "Workspace color must be a hex color like #2F5D9E.",
+      default: "Workspace color must be a hex color like #2F5D9E."
     }
   }),
   outputSchema: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" }),
@@ -88,6 +97,84 @@ defineField({
   resolveDefault: ({ workspace = {} } = {}) => coerceWorkspaceColor(workspace.color)
 });
 
+defineField({
+  key: "secondaryColor",
+  dbColumn: "secondary_color",
+  required: true,
+  inputSchema: Type.String({
+    minLength: 7,
+    maxLength: 7,
+    pattern: "^#[0-9A-Fa-f]{6}$",
+    messages: {
+      required: "Secondary color is required.",
+      pattern: "Secondary color must be a hex color like #224372.",
+      default: "Secondary color must be a hex color like #224372."
+    }
+  }),
+  outputSchema: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" }),
+  normalizeInput: normalizeHexColor,
+  normalizeOutput: (value, { workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSecondaryColor(value, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    }),
+  resolveDefault: ({ workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSecondaryColor(workspace.secondaryColor, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    })
+});
+
+defineField({
+  key: "surfaceColor",
+  dbColumn: "surface_color",
+  required: true,
+  inputSchema: Type.String({
+    minLength: 7,
+    maxLength: 7,
+    pattern: "^#[0-9A-Fa-f]{6}$",
+    messages: {
+      required: "Surface color is required.",
+      pattern: "Surface color must be a hex color like #F0F4F8.",
+      default: "Surface color must be a hex color like #F0F4F8."
+    }
+  }),
+  outputSchema: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" }),
+  normalizeInput: normalizeHexColor,
+  normalizeOutput: (value, { workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSurfaceColor(value, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    }),
+  resolveDefault: ({ workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSurfaceColor(workspace.surfaceColor, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    })
+});
+
+defineField({
+  key: "surfaceVariantColor",
+  dbColumn: "surface_variant_color",
+  required: true,
+  inputSchema: Type.String({
+    minLength: 7,
+    maxLength: 7,
+    pattern: "^#[0-9A-Fa-f]{6}$",
+    messages: {
+      required: "Surface variant color is required.",
+      pattern: "Surface variant color must be a hex color like #E2E8F1.",
+      default: "Surface variant color must be a hex color like #E2E8F1."
+    }
+  }),
+  outputSchema: Type.String({ minLength: 7, maxLength: 7, pattern: "^#[0-9A-Fa-f]{6}$" }),
+  normalizeInput: normalizeHexColor,
+  normalizeOutput: (value, { workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSurfaceVariantColor(value, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    }),
+  resolveDefault: ({ workspace = {}, settings = {} } = {}) =>
+    coerceWorkspaceSurfaceVariantColor(workspace.surfaceVariantColor, {
+      color: resolveThemeBaseColor({ workspace, settings })
+    })
+});
+
 defineField({
   key: "invitesEnabled",
   dbColumn: "invites_enabled",

package/test/workspaceSettingsRepository.test.js

@@ -1,12 +1,17 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import "../test-support/registerDefaultSettingsFields.js";
+import { resolveWorkspaceThemePalette } from "../src/shared/settings.js";
 import { createRepository } from "../src/server/workspaceSettings/workspaceSettingsRepository.js";
 
 function createDefaultWorkspaceSettings() {
   return true;
 }
 
+const DEFAULT_WORKSPACE_THEME = resolveWorkspaceThemePalette({
+  color: "#2F5D9E"
+});
+
 function createKnexStub(rowOverrides = {}) {
   const state = {
     insertedRow: null,
@@ -15,7 +20,10 @@ function createKnexStub(rowOverrides = {}) {
       workspace_id: 1,
       name: "Workspace",
       avatar_url: "",
-      color: "#0F6B54",
+      color: "#2F5D9E",
+      secondary_color: DEFAULT_WORKSPACE_THEME.secondaryColor,
+      surface_color: DEFAULT_WORKSPACE_THEME.surfaceColor,
+      surface_variant_color: DEFAULT_WORKSPACE_THEME.surfaceVariantColor,
       invites_enabled: 1,
       created_at: "2026-03-09 00:26:35.710",
       updated_at: "2026-03-09 00:26:35.710",
@@ -34,6 +42,9 @@ function createKnexStub(rowOverrides = {}) {
           name: payload.name,
           avatar_url: payload.avatar_url,
           color: payload.color,
+          secondary_color: payload.secondary_color,
+          surface_color: payload.surface_color,
+          surface_variant_color: payload.surface_variant_color,
           invites_enabled: payload.invites_enabled,
           created_at: "2026-03-10 00:00:00.000",
           updated_at: "2026-03-10 00:00:00.000"
@@ -61,6 +72,15 @@ function createKnexStub(rowOverrides = {}) {
             if (Object.hasOwn(payload, "color")) {
               state.row.color = payload.color;
             }
+            if (Object.hasOwn(payload, "secondary_color")) {
+              state.row.secondary_color = payload.secondary_color;
+            }
+            if (Object.hasOwn(payload, "surface_color")) {
+              state.row.surface_color = payload.surface_color;
+            }
+            if (Object.hasOwn(payload, "surface_variant_color")) {
+              state.row.surface_variant_color = payload.surface_variant_color;
+            }
             if (Object.hasOwn(payload, "updated_at")) {
               state.row.updated_at = payload.updated_at;
             }
@@ -86,7 +106,10 @@ test("workspaceSettingsRepository.findByWorkspaceId maps the stored row", async
     workspaceId: 1,
     name: "Workspace",
     avatarUrl: "",
-    color: "#0F6B54",
+    color: "#2F5D9E",
+    secondaryColor: DEFAULT_WORKSPACE_THEME.secondaryColor,
+    surfaceColor: DEFAULT_WORKSPACE_THEME.surfaceColor,
+    surfaceVariantColor: DEFAULT_WORKSPACE_THEME.surfaceVariantColor,
     invitesEnabled: true,
     createdAt: "2026-03-08T16:26:35.710Z",
     updatedAt: "2026-03-08T16:26:35.710Z"
@@ -119,11 +142,17 @@ test("workspaceSettingsRepository.ensureForWorkspaceId inserts the injected defa
   assert.equal(state.insertedRow.workspace_id, 5);
   assert.equal(state.insertedRow.name, "Workspace");
   assert.equal(state.insertedRow.avatar_url, "");
-  assert.equal(state.insertedRow.color, "#0F6B54");
+  assert.equal(state.insertedRow.color, "#2F5D9E");
+  assert.equal(state.insertedRow.secondary_color, DEFAULT_WORKSPACE_THEME.secondaryColor);
+  assert.equal(state.insertedRow.surface_color, DEFAULT_WORKSPACE_THEME.surfaceColor);
+  assert.equal(state.insertedRow.surface_variant_color, DEFAULT_WORKSPACE_THEME.surfaceVariantColor);
   assert.equal(state.insertedRow.invites_enabled, false);
   assert.equal(record.name, "Workspace");
   assert.equal(record.avatarUrl, "");
-  assert.equal(record.color, "#0F6B54");
+  assert.equal(record.color, "#2F5D9E");
+  assert.equal(record.secondaryColor, DEFAULT_WORKSPACE_THEME.secondaryColor);
+  assert.equal(record.surfaceColor, DEFAULT_WORKSPACE_THEME.surfaceColor);
+  assert.equal(record.surfaceVariantColor, DEFAULT_WORKSPACE_THEME.surfaceVariantColor);
   assert.equal(record.invitesEnabled, false);
 });
 

package/test/workspaceSettingsResource.test.js

@@ -2,6 +2,7 @@ import test from "node:test";
 import assert from "node:assert/strict";
 import { validateOperationSection } from "@jskit-ai/http-runtime/shared/validators/operationValidation";
 import "../test-support/registerDefaultSettingsFields.js";
+import { resolveWorkspaceThemePalette } from "../src/shared/settings.js";
 import { workspaceSettingsResource } from "../src/shared/resources/workspaceSettingsResource.js";
 import { createWorkspaceRoleCatalog } from "../src/shared/roles.js";
 
@@ -48,6 +49,9 @@ test("workspace settings patch body normalizes valid payload before validation",
     name: "  Team Mercury  ",
     avatarUrl: "https://example.com/avatar.png",
     color: "#0f6b54",
+    secondaryColor: "#0b4d3c",
+    surfaceColor: "#eef5f3",
+    surfaceVariantColor: "#ddeae7",
     invitesEnabled: false
   });
 
@@ -57,6 +61,9 @@ test("workspace settings patch body normalizes valid payload before validation",
     name: "Team Mercury",
     avatarUrl: "https://example.com/avatar.png",
     color: "#0F6B54",
+    secondaryColor: "#0B4D3C",
+    surfaceColor: "#EEF5F3",
+    surfaceVariantColor: "#DDEAE7",
     invitesEnabled: false
   });
 });
@@ -89,10 +96,16 @@ test("workspace settings create body requires full-write fields", () => {
 
   assert.equal(parsed.ok, false);
   assert.equal(parsed.fieldErrors.color, "Workspace color is required.");
+  assert.equal(parsed.fieldErrors.secondaryColor, "Secondary color is required.");
+  assert.equal(parsed.fieldErrors.surfaceColor, "Surface color is required.");
+  assert.equal(parsed.fieldErrors.surfaceVariantColor, "Surface variant color is required.");
   assert.equal(parsed.fieldErrors.invitesEnabled, "invitesEnabled is required.");
 });
 
 test("workspace settings output normalizes raw service payloads", () => {
+  const expectedTheme = resolveWorkspaceThemePalette({
+    color: "#0F6B54"
+  });
   const normalized = workspaceSettingsResource.operations.view.outputValidator.normalize({
     workspace: {
       id: "7",
@@ -118,6 +131,9 @@ test("workspace settings output normalizes raw service payloads", () => {
       name: "Mercury Workspace",
       avatarUrl: "https://example.com/avatar.png",
       color: "#0F6B54",
+      secondaryColor: expectedTheme.secondaryColor,
+      surfaceColor: expectedTheme.surfaceColor,
+      surfaceVariantColor: expectedTheme.surfaceVariantColor,
       invitesEnabled: false,
       invitesAvailable: true,
       invitesEffective: false

package/test/workspaceSettingsService.test.js

@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import "../test-support/registerDefaultSettingsFields.js";
+import { resolveWorkspaceThemePalette } from "../src/shared/settings.js";
 import { createService } from "../src/server/workspaceSettings/workspaceSettingsService.js";
 
 function authorizedOptions(permissions = []) {
@@ -15,6 +16,9 @@ function authorizedOptions(permissions = []) {
 }
 
 function createFixture({ workspaceInvitationsEnabled = true } = {}) {
+  const defaultTheme = resolveWorkspaceThemePalette({
+    color: "#0F6B54"
+  });
   const state = {
     settingsPatch: null,
     workspace: {
@@ -23,12 +27,15 @@ function createFixture({ workspaceInvitationsEnabled = true } = {}) {
       name: "TonyMobily3",
       ownerUserId: 9,
       avatarUrl: "",
-      color: "#0F6B54"
+      color: defaultTheme.color
     },
     settings: {
       name: "TonyMobily3",
       avatarUrl: "",
-      color: "#0F6B54",
+      color: defaultTheme.color,
+      secondaryColor: defaultTheme.secondaryColor,
+      surfaceColor: defaultTheme.surfaceColor,
+      surfaceVariantColor: defaultTheme.surfaceVariantColor,
       invitesEnabled: true
     }
   };
@@ -67,6 +74,9 @@ test("workspaceSettingsService.getWorkspaceSettings returns the stored invitesEn
     name: "TonyMobily3",
     avatarUrl: "",
     color: "#0F6B54",
+    secondaryColor: "#0B4D3C",
+    surfaceColor: "#EEF5F3",
+    surfaceVariantColor: "#DDEAE7",
     invitesEnabled: true,
     invitesAvailable: true,
     invitesEffective: true
@@ -93,6 +103,9 @@ test("workspaceSettingsService.updateWorkspaceSettings writes editable fields th
     name: "New Name",
     avatarUrl: "",
     color: "#0F6B54",
+    secondaryColor: "#0B4D3C",
+    surfaceColor: "#EEF5F3",
+    surfaceVariantColor: "#DDEAE7",
     invitesEnabled: false,
     invitesAvailable: true,
     invitesEffective: false
@@ -113,6 +126,9 @@ test("workspaceSettingsService disables invite settings in output when app polic
     name: "TonyMobily3",
     avatarUrl: "",
     color: "#0F6B54",
+    secondaryColor: "#0B4D3C",
+    surfaceColor: "#EEF5F3",
+    surfaceVariantColor: "#DDEAE7",
     invitesEnabled: false,
     invitesAvailable: false,
     invitesEffective: false

package/src/shared/resources/normalizeSettingsFieldInput.js

@@ -1,19 +0,0 @@
-import { normalizeObjectInput } from "@jskit-ai/kernel/shared/validators";
-
-function normalizeSettingsFieldInput(payload = {}, fields = []) {
-  const source = normalizeObjectInput(payload);
-  const normalized = {};
-
-  for (const field of fields) {
-    if (!Object.hasOwn(source, field.key)) {
-      continue;
-    }
-    normalized[field.key] = field.normalizeInput(source[field.key], {
-      payload: source
-    });
-  }
-
-  return normalized;
-}
-
-export { normalizeSettingsFieldInput };