@elevasis/core 0.31.0 → 0.32.0

package/dist/auth/index.d.ts

@@ -2153,6 +2153,51 @@ type Database = {
                     }
                 ];
             };
+            deployment_organization_models: {
+                Row: {
+                    created_at: string;
+                    deployment_id: string;
+                    model_hash: string | null;
+                    organization_id: string;
+                    organization_model: Json;
+                    schema_version: string;
+                    updated_at: string;
+                };
+                Insert: {
+                    created_at?: string;
+                    deployment_id: string;
+                    model_hash?: string | null;
+                    organization_id: string;
+                    organization_model: Json;
+                    schema_version?: string;
+                    updated_at?: string;
+                };
+                Update: {
+                    created_at?: string;
+                    deployment_id?: string;
+                    model_hash?: string | null;
+                    organization_id?: string;
+                    organization_model?: Json;
+                    schema_version?: string;
+                    updated_at?: string;
+                };
+                Relationships: [
+                    {
+                        foreignKeyName: "deployment_organization_models_deployment_id_fkey";
+                        columns: ["deployment_id"];
+                        isOneToOne: true;
+                        referencedRelation: "deployments";
+                        referencedColumns: ["id"];
+                    },
+                    {
+                        foreignKeyName: "deployment_organization_models_organization_id_fkey";
+                        columns: ["organization_id"];
+                        isOneToOne: false;
+                        referencedRelation: "organizations";
+                        referencedColumns: ["id"];
+                    }
+                ];
+            };
             deployments: {
                 Row: {
                     created_at: string;
@@ -4399,7 +4444,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             light: z.ZodOptional<z.ZodString>;
             dark: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
-    }, z.core.$strip>>;
+        voice: z.ZodOptional<z.ZodString>;
+        tagline: z.ZodOptional<z.ZodString>;
+        values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        themePresetId: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     navigation: z.ZodDefault<z.ZodObject<{
         sidebar: z.ZodDefault<z.ZodObject<{
             primary: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodType<SidebarNode, unknown, z.core.$ZodTypeInternals<SidebarNode, unknown>>>>;
@@ -4446,7 +4495,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             }, z.core.$strip>>;
         }, z.core.$strip>>;
         clientBrief: z.ZodDefault<z.ZodString>;
-    }, z.core.$strip>>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        productName: z.ZodOptional<z.ZodString>;
+        shortName: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     customers: z.ZodDefault<z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         id: z.ZodString;
         order: z.ZodNumber;

package/dist/index.d.ts

@@ -321,7 +321,11 @@ declare const OrganizationModelBrandingSchema: z.ZodObject<{
         light: z.ZodOptional<z.ZodString>;
         dark: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
-}, z.core.$strip>;
+    voice: z.ZodOptional<z.ZodString>;
+    tagline: z.ZodOptional<z.ZodString>;
+    values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    themePresetId: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>;
 
 /** One entry in the lead-gen stage catalog. */
 interface LeadGenStageCatalogEntry {
@@ -4067,7 +4071,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             light: z.ZodOptional<z.ZodString>;
             dark: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
-    }, z.core.$strip>>;
+        voice: z.ZodOptional<z.ZodString>;
+        tagline: z.ZodOptional<z.ZodString>;
+        values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        themePresetId: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     navigation: z.ZodDefault<z.ZodObject<{
         sidebar: z.ZodDefault<z.ZodObject<{
             primary: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodType<SidebarNode, unknown, z.core.$ZodTypeInternals<SidebarNode, unknown>>>>;
@@ -4114,7 +4122,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             }, z.core.$strip>>;
         }, z.core.$strip>>;
         clientBrief: z.ZodDefault<z.ZodString>;
-    }, z.core.$strip>>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        productName: z.ZodOptional<z.ZodString>;
+        shortName: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     customers: z.ZodDefault<z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         id: z.ZodString;
         order: z.ZodNumber;

package/dist/index.js

@@ -494,15 +494,55 @@ DisplayMetadataSchema.extend({
 
 // src/organization-model/domains/branding.ts
 var OrganizationModelBrandingSchema = z.object({
+  /**
+   * @deprecated Prefer `identity.organizationName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.organizationName` fall back to this field.
+   */
   organizationName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.productName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.productName` fall back to this field.
+   */
   productName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.shortName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.shortName` fall back to this field.
+   */
   shortName: z.string().trim().min(1).max(40),
+  /**
+   * @deprecated Prefer `identity.description`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.description` fall back to this field.
+   */
   description: DescriptionSchema.optional(),
   logos: z.object({
     light: z.string().trim().min(1).max(2048).optional(),
     dark: z.string().trim().min(1).max(2048).optional()
-  }).default({})
-});
+  }).default({}),
+  /**
+   * Brand voice — how the organization communicates. Plain-language description
+   * of tone, register, and personality (e.g. "Direct and human — no jargon").
+   * Max 280 characters.
+   */
+  voice: z.string().trim().max(280).optional(),
+  /**
+   * Brand tagline or positioning statement — the memorable one-liner that
+   * captures the brand's promise or differentiator. Max 200 characters.
+   */
+  tagline: z.string().trim().max(200).optional(),
+  /**
+   * Core brand values — an ordered list of principles the organization stands
+   * for (e.g. ["Transparency", "Craftsmanship", "Velocity"]). Each entry must
+   * be a non-empty trimmed string.
+   */
+  values: z.array(z.string().trim().min(1)).optional(),
+  /**
+   * ID of the active UI theme preset from the UI theme-presets registry.
+   * The UI layer resolves this to colors and typography via `usePresetsContext()`.
+   * Free-form string — validation and fallback state are handled at the UI layer.
+   * Min 1, max 64 characters.
+   */
+  themePresetId: z.string().trim().min(1).max(64).optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_BRANDING = {
   organizationName: "Default Organization",
   productName: "Organization OS",
@@ -633,8 +673,33 @@ var IdentityDomainSchema = z.object({
    * background. Populated by /setup; surfaced to agents as organizational context.
    * Optional — many projects have no external client.
    */
-  clientBrief: z.string().trim().default("")
-});
+  clientBrief: z.string().trim().default(""),
+  /**
+   * Display name of the organization as shown to end users.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.organizationName`. Falls back to `branding.organizationName` for
+   * legacy tenants that have not yet migrated.
+   */
+  organizationName: LabelSchema.optional(),
+  /**
+   * Display name of the primary product or platform.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.productName`. Falls back to `branding.productName` for legacy tenants.
+   */
+  productName: LabelSchema.optional(),
+  /**
+   * Short abbreviated name used in space-constrained UI surfaces (max 40 chars).
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.shortName`. Falls back to `branding.shortName` for legacy tenants.
+   */
+  shortName: z.string().trim().min(1).max(40).optional(),
+  /**
+   * Plain-language description of the organization for display and discovery.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.description`. Falls back to `branding.description` for legacy tenants.
+   */
+  description: DescriptionSchema.optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_IDENTITY = {
   mission: "",
   vision: "",

package/dist/knowledge/index.d.ts

@@ -537,7 +537,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             light: z.ZodOptional<z.ZodString>;
             dark: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
-    }, z.core.$strip>>;
+        voice: z.ZodOptional<z.ZodString>;
+        tagline: z.ZodOptional<z.ZodString>;
+        values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        themePresetId: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     navigation: z.ZodDefault<z.ZodObject<{
         sidebar: z.ZodDefault<z.ZodObject<{
             primary: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodType<SidebarNode, unknown, z.core.$ZodTypeInternals<SidebarNode, unknown>>>>;
@@ -584,7 +588,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             }, z.core.$strip>>;
         }, z.core.$strip>>;
         clientBrief: z.ZodDefault<z.ZodString>;
-    }, z.core.$strip>>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        productName: z.ZodOptional<z.ZodString>;
+        shortName: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     customers: z.ZodDefault<z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         id: z.ZodString;
         order: z.ZodNumber;

package/dist/organization-model/index.d.ts

@@ -321,7 +321,11 @@ declare const OrganizationModelBrandingSchema: z.ZodObject<{
         light: z.ZodOptional<z.ZodString>;
         dark: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
-}, z.core.$strip>;
+    voice: z.ZodOptional<z.ZodString>;
+    tagline: z.ZodOptional<z.ZodString>;
+    values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    themePresetId: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>;
 
 /** One entry in the lead-gen stage catalog. */
 interface LeadGenStageCatalogEntry {
@@ -4067,7 +4071,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             light: z.ZodOptional<z.ZodString>;
             dark: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
-    }, z.core.$strip>>;
+        voice: z.ZodOptional<z.ZodString>;
+        tagline: z.ZodOptional<z.ZodString>;
+        values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        themePresetId: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     navigation: z.ZodDefault<z.ZodObject<{
         sidebar: z.ZodDefault<z.ZodObject<{
             primary: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodType<SidebarNode, unknown, z.core.$ZodTypeInternals<SidebarNode, unknown>>>>;
@@ -4114,7 +4122,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             }, z.core.$strip>>;
         }, z.core.$strip>>;
         clientBrief: z.ZodDefault<z.ZodString>;
-    }, z.core.$strip>>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        productName: z.ZodOptional<z.ZodString>;
+        shortName: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     customers: z.ZodDefault<z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         id: z.ZodString;
         order: z.ZodNumber;

package/dist/organization-model/index.js

@@ -494,15 +494,55 @@ DisplayMetadataSchema.extend({
 
 // src/organization-model/domains/branding.ts
 var OrganizationModelBrandingSchema = z.object({
+  /**
+   * @deprecated Prefer `identity.organizationName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.organizationName` fall back to this field.
+   */
   organizationName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.productName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.productName` fall back to this field.
+   */
   productName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.shortName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.shortName` fall back to this field.
+   */
   shortName: z.string().trim().min(1).max(40),
+  /**
+   * @deprecated Prefer `identity.description`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.description` fall back to this field.
+   */
   description: DescriptionSchema.optional(),
   logos: z.object({
     light: z.string().trim().min(1).max(2048).optional(),
     dark: z.string().trim().min(1).max(2048).optional()
-  }).default({})
-});
+  }).default({}),
+  /**
+   * Brand voice — how the organization communicates. Plain-language description
+   * of tone, register, and personality (e.g. "Direct and human — no jargon").
+   * Max 280 characters.
+   */
+  voice: z.string().trim().max(280).optional(),
+  /**
+   * Brand tagline or positioning statement — the memorable one-liner that
+   * captures the brand's promise or differentiator. Max 200 characters.
+   */
+  tagline: z.string().trim().max(200).optional(),
+  /**
+   * Core brand values — an ordered list of principles the organization stands
+   * for (e.g. ["Transparency", "Craftsmanship", "Velocity"]). Each entry must
+   * be a non-empty trimmed string.
+   */
+  values: z.array(z.string().trim().min(1)).optional(),
+  /**
+   * ID of the active UI theme preset from the UI theme-presets registry.
+   * The UI layer resolves this to colors and typography via `usePresetsContext()`.
+   * Free-form string — validation and fallback state are handled at the UI layer.
+   * Min 1, max 64 characters.
+   */
+  themePresetId: z.string().trim().min(1).max(64).optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_BRANDING = {
   organizationName: "Default Organization",
   productName: "Organization OS",
@@ -633,8 +673,33 @@ var IdentityDomainSchema = z.object({
    * background. Populated by /setup; surfaced to agents as organizational context.
    * Optional — many projects have no external client.
    */
-  clientBrief: z.string().trim().default("")
-});
+  clientBrief: z.string().trim().default(""),
+  /**
+   * Display name of the organization as shown to end users.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.organizationName`. Falls back to `branding.organizationName` for
+   * legacy tenants that have not yet migrated.
+   */
+  organizationName: LabelSchema.optional(),
+  /**
+   * Display name of the primary product or platform.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.productName`. Falls back to `branding.productName` for legacy tenants.
+   */
+  productName: LabelSchema.optional(),
+  /**
+   * Short abbreviated name used in space-constrained UI surfaces (max 40 chars).
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.shortName`. Falls back to `branding.shortName` for legacy tenants.
+   */
+  shortName: z.string().trim().min(1).max(40).optional(),
+  /**
+   * Plain-language description of the organization for display and discovery.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.description`. Falls back to `branding.description` for legacy tenants.
+   */
+  description: DescriptionSchema.optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_IDENTITY = {
   mission: "",
   vision: "",

package/dist/test-utils/index.d.ts

@@ -1464,6 +1464,51 @@ type Database = {
                     }
                 ];
             };
+            deployment_organization_models: {
+                Row: {
+                    created_at: string;
+                    deployment_id: string;
+                    model_hash: string | null;
+                    organization_id: string;
+                    organization_model: Json;
+                    schema_version: string;
+                    updated_at: string;
+                };
+                Insert: {
+                    created_at?: string;
+                    deployment_id: string;
+                    model_hash?: string | null;
+                    organization_id: string;
+                    organization_model: Json;
+                    schema_version?: string;
+                    updated_at?: string;
+                };
+                Update: {
+                    created_at?: string;
+                    deployment_id?: string;
+                    model_hash?: string | null;
+                    organization_id?: string;
+                    organization_model?: Json;
+                    schema_version?: string;
+                    updated_at?: string;
+                };
+                Relationships: [
+                    {
+                        foreignKeyName: "deployment_organization_models_deployment_id_fkey";
+                        columns: ["deployment_id"];
+                        isOneToOne: true;
+                        referencedRelation: "deployments";
+                        referencedColumns: ["id"];
+                    },
+                    {
+                        foreignKeyName: "deployment_organization_models_organization_id_fkey";
+                        columns: ["organization_id"];
+                        isOneToOne: false;
+                        referencedRelation: "organizations";
+                        referencedColumns: ["id"];
+                    }
+                ];
+            };
             deployments: {
                 Row: {
                     created_at: string;
@@ -3961,7 +4006,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             light: z.ZodOptional<z.ZodString>;
             dark: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
-    }, z.core.$strip>>;
+        voice: z.ZodOptional<z.ZodString>;
+        tagline: z.ZodOptional<z.ZodString>;
+        values: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        themePresetId: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     navigation: z.ZodDefault<z.ZodObject<{
         sidebar: z.ZodDefault<z.ZodObject<{
             primary: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodType<SidebarNode, unknown, z.core.$ZodTypeInternals<SidebarNode, unknown>>>>;
@@ -4008,7 +4057,11 @@ declare const OrganizationModelSchema: z.ZodObject<{
             }, z.core.$strip>>;
         }, z.core.$strip>>;
         clientBrief: z.ZodDefault<z.ZodString>;
-    }, z.core.$strip>>;
+        organizationName: z.ZodOptional<z.ZodString>;
+        productName: z.ZodOptional<z.ZodString>;
+        shortName: z.ZodOptional<z.ZodString>;
+        description: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>>;
     customers: z.ZodDefault<z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
         id: z.ZodString;
         order: z.ZodNumber;

package/dist/test-utils/index.js

@@ -19895,15 +19895,55 @@ DisplayMetadataSchema.extend({
 
 // src/organization-model/domains/branding.ts
 var OrganizationModelBrandingSchema = z.object({
+  /**
+   * @deprecated Prefer `identity.organizationName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.organizationName` fall back to this field.
+   */
   organizationName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.productName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.productName` fall back to this field.
+   */
   productName: LabelSchema,
+  /**
+   * @deprecated Prefer `identity.shortName`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.shortName` fall back to this field.
+   */
   shortName: z.string().trim().min(1).max(40),
+  /**
+   * @deprecated Prefer `identity.description`; branding retains it for back-compat.
+   * Legacy tenants that have not set `identity.description` fall back to this field.
+   */
   description: DescriptionSchema.optional(),
   logos: z.object({
     light: z.string().trim().min(1).max(2048).optional(),
     dark: z.string().trim().min(1).max(2048).optional()
-  }).default({})
-});
+  }).default({}),
+  /**
+   * Brand voice — how the organization communicates. Plain-language description
+   * of tone, register, and personality (e.g. "Direct and human — no jargon").
+   * Max 280 characters.
+   */
+  voice: z.string().trim().max(280).optional(),
+  /**
+   * Brand tagline or positioning statement — the memorable one-liner that
+   * captures the brand's promise or differentiator. Max 200 characters.
+   */
+  tagline: z.string().trim().max(200).optional(),
+  /**
+   * Core brand values — an ordered list of principles the organization stands
+   * for (e.g. ["Transparency", "Craftsmanship", "Velocity"]). Each entry must
+   * be a non-empty trimmed string.
+   */
+  values: z.array(z.string().trim().min(1)).optional(),
+  /**
+   * ID of the active UI theme preset from the UI theme-presets registry.
+   * The UI layer resolves this to colors and typography via `usePresetsContext()`.
+   * Free-form string — validation and fallback state are handled at the UI layer.
+   * Min 1, max 64 characters.
+   */
+  themePresetId: z.string().trim().min(1).max(64).optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_BRANDING = {
   organizationName: "Default Organization",
   productName: "Organization OS",
@@ -20022,8 +20062,33 @@ var IdentityDomainSchema = z.object({
    * background. Populated by /setup; surfaced to agents as organizational context.
    * Optional — many projects have no external client.
    */
-  clientBrief: z.string().trim().default("")
-});
+  clientBrief: z.string().trim().default(""),
+  /**
+   * Display name of the organization as shown to end users.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.organizationName`. Falls back to `branding.organizationName` for
+   * legacy tenants that have not yet migrated.
+   */
+  organizationName: LabelSchema.optional(),
+  /**
+   * Display name of the primary product or platform.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.productName`. Falls back to `branding.productName` for legacy tenants.
+   */
+  productName: LabelSchema.optional(),
+  /**
+   * Short abbreviated name used in space-constrained UI surfaces (max 40 chars).
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.shortName`. Falls back to `branding.shortName` for legacy tenants.
+   */
+  shortName: z.string().trim().min(1).max(40).optional(),
+  /**
+   * Plain-language description of the organization for display and discovery.
+   * Recommended placement for display naming — prefer this over the deprecated
+   * `branding.description`. Falls back to `branding.description` for legacy tenants.
+   */
+  description: DescriptionSchema.optional()
+}).passthrough();
 var DEFAULT_ORGANIZATION_MODEL_IDENTITY = {
   mission: "",
   vision: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elevasis/core",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "license": "MIT",
   "description": "Minimal shared constants across Elevasis monorepo",
   "sideEffects": false,

package/src/organization-model/__tests__/domains/passthrough-extensibility.test.ts

@@ -0,0 +1,199 @@
+import { describe, expect, it } from 'vitest'
+import { IdentityDomainSchema } from '../../domains/identity'
+import { resolveOrganizationModel } from '../../resolve'
+
+/**
+ * Profile-singleton domains (`branding`, `identity`) use `.passthrough()` so that
+ * tenant-authored direct properties survive `resolveOrganizationModel` instead of
+ * being silently stripped by Zod's default `.strip()`. These tests lock that
+ * behavior in and verify the broadened typed branding fields round-trip.
+ */
+describe('profile-singleton passthrough extensibility', () => {
+  it('keeps an unknown direct property on branding through resolve', () => {
+    const model = resolveOrganizationModel({
+      branding: {
+        organizationName: 'Acme',
+        productName: 'AcmeOS',
+        shortName: 'Acme',
+        // Unknown tenant-authored direct property — must survive passthrough.
+        brandVibe: 'warm'
+      } as never
+    })
+
+    expect((model.branding as Record<string, unknown>).brandVibe).toBe('warm')
+    // Known fields still resolve normally.
+    expect(model.branding.organizationName).toBe('Acme')
+  })
+
+  it('keeps an unknown direct property on identity through resolve', () => {
+    const model = resolveOrganizationModel({
+      identity: {
+        // Unknown tenant-authored direct property — must survive passthrough.
+        founderNote: 'bootstrapped'
+      } as never
+    })
+
+    expect((model.identity as Record<string, unknown>).founderNote).toBe('bootstrapped')
+    // Known identity fields still resolve from defaults.
+    expect(model.identity.timeZone).toBe('UTC')
+  })
+
+  it('parses and round-trips the broadened typed branding fields', () => {
+    const model = resolveOrganizationModel({
+      branding: {
+        organizationName: 'Acme',
+        productName: 'AcmeOS',
+        shortName: 'Acme',
+        voice: 'Direct and human — no jargon',
+        tagline: 'Automation that works while you sleep',
+        values: ['Transparency', 'Craftsmanship', 'Velocity'],
+        themePresetId: 'midnight'
+      }
+    })
+
+    expect(model.branding.voice).toBe('Direct and human — no jargon')
+    expect(model.branding.tagline).toBe('Automation that works while you sleep')
+    expect(model.branding.values).toEqual(['Transparency', 'Craftsmanship', 'Velocity'])
+    expect(model.branding.themePresetId).toBe('midnight')
+  })
+
+  it('leaves the broadened branding fields undefined when not authored', () => {
+    const model = resolveOrganizationModel()
+
+    expect(model.branding.voice).toBeUndefined()
+    expect(model.branding.tagline).toBeUndefined()
+    expect(model.branding.values).toBeUndefined()
+    expect(model.branding.themePresetId).toBeUndefined()
+  })
+})
+
+/**
+ * Names → identity: the four display-name fields (organizationName, productName,
+ * shortName, description) are now the recommended placement on `identity`. They are
+ * optional so that legacy tenants can continue to rely on `branding.*` fallbacks
+ * without breaking. These tests lock the contract: fields round-trip, are truly
+ * optional (no default), and branding fields still validate unchanged.
+ */
+describe('identity display-name fields — recommended placement (Step 5)', () => {
+  it('accepts all four name fields on identity and round-trips them through resolveOrganizationModel', () => {
+    const model = resolveOrganizationModel({
+      identity: {
+        organizationName: 'Acme Corp',
+        productName: 'AcmeOS',
+        shortName: 'Acme',
+        description: 'AI orchestration for modern teams.'
+      }
+    })
+
+    expect(model.identity.organizationName).toBe('Acme Corp')
+    expect(model.identity.productName).toBe('AcmeOS')
+    expect(model.identity.shortName).toBe('Acme')
+    expect(model.identity.description).toBe('AI orchestration for modern teams.')
+  })
+
+  it('identity name fields are optional — a model with none set still resolves, and resolved values are undefined', () => {
+    const model = resolveOrganizationModel()
+
+    expect(model.identity.organizationName).toBeUndefined()
+    expect(model.identity.productName).toBeUndefined()
+    expect(model.identity.shortName).toBeUndefined()
+    expect(model.identity.description).toBeUndefined()
+  })
+
+  it('identity name fields parse as undefined through IdentityDomainSchema directly (no defaults injected)', () => {
+    const result = IdentityDomainSchema.safeParse({})
+    expect(result.success).toBe(true)
+    if (result.success) {
+      expect(result.data.organizationName).toBeUndefined()
+      expect(result.data.productName).toBeUndefined()
+      expect(result.data.shortName).toBeUndefined()
+      expect(result.data.description).toBeUndefined()
+    }
+  })
+
+  it('identity.shortName rejects values exceeding 40 characters', () => {
+    expect(() =>
+      resolveOrganizationModel({
+        identity: { shortName: 'a'.repeat(41) } as never
+      })
+    ).toThrow()
+  })
+
+  it('identity.organizationName rejects empty string (LabelSchema min 1)', () => {
+    expect(() =>
+      resolveOrganizationModel({
+        identity: { organizationName: '' } as never
+      })
+    ).toThrow()
+  })
+
+  it('identity.description rejects empty string (DescriptionSchema min 1)', () => {
+    expect(() =>
+      resolveOrganizationModel({
+        identity: { description: '' } as never
+      })
+    ).toThrow()
+  })
+
+  it('identity name fields trim whitespace', () => {
+    const model = resolveOrganizationModel({
+      identity: {
+        organizationName: '  Acme Corp  ',
+        shortName: '  Acme  '
+      } as never
+    })
+
+    expect(model.identity.organizationName).toBe('Acme Corp')
+    expect(model.identity.shortName).toBe('Acme')
+  })
+
+  it('branding still validates with its name fields — @deprecated tags change nothing at runtime', () => {
+    const model = resolveOrganizationModel({
+      branding: {
+        organizationName: 'Legacy Org',
+        productName: 'LegacyOS',
+        shortName: 'LGO',
+        description: 'Legacy description for back-compat.'
+      }
+    })
+
+    expect(model.branding.organizationName).toBe('Legacy Org')
+    expect(model.branding.productName).toBe('LegacyOS')
+    expect(model.branding.shortName).toBe('LGO')
+    expect(model.branding.description).toBe('Legacy description for back-compat.')
+  })
+})
+
+/**
+ * The broadened branding fields are *typed*, not passthrough — their constraints
+ * are part of the published contract. These tests lock those bounds so a future
+ * edit can't silently widen/drop them, and confirm `.passthrough()` does NOT
+ * bypass validation for known fields (only unknown ones are let through).
+ */
+describe('broadened branding typed-field validation', () => {
+  it('rejects a voice longer than 280 characters', () => {
+    expect(() => resolveOrganizationModel({ branding: { voice: 'a'.repeat(281) } as never })).toThrow()
+  })
+
+  it('rejects a tagline longer than 200 characters', () => {
+    expect(() => resolveOrganizationModel({ branding: { tagline: 'a'.repeat(201) } as never })).toThrow()
+  })
+
+  it('rejects an empty-string entry in values (each entry must be non-empty)', () => {
+    expect(() => resolveOrganizationModel({ branding: { values: ['Valid', ''] } as never })).toThrow()
+  })
+
+  it('rejects a themePresetId outside the 1–64 character bounds', () => {
+    expect(() => resolveOrganizationModel({ branding: { themePresetId: '' } as never })).toThrow()
+    expect(() => resolveOrganizationModel({ branding: { themePresetId: 'a'.repeat(65) } as never })).toThrow()
+  })
+
+  it('trims whitespace on string fields', () => {
+    const model = resolveOrganizationModel({
+      branding: { voice: '  trimmed voice  ', tagline: '  trimmed tagline  ' } as never
+    })
+
+    expect(model.branding.voice).toBe('trimmed voice')
+    expect(model.branding.tagline).toBe('trimmed tagline')
+  })
+})

package/src/organization-model/domains/branding.ts

@@ -1,19 +1,61 @@
-import { z } from 'zod'
-import { DescriptionSchema, LabelSchema } from './shared'
-
-export const OrganizationModelBrandingSchema = z.object({
-  organizationName: LabelSchema,
-  productName: LabelSchema,
-  shortName: z.string().trim().min(1).max(40),
-  description: DescriptionSchema.optional(),
-  logos: z
-    .object({
-      light: z.string().trim().min(1).max(2048).optional(),
-      dark: z.string().trim().min(1).max(2048).optional()
-    })
-    .default({})
-})
-
+import { z } from 'zod'
+import { DescriptionSchema, LabelSchema } from './shared'
+
+export const OrganizationModelBrandingSchema = z
+  .object({
+    /**
+     * @deprecated Prefer `identity.organizationName`; branding retains it for back-compat.
+     * Legacy tenants that have not set `identity.organizationName` fall back to this field.
+     */
+    organizationName: LabelSchema,
+    /**
+     * @deprecated Prefer `identity.productName`; branding retains it for back-compat.
+     * Legacy tenants that have not set `identity.productName` fall back to this field.
+     */
+    productName: LabelSchema,
+    /**
+     * @deprecated Prefer `identity.shortName`; branding retains it for back-compat.
+     * Legacy tenants that have not set `identity.shortName` fall back to this field.
+     */
+    shortName: z.string().trim().min(1).max(40),
+    /**
+     * @deprecated Prefer `identity.description`; branding retains it for back-compat.
+     * Legacy tenants that have not set `identity.description` fall back to this field.
+     */
+    description: DescriptionSchema.optional(),
+    logos: z
+      .object({
+        light: z.string().trim().min(1).max(2048).optional(),
+        dark: z.string().trim().min(1).max(2048).optional()
+      })
+      .default({}),
+    /**
+     * Brand voice — how the organization communicates. Plain-language description
+     * of tone, register, and personality (e.g. "Direct and human — no jargon").
+     * Max 280 characters.
+     */
+    voice: z.string().trim().max(280).optional(),
+    /**
+     * Brand tagline or positioning statement — the memorable one-liner that
+     * captures the brand's promise or differentiator. Max 200 characters.
+     */
+    tagline: z.string().trim().max(200).optional(),
+    /**
+     * Core brand values — an ordered list of principles the organization stands
+     * for (e.g. ["Transparency", "Craftsmanship", "Velocity"]). Each entry must
+     * be a non-empty trimmed string.
+     */
+    values: z.array(z.string().trim().min(1)).optional(),
+    /**
+     * ID of the active UI theme preset from the UI theme-presets registry.
+     * The UI layer resolves this to colors and typography via `usePresetsContext()`.
+     * Free-form string — validation and fallback state are handled at the UI layer.
+     * Min 1, max 64 characters.
+     */
+    themePresetId: z.string().trim().min(1).max(64).optional()
+  })
+  .passthrough()
+
 export const DEFAULT_ORGANIZATION_MODEL_BRANDING: z.infer<typeof OrganizationModelBrandingSchema> = {
   organizationName: 'Default Organization',
   productName: 'Organization OS',

package/src/organization-model/domains/identity.ts

@@ -1,94 +1,122 @@
-import { z } from 'zod'
-
-// ---------------------------------------------------------------------------
-// Business hours — simplest shape that captures weekday ranges.
-// Each day of the week is optional; when present it holds open/close times
-// in "HH:MM" 24-hour format. An empty object (default) means "not configured".
-// ---------------------------------------------------------------------------
-
-export const BusinessHoursDaySchema = z.object({
-  open: z
-    .string()
-    .trim()
-    .regex(/^\d{2}:\d{2}$/, 'Expected HH:MM format'),
-  close: z
-    .string()
-    .trim()
-    .regex(/^\d{2}:\d{2}$/, 'Expected HH:MM format')
-})
-
-export const BusinessHoursSchema = z
-  .object({
-    monday: BusinessHoursDaySchema.optional(),
-    tuesday: BusinessHoursDaySchema.optional(),
-    wednesday: BusinessHoursDaySchema.optional(),
-    thursday: BusinessHoursDaySchema.optional(),
-    friday: BusinessHoursDaySchema.optional(),
-    saturday: BusinessHoursDaySchema.optional(),
-    sunday: BusinessHoursDaySchema.optional()
-  })
-  .default({})
-
-// ---------------------------------------------------------------------------
-// Identity domain schema — legal identity, mission/vision, industry anchors,
-// and temporal/geographic context. Distinct from branding (display identity).
-// ---------------------------------------------------------------------------
-
-export const IdentityDomainSchema = z.object({
-  /** Why the organization exists — one or two plain-language sentences. */
-  mission: z.string().trim().max(1000).default(''),
-  /** Long-term direction the organization is moving toward. */
-  vision: z.string().trim().max(1000).default(''),
-  /** Legal registered name of the entity. */
-  legalName: z.string().trim().max(200).default(''),
-  /**
-   * Type of legal entity (e.g. "LLC", "Corporation", "Sole Proprietor",
-   * "Non-profit"). Free-form string so it covers any jurisdiction.
-   */
-  entityType: z.string().trim().max(100).default(''),
-  /**
-   * Primary jurisdiction of registration or operation
-   * (e.g. "United States – Delaware", "Canada – Ontario").
-   */
-  jurisdiction: z.string().trim().max(200).default(''),
-  /**
-   * Industry category — broad classification (e.g. "Marketing Agency",
-   * "Software / SaaS", "Professional Services").
-   */
-  industryCategory: z.string().trim().max(200).default(''),
-  /**
-   * Geographic focus — where the organization primarily operates or serves
-   * (e.g. "North America", "Global", "Southeast Asia").
-   */
-  geographicFocus: z.string().trim().max(200).default(''),
-  /**
-   * IANA timezone identifier for the organization's primary operating timezone
-   * (e.g. "America/Los_Angeles", "Europe/London", "UTC").
-   */
-  timeZone: z.string().trim().max(100).default('UTC'),
-  /** Typical operating hours per day of week. Empty object means not configured. */
-  businessHours: BusinessHoursSchema,
-  /**
-   * Long-form markdown capturing client context, problem narrative, and domain
-   * background. Populated by /setup; surfaced to agents as organizational context.
-   * Optional — many projects have no external client.
-   */
-  clientBrief: z.string().trim().default('')
-})
-
-// ---------------------------------------------------------------------------
-// Seed — placeholder defaults; external adapters override per organization.
-// ---------------------------------------------------------------------------
-
-export const DEFAULT_ORGANIZATION_MODEL_IDENTITY: z.infer<typeof IdentityDomainSchema> = {
-  mission: '',
-  vision: '',
-  legalName: '',
-  entityType: '',
-  jurisdiction: '',
-  industryCategory: '',
-  geographicFocus: '',
-  timeZone: 'UTC',
-  businessHours: {},
-  clientBrief: ''
-}
+import { z } from 'zod'
+import { DescriptionSchema, LabelSchema } from './shared'
+
+// ---------------------------------------------------------------------------
+// Business hours — simplest shape that captures weekday ranges.
+// Each day of the week is optional; when present it holds open/close times
+// in "HH:MM" 24-hour format. An empty object (default) means "not configured".
+// ---------------------------------------------------------------------------
+
+export const BusinessHoursDaySchema = z.object({
+  open: z
+    .string()
+    .trim()
+    .regex(/^\d{2}:\d{2}$/, 'Expected HH:MM format'),
+  close: z
+    .string()
+    .trim()
+    .regex(/^\d{2}:\d{2}$/, 'Expected HH:MM format')
+})
+
+export const BusinessHoursSchema = z
+  .object({
+    monday: BusinessHoursDaySchema.optional(),
+    tuesday: BusinessHoursDaySchema.optional(),
+    wednesday: BusinessHoursDaySchema.optional(),
+    thursday: BusinessHoursDaySchema.optional(),
+    friday: BusinessHoursDaySchema.optional(),
+    saturday: BusinessHoursDaySchema.optional(),
+    sunday: BusinessHoursDaySchema.optional()
+  })
+  .default({})
+
+// ---------------------------------------------------------------------------
+// Identity domain schema — legal identity, mission/vision, industry anchors,
+// and temporal/geographic context. Distinct from branding (display identity).
+// ---------------------------------------------------------------------------
+
+export const IdentityDomainSchema = z
+  .object({
+    /** Why the organization exists — one or two plain-language sentences. */
+    mission: z.string().trim().max(1000).default(''),
+    /** Long-term direction the organization is moving toward. */
+    vision: z.string().trim().max(1000).default(''),
+    /** Legal registered name of the entity. */
+    legalName: z.string().trim().max(200).default(''),
+    /**
+     * Type of legal entity (e.g. "LLC", "Corporation", "Sole Proprietor",
+     * "Non-profit"). Free-form string so it covers any jurisdiction.
+     */
+    entityType: z.string().trim().max(100).default(''),
+    /**
+     * Primary jurisdiction of registration or operation
+     * (e.g. "United States – Delaware", "Canada – Ontario").
+     */
+    jurisdiction: z.string().trim().max(200).default(''),
+    /**
+     * Industry category — broad classification (e.g. "Marketing Agency",
+     * "Software / SaaS", "Professional Services").
+     */
+    industryCategory: z.string().trim().max(200).default(''),
+    /**
+     * Geographic focus — where the organization primarily operates or serves
+     * (e.g. "North America", "Global", "Southeast Asia").
+     */
+    geographicFocus: z.string().trim().max(200).default(''),
+    /**
+     * IANA timezone identifier for the organization's primary operating timezone
+     * (e.g. "America/Los_Angeles", "Europe/London", "UTC").
+     */
+    timeZone: z.string().trim().max(100).default('UTC'),
+    /** Typical operating hours per day of week. Empty object means not configured. */
+    businessHours: BusinessHoursSchema,
+    /**
+     * Long-form markdown capturing client context, problem narrative, and domain
+     * background. Populated by /setup; surfaced to agents as organizational context.
+     * Optional — many projects have no external client.
+     */
+    clientBrief: z.string().trim().default(''),
+    /**
+     * Display name of the organization as shown to end users.
+     * Recommended placement for display naming — prefer this over the deprecated
+     * `branding.organizationName`. Falls back to `branding.organizationName` for
+     * legacy tenants that have not yet migrated.
+     */
+    organizationName: LabelSchema.optional(),
+    /**
+     * Display name of the primary product or platform.
+     * Recommended placement for display naming — prefer this over the deprecated
+     * `branding.productName`. Falls back to `branding.productName` for legacy tenants.
+     */
+    productName: LabelSchema.optional(),
+    /**
+     * Short abbreviated name used in space-constrained UI surfaces (max 40 chars).
+     * Recommended placement for display naming — prefer this over the deprecated
+     * `branding.shortName`. Falls back to `branding.shortName` for legacy tenants.
+     */
+    shortName: z.string().trim().min(1).max(40).optional(),
+    /**
+     * Plain-language description of the organization for display and discovery.
+     * Recommended placement for display naming — prefer this over the deprecated
+     * `branding.description`. Falls back to `branding.description` for legacy tenants.
+     */
+    description: DescriptionSchema.optional()
+  })
+  .passthrough()
+
+// ---------------------------------------------------------------------------
+// Seed — placeholder defaults; external adapters override per organization.
+// ---------------------------------------------------------------------------
+
+export const DEFAULT_ORGANIZATION_MODEL_IDENTITY: z.infer<typeof IdentityDomainSchema> = {
+  mission: '',
+  vision: '',
+  legalName: '',
+  entityType: '',
+  jurisdiction: '',
+  industryCategory: '',
+  geographicFocus: '',
+  timeZone: 'UTC',
+  businessHours: {},
+  clientBrief: ''
+}

package/src/supabase/database.types.ts

@@ -1465,6 +1465,51 @@ export type Database = {
           },
         ]
       }
+      deployment_organization_models: {
+        Row: {
+          created_at: string
+          deployment_id: string
+          model_hash: string | null
+          organization_id: string
+          organization_model: Json
+          schema_version: string
+          updated_at: string
+        }
+        Insert: {
+          created_at?: string
+          deployment_id: string
+          model_hash?: string | null
+          organization_id: string
+          organization_model: Json
+          schema_version?: string
+          updated_at?: string
+        }
+        Update: {
+          created_at?: string
+          deployment_id?: string
+          model_hash?: string | null
+          organization_id?: string
+          organization_model?: Json
+          schema_version?: string
+          updated_at?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "deployment_organization_models_deployment_id_fkey"
+            columns: ["deployment_id"]
+            isOneToOne: true
+            referencedRelation: "deployments"
+            referencedColumns: ["id"]
+          },
+          {
+            foreignKeyName: "deployment_organization_models_organization_id_fkey"
+            columns: ["organization_id"]
+            isOneToOne: false
+            referencedRelation: "organizations"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       deployments: {
         Row: {
           created_at: string