@stndrds/schema 0.1.0-alpha.63 → 0.1.0-alpha.64

package/dist/{chunk-MUJVBSBL.mjs → chunk-IIKZXK57.mjs}

@@ -5,6 +5,7 @@ import {
 } from "./chunk-V2RPPE2Y.mjs";
 import {
   computeRecordStatus,
+  createFormAttributeValidator,
   formatZodErrors,
   parseAttributeConfig,
   validateDraftOrThrow,
@@ -4133,7 +4134,6 @@ function createMockRelationAttributesRepository(stores) {
       }
       const results = [];
       for (const item of items) {
-        const _key = `${context.tenantId}:${item.fromObject}:${item.fromId}:${item.fromAttribute}:${item.toId}`;
         const existing = Array.from(stores.relationAttributes.values()).find(
           (row) => row.tenantId === context.tenantId && row.fromObject === item.fromObject && row.fromId === item.fromId && row.fromAttribute === item.fromAttribute && row.toId === item.toId
         );
@@ -4180,6 +4180,36 @@ function createMockRelationAttributesRepository(stores) {
         (row) => row.tenantId === context.tenantId && row.toId === toId
       );
     },
+    async findBySourceBatch(fromObject, fromIds, fromAttribute) {
+      const context = getContext2();
+      if (!context) {
+        throw new Error("Context required for relationAttributes operations");
+      }
+      return Array.from(stores.relationAttributes.values()).filter(
+        (row) => row.tenantId === context.tenantId && row.fromObject === fromObject && fromIds.includes(row.fromId) && row.fromAttribute === fromAttribute
+      );
+    },
+    async findByTargetBatch(toIds) {
+      const context = getContext2();
+      if (!context) {
+        throw new Error("Context required for relationAttributes operations");
+      }
+      return Array.from(stores.relationAttributes.values()).filter(
+        (row) => row.tenantId === context.tenantId && toIds.includes(row.toId)
+      );
+    },
+    async deleteBySourceAndTarget(fromObject, fromId, fromAttribute, toId) {
+      const context = getContext2();
+      if (!context) {
+        throw new Error("Context required for relationAttributes operations");
+      }
+      const toDelete = Array.from(stores.relationAttributes.entries()).filter(
+        ([_id, row]) => row.tenantId === context.tenantId && row.fromObject === fromObject && row.fromId === fromId && row.fromAttribute === fromAttribute && row.toId === toId
+      );
+      for (const [id] of toDelete) {
+        stores.relationAttributes.delete(id);
+      }
+    },
     async deleteBySource(fromObject, fromId, fromAttribute) {
       const context = getContext2();
       if (!context) {
@@ -5244,92 +5274,6 @@ var PolicyRegistry = class {
 };
 var defaultPolicyRegistry = new PolicyRegistry();
 
-// src/runtime/policies/notes.policy.ts
-var notesPolicy = {
-  objectName: "notes",
-  /**
-   * Inject visibility filter for list/search operations.
-   *
-   * Creates: (visibility = 'shared') OR (createdBy = userId)
-   *
-   * This filters at the SQL level for better performance.
-   * canAccessRecord provides defense-in-depth as a secondary check.
-   *
-   * Note: When user filters exist, we preserve linkedTo filter (common for notes)
-   * but the visibility OR filter takes precedence. Full filter merging would require
-   * AdvancedFilterState support in the adapter.
-   */
-  applyListFilter(ctx, options) {
-    const visibilityRules = [
-      { attribute: "visibility", operator: "is", value: "shared" },
-      { attribute: "createdBy", operator: "is", value: ctx.userId }
-    ];
-    if (!options?.filters || options.filters.rules.length === 0) {
-      return {
-        ...options,
-        filters: { combinator: "or", rules: visibilityRules }
-      };
-    }
-    const linkedToFilter = options.filters.rules.find((r) => r.attribute === "linkedTo");
-    if (linkedToFilter) {
-      return {
-        ...options,
-        filters: {
-          combinator: "and",
-          rules: [linkedToFilter]
-        }
-      };
-    }
-    return {
-      ...options,
-      filters: { combinator: "or", rules: visibilityRules }
-    };
-  },
-  /**
-   * Check if user can access a specific note.
-   *
-   * Rules:
-   * - Shared notes: accessible by anyone in the tenant
-   * - Private notes: only accessible by the author (createdBy)
-   */
-  canAccessRecord(ctx, record) {
-    const visibility = record.values.visibility;
-    if (visibility === "shared") {
-      return true;
-    }
-    if (visibility === "private") {
-      return record.createdBy === ctx.userId;
-    }
-    return false;
-  },
-  /**
-   * Check if user can modify a note.
-   *
-   * Rules:
-   * - Private notes: only the author can modify
-   * - Shared notes: anyone can modify
-   */
-  canModifyRecord(ctx, record) {
-    const visibility = record.values.visibility;
-    if (visibility === "private") {
-      return record.createdBy === ctx.userId;
-    }
-    return true;
-  },
-  /**
-   * Check if user can delete a note.
-   *
-   * Rules:
-   * - Only the author (createdBy) can delete a note, regardless of visibility
-   */
-  canDeleteRecord(ctx, record) {
-    return record.createdBy === ctx.userId;
-  }
-};
-
-// src/runtime/policies/index.ts
-defaultPolicyRegistry.register(notesPolicy);
-
 // src/runtime/services/base.service.ts
 var BaseService = class {
   constructor(adapter) {
@@ -5543,6 +5487,23 @@ var RELATION_TARGET_ANY = "*";
 function isUniversalRelation(attr) {
   return attr.targets.length === 1 && attr.targets[0].object === RELATION_TARGET_ANY;
 }
+function isBilateralRelation(attr) {
+  return attr.bilateral !== void 0;
+}
+function inferInverseCardinality(cardinality) {
+  return cardinality === "one" ? "many" : "many";
+}
+
+// src/types/relation-properties.ts
+var FORBIDDEN_PROPERTY_TYPES = [
+  "formula",
+  "rollup",
+  "relation",
+  "file",
+  "user",
+  "document",
+  "richtext"
+];
 
 // src/builders/attribute-validators.ts
 import { ICONS } from "@stndrds/constants";
@@ -5649,292 +5610,6 @@ function validateOptions(options, attributeName) {
   }
 }
 
-// src/types/relation-properties.ts
-var FORBIDDEN_PROPERTY_TYPES = [
-  "formula",
-  "rollup",
-  "relation",
-  "file",
-  "user",
-  "document",
-  "richtext"
-];
-
-// src/builders/property-schema-builder.ts
-var PropertySchemaBuilder = class {
-  constructor() {
-    this.definitions = [];
-  }
-  /**
-   * Add a property to the schema
-   * The type of property is automatically detected based on the builder methods used
-   */
-  add(name, configure) {
-    const builder = new PropertyTypeBuilder(name);
-    const configured = configure(builder);
-    const definition = configured.build();
-    this.definitions.push(definition);
-    return this;
-  }
-  /**
-   * Build the final PropertySchema
-   */
-  build() {
-    return {
-      definitions: this.definitions
-    };
-  }
-};
-var PropertyTypeBuilder = class {
-  constructor(name) {
-    this.name = name;
-  }
-  // Explicit type constructors
-  text() {
-    return new TextPropertyBuilder(this.name);
-  }
-  textarea() {
-    return new TextareaPropertyBuilder(this.name);
-  }
-  number() {
-    return new NumberPropertyBuilder(this.name);
-  }
-  checkbox() {
-    return new CheckboxPropertyBuilder(this.name);
-  }
-  date() {
-    return new DatePropertyBuilder(this.name);
-  }
-  phone() {
-    return new PhonePropertyBuilder(this.name);
-  }
-  currency() {
-    return new CurrencyPropertyBuilder(this.name);
-  }
-  status() {
-    return new StatusPropertyBuilder(this.name);
-  }
-  select() {
-    return new SelectPropertyBuilder(this.name);
-  }
-  multiselect() {
-    return new MultiselectPropertyBuilder(this.name);
-  }
-  rating() {
-    return new RatingPropertyBuilder(this.name);
-  }
-  location() {
-    return new LocationPropertyBuilder(this.name);
-  }
-};
-var BasePropertyBuilder = class {
-  constructor(name) {
-    this.definition = { name };
-  }
-  /**
-   * Set the label
-   */
-  label(label) {
-    this.definition.label = label;
-    return this;
-  }
-  /**
-   * Mark as required
-   */
-  required() {
-    this.definition.required = true;
-    return this;
-  }
-  /**
-   * Set description
-   */
-  description(description) {
-    this.definition.description = description;
-    return this;
-  }
-  /**
-   * Build the final definition
-   */
-  build() {
-    return this.definition;
-  }
-};
-var TextPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "text";
-  }
-  minLength(value) {
-    this.definition.minLength = value;
-    return this;
-  }
-  maxLength(value) {
-    this.definition.maxLength = value;
-    return this;
-  }
-  pattern(pattern) {
-    this.definition.pattern = pattern;
-    return this;
-  }
-  placeholder(value) {
-    this.definition.placeholder = value;
-    return this;
-  }
-};
-var TextareaPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "textarea";
-  }
-  minLength(value) {
-    this.definition.minLength = value;
-    return this;
-  }
-  maxLength(value) {
-    this.definition.maxLength = value;
-    return this;
-  }
-  placeholder(value) {
-    this.definition.placeholder = value;
-    return this;
-  }
-};
-var NumberPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "number";
-  }
-  min(value) {
-    this.definition.min = value;
-    return this;
-  }
-  max(value) {
-    this.definition.max = value;
-    return this;
-  }
-  decimal(places) {
-    this.definition.decimal = places;
-    return this;
-  }
-  integer() {
-    this.definition.integer = true;
-    return this;
-  }
-  placeholder(value) {
-    this.definition.placeholder = value;
-    return this;
-  }
-};
-var CheckboxPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "checkbox";
-  }
-};
-var DatePropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "date";
-  }
-  includeTime() {
-    this.definition.includeTime = true;
-    return this;
-  }
-  min(date2) {
-    this.definition.min = date2;
-    return this;
-  }
-  max(date2) {
-    this.definition.max = date2;
-    return this;
-  }
-};
-var PhonePropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "phone";
-  }
-};
-var CurrencyPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "currency";
-  }
-  currency(code) {
-    this.definition.currency = code;
-    return this;
-  }
-  min(value) {
-    this.definition.min = value;
-    return this;
-  }
-  max(value) {
-    this.definition.max = value;
-    return this;
-  }
-};
-var StatusPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "status";
-  }
-  options(options) {
-    this.definition.options = options;
-    return this;
-  }
-};
-var SelectPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "select";
-  }
-  options(options) {
-    this.definition.options = options;
-    return this;
-  }
-};
-var MultiselectPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "multiselect";
-  }
-  options(options) {
-    this.definition.options = options;
-    return this;
-  }
-  maxSelections(value) {
-    this.definition.maxSelections = value;
-    return this;
-  }
-};
-var RatingPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "rating";
-  }
-  max(value) {
-    this.definition.max = value;
-    return this;
-  }
-  icon(icon) {
-    this.definition.icon = icon;
-    return this;
-  }
-};
-var LocationPropertyBuilder = class extends BasePropertyBuilder {
-  constructor(name) {
-    super(name);
-    this.definition.type = "location";
-  }
-};
-function validatePropertyType(type) {
-  if (FORBIDDEN_PROPERTY_TYPES.includes(type)) {
-    throw new Error(
-      `Property type "${type}" is not supported in .qualifyWith(). Only simple types (text, number, date, select, etc.) are allowed. Complex types (formula, rollup, relation, file, user, document) would require duplicating backend behavior.`
-    );
-  }
-}
-
 // src/builders/attribute-builders.ts
 var BaseAttributeBuilder = class {
   constructor(type, name, label) {
@@ -6443,12 +6118,7 @@ var UserAttributeBuilder = class extends BaseAttributeBuilder {
 function user(config) {
   return new UserAttributeBuilder(config.name, config.label);
 }
-var SingleRelationAttributeBuilder = class extends BaseAttributeBuilder {
-  constructor(name, label) {
-    super("relation", name, label);
-    this.attr.cardinality = "one";
-    this.attr.targets = [];
-  }
+var BaseRelationAttributeBuilder = class extends BaseAttributeBuilder {
   /**
    * Add a target object that can be linked
    * @param objectName - Name of the object (e.g., "companies")
@@ -6465,68 +6135,95 @@ var SingleRelationAttributeBuilder = class extends BaseAttributeBuilder {
   /**
    * Allow linking to any object in the tenant (universal polymorphic)
    * Creates a relation with `targets: [{ object: "*" }]`
-   *
-   * @example
-   * ```typescript
-   * relation({ name: "linkedTo", label: "Linked To" })
-   *   .toAny()
-   *   .hidden()
-   * ```
    */
   toAny() {
     this.attr.targets = [{ object: RELATION_TARGET_ANY }];
     return this;
   }
   /**
-   * Convert to a multi-relation (cardinality: "many")
-   */
-  many() {
-    const multiBuilder = new MultiRelationAttributeBuilder(
-      this.attr.name,
-      this.attr.label ?? "",
-      {
-        targets: this.attr.targets,
-        isRequired: this.attr.required
-      }
-    );
-    return multiBuilder;
-  }
-  /**
-   * Add properties to qualify the relation
-   * Must be called AFTER .to() to ensure targets are defined
+   * Add properties to qualify the relation using existing attribute builders.
+   * Must be called AFTER .to() to ensure targets are defined.
    *
    * @example
    * ```typescript
-   * relation({ name: "mainCompany", label: "Main Company" })
-   *   .to("companies")
-   *   .qualifyWith(props => props
-   *     .add("role", select => select.options([...]).required())
-   *     .add("shares", number => number.min(0))
+   * relation({ name: "companies", label: "Companies" })
+   *   .to("companies").many()
+   *   .qualifyWith(
+   *     select({ name: "role", label: "Role" }).options([...]).required(),
+   *     number({ name: "shares", label: "Shares" }).min(0),
    *   )
    * ```
    */
-  qualifyWith(configure) {
+  qualifyWith(...builders) {
     const targets = this.attr.targets;
     if (!targets || targets.length === 0) {
       throw new Error(
-        '.qualifyWith() must be called AFTER .to(). Example: relation({ name: "mainCompany" }).to("companies").qualifyWith(...)'
+        '.qualifyWith() must be called AFTER .to(). Example: relation({ name: "companies" }).to("companies").qualifyWith(...)'
       );
     }
-    const builder = new PropertySchemaBuilder();
-    const schema = configure(builder).build();
-    this.attr.properties = schema;
-    return this;
-  }
-  required() {
-    this.setRequired(true);
-    return this;
-  }
-  optional() {
-    this.setRequired(false);
+    const definitions = builders.map((builder) => {
+      const attr = builder.build();
+      if (FORBIDDEN_PROPERTY_TYPES.includes(attr.type)) {
+        throw new Error(`Property type "${attr.type}" is not supported in .qualifyWith()`);
+      }
+      return attr;
+    });
+    this.attr.properties = { definitions };
+    return this;
+  }
+  /**
+   * Enable bilateral synchronization for this relation.
+   * Must be called AFTER .to() to ensure targets are defined.
+   */
+  bilateral(config) {
+    const targets = this.attr.targets;
+    if (!targets || targets.length === 0) {
+      throw new Error(
+        '.bilateral() must be called AFTER .to(). Example: relation({ name: "company" }).to("companies").bilateral({ ... })'
+      );
+    }
+    if (targets.length > 1) {
+      throw new Error(
+        "Bilateral relations are not supported for polymorphic relations (multiple .to() targets)."
+      );
+    }
+    if (isUniversalRelation(this.attr)) {
+      throw new Error("Bilateral relations are not supported for universal relations (.toAny()).");
+    }
+    this.attr.bilateral = config;
+    return this;
+  }
+};
+var SingleRelationAttributeBuilder = class extends BaseRelationAttributeBuilder {
+  constructor(name, label) {
+    super("relation", name, label);
+    this.attr.cardinality = "one";
+    this.attr.targets = [];
+  }
+  /**
+   * Convert to a multi-relation (cardinality: "many")
+   */
+  many() {
+    const multiBuilder = new MultiRelationAttributeBuilder(
+      this.attr.name,
+      this.attr.label ?? "",
+      {
+        targets: this.attr.targets,
+        isRequired: this.attr.required
+      }
+    );
+    return multiBuilder;
+  }
+  required() {
+    this.setRequired(true);
+    return this;
+  }
+  optional() {
+    this.setRequired(false);
     return this;
   }
 };
-var MultiRelationAttributeBuilder = class extends BaseAttributeBuilder {
+var MultiRelationAttributeBuilder = class extends BaseRelationAttributeBuilder {
   constructor(name, label, initOptions) {
     super("relation", name, label);
     this.attr.cardinality = "many";
@@ -6536,34 +6233,6 @@ var MultiRelationAttributeBuilder = class extends BaseAttributeBuilder {
       this.setRequired(true);
     }
   }
-  /**
-   * Add a target object that can be linked
-   * @param objectName - Name of the object (e.g., "companies")
-   * @param options - Display template and filter options
-   */
-  to(objectName, options) {
-    const target = {
-      object: objectName,
-      ...options
-    };
-    this.attr.targets?.push(target);
-    return this;
-  }
-  /**
-   * Allow linking to any object in the tenant (universal polymorphic)
-   * Creates a relation with `targets: [{ object: "*" }]`
-   *
-   * @example
-   * ```typescript
-   * relation({ name: "linkedItems", label: "Linked Items" })
-   *   .toAny()
-   *   .many()
-   * ```
-   */
-  toAny() {
-    this.attr.targets = [{ object: RELATION_TARGET_ANY }];
-    return this;
-  }
   /**
    * Set minimum number of relations required
    */
@@ -6578,33 +6247,6 @@ var MultiRelationAttributeBuilder = class extends BaseAttributeBuilder {
     this.attr.maxItems = count;
     return this;
   }
-  /**
-   * Add properties to qualify the relation
-   * Must be called AFTER .to() or .many() to ensure targets are defined
-   *
-   * @example
-   * ```typescript
-   * relation({ name: "companies", label: "Companies" })
-   *   .to("companies")
-   *   .many()
-   *   .qualifyWith(props => props
-   *     .add("role", select => select.options([...]).required())
-   *     .add("shares", number => number.min(0))
-   *   )
-   * ```
-   */
-  qualifyWith(configure) {
-    const targets = this.attr.targets;
-    if (!targets || targets.length === 0) {
-      throw new Error(
-        '.qualifyWith() must be called AFTER .to() or .many(). Example: relation({ name: "companies" }).to("companies").many().qualifyWith(...)'
-      );
-    }
-    const builder = new PropertySchemaBuilder();
-    const schema = configure(builder).build();
-    this.attr.properties = schema;
-    return this;
-  }
   required() {
     this.setRequired(true);
     return this;
@@ -6672,8 +6314,9 @@ var FormulaAttributeBuilder = class extends BaseAttributeBuilder {
   // Override to prevent making formulas required
   // biome-ignore lint/suspicious/noExplicitAny: intentional override
   required() {
-    console.warn("Formula attributes cannot be required (they are read-only)");
-    return this;
+    throw new Error(
+      "Formula attributes cannot be required: they are computed read-only values. Remove .required() from this attribute definition."
+    );
   }
   // biome-ignore lint/suspicious/noExplicitAny: intentional override
   optional() {
@@ -6747,8 +6390,9 @@ var RollupAttributeBuilder = class extends BaseAttributeBuilder {
   // Override to prevent making rollups required
   // biome-ignore lint/suspicious/noExplicitAny: intentional override
   required() {
-    console.warn("Rollup attributes cannot be required (they are read-only)");
-    return this;
+    throw new Error(
+      "Rollup attributes cannot be required: they are computed read-only values. Remove .required() from this attribute definition."
+    );
   }
   // biome-ignore lint/suspicious/noExplicitAny: intentional override
   optional() {
@@ -7063,7 +6707,8 @@ var GroupBuilder = class {
     return this.data;
   }
 };
-var BaseTableTabConfig = class {
+var TableTabConfig = class {
+  /** @internal */
   constructor(view2, tabData) {
     this.view = view2;
     this.tabData = tabData;
@@ -7141,6 +6786,29 @@ var BaseTableTabConfig = class {
     this.tabData.sorts.push({ attribute, direction });
     return this;
   }
+  /**
+   * Traverse a 2nd-level relation to display nested data.
+   * When active, `tab.columns` stores the 2nd-level object's attribute names.
+   *
+   * @param attribute - Relation attribute on the first-level target object
+   * @example .table("members").through("companies").columns(["name", "sector"])
+   */
+  through(attribute) {
+    this.tabData.through = { attribute };
+    return this;
+  }
+  /**
+   * Show _source and _target columns in flattened (through) view
+   */
+  showSourceTarget(value = true) {
+    if (!this.tabData.through) {
+      throw new Error(
+        `[TableTabConfig] showSourceTarget() requires through() to be called first for tab "${this.tabData.name}"`
+      );
+    }
+    this.tabData.through.showSourceTarget = value;
+    return this;
+  }
   /**
    * Continue building with a new tab
    */
@@ -7169,31 +6837,6 @@ var BaseTableTabConfig = class {
     this.view._addTab(this.tabData);
   }
 };
-var DirectTableTabConfig = class extends BaseTableTabConfig {
-  /** @internal */
-  constructor(view2, base, relationAttribute) {
-    super(view2, {
-      ...base,
-      type: "table",
-      relationMode: "direct",
-      relationAttribute,
-      columns: []
-    });
-  }
-};
-var InverseTableTabConfig = class extends BaseTableTabConfig {
-  /** @internal */
-  constructor(view2, base, sourceObject, relationAttribute) {
-    super(view2, {
-      ...base,
-      type: "table",
-      relationMode: "inverse",
-      sourceObject,
-      relationAttribute,
-      columns: []
-    });
-  }
-};
 var CustomTabConfig = class {
   /** @internal */
   constructor(view2, base, component) {
@@ -7229,24 +6872,17 @@ var CustomTabConfig = class {
     return this.view.build();
   }
 };
-var NotesTabConfig = class {
+var RichtextTabConfig = class {
   /** @internal */
-  constructor(view2, base) {
+  constructor(view2, base, attribute) {
     this.view = view2;
-    this.tabData = { ...base, type: "notes" };
-  }
-  /**
-   * Show only private notes of the current user
-   */
-  privateOnly() {
-    this.tabData.privateOnly = true;
-    return this;
+    this.tabData = { ...base, type: "richtext", attribute };
   }
   /**
-   * Allow creating new notes from this tab
+   * Set a text attribute to display as an editable title above the editor
    */
-  create() {
-    this.tabData.allowCreate = true;
+  titleAttribute(name) {
+    this.tabData.titleAttribute = name;
     return this;
   }
   /**
@@ -7485,27 +7121,37 @@ var TabBuilder = class {
     return this.view._addTab(tab);
   }
   /**
-   * Create a direct table tab for a relation attribute on the current object
+   * Create a table tab for a relation attribute on the current object
    *
    * Use this when the current object has a relation attribute pointing to another object.
    *
    * @param relationAttribute - Name of the relation attribute on the current object
-   * @example .table("members").columns("name", "email").crud()  // Show users from Project.members
+   * @example .table("members").columns("name", "email").crud()
    */
   table(relationAttribute) {
-    return new DirectTableTabConfig(this.view, this.base, relationAttribute);
+    return new TableTabConfig(this.view, {
+      ...this.base,
+      type: "table",
+      source: { type: "relation", attribute: relationAttribute },
+      columns: []
+    });
   }
   /**
-   * Create an inverse table tab showing records from another object that have a relation to us
+   * Create a table tab showing records from another object that have a relation to us
    *
    * Use this when another object has a relation attribute pointing to the current object.
    *
    * @param sourceObject - Name of the object that has the relation to us
    * @param relationAttribute - Name of the relation attribute on the source object
-   * @example .tableFrom("contacts", "company").columns("firstName", "lastName")  // Show contacts where Contact.company = this
+   * @example .tableFrom("contacts", "company").columns("firstName", "lastName")
    */
   tableFrom(sourceObject, relationAttribute) {
-    return new InverseTableTabConfig(this.view, this.base, sourceObject, relationAttribute);
+    return new TableTabConfig(this.view, {
+      ...this.base,
+      type: "table",
+      source: { type: "inverse", object: sourceObject, attribute: relationAttribute },
+      columns: []
+    });
   }
   /**
    * Create a custom tab with a component
@@ -7515,11 +7161,11 @@ var TabBuilder = class {
     return new CustomTabConfig(this.view, this.base, component);
   }
   /**
-   * Create a notes tab
-   * @example .notes().create().privateOnly()
+   * Create a richtext tab for a richtext attribute
+   * @example .richtext("content").titleAttribute("title")
    */
-  notes() {
-    return new NotesTabConfig(this.view, this.base);
+  richtext(attribute) {
+    return new RichtextTabConfig(this.view, this.base, attribute);
   }
   /**
    * Create an activity tab
@@ -7606,6 +7252,16 @@ var DetailViewBuilder = class {
     this.data.metadata = value;
     return this;
   }
+  /**
+   * Configure a side panel with flat attribute fields displayed alongside tab content.
+   * Not available for modal layout.
+   *
+   * @example .sidePanel({ attributes: ["visibility", "linkedTo"] })
+   */
+  sidePanel(config) {
+    this.data.sidePanel = config;
+    return this;
+  }
   /**
    * Start building a new tab
    */
@@ -7650,10 +7306,14 @@ var DetailViewBuilder = class {
       if (this.data.tabs[0].type !== "form") {
         throw new Error("[DetailViewBuilder] Modal views must have a form tab");
       }
+      if (this.data.sidePanel) {
+        throw new Error("[DetailViewBuilder] Modal views cannot have a side panel");
+      }
     }
     const config = {
       layout: this.data.layout,
-      tabs: this.data.tabs
+      tabs: this.data.tabs,
+      sidePanel: this.data.sidePanel
     };
     return {
       name: this.data.name,
@@ -8648,12 +8308,125 @@ function buildAuditChanges(oldValues, newValues, fieldsToCheck) {
   return changes;
 }
 
+// src/runtime/services/bilateral/bilateral-validation.service.ts
+var BilateralValidationService = class extends BaseService {
+  constructor(adapter, schemaService) {
+    super(adapter);
+    this.schemaService = schemaService;
+  }
+  /**
+   * Validate a bilateral relation configuration.
+   *
+   * Performs comprehensive checks:
+   * 1. Verifies target object exists
+   * 2. Verifies inverse attribute exists on target object
+   * 3. Verifies inverse attribute targets the source object
+   * 4. Detects invalid circular bilateral declarations
+   *
+   * @param sourceSchema - Schema containing the relation attribute
+   * @param sourceAttr - Relation attribute to validate
+   * @returns Validation result with errors if any
+   */
+  async validateBilateralRelation(sourceSchema, sourceAttr) {
+    const errors = [];
+    if (!(isBilateralRelation(sourceAttr) && sourceAttr.bilateral)) {
+      return { valid: true, errors: [] };
+    }
+    const { object: targetObjectName, attribute: inverseAttrName } = sourceAttr.bilateral;
+    let targetSchema = null;
+    try {
+      targetSchema = await this.schemaService.getObjectSchemaByName(targetObjectName);
+    } catch {
+      targetSchema = null;
+    }
+    if (!targetSchema) {
+      errors.push({
+        code: "INVERSE_ATTR_NOT_FOUND",
+        message: `Target object "${targetObjectName}" not found`,
+        context: {
+          sourceObject: sourceSchema.name,
+          sourceAttribute: sourceAttr.name,
+          targetObject: targetObjectName,
+          targetAttribute: inverseAttrName
+        }
+      });
+      return { valid: false, errors };
+    }
+    const inverseAttr = targetSchema.attributes.find(
+      (a) => a.name === inverseAttrName && a.type === "relation"
+    );
+    if (!inverseAttr) {
+      errors.push({
+        code: "INVERSE_ATTR_NOT_FOUND",
+        message: `Inverse attribute "${inverseAttrName}" not found on "${targetObjectName}"`,
+        context: {
+          sourceObject: sourceSchema.name,
+          sourceAttribute: sourceAttr.name,
+          targetObject: targetObjectName,
+          targetAttribute: inverseAttrName
+        }
+      });
+      return { valid: false, errors };
+    }
+    const inverseTargetsSource = inverseAttr.targets.some(
+      (target) => target.object === sourceSchema.name
+    );
+    if (!inverseTargetsSource) {
+      errors.push({
+        code: "INVERSE_TARGET_MISMATCH",
+        message: `Inverse attribute doesn't target source object`,
+        context: {
+          sourceObject: sourceSchema.name,
+          sourceAttribute: sourceAttr.name,
+          targetObject: targetObjectName,
+          targetAttribute: inverseAttrName
+        }
+      });
+    }
+    if (isBilateralRelation(inverseAttr)) {
+      const inverseBilateral = inverseAttr.bilateral;
+      if (inverseBilateral.object === sourceSchema.name && inverseBilateral.attribute !== sourceAttr.name) {
+        errors.push({
+          code: "CIRCULAR_BILATERAL",
+          message: "Both sides declare bilateral but point to different attributes",
+          context: {
+            sourceObject: sourceSchema.name,
+            sourceAttribute: sourceAttr.name,
+            targetObject: targetObjectName,
+            targetAttribute: inverseAttrName
+          }
+        });
+      }
+    }
+    return { valid: errors.length === 0, errors };
+  }
+  /**
+   * Validate all bilateral relations in a schema.
+   *
+   * Iterates through all relation attributes and validates each bilateral configuration.
+   *
+   * @param schema - Object schema to validate
+   * @returns Combined validation result with all errors
+   */
+  async validateAllBilateralRelations(schema) {
+    const allErrors = [];
+    for (const attr of schema.attributes) {
+      if (attr.type === "relation" && isBilateralRelation(attr)) {
+        const result = await this.validateBilateralRelation(schema, attr);
+        allErrors.push(...result.errors);
+      }
+    }
+    return { valid: allErrors.length === 0, errors: allErrors };
+  }
+};
+
 // src/runtime/services/schema/object-schema.service.ts
 var ObjectSchemaService = class extends BaseService {
   constructor(adapter, nativeRegistry, options) {
     super(adapter);
     this.nativeRegistry = nativeRegistry;
     this.auditService = options?.auditService;
+    this.bilateralValidationService = new BilateralValidationService(adapter, this);
   }
   /**
    * Create a new custom object.
@@ -8677,6 +8450,15 @@ var ObjectSchemaService = class extends BaseService {
       builder.attributes(definition.attributes);
     }
     const objectDef = builder.build();
+    const bilateralValidation = await this.bilateralValidationService.validateAllBilateralRelations(objectDef);
+    if (!bilateralValidation.valid) {
+      const errorMessages = bilateralValidation.errors.map((e) => `${e.code}: ${e.message}`).join("; ");
+      throw new SchemaError(
+        `Bilateral relation validation failed: ${errorMessages}`,
+        SchemaErrorCode.VALIDATION_FAILED,
+        { errors: bilateralValidation.errors }
+      );
+    }
     const existing = await this.adapter.objects.findByName(objectDef.name);
     if (existing) {
       throw new Error(`Object with name "${objectDef.name}" already exists`);
@@ -8766,6 +8548,28 @@ var ObjectSchemaService = class extends BaseService {
       );
     }
     const config = await this.validateAttributeInput(attribute);
+    if (attribute.type === "relation" && attribute.bilateral) {
+      const tempSchema = await this.getObjectSchema(objectId);
+      const tempAttr = {
+        ...attribute,
+        id: "temp-id",
+        // Temporary ID for validation
+        system: false,
+        config
+      };
+      const validation = await this.bilateralValidationService.validateBilateralRelation(
+        tempSchema,
+        tempAttr
+      );
+      if (!validation.valid) {
+        const errorMessages = validation.errors.map((e) => `${e.code}: ${e.message}`).join("; ");
+        throw new SchemaError(
+          `Bilateral relation validation failed: ${errorMessages}`,
+          SchemaErrorCode.VALIDATION_FAILED,
+          { errors: validation.errors }
+        );
+      }
+    }
     const dbAttr = await this.adapter.attributes.create({
       objectId,
       name: attribute.name,
@@ -9190,7 +8994,59 @@ Reserved names: ${RESERVED_ATTRIBUTE_NAMES.join(", ")}`
   async buildObjectDefinition(dbObject) {
     const dbAttributes = await this.adapter.attributes.findByObjectId(dbObject.id);
     const baseDef = dbObject.system ? this.mergeNativeObject(dbObject, dbAttributes) : this.convertDBObjectToDefinition(dbObject, dbAttributes);
-    return this.withSystemAttributes(baseDef);
+    const enriched = await this.enrichBilateralProperties(baseDef);
+    return this.withSystemAttributes(enriched);
+  }
+  /**
+   * Enrich bilateral relation attributes that don't own property definitions.
+   * Copies `properties` from the canonical side (the one with `.qualifyWith()`)
+   * and sets `storageOwner: false` so the storage layer knows direction.
+   *
+   * Uses direct DB lookups to avoid circular recursion through `getObjectSchema`.
+   * @internal
+   */
+  async enrichBilateralProperties(def) {
+    const toEnrich = def.attributes.filter(
+      (attr) => attr.type === "relation" && !!attr.bilateral && !attr.properties
+    );
+    if (toEnrich.length === 0) return def;
+    const enrichedMap = /* @__PURE__ */ new Map();
+    for (const attr of toEnrich) {
+      const { bilateral } = attr;
+      if (!bilateral) continue;
+      const inverseObject = await this.adapter.objects.findByName(bilateral.object);
+      if (!inverseObject) continue;
+      const inverseDbAttrs = await this.adapter.attributes.findByObjectId(inverseObject.id);
+      const inverseDbAttr = inverseDbAttrs.find((a) => a.name === bilateral.attribute);
+      if (!inverseDbAttr) continue;
+      let properties = inverseDbAttr.config.properties;
+      if (!properties) {
+        const nativeObj = this.nativeRegistry.getByName(bilateral.object);
+        const nativeAttr = nativeObj?.attributes.find((a) => a.name === bilateral.attribute);
+        if (nativeAttr && "properties" in nativeAttr) {
+          properties = nativeAttr.properties;
+        }
+      }
+      if (properties) {
+        enrichedMap.set(attr.name, {
+          properties,
+          bilateral: { ...bilateral, storageOwner: false }
+        });
+      }
+    }
+    if (enrichedMap.size === 0) return def;
+    return {
+      ...def,
+      attributes: def.attributes.map((attr) => {
+        const enrichment = enrichedMap.get(attr.name);
+        if (!enrichment) return attr;
+        return {
+          ...attr,
+          properties: enrichment.properties,
+          bilateral: enrichment.bilateral
+        };
+      })
+    };
   }
   /**
    * Append system attributes to an ObjectDefinition
@@ -9785,30 +9641,327 @@ var AuditService = class extends BaseService {
   }
 };
 
-// src/runtime/services/user/user.service.ts
-var UserService = class extends BaseService {
-  constructor(adapter) {
+// src/runtime/services/bilateral/bilateral-sync.service.ts
+var browserStub4 = {
+  getStore: () => void 0,
+  run: (_store, callback) => callback()
+};
+var AsyncLocalStorageClass4 = null;
+if (typeof process !== "undefined" && process.versions?.node) {
+  try {
+    if (typeof __require !== "undefined") {
+      const asyncHooks = __require("async_hooks");
+      AsyncLocalStorageClass4 = asyncHooks.AsyncLocalStorage;
+    }
+  } catch {
+    try {
+      const dynamicRequire = new Function(
+        "m",
+        'return typeof require!=="undefined"?require(m):null'
+      );
+      const asyncHooks = dynamicRequire("node:async_hooks");
+      if (asyncHooks) {
+        AsyncLocalStorageClass4 = asyncHooks.AsyncLocalStorage;
+      }
+    } catch {
+    }
+  }
+}
+var bilateralSyncContext = null;
+function getSyncContext() {
+  if (bilateralSyncContext !== null) {
+    return bilateralSyncContext;
+  }
+  if (AsyncLocalStorageClass4) {
+    bilateralSyncContext = new AsyncLocalStorageClass4();
+    return bilateralSyncContext;
+  }
+  bilateralSyncContext = browserStub4;
+  return bilateralSyncContext;
+}
+var BilateralSyncService = class extends BaseService {
+  constructor(adapter, schemaService, relationPropertiesService) {
     super(adapter);
+    this.schemaService = schemaService;
+    this.relationPropertiesService = relationPropertiesService;
   }
+  // ============================================================================
+  // PUBLIC API
+  // ============================================================================
   /**
-   * Validate all user attributes in the data.
+   * Synchronize a bilateral relation after modification.
    *
-   * Uses batch fetching (findByIds) to avoid N+1 query pattern.
-   *
-   * @param schema - Object schema containing attribute definitions
-   * @param data - Record data to validate
-   * @returns Validation result with errors if any
-   *
-   * @example
-   * ```typescript
-   * const result = await userService.validateUsers(schema, {
-   *   assignee: "user-123",
-   *   watchers: ["user-456", "user-789"]
-   * });
-   *
-   * if (!result.valid) {
-   *   console.log(result.errors);
-   *   // [{ attribute: "assignee", message: "User not found", invalidIds: ["user-123"] }]
+   * @param sourceSchema - Schema of the object containing the relation
+   * @param sourceRecordId - ID of the record being modified
+   * @param attributeName - Name of the relation attribute
+   * @param newValue - New value (ID, array of IDs, or hybrid format with properties)
+   * @param oldValue - Old value (ID, array of IDs, or hybrid format with properties)
+   */
+  async syncBilateralRelation(sourceSchema, sourceRecordId, attributeName, newValue, oldValue) {
+    const attribute = sourceSchema.attributes.find(
+      (a) => a.name === attributeName && a.type === "relation"
+    );
+    if (!(attribute && isBilateralRelation(attribute))) {
+      return;
+    }
+    const ctx = getSyncContext().getStore();
+    const syncKey = `${sourceSchema.name}:${sourceRecordId}:${attributeName}`;
+    if (ctx?.syncing.has(syncKey)) {
+      return;
+    }
+    await this.runWithSyncContext(syncKey, async () => {
+      await this.performBilateralSync(sourceSchema, sourceRecordId, attribute, newValue, oldValue);
+    });
+  }
+  // ============================================================================
+  // PRIVATE METHODS
+  // ============================================================================
+  /**
+   * Perform the bidirectional synchronization.
+   * @private
+   */
+  async performBilateralSync(sourceSchema, sourceRecordId, sourceAttr, newValue, oldValue) {
+    const bilateral = sourceAttr.bilateral;
+    const targetSchema = await this.schemaService.getObjectSchemaByName(bilateral.object);
+    if (!targetSchema) {
+      throw new Error(`Target object "${bilateral.object}" not found`);
+    }
+    const inverseAttr = targetSchema.attributes.find(
+      (a) => a.name === bilateral.attribute && a.type === "relation"
+    );
+    if (!inverseAttr) {
+      throw new Error(
+        `Inverse attribute "${bilateral.attribute}" not found on "${bilateral.object}"`
+      );
+    }
+    const newData = this.extractRelationData(newValue);
+    const oldData = this.extractRelationData(oldValue);
+    const addedIds = newData.ids.filter((id) => !oldData.ids.includes(id));
+    const removedIds = oldData.ids.filter((id) => !newData.ids.includes(id));
+    const commonIds = newData.ids.filter((id) => oldData.ids.includes(id));
+    await Promise.all([
+      // Add new relations
+      ...addedIds.map(
+        (targetId) => this.addInverseRelation(
+          targetId,
+          inverseAttr,
+          sourceRecordId,
+          sourceSchema.name,
+          sourceAttr.name,
+          newData.properties.get(targetId)
+        )
+      ),
+      // Remove deleted relations
+      ...removedIds.map(
+        (targetId) => this.removeInverseRelation(targetId, inverseAttr, sourceRecordId)
+      ),
+      // Update properties for common IDs
+      ...commonIds.map(
+        (targetId) => this.updateInverseRelationProperties(
+          targetId,
+          inverseAttr,
+          sourceRecordId,
+          sourceSchema.name,
+          sourceAttr.name,
+          newData.properties.get(targetId),
+          oldData.properties.get(targetId)
+        )
+      )
+    ]);
+  }
+  /**
+   * Extract IDs and properties from hybrid relation value.
+   * @private
+   */
+  extractRelationData(value) {
+    const ids = [];
+    const properties = /* @__PURE__ */ new Map();
+    if (value === null || value === void 0) {
+      return { ids, properties };
+    }
+    if (typeof value === "string") {
+      ids.push(value);
+      return { ids, properties };
+    }
+    if (!Array.isArray(value) && typeof value === "object" && "id" in value) {
+      ids.push(value.id);
+      if (value.props) {
+        properties.set(value.id, value.props);
+      }
+      return { ids, properties };
+    }
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        if (typeof item === "string") {
+          ids.push(item);
+        } else if (typeof item === "object" && item !== null && "id" in item) {
+          ids.push(item.id);
+          if (item.props) {
+            properties.set(item.id, item.props);
+          }
+        }
+      }
+    }
+    return { ids, properties };
+  }
+  /**
+   * Add an ID to an inverse relation (with properties).
+   * @private
+   */
+  async addInverseRelation(targetRecordId, inverseAttr, sourceRecordId, sourceObject, sourceAttribute, properties) {
+    const targetRecord = await this.adapter.objectRecords.findById(targetRecordId);
+    if (!targetRecord) {
+      return;
+    }
+    const currentValue = targetRecord.values[inverseAttr.name];
+    let newValue;
+    if (inverseAttr.cardinality === "one") {
+      newValue = sourceRecordId;
+    } else {
+      const currentArray = this.normalizeToArray(currentValue);
+      if (currentArray.includes(sourceRecordId)) {
+        return;
+      }
+      newValue = [...currentArray, sourceRecordId];
+    }
+    await this.adapter.objectRecords.update(targetRecordId, {
+      [inverseAttr.name]: newValue
+    });
+    await this.invalidateTargetRecordCaches(targetRecordId, targetRecord.objectId);
+    if (properties && Object.keys(properties).length > 0 && this.adapter.relationAttributes) {
+      const sourceSchema = await this.schemaService.getObjectSchemaByName(sourceObject);
+      if (sourceSchema) {
+        await this.relationPropertiesService.syncRelationProperties(
+          sourceSchema,
+          sourceRecordId,
+          sourceAttribute,
+          [{ id: targetRecordId, props: properties }],
+          this.adapter
+        );
+      }
+    }
+  }
+  /**
+   * Update properties of an existing inverse relation.
+   * @private
+   */
+  async updateInverseRelationProperties(targetRecordId, _inverseAttr, sourceRecordId, sourceObject, sourceAttribute, newProperties, oldProperties) {
+    if (JSON.stringify(newProperties) === JSON.stringify(oldProperties)) {
+      return;
+    }
+    if (!this.adapter.relationAttributes) {
+      return;
+    }
+    const sourceSchema = await this.schemaService.getObjectSchemaByName(sourceObject);
+    if (!sourceSchema) {
+      return;
+    }
+    if (newProperties && Object.keys(newProperties).length > 0) {
+      await this.relationPropertiesService.syncRelationProperties(
+        sourceSchema,
+        sourceRecordId,
+        sourceAttribute,
+        [{ id: targetRecordId, props: newProperties }],
+        this.adapter
+      );
+    } else {
+      await this.adapter.relationAttributes.deleteBySource(
+        sourceObject,
+        sourceRecordId,
+        sourceAttribute
+      );
+    }
+  }
+  /**
+   * Remove an ID from an inverse relation.
+   * @private
+   */
+  async removeInverseRelation(targetRecordId, inverseAttr, sourceRecordId) {
+    const targetRecord = await this.adapter.objectRecords.findById(targetRecordId);
+    if (!targetRecord) {
+      return;
+    }
+    const currentValue = targetRecord.values[inverseAttr.name];
+    let newValue;
+    if (inverseAttr.cardinality === "one") {
+      if (currentValue === sourceRecordId) {
+        newValue = null;
+      } else {
+        return;
+      }
+    } else {
+      const currentArray = this.normalizeToArray(currentValue);
+      newValue = currentArray.filter((id) => id !== sourceRecordId);
+      if (newValue.length === currentArray.length) {
+        return;
+      }
+    }
+    await this.adapter.objectRecords.update(targetRecordId, {
+      [inverseAttr.name]: newValue
+    });
+    await this.invalidateTargetRecordCaches(targetRecordId, targetRecord.objectId);
+  }
+  /**
+   * Normalize a relation value to an array of IDs.
+   * @private
+   */
+  normalizeToArray(value) {
+    if (value === null || value === void 0) return [];
+    if (typeof value === "string") return [value];
+    if (Array.isArray(value)) return value;
+    return [];
+  }
+  /**
+   * Invalidate caches for a target record after bilateral update.
+   * Mirrors RecordService.invalidateRecordCaches to ensure consistency.
+   * @private
+   */
+  async invalidateTargetRecordCaches(recordId, objectId) {
+    await this.invalidateCache(cacheKeys.record(this.tenantId, recordId));
+    await this.invalidateLists("allRecordLists", objectId);
+    await this.invalidateLists("allSearchResults", objectId);
+    await this.invalidateCachePattern(cacheKeys.allGlobalSearch(this.tenantId));
+    await this.invalidateCachePattern(cacheKeys.resolvedRelationsByRecord(this.tenantId, recordId));
+  }
+  /**
+   * Execute a function with sync context.
+   * @private
+   */
+  async runWithSyncContext(syncKey, fn) {
+    const storage = getSyncContext();
+    const existingCtx = storage.getStore();
+    const ctx = {
+      syncing: new Set(existingCtx?.syncing ?? [])
+    };
+    ctx.syncing.add(syncKey);
+    return await storage.run(ctx, fn);
+  }
+};
+
+// src/runtime/services/user/user.service.ts
+var UserService = class extends BaseService {
+  constructor(adapter) {
+    super(adapter);
+  }
+  /**
+   * Validate all user attributes in the data.
+   *
+   * Uses batch fetching (findByIds) to avoid N+1 query pattern.
+   *
+   * @param schema - Object schema containing attribute definitions
+   * @param data - Record data to validate
+   * @returns Validation result with errors if any
+   *
+   * @example
+   * ```typescript
+   * const result = await userService.validateUsers(schema, {
+   *   assignee: "user-123",
+   *   watchers: ["user-456", "user-789"]
+   * });
+   *
+   * if (!result.valid) {
+   *   console.log(result.errors);
+   *   // [{ attribute: "assignee", message: "User not found", invalidIds: ["user-123"] }]
    * }
    * ```
    */
@@ -10185,6 +10338,359 @@ async function recalculateParentRollups(record, schema, ctx) {
   }
 }
 
+// src/runtime/services/record/relation-properties.service.ts
+import { z as z5 } from "zod";
+var RelationPropertiesService = class extends BaseService {
+  constructor(adapter) {
+    super(adapter);
+  }
+  // ============================================================================
+  // PUBLIC API
+  // ============================================================================
+  /**
+   * Get relation properties for a given attribute.
+   *
+   * Supports bidirectional relations: searches for properties in both directions
+   * (forward: from_object/from_id → to_id, and inverse: to_id → from_id).
+   *
+   * This ensures that qualified properties are SHARED between both directions
+   * of a bilateral relation, as they are stored in a single row in relation_attributes.
+   *
+   * @param objectName - Source object name
+   * @param recordId - Source record ID
+   * @param attributeName - Relation attribute name
+   * @param targetIds - Array of target record IDs
+   * @returns Map of target ID → properties
+   *
+   * @example
+   * ```typescript
+   * // Properties stored as: contacts/A/companies → X with { role: "CEO" }
+   *
+   * // Read from Contact A → Company X
+   * const propsFromContact = await service.getRelationProperties(
+   *   "contacts", "A", "companies", ["X"]
+   * );
+   * // → Map { "X" => { role: "CEO" } }
+   *
+   * // Read from Company X → Contact A (inverse)
+   * const propsFromCompany = await service.getRelationProperties(
+   *   "companies", "X", "contacts", ["A"]
+   * );
+   * // → Map { "A" => { role: "CEO" } } (same properties!)
+   * ```
+   */
+  async getRelationProperties(objectName, recordId, attributeName, targetIds) {
+    const properties = /* @__PURE__ */ new Map();
+    if (!this.adapter.relationAttributes) {
+      return properties;
+    }
+    const forwardProps = await this.adapter.relationAttributes.findBySource(
+      objectName,
+      recordId,
+      attributeName
+    );
+    for (const prop of forwardProps) {
+      if (targetIds.includes(prop.toId)) {
+        properties.set(prop.toId, prop.properties);
+      }
+    }
+    const inverseProps = await this.adapter.relationAttributes.findByTarget(recordId);
+    for (const prop of inverseProps) {
+      if (targetIds.includes(prop.fromId) && !properties.has(prop.fromId)) {
+        properties.set(prop.fromId, prop.properties);
+      }
+    }
+    return properties;
+  }
+  /**
+   * Batch enrich records with qualified relation properties.
+   *
+   * Detects qualified attributes in the schema and fetches their properties
+   * using batch queries (1 query per qualified attribute, not per record).
+   * Returns records with values in hybrid format `{ id, props }`.
+   *
+   * For bilateral relations, also checks the inverse direction.
+   *
+   * @param records - Records to enrich
+   * @param schema - Object schema
+   * @returns Records with relation values enriched with properties
+   */
+  async enrichRecordsBatch(records, schema) {
+    if (!this.adapter.relationAttributes) return records;
+    if (records.length === 0) return records;
+    const qualifiedAttrs = schema.attributes.filter(
+      (a) => a.type === "relation" && (!!a.properties || !!a.bilateral)
+    );
+    if (qualifiedAttrs.length === 0) return records;
+    const recordIds = records.map((r) => r.id);
+    const relationAttrsRepo = this.adapter.relationAttributes;
+    await Promise.all(
+      qualifiedAttrs.map(async (attr) => {
+        const forwardRows = await relationAttrsRepo.findBySourceBatch(
+          schema.name,
+          recordIds,
+          attr.name
+        );
+        const inverseRows = attr.bilateral ? await relationAttrsRepo.findByTargetBatch(recordIds) : [];
+        const byRecord = /* @__PURE__ */ new Map();
+        for (const row of forwardRows) {
+          let recordMap = byRecord.get(row.fromId);
+          if (!recordMap) {
+            recordMap = /* @__PURE__ */ new Map();
+            byRecord.set(row.fromId, recordMap);
+          }
+          recordMap.set(row.toId, row.properties);
+        }
+        for (const row of inverseRows) {
+          let recordMap = byRecord.get(row.toId);
+          if (!recordMap) {
+            recordMap = /* @__PURE__ */ new Map();
+            byRecord.set(row.toId, recordMap);
+          }
+          if (!recordMap.has(row.fromId)) {
+            recordMap.set(row.fromId, row.properties);
+          }
+        }
+        for (const record of records) {
+          const propsForRecord = byRecord.get(record.id);
+          if (!propsForRecord) continue;
+          const value = record.values[attr.name];
+          if (Array.isArray(value)) {
+            record.values = {
+              ...record.values,
+              [attr.name]: value.map((id) => {
+                const props = propsForRecord.get(id);
+                return props ? { id, props } : id;
+              })
+            };
+          } else if (typeof value === "string") {
+            const props = propsForRecord.get(value);
+            if (props) {
+              record.values = {
+                ...record.values,
+                [attr.name]: { id: value, props }
+              };
+            }
+          }
+        }
+      })
+    );
+    return records;
+  }
+  /**
+   * Normalize relation values for storage in object_records table.
+   *
+   * Extracts IDs from hybrid format ({ id, props }) and returns legacy format (string[] or string).
+   * This ensures object_records.values only contains IDs, while properties are in relation_attributes.
+   *
+   * @param schema - Object schema
+   * @param data - Record data with hybrid relation values
+   * @returns Data with relation values normalized to ID-only format
+   */
+  normalizeRelationValuesForStorage(schema, data) {
+    const normalized = { ...data };
+    for (const attr of schema.attributes) {
+      if (attr.type !== "relation") {
+        continue;
+      }
+      const value = data[attr.name];
+      if (value === null || value === void 0) {
+        continue;
+      }
+      if (attr.cardinality === "many" && Array.isArray(value)) {
+        normalized[attr.name] = value.map((item) => {
+          if (typeof item === "string") return item;
+          if (typeof item === "object" && item !== null && "id" in item) {
+            return item.id;
+          }
+          return item;
+        });
+      } else if (typeof value === "object" && value !== null && "id" in value) {
+        normalized[attr.name] = value.id;
+      }
+    }
+    return normalized;
+  }
+  /**
+   * Synchronize relation properties for a given attribute.
+   *
+   * Handles:
+   * - Format normalization (legacy → new)
+   * - Validation of properties
+   * - Upsert for present IDs
+   * - Delete for absent IDs
+   *
+   * @param schema - Object schema
+   * @param recordId - Source record ID
+   * @param attributeName - Relation attribute name
+   * @param relationValue - Relation value (hybrid format)
+   * @param adapter - Database adapter
+   */
+  async syncRelationProperties(schema, recordId, attributeName, relationValue, adapter) {
+    const attribute = schema.attributes.find((a) => a.name === attributeName);
+    if (!attribute || attribute.type !== "relation") {
+      return;
+    }
+    const normalized = this.normalizeRelationValue(relationValue);
+    const propertySchema = this.getPropertySchema(attribute);
+    const hasPropsInInput = normalized.some((item) => item.props !== void 0);
+    const hasSchema = Boolean(propertySchema);
+    const canSync = hasSchema || hasPropsInInput;
+    if (!canSync) {
+      return;
+    }
+    if (propertySchema) {
+      for (const item of normalized) {
+        if (item.props && Object.keys(item.props).length > 0) {
+          this.validateProperties(propertySchema, item.props);
+        }
+      }
+    }
+    const shouldStoreAsInverse = attribute.bilateral?.storageOwner === false;
+    let storageFromObject = schema.name;
+    let storageFromAttribute = attributeName;
+    if (shouldStoreAsInverse && attribute.bilateral) {
+      storageFromObject = attribute.bilateral.object;
+      storageFromAttribute = attribute.bilateral.attribute;
+    }
+    let existing;
+    if (adapter.relationAttributes) {
+      if (shouldStoreAsInverse) {
+        const results = await Promise.all(
+          normalized.map(
+            (item) => adapter.relationAttributes?.findBySource(
+              storageFromObject,
+              item.id,
+              storageFromAttribute
+            )
+          )
+        );
+        existing = results.filter((r) => r !== void 0).flat().filter((r) => r.toId === recordId);
+      } else {
+        existing = await adapter.relationAttributes.findBySource(
+          schema.name,
+          recordId,
+          attributeName
+        );
+      }
+    }
+    const hasChanges = existing && existing.length > 0;
+    const toUpsert = normalized.filter((item) => {
+      return item.props !== void 0 && Object.keys(item.props).length > 0;
+    });
+    if (!adapter.relationAttributes) {
+      return;
+    }
+    if (hasChanges && existing) {
+      if (shouldStoreAsInverse) {
+        for (const item of normalized) {
+          await adapter.relationAttributes.deleteBySourceAndTarget(
+            storageFromObject,
+            item.id,
+            storageFromAttribute,
+            recordId
+          );
+        }
+      } else {
+        await adapter.relationAttributes.deleteBySource(schema.name, recordId, attributeName);
+      }
+    }
+    if (toUpsert.length > 0) {
+      const inputs = toUpsert.map((item) => {
+        if (shouldStoreAsInverse) {
+          return {
+            fromObject: storageFromObject,
+            fromId: item.id,
+            fromAttribute: storageFromAttribute,
+            toId: recordId,
+            properties: item.props ?? {},
+            updatedBy: this.userId ?? void 0,
+            createdBy: this.userId ?? void 0
+          };
+        }
+        return {
+          fromObject: schema.name,
+          fromId: recordId,
+          fromAttribute: attributeName,
+          toId: item.id,
+          properties: item.props ?? {},
+          updatedBy: this.userId ?? void 0,
+          createdBy: this.userId ?? void 0
+        };
+      });
+      await adapter.relationAttributes.upsertBatch(inputs);
+    }
+  }
+  /**
+   * Validate relation properties against PropertySchema.
+   *
+   * Uses Zod for runtime validation based on PropertyAttribute types.
+   *
+   * @param propertySchema - Schema defining allowed properties
+   * @param properties - Properties to validate
+   * @throws {z.ZodError} if validation fails
+   */
+  validateProperties(propertySchema, properties) {
+    const schema = this.buildZodSchema(propertySchema);
+    schema.parse(properties);
+  }
+  // ============================================================================
+  // PRIVATE HELPERS
+  // ============================================================================
+  /**
+   * Get PropertySchema for a relation attribute.
+   *
+   * For bilateral relations without .qualifyWith(), returns undefined.
+   * Properties will be stored/retrieved but not validated on the inverse side.
+   */
+  getPropertySchema(attribute) {
+    return attribute.properties;
+  }
+  /**
+   * Normalize relation value to unified internal format.
+   *
+   * Converts:
+   * - string[] → Array<{ id, props?: undefined }>
+   * - string → [{ id, props?: undefined }]
+   * - null → []
+   * - Array<{ id, props }> → Array<{ id, props }> (passthrough)
+   * - { id, props } → [{ id, props }] (single to array)
+   */
+  normalizeRelationValue(value) {
+    if (value === null || value === void 0) {
+      return [];
+    }
+    if (typeof value === "string") {
+      return [{ id: value }];
+    }
+    if (!Array.isArray(value) && typeof value === "object" && "id" in value) {
+      return [value];
+    }
+    if (Array.isArray(value)) {
+      return value.map((item) => {
+        if (typeof item === "string") {
+          return { id: item };
+        }
+        return item;
+      });
+    }
+    return [];
+  }
+  /**
+   * Build Zod schema from PropertySchema definition.
+   *
+   * Reuses createFormAttributeValidator() to avoid code duplication with validators.ts.
+   * This validator handles null/undefined values correctly for optional fields.
+   */
+  buildZodSchema(propertySchema) {
+    const shape = {};
+    for (const def of propertySchema.definitions) {
+      shape[def.name] = createFormAttributeValidator(def);
+    }
+    return z5.object(shape);
+  }
+};
+
 // src/runtime/services/record/query.service.ts
 var RecordQueryService = class extends BaseService {
   constructor(adapter, schemaService, options) {
@@ -10192,6 +10698,7 @@ var RecordQueryService = class extends BaseService {
     this.schemaService = schemaService;
     this.options = options;
     this.policyRegistry = options?.policyRegistry === null ? null : options?.policyRegistry ?? defaultPolicyRegistry;
+    this.relationPropertiesService = new RelationPropertiesService(adapter);
   }
   // ============================================================================
   // LIST
@@ -10293,13 +10800,10 @@ var RecordQueryService = class extends BaseService {
       effectiveTotal = exhausted ? collected.length : Math.max(collected.length, result.total);
       filteredRecords = collected.slice(requestedOffset, requestedOffset + requestedLimit);
     }
-    if (options?.include && options.include.length > 0) {
-      filteredRecords = await this.includeRelationsWithProperties(
-        filteredRecords,
-        schema,
-        options.include
-      );
-    }
+    filteredRecords = await this.relationPropertiesService.enrichRecordsBatch(
+      filteredRecords,
+      schema
+    );
     if (!options?.skipFormulas) {
       return {
         records: enrichRecordsWithFormulas(filteredRecords, schema),
@@ -10367,86 +10871,20 @@ var RecordQueryService = class extends BaseService {
       [schema],
       () => this.adapter.objectRecords.search(objectId, query, options)
     );
+    const enrichedRecords = await this.relationPropertiesService.enrichRecordsBatch(
+      result.records,
+      schema
+    );
     if (!options?.skipFormulas) {
       return {
-        records: enrichRecordsWithFormulas(result.records, schema),
+        records: enrichRecordsWithFormulas(enrichedRecords, schema),
         total: result.total
       };
     }
-    return result;
-  }
-  // ============================================================================
-  // INCLUDE RELATIONS WITH PROPERTIES
-  // ============================================================================
-  /**
-   * Include relation properties in records.
-   *
-   * For each requested relation attribute:
-   * - If attribute has properties → Fetch from relation_attributes and return hybrid format
-   * - If attribute has NO properties → Return legacy format (string[] or string)
-   *
-   * Uses batch loading to avoid N+1 queries.
-   *
-   * @param records - Records to enrich with relation properties
-   * @param schema - Object schema
-   * @param includes - Array of relation attribute names to include
-   * @returns Records enriched with relation properties in hybrid format
-   * @private
-   */
-  async includeRelationsWithProperties(records, schema, includes) {
-    if (records.length === 0 || includes.length === 0) {
-      return records;
-    }
-    for (const includeName of includes) {
-      const attr = schema.attributes.find((a) => a.name === includeName);
-      if (!attr || attr.type !== "relation") {
-        continue;
-      }
-      if (attr.properties && this.adapter.relationAttributes) {
-        const recordIds = records.map((r) => r.id);
-        const relationAttributesRepo = this.adapter.relationAttributes;
-        const allRelationProps = await Promise.all(
-          recordIds.map(
-            (recordId) => relationAttributesRepo.findBySource(schema.name, recordId, includeName)
-          )
-        );
-        const propsByRecord = /* @__PURE__ */ new Map();
-        allRelationProps.forEach((props, index) => {
-          const recordId = recordIds[index];
-          const propsMap = /* @__PURE__ */ new Map();
-          for (const prop of props) {
-            propsMap.set(prop.toId, prop.properties);
-          }
-          propsByRecord.set(recordId, propsMap);
-        });
-        for (const record of records) {
-          const currentValue = record.values[includeName];
-          const propsMap = propsByRecord.get(record.id);
-          if (!currentValue) {
-            continue;
-          }
-          if (!propsMap) {
-            continue;
-          }
-          if (attr.cardinality === "many" && Array.isArray(currentValue)) {
-            record.values[includeName] = currentValue.map((id) => {
-              if (typeof id === "string") {
-                const props = propsMap.get(id);
-                return props ? { id, props } : { id };
-              }
-              return id;
-            });
-          } else if (attr.cardinality === "one") {
-            const id = typeof currentValue === "string" ? currentValue : null;
-            if (id) {
-              const props = propsMap.get(id);
-              record.values[includeName] = props ? { id, props } : { id };
-            }
-          }
-        }
-      }
-    }
-    return records;
+    return {
+      records: enrichedRecords,
+      total: result.total
+    };
   }
 };
 
@@ -10542,280 +10980,6 @@ var RecordResolverService = class extends BaseService {
   }
 };
 
-// src/runtime/services/record/relation-properties.service.ts
-import { z as z5 } from "zod";
-var RelationPropertiesService = class extends BaseService {
-  constructor(adapter) {
-    super(adapter);
-  }
-  // ============================================================================
-  // PUBLIC API
-  // ============================================================================
-  /**
-   * Normalize relation values for storage in object_records table.
-   *
-   * Extracts IDs from hybrid format ({ id, props }) and returns legacy format (string[] or string).
-   * This ensures object_records.values only contains IDs, while properties are in relation_attributes.
-   *
-   * @param schema - Object schema
-   * @param data - Record data with hybrid relation values
-   * @returns Data with relation values normalized to ID-only format
-   */
-  normalizeRelationValuesForStorage(schema, data) {
-    const normalized = { ...data };
-    for (const attr of schema.attributes) {
-      if (attr.type !== "relation" || !attr.properties) {
-        continue;
-      }
-      const value = data[attr.name];
-      if (value === null || value === void 0) {
-        continue;
-      }
-      if (attr.cardinality === "many" && Array.isArray(value)) {
-        normalized[attr.name] = value.map((item) => {
-          if (typeof item === "string") return item;
-          if (typeof item === "object" && item !== null && "id" in item) {
-            return item.id;
-          }
-          return item;
-        });
-      } else if (typeof value === "object" && value !== null && "id" in value) {
-        normalized[attr.name] = value.id;
-      }
-    }
-    return normalized;
-  }
-  /**
-   * Synchronize relation properties for a given attribute.
-   *
-   * Handles:
-   * - Format normalization (legacy → new)
-   * - Validation of properties
-   * - Upsert for present IDs
-   * - Delete for absent IDs
-   *
-   * @param schema - Object schema
-   * @param recordId - Source record ID
-   * @param attributeName - Relation attribute name
-   * @param relationValue - Relation value (hybrid format)
-   * @param adapter - Database adapter
-   */
-  async syncRelationProperties(schema, recordId, attributeName, relationValue, adapter) {
-    const attribute = schema.attributes.find((a) => a.name === attributeName);
-    if (!attribute || attribute.type !== "relation") {
-      return;
-    }
-    if (!attribute.properties) {
-      return;
-    }
-    const normalized = this.normalizeRelationValue(relationValue);
-    for (const item of normalized) {
-      if (item.props) {
-        this.validateProperties(attribute.properties, item.props);
-      }
-    }
-    const existing = await adapter.relationAttributes?.findBySource(
-      schema.name,
-      recordId,
-      attributeName
-    );
-    const existingIds = new Set((existing ?? []).map((r) => r.toId));
-    const newIds = new Set(normalized.map((item) => item.id));
-    const toUpsert = normalized.filter((item) => item.props !== void 0);
-    const toDelete = Array.from(existingIds).filter((id) => !newIds.has(id));
-    if (toUpsert.length > 0 && adapter.relationAttributes) {
-      const inputs = toUpsert.map((item) => ({
-        fromObject: schema.name,
-        fromId: recordId,
-        fromAttribute: attributeName,
-        toId: item.id,
-        properties: item.props ?? {},
-        updatedBy: this.userId ?? void 0,
-        createdBy: this.userId ?? void 0
-      }));
-      await adapter.relationAttributes.upsertBatch(inputs);
-    }
-    if (toDelete.length > 0 && adapter.relationAttributes && existing) {
-      for (const toId of toDelete) {
-        const relation2 = existing.find((r) => r.toId === toId);
-        if (relation2) {
-        }
-      }
-      await adapter.relationAttributes.deleteBySource(schema.name, recordId, attributeName);
-      if (toUpsert.length > 0) {
-        const inputs = toUpsert.map((item) => ({
-          fromObject: schema.name,
-          fromId: recordId,
-          fromAttribute: attributeName,
-          toId: item.id,
-          properties: item.props ?? {},
-          updatedBy: this.userId ?? void 0,
-          createdBy: this.userId ?? void 0
-        }));
-        await adapter.relationAttributes.upsertBatch(inputs);
-      }
-    }
-  }
-  /**
-   * Validate relation properties against PropertySchema.
-   *
-   * Uses Zod for runtime validation based on PropertyDefinition types.
-   *
-   * @param propertySchema - Schema defining allowed properties
-   * @param properties - Properties to validate
-   * @throws {z.ZodError} if validation fails
-   */
-  validateProperties(propertySchema, properties) {
-    const schema = this.buildZodSchema(propertySchema);
-    schema.parse(properties);
-  }
-  // ============================================================================
-  // PRIVATE HELPERS
-  // ============================================================================
-  /**
-   * Normalize relation value to unified internal format.
-   *
-   * Converts:
-   * - string[] → Array<{ id, props?: undefined }>
-   * - string → [{ id, props?: undefined }]
-   * - null → []
-   * - Array<{ id, props }> → Array<{ id, props }> (passthrough)
-   * - { id, props } → [{ id, props }] (single to array)
-   *
-   * @param value - Relation value in hybrid format
-   * @returns Normalized array of relation items
-   * @private
-   */
-  normalizeRelationValue(value) {
-    if (value === null || value === void 0) {
-      return [];
-    }
-    if (typeof value === "string") {
-      return [{ id: value }];
-    }
-    if (!Array.isArray(value) && typeof value === "object" && "id" in value) {
-      return [value];
-    }
-    if (Array.isArray(value)) {
-      return value.map((item) => {
-        if (typeof item === "string") {
-          return { id: item };
-        }
-        return item;
-      });
-    }
-    return [];
-  }
-  /**
-   * Build Zod schema from PropertySchema definition.
-   *
-   * Dynamically generates validation schema based on PropertyDefinition types.
-   *
-   * @param propertySchema - PropertySchema with definitions
-   * @returns Zod schema for validation
-   * @private
-   */
-  buildZodSchema(propertySchema) {
-    const shape = {};
-    for (const def of propertySchema.definitions) {
-      let fieldSchema = this.buildFieldSchema(def);
-      if (!def.required) {
-        fieldSchema = fieldSchema.optional();
-      }
-      shape[def.name] = fieldSchema;
-    }
-    return z5.object(shape);
-  }
-  /**
-   * Build Zod schema for a single property field.
-   *
-   * @param def - PropertyDefinition
-   * @returns Zod schema for the field
-   * @private
-   */
-  buildFieldSchema(def) {
-    switch (def.type) {
-      case "text":
-      case "textarea": {
-        let schema = z5.string();
-        if (def.minLength !== void 0) {
-          schema = schema.min(def.minLength);
-        }
-        if (def.maxLength !== void 0) {
-          schema = schema.max(def.maxLength);
-        }
-        if (def.type === "text" && def.pattern) {
-          schema = schema.regex(new RegExp(def.pattern));
-        }
-        return schema;
-      }
-      case "number": {
-        let schema = z5.number();
-        if (def.min !== void 0) {
-          schema = schema.min(def.min);
-        }
-        if (def.max !== void 0) {
-          schema = schema.max(def.max);
-        }
-        if (def.integer) {
-          schema = schema.int();
-        }
-        return schema;
-      }
-      case "checkbox": {
-        return z5.boolean();
-      }
-      case "date": {
-        const schema = z5.string().datetime();
-        return schema;
-      }
-      case "phone": {
-        return z5.string();
-      }
-      case "currency": {
-        let schema = z5.number();
-        if (def.min !== void 0) {
-          schema = schema.min(def.min);
-        }
-        if (def.max !== void 0) {
-          schema = schema.max(def.max);
-        }
-        return schema;
-      }
-      case "status":
-      case "select": {
-        const validValues = def.options.map((opt) => opt.value);
-        return z5.enum(validValues);
-      }
-      case "multiselect": {
-        const validValues = def.options.map((opt) => opt.value);
-        let schema = z5.array(z5.enum(validValues));
-        if (def.maxSelections !== void 0) {
-          schema = schema.max(def.maxSelections);
-        }
-        return schema;
-      }
-      case "rating": {
-        let schema = z5.number().int();
-        if (def.max !== void 0) {
-          schema = schema.max(def.max);
-        }
-        return schema.min(0);
-      }
-      case "location": {
-        return z5.object({
-          address: z5.string().optional(),
-          lat: z5.number().optional(),
-          lng: z5.number().optional()
-        });
-      }
-      default: {
-        return z5.unknown();
-      }
-    }
-  }
-};
-
 // src/runtime/services/record/relation.service.ts
 var RelationService = class extends BaseService {
   constructor(adapter, nativeRegistry, options) {
@@ -10823,6 +10987,7 @@ var RelationService = class extends BaseService {
     this.schemaService = new ObjectSchemaService(adapter, nativeRegistry);
     this.queryService = options.queryService;
     this.recordResolver = options.recordResolver;
+    this.relationPropertiesService = options.relationPropertiesService;
   }
   /**
    * Set the query service after construction.
@@ -11190,20 +11355,33 @@ var RelationService = class extends BaseService {
   /**
    * Resolve the display label for a record.
    * Uses custom template if provided, otherwise falls back to pre-computed label.
+   *
+   * Preserves `{{ props.X }}` tokens for client-side substitution using a sentinel approach:
+   * tokens are replaced with null-byte sentinels before template rendering, then restored after.
+   * This lets `computeLabelWithRelations` resolve target fields while keeping prop placeholders intact.
    */
   async resolveLabel(record, objectSchema, customTemplate) {
-    if (customTemplate) {
-      return computeLabelWithRelations(
-        customTemplate,
-        record.values,
-        objectSchema.attributes,
-        async (nestedIds) => {
-          const linkedRecords = await this.recordResolver.findByIds(nestedIds);
-          return new Map(linkedRecords.map((r) => [r.id, r.label]));
-        }
-      );
+    if (!customTemplate) return record.label;
+    const preserved = [];
+    let i = 0;
+    const safeTemplate = customTemplate.replace(/\{\{\s*props\.\w+[^}]*\}\}/g, (match) => {
+      const key = `\0PROP${i++}\0`;
+      preserved.push([key, match]);
+      return key;
+    });
+    let label = await computeLabelWithRelations(
+      safeTemplate,
+      record.values,
+      objectSchema.attributes,
+      async (nestedIds) => {
+        const linkedRecords = await this.recordResolver.findByIds(nestedIds);
+        return new Map(linkedRecords.map((r) => [r.id, r.label]));
+      }
+    );
+    for (const [key, token] of preserved) {
+      label = label.replace(key, token);
     }
-    return record.label;
+    return label;
   }
   /**
    * Find a relation attribute by ID.
@@ -11650,6 +11828,11 @@ var RecordService = class extends BaseService {
     });
     this.userService = new UserService(adapter);
     this.hookRegistry = options?.hookRegistry ?? new NoopHookRegistry();
+    this.bilateralSyncService = new BilateralSyncService(
+      adapter,
+      this.schemaService,
+      this.relationPropertiesService
+    );
     this.labelResolver = this.recordResolver.createLabelResolver(this.relationService);
     this.rollupContext = this.recordResolver.createRollupContext(
       this.rollupService,
@@ -11718,13 +11901,30 @@ var RecordService = class extends BaseService {
     });
     for (const [attrName, value] of Object.entries(dataWithDefaults)) {
       const attr = schema.attributes.find((a) => a.name === attrName);
-      if (attr?.type === "relation" && attr.properties) {
-        await this.relationPropertiesService.syncRelationProperties(
+      if (attr?.type === "relation") {
+        const hasProperties2 = attr.properties !== void 0;
+        const isBilateral = isBilateralRelation(attr);
+        if (hasProperties2 || isBilateral) {
+          await this.relationPropertiesService.syncRelationProperties(
+            schema,
+            record.id,
+            attrName,
+            value,
+            this.adapter
+          );
+        }
+      }
+    }
+    for (const [attrName, value] of Object.entries(normalizedData)) {
+      const attr = schema.attributes.find((a) => a.name === attrName);
+      if (attr?.type === "relation" && isBilateralRelation(attr)) {
+        await this.bilateralSyncService.syncBilateralRelation(
           schema,
           record.id,
           attrName,
           value,
-          this.adapter
+          null
+          // oldValue is null for create
         );
       }
     }
@@ -11747,11 +11947,7 @@ var RecordService = class extends BaseService {
         recordId: record.id,
         recordLabel: record.label,
         metadata: options?.hookMetadata
-      }).catch((err) => {
-        console.error(
-          "Audit log failed (record.created):",
-          err instanceof Error ? err.message : err
-        );
+      }).catch(() => {
       });
     }
     return record;
@@ -11785,6 +11981,7 @@ var RecordService = class extends BaseService {
     if (!options?.skipFormulas) {
       enrichedRecord = enrichWithFormulas(record, schema);
     }
+    enrichedRecord = await this.enrichRelationProperties(enrichedRecord, schema);
     if (options?.includeSchema) {
       const recordWithSchema = enrichedRecord;
       recordWithSchema.schema = schema;
@@ -11894,17 +12091,41 @@ var RecordService = class extends BaseService {
       );
       updatePayload.__metadata = cleanedMetadata;
     }
+    const bilateralOldValues = {};
+    for (const attrName of Object.keys(normalizedUpdate)) {
+      const attr = schema.attributes.find((a) => a.name === attrName);
+      if (attr?.type === "relation" && isBilateralRelation(attr)) {
+        bilateralOldValues[attrName] = existing.values[attrName];
+      }
+    }
     const updated = await this.adapter.objectRecords.update(recordId, updatePayload);
     await this.invalidateRecordCaches(recordId, existing.objectId);
     for (const [attrName, value] of Object.entries(dataToUpdate)) {
       const attr = schema.attributes.find((a) => a.name === attrName);
-      if (attr?.type === "relation" && attr.properties) {
-        await this.relationPropertiesService.syncRelationProperties(
+      if (attr?.type === "relation") {
+        const hasProperties2 = attr.properties !== void 0;
+        const isBilateral = isBilateralRelation(attr);
+        if (hasProperties2 || isBilateral) {
+          await this.relationPropertiesService.syncRelationProperties(
+            schema,
+            recordId,
+            attrName,
+            value,
+            this.adapter
+          );
+        }
+      }
+    }
+    for (const [attrName, value] of Object.entries(normalizedUpdate)) {
+      const attr = schema.attributes.find((a) => a.name === attrName);
+      if (attr?.type === "relation" && isBilateralRelation(attr)) {
+        const oldValue = bilateralOldValues[attrName];
+        await this.bilateralSyncService.syncBilateralRelation(
           schema,
           recordId,
           attrName,
           value,
-          this.adapter
+          oldValue
         );
       }
     }
@@ -11935,11 +12156,7 @@ var RecordService = class extends BaseService {
         recordLabel: updated.label,
         changes,
         metadata: options?.hookMetadata
-      }).catch((err) => {
-        console.error(
-          "Audit log failed (record.updated):",
-          err instanceof Error ? err.message : err
-        );
+      }).catch(() => {
       });
     }
     return updated;
@@ -11982,6 +12199,19 @@ var RecordService = class extends BaseService {
     if (!options?.skipHooks) {
       await this.hookRegistry.execute("beforeDelete", schema.name, hookCtx);
     }
+    for (const attr of schema.attributes) {
+      if (attr.type === "relation" && isBilateralRelation(attr)) {
+        const currentValue = record.values[attr.name];
+        await this.bilateralSyncService.syncBilateralRelation(
+          schema,
+          recordId,
+          attr.name,
+          null,
+          // newValue is null
+          currentValue
+        );
+      }
+    }
     await this.adapter.objectRecords.delete(recordId);
     await this.invalidateRecordCaches(recordId, record.objectId);
     if (!options?.skipHooks) {
@@ -11997,11 +12227,7 @@ var RecordService = class extends BaseService {
         recordId: record.id,
         recordLabel: record.label,
         metadata: options?.hookMetadata
-      }).catch((err) => {
-        console.error(
-          "Audit log failed (record.deleted):",
-          err instanceof Error ? err.message : err
-        );
+      }).catch(() => {
       });
     }
   }
@@ -12083,11 +12309,7 @@ var RecordService = class extends BaseService {
         recordId: restored.id,
         recordLabel: restored.label,
         metadata: options?.hookMetadata
-      }).catch((err) => {
-        console.error(
-          "Audit log failed (record.restored):",
-          err instanceof Error ? err.message : err
-        );
+      }).catch(() => {
       });
     }
     return restored;
@@ -12095,6 +12317,60 @@ var RecordService = class extends BaseService {
   // ============================================================================
   // PRIVATE HELPERS
   // ============================================================================
+  /**
+   * Enrich relation attributes with their properties (for qualified relations).
+   *
+   * Transforms simple ID arrays into hybrid format { id, props } when properties exist.
+   *
+   * @param record - Record to enrich
+   * @param schema - Object schema
+   * @returns Enriched record with relation properties loaded
+   * @private
+   */
+  async enrichRelationProperties(record, schema) {
+    const enrichedValues = { ...record.values };
+    for (const attr of schema.attributes) {
+      if (attr.type !== "relation") {
+        continue;
+      }
+      const hasProperties2 = attr.properties && attr.properties.definitions.length > 0;
+      const isBilateral = isBilateralRelation(attr);
+      const shouldEnrich = hasProperties2 || isBilateral;
+      if (!shouldEnrich) {
+        continue;
+      }
+      const value = record.values[attr.name];
+      if (value === null || value === void 0) {
+        continue;
+      }
+      const isMany = attr.cardinality === "many";
+      const targetIds = isMany ? value : [value];
+      if (!targetIds || targetIds.length === 0) {
+        continue;
+      }
+      const propsMap = await this.relationPropertiesService.getRelationProperties(
+        schema.name,
+        record.id,
+        attr.name,
+        targetIds
+      );
+      if (isMany) {
+        const hybridArray = targetIds.map((id) => {
+          const props = propsMap.get(id);
+          return props ? { id, props } : id;
+        });
+        enrichedValues[attr.name] = hybridArray;
+      } else {
+        const id = targetIds[0];
+        const props = propsMap.get(id);
+        enrichedValues[attr.name] = props ? { id, props } : id;
+      }
+    }
+    return {
+      ...record,
+      values: enrichedValues
+    };
+  }
   /**
    * Invalidate all caches related to a record (record cache + lists + global search)
    * @private
@@ -17259,14 +17535,6 @@ var ViewService = class extends BaseService {
       type: "activity",
       order: 1
     });
-    tabs.push({
-      id: "notes",
-      name: "notes",
-      label: "Notes",
-      type: "notes",
-      order: 2,
-      allowCreate: true
-    });
     const hasDocuments = object2.attributes.some((attr) => attr.type === "document");
     if (hasDocuments) {
       tabs.push({
@@ -17991,6 +18259,8 @@ export {
   isPresentationProperty,
   RELATION_TARGET_ANY,
   isUniversalRelation,
+  isBilateralRelation,
+  inferInverseCardinality,
   RecordReferencedError,
   AttributeInUseError,
   ObjectReferencedError,
@@ -18076,6 +18346,14 @@ export {
   hasProperties,
   EMPTY_VALUE_PLACEHOLDER,
   formatAttributeValue,
+  DEFAULT_LABEL_FALLBACK,
+  renderLabelExpression,
+  isLabelExpression,
+  extractAttributeNames,
+  enrichValuesForDisplay,
+  enrichValuesWithSelectLabels,
+  extractRelationIds,
+  computeLabelWithRelations,
   SchemaErrorCode,
   SchemaError,
   NotFoundError,
@@ -18098,22 +18376,6 @@ export {
   RoleNotFoundError,
   isForbiddenError,
   ConcurrentModificationError,
-  PropertySchemaBuilder,
-  PropertyTypeBuilder,
-  BasePropertyBuilder,
-  TextPropertyBuilder,
-  TextareaPropertyBuilder,
-  NumberPropertyBuilder,
-  CheckboxPropertyBuilder,
-  DatePropertyBuilder,
-  PhonePropertyBuilder,
-  CurrencyPropertyBuilder,
-  StatusPropertyBuilder,
-  SelectPropertyBuilder,
-  MultiselectPropertyBuilder,
-  RatingPropertyBuilder,
-  LocationPropertyBuilder,
-  validatePropertyType,
   text,
   textarea,
   richtext,
@@ -18136,10 +18398,9 @@ export {
   ObjectBuilder,
   object,
   GroupBuilder,
-  DirectTableTabConfig,
-  InverseTableTabConfig,
+  TableTabConfig,
   CustomTabConfig,
-  NotesTabConfig,
+  RichtextTabConfig,
   ActivityTabConfig,
   FlowsTabConfig,
   DocumentsTabConfig,
@@ -18246,18 +18507,9 @@ export {
   resolveSingleValue,
   resolveMultiplePaths,
   NoopHookRegistry,
-  DEFAULT_LABEL_FALLBACK,
-  renderLabelExpression,
-  isLabelExpression,
-  extractAttributeNames,
-  enrichValuesForDisplay,
-  enrichValuesWithSelectLabels,
-  extractRelationIds,
-  computeLabelWithRelations,
   createMockAdapter,
   PolicyRegistry,
   defaultPolicyRegistry,
-  notesPolicy,
   BaseService,
   BaseRepository,
   SchemaContextAwareRepository,
@@ -18281,9 +18533,9 @@ export {
   createContextForDelete,
   createContextForRestore,
   recalculateParentRollups,
+  RelationPropertiesService,
   RecordQueryService,
   RecordResolverService,
-  RelationPropertiesService,
   RelationService,
   RollupService,
   RecordService,